November 2018 - Wine-commits

Fabian Maurer : user32: LoadImage should not only search in the working directory.
by Alexandre Julliard 30 Nov '18

30 Nov '18

Module: wine Branch: master Commit: 400dd1596ab7946e68278b3f8dc7c87b898c7e9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=400dd1596ab7946e68278b3f… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Wed Nov 28 22:39:49 2018 +0100 user32: LoadImage should not only search in the working directory. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46186 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 8 +++- dlls/user32/tests/cursoricon.c | 89 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+), 1 deletion(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index f11f5e4..539fc7c 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -3039,11 +3039,17 @@ HANDLE WINAPI LoadImageW( HINSTANCE hinst, LPCWSTR name, UINT type, INT desiredx, INT desiredy, UINT loadflags ) { int depth; + WCHAR path[MAX_PATH]; TRACE_(resource)("(%p,%s,%d,%d,%d,0x%08x)\n", hinst,debugstr_w(name),type,desiredx,desiredy,loadflags); - if (loadflags & LR_LOADFROMFILE) loadflags &= ~LR_SHARED; + if (loadflags & LR_LOADFROMFILE) + { + loadflags &= ~LR_SHARED; + /* relative paths are not only relative to the current working directory */ + if (SearchPathW(NULL, name, NULL, ARRAY_SIZE(path), path, NULL)) name = path; + } switch (type) { case IMAGE_BITMAP: return BITMAP_Load( hinst, name, desiredx, desiredy, loadflags ); diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 8404ee7..405856c 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1203,6 +1203,92 @@ static void create_ico_file(const char *filename, const test_icon_entries_t *tes HeapFree(GetProcessHeap(), 0, buf); } +void test_LoadImage_working_directory_run(char *path) +{ + DWORD bytes_written; + HANDLE handle; + BOOL ret; + char path_icon[MAX_PATH]; + char path_image[MAX_PATH]; + static const test_icon_entries_t icon_desc = {32, 32}; + + sprintf(path_icon, "%s\\icon.ico", path); + sprintf(path_image, "%s\\test.bmp", path); + + /* Create Files */ + create_ico_file(path_icon, &icon_desc, 1); + + handle = CreateFileA(path_image, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); + ok(handle != INVALID_HANDLE_VALUE, "run %s: CreateFileA failed. %u\n", path, GetLastError()); + ret = WriteFile(handle, bmpimage, sizeof(bmpimage), &bytes_written, NULL); + ok(ret && bytes_written == sizeof(bmpimage), "run %s: Test file created improperly.\n", path); + CloseHandle(handle); + + /* Test cursor */ + handle = LoadImageA(NULL, "icon.ico", IMAGE_CURSOR, 0, 0, LR_LOADFROMFILE); + ok(handle != NULL, "run %s: LoadImage() failed.\n", path); + + ret = DestroyIcon(handle); + ok(ret, "run %s: DestroyIcon failed: %d\n", path, GetLastError()); + + /* Test image */ + handle = LoadImageA(NULL, "test.bmp", IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE); + ok(handle != NULL, "run %s: LoadImageA failed.\n", path); + + ret = DeleteObject(handle); + ok(ret, "run %s: DeleteObject failed: %d\n", path, GetLastError()); + + /* Cleanup */ + ret = DeleteFileA(path_image); + ok(ret, "run %s: DeleteFileA failed: %d\n", path, GetLastError()); + ret = DeleteFileA(path_icon); + ok(ret, "run %s: DeleteFileA failed: %d\n", path, GetLastError()); +} + +static void test_LoadImage_working_directory(void) +{ + char old_working_dir[MAX_PATH]; + char temp_dir_current[MAX_PATH]; + char temp_dir_PATH[MAX_PATH]; + char executable_path[MAX_PATH]; + int pos_slash; + char old_PATH[10000]; + char new_PATH[10000]; + BOOL ret; + + GetCurrentDirectoryA(ARRAY_SIZE(old_working_dir), old_working_dir); + + GetTempPathA(ARRAY_SIZE(temp_dir_current), temp_dir_current); + strcat(temp_dir_current, "wine-test-dir-current\\"); + GetTempPathA(ARRAY_SIZE(temp_dir_PATH), temp_dir_PATH); + strcat(temp_dir_PATH, "wine-test-dir-path\\"); + + GetModuleFileNameA(NULL, executable_path, ARRAY_SIZE(executable_path)); + pos_slash = strrchr(executable_path, '\\') - executable_path; + executable_path[pos_slash + 1] = 0; + + CreateDirectoryA(temp_dir_current, NULL); + CreateDirectoryA(temp_dir_PATH, NULL); + + SetCurrentDirectoryA(temp_dir_current); + + GetEnvironmentVariableA("PATH", old_PATH, ARRAY_SIZE(old_PATH)); + sprintf(new_PATH, "%s;%s", old_PATH, temp_dir_PATH); + SetEnvironmentVariableA("PATH", new_PATH); + + test_LoadImage_working_directory_run(temp_dir_current); + test_LoadImage_working_directory_run(executable_path); + test_LoadImage_working_directory_run(temp_dir_PATH); + + SetCurrentDirectoryA(old_working_dir); + SetEnvironmentVariableA("PATH", old_PATH); + + ret = RemoveDirectoryA(temp_dir_current); + ok(ret, "RemoveDirectoryA failed: %d\n", GetLastError()); + ret = RemoveDirectoryA(temp_dir_PATH); + ok(ret, "RemoveDirectoryA failed: %d\n", GetLastError()); +} + static void test_LoadImage(void) { HANDLE handle; @@ -1326,6 +1412,9 @@ static void test_LoadImage(void) bitmap_header->biSize = sizeof(BITMAPINFOHEADER); test_LoadImageFile("Cursor (invalid dwDIBOffset)", invalid_dwDIBOffset, sizeof(invalid_dwDIBOffset), "cur", 0); + + /* Test in which paths images with a relative path can be found */ + test_LoadImage_working_directory(); } static void test_CreateIconFromResource(void)

1 0

Alex Henrie : atl: Make constants 'AtlAxWinW' and 'AtlAxWinLicW' static.
by Alexandre Julliard 30 Nov '18

30 Nov '18

Module: wine Branch: master Commit: ef7855e1310aed44376ab23890bc4d68dd63d380 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef7855e1310aed44376ab238… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 30 00:13:59 2018 -0700 atl: Make constants 'AtlAxWinW' and 'AtlAxWinLicW' static. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/atl/atl_ax.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c index 8121278..ce18044 100644 --- a/dlls/atl/atl_ax.c +++ b/dlls/atl/atl_ax.c @@ -104,7 +104,7 @@ BOOL WINAPI AtlAxWinInit(void) #error Unsupported version #endif - const WCHAR AtlAxWinW[] = {'A','t','l','A','x','W','i','n',ATL_NAME_SUFFIX}; + static const WCHAR AtlAxWinW[] = {'A','t','l','A','x','W','i','n',ATL_NAME_SUFFIX}; FIXME("version %04x semi-stub\n", _ATL_VER); @@ -128,7 +128,7 @@ BOOL WINAPI AtlAxWinInit(void) return FALSE; if(_ATL_VER > _ATL_VER_30) { - const WCHAR AtlAxWinLicW[] = {'A','t','l','A','x','W','i','n','L','i','c',ATL_NAME_SUFFIX}; + static const WCHAR AtlAxWinLicW[] = {'A','t','l','A','x','W','i','n','L','i','c',ATL_NAME_SUFFIX}; wcex.lpszClassName = AtlAxWinLicW; if ( !RegisterClassExW( &wcex ) )

1 0

Alex Henrie : hhctrl.ocx: Make constant 'szHTMext' static.
by Alexandre Julliard 30 Nov '18

30 Nov '18

Module: wine Branch: master Commit: 634637c05766fdec049997c7363f25a22a42caeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=634637c05766fdec049997c7… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 30 00:14:05 2018 -0700 hhctrl.ocx: Make constant 'szHTMext' static. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hhctrl.ocx/search.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hhctrl.ocx/search.c b/dlls/hhctrl.ocx/search.c index d758a1b..0e198b8 100644 --- a/dlls/hhctrl.ocx/search.c +++ b/dlls/hhctrl.ocx/search.c @@ -152,7 +152,7 @@ cleanup: static SearchItem *SearchCHM_Storage(SearchItem *item, IStorage *pStorage, const char *needle) { - const WCHAR szHTMext[] = {'.','h','t','m',0}; + static const WCHAR szHTMext[] = {'.','h','t','m',0}; IEnumSTATSTG *elem = NULL; WCHAR *filename = NULL; STATSTG entries;

1 0

Alex Henrie : midimap: Turn variable 'throughportW' into a static constant.
by Alexandre Julliard 30 Nov '18

30 Nov '18

Module: wine Branch: master Commit: cd485b325226280f1c224b773049a3b66dfe57db URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd485b325226280f1c224b77… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 30 00:14:08 2018 -0700 midimap: Turn variable 'throughportW' into a static constant. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/midimap/midimap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/midimap/midimap.c b/dlls/midimap/midimap.c index 290300a..540dac3 100644 --- a/dlls/midimap/midimap.c +++ b/dlls/midimap/midimap.c @@ -553,9 +553,9 @@ DWORD WINAPI MIDIMAP_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, */ static LRESULT MIDIMAP_drvOpen(void) { + static const WCHAR throughportW[] = {'M','i','d','i',' ','T','h','r','o','u','g','h',0}; MIDIOUTCAPSW moc; unsigned dev, i; - WCHAR throughportW[] = {'M','i','d','i',' ','T','h','r','o','u','g','h',0}; BOOL found_valid_port = FALSE; if (midiOutPorts)

1 0

Alex Henrie : mscms: Turn variables 'slash' and 'spec' into static constants.
by Alexandre Julliard 30 Nov '18

30 Nov '18

Module: wine Branch: master Commit: a07e3341252580ca1e5c288755945834479024df URL: https://source.winehq.org/git/wine.git/?a=commit;h=a07e3341252580ca1e5c2887… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 30 00:14:09 2018 -0700 mscms: Turn variables 'slash' and 'spec' into static constants. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscms/profile.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index 039a271..a0b9d41 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -668,9 +668,10 @@ BOOL WINAPI GetStandardColorSpaceProfileW( PCWSTR machine, DWORD id, PWSTR profi static BOOL header_from_file( LPCWSTR file, PPROFILEHEADER header ) { + static const WCHAR slash[] = {'\\',0}; BOOL ret; PROFILE profile; - WCHAR path[MAX_PATH], slash[] = {'\\',0}; + WCHAR path[MAX_PATH]; DWORD size = sizeof(path); HANDLE handle; @@ -953,8 +954,8 @@ exit: BOOL WINAPI EnumColorProfilesW( PCWSTR machine, PENUMTYPEW record, PBYTE buffer, PDWORD size, PDWORD number ) { + static const WCHAR spec[] = {'\\','*','i','c','m',0}; BOOL match, ret = FALSE; - WCHAR spec[] = {'\\','*','i','c','m',0}; WCHAR colordir[MAX_PATH], glob[MAX_PATH], **profiles = NULL; DWORD i, len = sizeof(colordir), count = 0, totalsize = 0; PROFILEHEADER header;

1 0

Alex Henrie : msi: Turn several variables and constants into static constants.
by Alexandre Julliard 30 Nov '18

30 Nov '18

Module: wine Branch: master Commit: 6a833ce0b39ae9f57162f6ffd3ff55f19f3ba540 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a833ce0b39ae9f57162f6ff… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 30 00:14:12 2018 -0700 msi: Turn several variables and constants into static constants. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 4 ++-- dlls/msi/database.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 8ae9dce..9407d36 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -160,7 +160,7 @@ static const WCHAR szINSTALL[] = static INT ui_actionstart(MSIPACKAGE *package, LPCWSTR action, LPCWSTR description, LPCWSTR template) { - WCHAR query[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + static const WCHAR query[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', '`','A','c','t','i','o','n','T','e','x','t','`',' ','W','H','E','R','E',' ', '`','A','c','t','i','o','n','`',' ','=',' ','\'','%','s','\'',0}; MSIRECORD *row, *textrow; @@ -3546,7 +3546,7 @@ static WCHAR *build_full_keypath( MSIPACKAGE *package, MSICOMPONENT *comp ) { if (comp->assembly) { - const WCHAR prefixW[] = {'<','\\',0}; + static const WCHAR prefixW[] = {'<','\\',0}; DWORD len = strlenW( prefixW ) + strlenW( comp->assembly->display_name ); WCHAR *keypath = msi_alloc( (len + 1) * sizeof(WCHAR) ); diff --git a/dlls/msi/database.c b/dlls/msi/database.c index c1fb37b..b8ec393 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -1333,7 +1333,7 @@ static LPWSTR get_key_value(MSIQUERY *view, LPCWSTR key, MSIRECORD *rec) if (MSI_RecordGetString(rec, i)) /* check record field is a string */ { /* quote string record fields */ - const WCHAR szQuote[] = {'\'', 0}; + static const WCHAR szQuote[] = {'\'', 0}; sz += 2; val = msi_alloc(sz*sizeof(WCHAR)); if (!val)

1 0

Alex Henrie : netapi32: Make constant 'admins' static.
by Alexandre Julliard 30 Nov '18

30 Nov '18

Module: wine Branch: master Commit: 5ceb740793eb27d3e932a6f5492b0722197ebe2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ceb740793eb27d3e932a6f5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 30 00:14:13 2018 -0700 netapi32: Make constant 'admins' static. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netapi32/netapi32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index afeada6..c765f36 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -2298,8 +2298,8 @@ NetUserGetLocalGroups(LPCWSTR servername, LPCWSTR username, DWORD level, DWORD flags, LPBYTE* bufptr, DWORD prefmaxlen, LPDWORD entriesread, LPDWORD totalentries) { + static const WCHAR admins[] = {'A','d','m','i','n','i','s','t','r','a','t','o','r','s',0}; NET_API_STATUS status; - const WCHAR admins[] = {'A','d','m','i','n','i','s','t','r','a','t','o','r','s',0}; LPWSTR currentuser; LOCALGROUP_USERS_INFO_0* info; DWORD size;

1 0

Alex Henrie : ntoskrnl.exe: Make several string constants static.
by Alexandre Julliard 30 Nov '18

30 Nov '18

Module: wine Branch: master Commit: 2e758ea86c1412be7e99dcfc25eea8796b06f073 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e758ea86c1412be7e99dcfc… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 30 00:14:14 2018 -0700 ntoskrnl.exe: Make several string constants static. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 81731ce..2b3b2ec 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1371,15 +1371,15 @@ static NTSTATUS create_device_symlink( DEVICE_OBJECT *device, UNICODE_STRING *sy */ NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable ) { - const WCHAR DeviceClassesW[] = {'\\','R','E','G','I','S','T','R','Y','\\', + static const WCHAR DeviceClassesW[] = {'\\','R','E','G','I','S','T','R','Y','\\', 'M','a','c','h','i','n','e','\\','S','y','s','t','e','m','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', 'C','o','n','t','r','o','l','\\', 'D','e','v','i','c','e','C','l','a','s','s','e','s','\\',0}; - const WCHAR controlW[] = {'C','o','n','t','r','o','l',0}; - const WCHAR linkedW[] = {'L','i','n','k','e','d',0}; - const WCHAR slashW[] = {'\\',0}; - const WCHAR hashW[] = {'#',0}; + static const WCHAR controlW[] = {'C','o','n','t','r','o','l',0}; + static const WCHAR linkedW[] = {'L','i','n','k','e','d',0}; + static const WCHAR slashW[] = {'\\',0}; + static const WCHAR hashW[] = {'#',0}; size_t namelen = name->Length / sizeof(WCHAR); DEV_BROADCAST_DEVICEINTERFACE_W *broadcast;

1 0

Alex Henrie : oleaut32: Make constant 'szAccept' static.
by Alexandre Julliard 30 Nov '18

30 Nov '18

Module: wine Branch: master Commit: 77a8872fc9e2e44ec3b502cadcb883577a0b70f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77a8872fc9e2e44ec3b502ca… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 30 00:14:15 2018 -0700 oleaut32: Make constant 'szAccept' static. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/vartype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index e2df873..067d515 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -6522,7 +6522,7 @@ static HRESULT VARIANT_BstrFromReal(DOUBLE dblIn, LCID lcid, ULONG dwFlags, */ if (buff[0] == '-') { - const WCHAR szAccept[] = {'0', '.', '\0'}; + static const WCHAR szAccept[] = {'0', '.', '\0'}; if (strlenW(buff + 1) == strspnW(buff + 1, szAccept)) { buff[0] = '0'; buff[1] = '\0'; } }

1 0

Alex Henrie : oledb32: Turn variable 'format' into a static constant.
by Alexandre Julliard 30 Nov '18

30 Nov '18

Module: wine Branch: master Commit: 4d525212a9cbb8f63587635a3e5b2b9d94248e09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d525212a9cbb8f63587635a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 30 00:14:16 2018 -0700 oledb32: Turn variable 'format' into a static constant. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/convert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 5bad105..971e6d9 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -619,7 +619,7 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, { WCHAR szBuff[39]; const GUID *id = (const GUID *)src; - WCHAR format[] = { + static const WCHAR format[] = { '{','%','0','8','X','-','%','0','4','X','-','%','0','4','X','-', '%','0','2','X','%','0','2','X','-', '%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X','}',0};

1 0