October 2020 - Wine-Commits

Alexandre Julliard : gdi32: Compare DOS filenames instead of Unix stat information for font files.
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: 14395c85354ca90f2f37b1ed3ac6d2077e3d1f0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=14395c85354ca90f2f37b1ed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 6 15:40:25 2020 +0200 gdi32: Compare DOS filenames instead of Unix stat information for font files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 64 ++++++++++++++++++++------------------------------- 1 file changed, 25 insertions(+), 39 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index cb23173915..23edd1b0c3 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -272,8 +272,6 @@ typedef struct tagFace { WCHAR *style_name; WCHAR *full_name; WCHAR *file; - dev_t dev; - ino_t ino; void *font_data_ptr; DWORD font_data_size; FT_Long face_index; @@ -1573,7 +1571,7 @@ static BOOL insert_face_in_family_list( Face *face, Family *family ) debugstr_w(face->full_name), debugstr_w(family->family_name), cursor->font_version, face->font_version ); - if (face->file && face->dev == cursor->dev && face->ino == cursor->ino) + if (face->file && !strcmpiW( face->file, cursor->file )) { cursor->refcount++; TRACE("Font %s already in list, refcount now %d\n", @@ -2100,10 +2098,9 @@ static inline void get_fontsig( FT_Face ft_face, FONTSIGNATURE *fs ) } } -static Face *create_face( FT_Face ft_face, FT_Long face_index, const WCHAR *dos_name, const char *unix_name, +static Face *create_face( FT_Face ft_face, FT_Long face_index, const WCHAR *filename, void *font_data_ptr, DWORD font_data_size, DWORD flags ) { - struct stat st; Face *face = HeapAlloc( GetProcessHeap(), 0, sizeof(*face) ); face->refcount = 1; @@ -2111,18 +2108,11 @@ static Face *create_face( FT_Face ft_face, FT_Long face_index, const WCHAR *dos_ face->full_name = ft_face_get_full_name( ft_face, GetSystemDefaultLangID() ); if (flags & ADDFONT_VERTICAL_FONT) face->full_name = get_vertical_name( face->full_name ); - face->dev = 0; - face->ino = 0; - if (unix_name) + if (filename) { - face->file = dos_name ? strdupW( dos_name ) : wine_get_dos_file_name( unix_name ); + face->file = strdupW( filename ); face->font_data_ptr = NULL; face->font_data_size = 0; - if (!stat( unix_name, &st )) - { - face->dev = st.st_dev; - face->ino = st.st_ino; - } } else { @@ -2160,13 +2150,13 @@ static Face *create_face( FT_Face ft_face, FT_Long face_index, const WCHAR *dos_ return face; } -static void AddFaceToList(FT_Face ft_face, const WCHAR *dos_name, const char *unix_name, - void *font_data_ptr, DWORD font_data_size, FT_Long face_index, DWORD flags ) +static void AddFaceToList(FT_Face ft_face, const WCHAR *file, void *font_data_ptr, DWORD font_data_size, + FT_Long face_index, DWORD flags ) { Face *face; Family *family; - face = create_face( ft_face, face_index, dos_name, unix_name, font_data_ptr, font_data_size, flags ); + face = create_face( ft_face, face_index, file, font_data_ptr, font_data_size, flags ); family = get_family( ft_face, flags & ADDFONT_VERTICAL_FONT ); if (insert_face_in_family_list( face, family )) @@ -2261,6 +2251,7 @@ static INT AddFontToList(const WCHAR *dos_name, const char *unix_name, void *fon FT_Face ft_face; FT_Long face_index = 0, num_faces; INT ret = 0; + WCHAR *filename = NULL; /* we always load external fonts from files - otherwise we would get a crash in update_reg_entries */ assert(unix_name || !(flags & ADDFONT_EXTERNAL_FONT)); @@ -2286,26 +2277,28 @@ static INT AddFontToList(const WCHAR *dos_name, const char *unix_name, void *fon } #endif /* HAVE_CARBON_CARBON_H */ + if (!dos_name && unix_name) dos_name = filename = wine_get_dos_file_name( unix_name ); + do { FONTSIGNATURE fs; ft_face = new_ft_face( unix_name, font_data_ptr, font_data_size, face_index, flags & ADDFONT_ALLOW_BITMAP ); - if (!ft_face) return 0; + if (!ft_face) break; if(ft_face->family_name[0] == '.') /* Ignore fonts with names beginning with a dot */ { TRACE("Ignoring %s since its family name begins with a dot\n", debugstr_a(unix_name)); pFT_Done_Face(ft_face); - return 0; + break; } - AddFaceToList(ft_face, dos_name, unix_name, font_data_ptr, font_data_size, face_index, flags); + AddFaceToList(ft_face, dos_name, font_data_ptr, font_data_size, face_index, flags); ++ret; get_fontsig(ft_face, &fs); if (fs.fsCsb[0] & FS_DBCS_MASK) { - AddFaceToList(ft_face, dos_name, unix_name, font_data_ptr, font_data_size, face_index, + AddFaceToList(ft_face, dos_name, font_data_ptr, font_data_size, face_index, flags | ADDFONT_VERTICAL_FONT); ++ret; } @@ -2313,6 +2306,7 @@ static INT AddFontToList(const WCHAR *dos_name, const char *unix_name, void *fon num_faces = ft_face->num_faces; pFT_Done_Face(ft_face); } while(num_faces > ++face_index); + HeapFree( GetProcessHeap(), 0, filename ); return ret; } @@ -2333,12 +2327,8 @@ static int remove_font_resource( const WCHAR *file, DWORD flags ) { Family *family, *family_next; Face *face, *face_next; - struct stat st; int count = 0; - char *unixname; - if (!(unixname = wine_get_unix_file_name( file ))) return 0; - if (stat( unixname, &st ) == -1) goto done; LIST_FOR_EACH_ENTRY_SAFE( family, family_next, &font_list, Family, entry ) { family->refcount++; @@ -2346,7 +2336,7 @@ static int remove_font_resource( const WCHAR *file, DWORD flags ) { if (!face->file) continue; if (LOWORD(face->flags) != LOWORD(flags)) continue; - if (st.st_dev == face->dev && st.st_ino == face->ino) + if (!strcmpiW( face->file, file )) { TRACE( "removing matching face %s refcount %d\n", debugstr_w(face->file), face->refcount ); release_face( face ); @@ -2355,8 +2345,6 @@ static int remove_font_resource( const WCHAR *file, DWORD flags ) } release_family( family ); } -done: - HeapFree( GetProcessHeap(), 0, unixname ); return count; } @@ -3500,19 +3488,17 @@ static BOOL get_fontdir( const WCHAR *dos_name, struct fontdir *fd ) if (!(unix_name = wine_get_unix_file_name( dos_name ))) return FALSE; ft_face = new_ft_face( unix_name, NULL, 0, 0, FALSE ); - if (ft_face) + HeapFree( GetProcessHeap(), 0, unix_name ); + if (!ft_face) return FALSE; + face = create_face( ft_face, 0, dos_name, NULL, 0, 0 ); + if (face) { - face = create_face( ft_face, 0, dos_name, unix_name, NULL, 0, 0 ); - if (face) - { - family_name = ft_face_get_family_name( ft_face, GetSystemDefaultLCID() ); - GetEnumStructs( face, family_name, &elf, &ntm, &type ); - release_face( face ); - HeapFree( GetProcessHeap(), 0, family_name ); - } - pFT_Done_Face( ft_face ); + family_name = ft_face_get_family_name( ft_face, GetSystemDefaultLCID() ); + GetEnumStructs( face, family_name, &elf, &ntm, &type ); + release_face( face ); + HeapFree( GetProcessHeap(), 0, family_name ); } - HeapFree( GetProcessHeap(), 0, unix_name ); + pFT_Done_Face( ft_face ); if (!face) return FALSE; if ((type & TRUETYPE_FONTTYPE) == 0) return FALSE;

1 0

Hans Leidekker : bcrypt: Fix buffer size query in BCryptExportKey.
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: 7d54f9a87f337276fb5c328872951e485cdc37af URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d54f9a87f337276fb5c3288… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 6 12:27:11 2020 +0200 bcrypt: Fix buffer size query in BCryptExportKey. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 16c68ed691..7f8b08869d 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -968,11 +968,13 @@ static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, U *size = req_size; if (output_len < req_size) return STATUS_BUFFER_TOO_SMALL; - - header->dwMagic = BCRYPT_KEY_DATA_BLOB_MAGIC; - header->dwVersion = BCRYPT_KEY_DATA_BLOB_VERSION1; - header->cbKeyData = key->u.s.secret_len; - memcpy( &header[1], key->u.s.secret, key->u.s.secret_len ); + if (output) + { + header->dwMagic = BCRYPT_KEY_DATA_BLOB_MAGIC; + header->dwVersion = BCRYPT_KEY_DATA_BLOB_VERSION1; + header->cbKeyData = key->u.s.secret_len; + memcpy( &header[1], key->u.s.secret, key->u.s.secret_len ); + } return STATUS_SUCCESS; } else if (!wcscmp( type, BCRYPT_OPAQUE_KEY_BLOB )) @@ -981,9 +983,11 @@ static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, U *size = req_size; if (output_len < req_size) return STATUS_BUFFER_TOO_SMALL; - - *(ULONG *)output = key->u.s.secret_len; - memcpy( output + sizeof(len), key->u.s.secret, key->u.s.secret_len ); + if (output) + { + *(ULONG *)output = key->u.s.secret_len; + memcpy( output + sizeof(len), key->u.s.secret, key->u.s.secret_len ); + } return STATUS_SUCCESS; } else if (!wcscmp( type, BCRYPT_RSAPUBLIC_BLOB ) || !wcscmp( type, BCRYPT_DSA_PUBLIC_BLOB ) || @@ -991,8 +995,7 @@ static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, U { *size = key->u.a.pubkey_len; if (output_len < key->u.a.pubkey_len) return STATUS_SUCCESS; - - memcpy( output, key->u.a.pubkey, key->u.a.pubkey_len ); + if (output) memcpy( output, key->u.a.pubkey, key->u.a.pubkey_len ); return STATUS_SUCCESS; } else if (!wcscmp( type, BCRYPT_ECCPRIVATE_BLOB ))

1 0

Michael Stefaniuc : schtasks: Use wide-char string literals.
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: 26be243d1668dbf47a42bb670e16f323a2ffd4a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26be243d1668dbf47a42bb67… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Oct 5 23:22:54 2020 +0200 schtasks: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/schtasks/schtasks.c | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/programs/schtasks/schtasks.c b/programs/schtasks/schtasks.c index 2ffc241153..79f2555522 100644 --- a/programs/schtasks/schtasks.c +++ b/programs/schtasks/schtasks.c @@ -25,16 +25,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(schtasks); -static const WCHAR change_optW[] = {'/','c','h','a','n','g','e',0}; -static const WCHAR create_optW[] = {'/','c','r','e','a','t','e',0}; -static const WCHAR delete_optW[] = {'/','d','e','l','e','t','e',0}; -static const WCHAR enable_optW[] = {'/','e','n','a','b','l','e',0}; -static const WCHAR f_optW[] = {'/','f',0}; -static const WCHAR ru_optW[] = {'/','r','u',0}; -static const WCHAR tn_optW[] = {'/','t','n',0}; -static const WCHAR tr_optW[] = {'/','t','r',0}; -static const WCHAR xml_optW[] = {'/','x','m','l',0}; - static ITaskFolder *get_tasks_root_folder(void) { ITaskService *service; @@ -140,7 +130,7 @@ static int change_command(int argc, WCHAR *argv[]) HRESULT hres; while (argc) { - if(!wcsicmp(argv[0], tn_optW)) { + if (!wcsicmp(argv[0], L"/tn")) { if (argc < 2) { FIXME("Missing /tn value\n"); return 1; @@ -154,12 +144,12 @@ static int change_command(int argc, WCHAR *argv[]) task_name = argv[1]; argc -= 2; argv += 2; - }else if (!wcsicmp(argv[0], enable_optW)) { + } else if (!wcsicmp(argv[0], L"/enable")) { enable = TRUE; have_option = TRUE; argc--; argv++; - }else if (!wcsicmp(argv[0], tr_optW)) { + } else if (!wcsicmp(argv[0], L"/tr")) { if (argc < 2) { FIXME("Missing /tr value\n"); return 1; @@ -213,7 +203,7 @@ static int create_command(int argc, WCHAR *argv[]) HRESULT hres; while (argc) { - if (!wcsicmp(argv[0], xml_optW)) { + if (!wcsicmp(argv[0], L"/xml")) { if (argc < 2) { FIXME("Missing /xml value\n"); return 1; @@ -227,7 +217,7 @@ static int create_command(int argc, WCHAR *argv[]) xml_file = argv[1]; argc -= 2; argv += 2; - }else if(!wcsicmp(argv[0], tn_optW)) { + } else if (!wcsicmp(argv[0], L"/tn")) { if (argc < 2) { FIXME("Missing /tn value\n"); return 1; @@ -241,11 +231,11 @@ static int create_command(int argc, WCHAR *argv[]) task_name = argv[1]; argc -= 2; argv += 2; - }else if(!wcsicmp(argv[0], f_optW)) { + } else if (!wcsicmp(argv[0], L"/f")) { flags = TASK_CREATE_OR_UPDATE; argc--; argv++; - }else if (!wcsicmp(argv[0], ru_optW)) { + } else if (!wcsicmp(argv[0], L"/ru")) { if (argc < 2) { FIXME("Missing /ru value\n"); return 1; @@ -302,11 +292,11 @@ static int delete_command(int argc, WCHAR *argv[]) HRESULT hres; while (argc) { - if (!wcsicmp(argv[0], f_optW)) { + if (!wcsicmp(argv[0], L"/f")) { TRACE("force opt\n"); argc--; argv++; - }else if(!wcsicmp(argv[0], tn_optW)) { + } else if (!wcsicmp(argv[0], L"/tn")) { if (argc < 2) { FIXME("Missing /tn value\n"); return 1; @@ -357,11 +347,11 @@ int __cdecl wmain(int argc, WCHAR *argv[]) if (argc < 2) FIXME("Print current tasks state\n"); - else if (!wcsicmp(argv[1], change_optW)) + else if (!wcsicmp(argv[1], L"/change")) ret = change_command(argc - 2, argv + 2); - else if (!wcsicmp(argv[1], create_optW)) + else if (!wcsicmp(argv[1], L"/create")) ret = create_command(argc - 2, argv + 2); - else if (!wcsicmp(argv[1], delete_optW)) + else if (!wcsicmp(argv[1], L"/delete")) ret = delete_command(argc - 2, argv + 2); else FIXME("Unsupported command %s\n", debugstr_w(argv[1]));

1 0

Michael Stefaniuc : control: Use wide-char string literals.
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: 80912728f1fdd95d03a7c57bede85ab9e94edebc URL: https://source.winehq.org/git/wine.git/?a=commit;h=80912728f1fdd95d03a7c57b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Oct 5 23:22:49 2020 +0200 control: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/control/control.c | 52 ++++++++++++++-------------------------------- 1 file changed, 16 insertions(+), 36 deletions(-) diff --git a/programs/control/control.c b/programs/control/control.c index 9f9005f748..b72416893c 100644 --- a/programs/control/control.c +++ b/programs/control/control.c @@ -26,26 +26,6 @@ #include <windows.h> #include <shellapi.h> -/* alphabetical list of recognized optional command line parameters */ -static const WCHAR szP_COLOR[] = {'C','O','L','O','R',0}; -static const WCHAR szP_DATETIME[] = {'D','A','T','E','/','T','I','M','E',0}; -static const WCHAR szP_DESKTOP[] = {'D','E','S','K','T','O','P',0}; -static const WCHAR szP_INTERNATIONAL[] = {'I','N','T','E','R','N','A','T','I','O','N','A','L',0}; -static const WCHAR szP_KEYBOARD[] = {'K','E','Y','B','O','A','R','D',0}; -static const WCHAR szP_MOUSE[] = {'M','O','U','S','E',0}; -static const WCHAR szP_PORTS[] = {'P','O','R','T','S',0}; -static const WCHAR szP_PRINTERS [] = {'P','R','I','N','T','E','R','S',0}; - -/* alphabetical list of appropriate commands to execute */ -static const WCHAR szC_COLOR[] = {'d','e','s','k','.','c','p','l',',',',','2',0}; -static const WCHAR szC_DATETIME[] = {'t','i','m','e','d','a','t','e','.','c','p','l',0}; -static const WCHAR szC_DESKTOP[] = {'d','e','s','k','.','c','p','l',0}; -static const WCHAR szC_INTERNATIONAL[] = {'i','n','t','l','.','c','p','l',0}; -static const WCHAR szC_KEYBOARD[] = {'m','a','i','n','.','c','p','l',' ','@','1',0}; -static const WCHAR szC_MOUSE[] = {'m','a','i','n','.','c','p','l',0}; -static const WCHAR szC_PORTS[] = {'s','y','s','d','m','.','c','p','l',',',',','1',0}; -static const WCHAR szC_PRINTERS[] = {'m','a','i','n','.','c','p','l',' ','@','2',0}; - extern void WINAPI Control_RunDLLW(HWND hWnd, HINSTANCE hInst, LPCWSTR cmd, DWORD nCmdShow); @@ -63,22 +43,22 @@ int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrev, LPWSTR lpszCmdLine, INT nC } /* check for optional parameter */ - if (!lstrcmpiW(lpszCmdLine,szP_COLOR)) - launch(szC_COLOR); - if (!lstrcmpiW(lpszCmdLine,szP_DATETIME)) - launch(szC_DATETIME); - if (!lstrcmpiW(lpszCmdLine,szP_DESKTOP)) - launch(szC_DESKTOP); - if (!lstrcmpiW(lpszCmdLine,szP_INTERNATIONAL)) - launch(szC_INTERNATIONAL); - if (!lstrcmpiW(lpszCmdLine,szP_KEYBOARD)) - launch(szC_KEYBOARD); - if (!lstrcmpiW(lpszCmdLine,szP_MOUSE)) - launch(szC_MOUSE); - if (!lstrcmpiW(lpszCmdLine,szP_PORTS)) - launch(szC_PORTS); - if (!lstrcmpiW(lpszCmdLine,szP_PRINTERS)) - launch(szC_PRINTERS); + if (!lstrcmpiW(lpszCmdLine, L"COLOR")) + launch(L"desk.cpl,,2"); + if (!lstrcmpiW(lpszCmdLine, L"DATE/TIME")) + launch(L"timedate.cpl"); + if (!lstrcmpiW(lpszCmdLine, L"DESKTOP")) + launch(L"desk.cpl"); + if (!lstrcmpiW(lpszCmdLine, L"INTERNATIONAL")) + launch(L"intl.cpl"); + if (!lstrcmpiW(lpszCmdLine, L"KEYBOARD")) + launch(L"main.cpl @1"); + if (!lstrcmpiW(lpszCmdLine, L"MOUSE")) + launch(L"main.cpl"); + if (!lstrcmpiW(lpszCmdLine, L"PORTS")) + launch(L"sysdm.cpl,,1"); + if (!lstrcmpiW(lpszCmdLine, L"PRINTERS")) + launch(L"main.cpl @2"); /* try to launch if a .cpl file is given directly */ launch(lpszCmdLine);

1 0

Michael Stefaniuc : clock: Use wide-char string literals.
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: 53e04ef328290bf3584c38e78dd4a229a949b147 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53e04ef328290bf3584c38e7… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Oct 5 23:22:48 2020 +0200 clock: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/clock/main.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/programs/clock/main.c b/programs/clock/main.c index 3ad636be43..43364745ea 100644 --- a/programs/clock/main.c +++ b/programs/clock/main.c @@ -104,10 +104,9 @@ static BOOL CLOCK_ResetTimer(void) period = 1000; if (!SetTimer (Globals.hMainWnd, TIMER_ID, period, NULL)) { - static const WCHAR notimersW[] = {'N','o',' ','a','v','a','i','l','a','b','l','e',' ','t','i','m','e','r','s',0}; WCHAR szApp[MAX_STRING_LEN]; LoadStringW(Globals.hInstance, IDS_CLOCK, szApp, MAX_STRING_LEN); - MessageBoxW(0, notimersW, szApp, MB_ICONEXCLAMATION | MB_OK); + MessageBoxW(0, L"No available timers", szApp, MB_ICONEXCLAMATION | MB_OK); return FALSE; } return TRUE; @@ -390,9 +389,6 @@ int PASCAL WinMain (HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show MSG msg; WNDCLASSW class; - static const WCHAR szClassName[] = {'C','L','C','l','a','s','s',0}; - static const WCHAR szWinName[] = {'C','l','o','c','k',0}; - /* Setup Globals */ memset(&Globals.hFont, 0, sizeof (Globals.hFont)); Globals.bAnalog = TRUE; @@ -408,13 +404,13 @@ int PASCAL WinMain (HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show class.hCursor = LoadCursorW(0, (LPCWSTR)IDC_ARROW); class.hbrBackground = 0; class.lpszMenuName = 0; - class.lpszClassName = szClassName; + class.lpszClassName = L"CLClass"; } - + if (!RegisterClassW(&class)) return FALSE; - + Globals.MaxX = Globals.MaxY = INITIAL_WINDOW_SIZE; - Globals.hMainWnd = CreateWindowW(szClassName, szWinName, WS_OVERLAPPEDWINDOW, + Globals.hMainWnd = CreateWindowW(L"CLClass", L"Clock", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, Globals.MaxX, Globals.MaxY, 0, 0, hInstance, 0);

1 0

Michael Stefaniuc : hostname: Use wide-char string literals.
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: 0df592b7d5121862231b8224175f59bed160c5f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0df592b7d5121862231b8224… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Oct 5 23:22:52 2020 +0200 hostname: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/hostname/hostname.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/programs/hostname/hostname.c b/programs/hostname/hostname.c index 0738e718e1..e6c2ed76cd 100644 --- a/programs/hostname/hostname.c +++ b/programs/hostname/hostname.c @@ -91,18 +91,15 @@ static int WINAPIV hostname_message_printfW(int msg, ...) static int hostname_message(int msg) { - static const WCHAR formatW[] = {'%','s',0}; WCHAR msg_buffer[8192]; LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, ARRAY_SIZE(msg_buffer)); - return hostname_printfW(formatW, msg_buffer); + return hostname_printfW(L"%s", msg_buffer); } static int display_computer_name(void) { - static const WCHAR fmtW[] = {'%','s','\r','\n',0}; - WCHAR name[MAX_COMPUTERNAME_LENGTH + 1]; DWORD size = ARRAY_SIZE(name); BOOL ret; @@ -114,7 +111,7 @@ static int display_computer_name(void) return 1; } - hostname_printfW(fmtW, name); + hostname_printfW(L"%s\r\n", name); return 0; } @@ -122,11 +119,9 @@ int __cdecl wmain(int argc, WCHAR *argv[]) { if (argc > 1) { - static const WCHAR slashHelpW[] = {'/','?',0}; - unsigned int i; - if (!wcsncmp(argv[1], slashHelpW, ARRAY_SIZE(slashHelpW) - 1)) + if (!wcsncmp(argv[1], L"/?", ARRAY_SIZE(L"/?") - 1)) { hostname_message(STRING_USAGE); return 1;

1 0

Michael Stefaniuc : net: Use wide-char string literals.
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: e14b2d486d833875fe0142129eaa878a5f413e08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e14b2d486d833875fe014212… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Oct 5 23:22:53 2020 +0200 net: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/net/net.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/programs/net/net.c b/programs/net/net.c index 0f43e8a973..dbc4bf2bfc 100644 --- a/programs/net/net.c +++ b/programs/net/net.c @@ -155,7 +155,6 @@ static BOOL net_use(int argc, const WCHAR* argv[]) static BOOL net_enum_services(void) { - static const WCHAR runningW[]={' ',' ',' ',' ','%','1','\n',0}; SC_HANDLE SCManager; LPENUM_SERVICE_STATUS_PROCESSW services; DWORD size, i, count, resume; @@ -184,7 +183,7 @@ static BOOL net_enum_services(void) output_string(STRING_RUNNING_HEADER); for(i = 0; i < count; i++) { - output_printf(runningW, services[i].lpDisplayName); + output_printf(L" %1\n", services[i].lpDisplayName); WINE_TRACE("service=%s state=%d controls=%x\n", wine_dbgstr_w(services[i].lpServiceName), services[i].ServiceStatusProcess.dwCurrentState, @@ -295,19 +294,13 @@ static BOOL arg_is(const WCHAR* str1, const WCHAR* str2) int __cdecl wmain(int argc, const WCHAR* argv[]) { - static const WCHAR helpW[]={'h','e','l','p',0}; - static const WCHAR shelpW[]={'/','h','e','l','p',0}; - static const WCHAR startW[]={'s','t','a','r','t',0}; - static const WCHAR stopW[]={'s','t','o','p',0}; - static const WCHAR useW[]={'u','s','e',0}; - if (argc < 2) { output_string(STRING_USAGE); return 1; } - if(arg_is(argv[1], helpW)) + if(arg_is(argv[1], L"help")) { if(argc > 3) { @@ -316,14 +309,14 @@ int __cdecl wmain(int argc, const WCHAR* argv[]) } if(argc == 2) output_string(STRING_USAGE); - else if(arg_is(argv[2], startW)) + else if(arg_is(argv[2], L"start")) output_string(STRING_START_USAGE); - else if(arg_is(argv[2], stopW)) + else if(arg_is(argv[2], L"stop")) output_string(STRING_STOP_USAGE); else output_string(STRING_USAGE); } - else if(arg_is(argv[1], startW)) + else if(arg_is(argv[1], L"start")) { if(argc > 3) { @@ -335,24 +328,24 @@ int __cdecl wmain(int argc, const WCHAR* argv[]) if (!net_enum_services()) return 1; } - else if(arg_is(argv[2], shelpW)) + else if(arg_is(argv[2], L"/help")) output_string(STRING_START_USAGE); else if(!net_service(NET_START, argv[2])) return 1; } - else if(arg_is(argv[1], stopW)) + else if(arg_is(argv[1], L"stop")) { if(argc != 3) { output_string(STRING_STOP_USAGE); return 1; } - if(arg_is(argv[2], shelpW)) + if(arg_is(argv[2], L"/help")) output_string(STRING_STOP_USAGE); else if(!net_service(NET_STOP, argv[2])) return 1; } - else if(arg_is(argv[1], useW)) + else if(arg_is(argv[1], L"use")) { if(!net_use(argc, argv)) return 1; }

1 0

Michael Stefaniuc : conhost: Correct whitespace placement in a TRACE().
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: 8bfdc84a1994274e5d7ee44c4ee3892666f4cdc7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bfdc84a1994274e5d7ee44c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Oct 5 23:22:44 2020 +0200 conhost: Correct whitespace placement in a TRACE(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index ac0e22b4c4..a54238c80f 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2477,7 +2477,7 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, case IOCTL_CONDRV_PEEK: { void *result; - TRACE( "peek\n "); + TRACE( "peek\n" ); if (in_size) return STATUS_INVALID_PARAMETER; ensure_tty_input_thread( console ); *out_size = min( *out_size, console->record_count * sizeof(INPUT_RECORD) );

1 0

Michael Stefaniuc : packager: Use wide-char string literals.
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: cc8adf7db1838b2f841b069217b0d925dbbbb324 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc8adf7db1838b2f841b0692… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Oct 5 23:22:45 2020 +0200 packager: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/packager/packager_main.c | 11 +++-------- dlls/packager/tests/oleobj.c | 8 ++------ 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/dlls/packager/packager_main.c b/dlls/packager/packager_main.c index 0a0790e903..de07e5ca26 100644 --- a/dlls/packager/packager_main.c +++ b/dlls/packager/packager_main.c @@ -181,8 +181,7 @@ static HRESULT WINAPI OleObject_GetClipboardData(IOleObject *iface, DWORD dwRese static HRESULT do_activate_object(struct Package *This, HWND parent) { - static const WCHAR openW[] = {'o','p','e','n',0}; - ShellExecuteW(parent, openW, This->filename, NULL, NULL, SW_SHOW); + ShellExecuteW(parent, L"open", This->filename, NULL, NULL, SW_SHOW); return S_OK; } @@ -396,11 +395,9 @@ static HRESULT WINAPI PersistStorage_Load(IPersistStorage* iface, WCHAR *stream_filename; WCHAR *base_end, extension[MAX_PATH]; - static const WCHAR ole10nativeW[] = {0x0001,'O','l','e','1','0','N','a','t','i','v','e',0}; - TRACE("(%p)->(%p)\n", This, pStg); - hr = IStorage_OpenStream(pStg, ole10nativeW, NULL, + hr = IStorage_OpenStream(pStg, L"\1Ole10Native", NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stream); if(FAILED(hr)){ TRACE("OpenStream gave: %08x\n", hr); @@ -489,8 +486,6 @@ static HRESULT WINAPI PersistStorage_Load(IPersistStorage* iface, file = CreateFileW(This->filename, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); while(file == INVALID_HANDLE_VALUE){ - static const WCHAR fmtW[] = {' ','(','%','u',')',0}; - if(GetLastError() != ERROR_FILE_EXISTS){ WARN("CreateFile failed: %u\n", GetLastError()); hr = E_FAIL; @@ -499,7 +494,7 @@ static HRESULT WINAPI PersistStorage_Load(IPersistStorage* iface, /* file exists, so increment file name and try again */ ++i; - wsprintfW(base_end, fmtW, i); + wsprintfW(base_end, L" (%u)", i); lstrcatW(base_end, extension); file = CreateFileW(This->filename, GENERIC_WRITE, FILE_SHARE_READ, NULL, diff --git a/dlls/packager/tests/oleobj.c b/dlls/packager/tests/oleobj.c index 1ce54eda7e..6287558493 100644 --- a/dlls/packager/tests/oleobj.c +++ b/dlls/packager/tests/oleobj.c @@ -210,9 +210,7 @@ static HRESULT WINAPI stg_CreateStream(IStorage* This, LPCOLESTR pwcsName, static HRESULT WINAPI stg_OpenStream(IStorage* This, LPCOLESTR pwcsName, void *reserved1, DWORD grfMode, DWORD reserved2, IStream **ppstm) { - static const WCHAR ole10NativeW[] = {1,'O','l','e','1','0','N','a','t','i','v','e',0}; - - if(lstrcmpW(pwcsName, ole10NativeW)) + if(lstrcmpW(pwcsName, L"\1Ole10Native")) return STG_E_FILENOTFOUND; *ppstm = &ole10native_stream; @@ -417,8 +415,6 @@ static void test_packager(void) char contents[11]; BOOL br, extended = FALSE; - static const WCHAR filename3W[] = {'f','i','l','e','n','a','m','e','3','.','t','x','t',0}; - hr = CoCreateInstance(&CLSID_Package, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, &IID_IOleObject, (void**)&oleobj); ok(hr == S_OK || @@ -458,7 +454,7 @@ static void test_packager(void) if(extended){ len = GetTempPathW(ARRAY_SIZE(filename), filename); - lstrcpyW(filename + len, filename3W); + lstrcpyW(filename + len, L"filename3.txt"); file = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);

1 0

Michael Stefaniuc : attrib: Use wide-char string literals.
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: 283dfa0f278c32ed615773d668a79a0beea43864 URL: https://source.winehq.org/git/wine.git/?a=commit;h=283dfa0f278c32ed615773d6… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Oct 5 23:22:46 2020 +0200 attrib: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/attrib/attrib.c | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c index 558a393253..53f6302097 100644 --- a/programs/attrib/attrib.c +++ b/programs/attrib/attrib.c @@ -24,8 +24,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(attrib); -static const WCHAR starW[] = {'*','\0'}; - /* ========================================================================= * Load a string from the resource file, handling any error * Returns string retrieved from resource file @@ -33,11 +31,10 @@ static const WCHAR starW[] = {'*','\0'}; static WCHAR *ATTRIB_LoadMessage(UINT id) { static WCHAR msg[MAXSTRING]; - const WCHAR failedMsg[] = {'F', 'a', 'i', 'l', 'e', 'd', '!', 0}; if (!LoadStringW(GetModuleHandleW(NULL), id, msg, ARRAY_SIZE(msg))) { WINE_FIXME("LoadString failed with %d\n", GetLastError()); - lstrcpyW(msg, failedMsg); + lstrcpyW(msg, L"Failed!"); } return msg; } @@ -144,8 +141,7 @@ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, WCHAR buffer[MAX_PATH]; HANDLE hff; WIN32_FIND_DATAW fd; - WCHAR flags[] = {' ',' ',' ',' ',' ',' ',' ',' ','\0'}; - static const WCHAR slashW[] = {'\\','\0'}; + WCHAR flags[] = L" "; WINE_TRACE("Processing dir '%s', spec '%s', %d,%x,%x\n", wine_dbgstr_w(rootdir), wine_dbgstr_w(filespec), @@ -155,25 +151,22 @@ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, /* Build spec to search for */ lstrcpyW(buffer, rootdir); - lstrcatW(buffer, starW); + lstrcatW(buffer, L"*"); /* Search for directories in the location and recurse if necessary */ WINE_TRACE("Searching for directories with '%s'\n", wine_dbgstr_w(buffer)); hff = FindFirstFileW(buffer, &fd); if (hff != INVALID_HANDLE_VALUE) { do { - const WCHAR dot[] = {'.', 0}; - const WCHAR dotdot[] = {'.', '.', 0}; - /* Only interested in directories, and not . nor .. */ if (!(fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) || - !lstrcmpW(fd.cFileName, dot) || !lstrcmpW(fd.cFileName, dotdot)) + !lstrcmpW(fd.cFileName, L".") || !lstrcmpW(fd.cFileName, L"..")) continue; /* Build new root dir to go searching in */ lstrcpyW(buffer, rootdir); lstrcatW(buffer, fd.cFileName); - lstrcatW(buffer, slashW); + lstrcatW(buffer, L"\\"); ATTRIB_processdirectory(buffer, filespec, recurse, includedirs, attrib_set, attrib_clear); @@ -191,12 +184,10 @@ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, hff = FindFirstFileW(buffer, &fd); if (hff != INVALID_HANDLE_VALUE) { do { - const WCHAR dot[] = {'.', 0}; - const WCHAR dotdot[] = {'.', '.', 0}; DWORD count; WINE_TRACE("Found '%s'\n", wine_dbgstr_w(fd.cFileName)); - if (!lstrcmpW(fd.cFileName, dot) || !lstrcmpW(fd.cFileName, dotdot)) + if (!lstrcmpW(fd.cFileName, L".") || !lstrcmpW(fd.cFileName, L"..")) continue; if (!includedirs && (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) @@ -212,7 +203,6 @@ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, SetFileAttributesW(buffer, fd.dwFileAttributes); found = TRUE; } else { - static const WCHAR fmt[] = {'%','1',' ',' ',' ',' ',' ','%','2','\n','\0'}; if (fd.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) { flags[4] = 'H'; } @@ -233,7 +223,7 @@ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, } lstrcpyW(buffer, rootdir); lstrcatW(buffer, fd.cFileName); - ATTRIB_wprintf(fmt, flags, buffer); + ATTRIB_wprintf(L"%1 %2\n", flags, buffer); for (count = 0; count < (ARRAY_SIZE(flags) - 1); count++) flags[count] = ' '; found = TRUE; } @@ -253,18 +243,16 @@ int __cdecl wmain(int argc, WCHAR *argv[]) DWORD attrib_clear = 0; BOOL attrib_recurse = FALSE; BOOL attrib_includedirs = FALSE; - static const WCHAR help_option[] = {'/','?','\0'}; - static const WCHAR wildcardsW[] = {'*','?','\0'}; int i = 1; BOOL found = FALSE; - if ((argc >= 2) && !lstrcmpW(argv[1], help_option)) { + if ((argc >= 2) && !lstrcmpW(argv[1], L"/?")) { ATTRIB_wprintf(ATTRIB_LoadMessage(STRING_HELP)); return 0; } /* By default all files from current directory are taken into account */ - lstrcpyW(name, starW); + lstrcpyW(name, L"*"); while (i < argc) { WCHAR *param = argv[i++]; @@ -311,7 +299,7 @@ int __cdecl wmain(int argc, WCHAR *argv[]) /* If a directory is explicitly supplied on the command line, and no wildcards are in the name, then allow it to be changed/displayed */ - if (wcspbrk(originalname, wildcardsW) == NULL) attrib_includedirs = TRUE; + if (wcspbrk(originalname, L"*?") == NULL) attrib_includedirs = TRUE; /* Do all the processing based on the filename arg */ found = ATTRIB_processdirectory(curdir, name, attrib_recurse,

1 0