Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-28 13:34:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

[0.4.14][FONTVIEW] Fix regression; opening files won't list files (#3045)

Browse source 
Based on Mark Jansen's patch in CORE-17001.

The issue started to show with 0.4.14-dev-77-g
d9e7c48c1a

fix cherry picked from commit 0.4.15-dev-513-g
49be08bc69

no official ros release was affected therefore.
This commit is contained in:
Katayama Hirofumi MZ 2020-08-15 07:08:40 +09:00 committed by Joachim Henze
parent 3a96eeb446
commit 22210acfdf
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
base/applications/fontview/fontview.c
View file

@ -35,7 +35,7 @@ HINSTANCE g_hInstance;
INT g_FontIndex = 0;
INT g_NumFonts = 0;
LOGFONTW g_LogFonts[64];
LPCWSTR g_fileName;
LPCWSTR g_fileName = L"";
WCHAR g_FontTitle[1024] = L"";
BOOL g_FontPrint = FALSE;
BOOL g_DisableInstall = FALSE;
@ -102,7 +102,6 @@ wWinMain(HINSTANCE hThisInstance,
int argc;
INT i;
WCHAR** argv;
WCHAR szFileName[MAX_PATH] = L"";
DWORD dwSize;
HWND hMainWnd;
MSG msg;
@ -125,6 +124,8 @@ wWinMain(HINSTANCE hThisInstance,
argv = CommandLineToArgvW(GetCommandLineW(), &argc);
if (argc < 2)
{
#if 0
WCHAR szFileName[MAX_PATH] = L"";
OPENFILENAMEW fontOpen;
WCHAR filter[MAX_PATH*2], dialogTitle[MAX_PATH];
@ -154,6 +155,7 @@ wWinMain(HINSTANCE hThisInstance,
exiting the program altogether */
return 0;
}
#endif
}
else
{
@ -190,9 +192,9 @@ wWinMain(HINSTANCE hThisInstance,
g_fileName = fileName;
}
if (!AddFontResourceW(fileName))
if (!AddFontResourceW(g_fileName))
{
ErrorMsgBox(0, IDS_ERROR_NOFONT, fileName);
ErrorMsgBox(0, IDS_ERROR_NOFONT, g_fileName);
return -1;
}