October 2017 - Wine-commits

Stefan Dösinger : msvcp: Implement the WCHAR version of _Symlink.
by Alexandre Julliard 10 Oct '17

10 Oct '17

Module: wine Branch: master Commit: 12dadd04cb814aea835f8b98627c0e3bd6b3d734 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12dadd04cb814aea835f8b986… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Oct 10 17:09:44 2017 +0200 msvcp: Implement the WCHAR version of _Symlink. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/msvcp120.spec | 4 ++-- dlls/msvcp120_app/msvcp120_app.spec | 4 ++-- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp90/ios.c | 14 ++++++++++++++ 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 4d46be4..3b29e73 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1734,8 +1734,8 @@ @ cdecl -arch=win64 ?_Swap_all(a)_Container_base12@std@@QEAAXAEAU12@@Z(ptr ptr) _Container_base12__Swap_all @ cdecl -arch=win32 ?_Symlink(a)sys@tr2(a)std@@YAHPBD0(a)Z(str str) tr2_sys__Symlink @ cdecl -arch=win64 ?_Symlink(a)sys@tr2(a)std@@YAHPEBD0(a)Z(str str) tr2_sys__Symlink -@ stub -arch=win32 ?_Symlink(a)sys@tr2(a)std@@YAHPB_W0(a)Z -@ stub -arch=win64 ?_Symlink(a)sys@tr2(a)std@@YAHPEB_W0(a)Z +@ cdecl -arch=win32 ?_Symlink(a)sys@tr2(a)std@@YAHPB_W0(a)Z(wstr wstr) tr2_sys__Symlink_wchar +@ cdecl -arch=win64 ?_Symlink(a)sys@tr2(a)std@@YAHPEB_W0(a)Z(wstr wstr) tr2_sys__Symlink_wchar @ extern ?_Sync(a)ios_base@std@@0_NA ios_base_Sync @ stub -arch=win32 ?_Syserror_map(a)std@@YAPBDH(a)Z @ stub -arch=win64 ?_Syserror_map(a)std@@YAPEBDH(a)Z diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index fd99058..7a6dc58 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1734,8 +1734,8 @@ @ cdecl -arch=win64 ?_Swap_all(a)_Container_base12@std@@QEAAXAEAU12@@Z(ptr ptr) msvcp120.?_Swap_all(a)_Container_base12@std@@QEAAXAEAU12@@Z @ cdecl -arch=win32 ?_Symlink(a)sys@tr2(a)std@@YAHPBD0(a)Z(str str) msvcp120.?_Symlink(a)sys@tr2(a)std@@YAHPBD0(a)Z @ cdecl -arch=win64 ?_Symlink(a)sys@tr2(a)std@@YAHPEBD0(a)Z(str str) msvcp120.?_Symlink(a)sys@tr2(a)std@@YAHPEBD0(a)Z -@ stub -arch=win32 ?_Symlink(a)sys@tr2(a)std@@YAHPB_W0(a)Z -@ stub -arch=win64 ?_Symlink(a)sys@tr2(a)std@@YAHPEB_W0(a)Z +@ cdecl -arch=win32 ?_Symlink(a)sys@tr2(a)std@@YAHPB_W0(a)Z(wstr wstr) msvcp120.?_Symlink(a)sys@tr2(a)std@@YAHPB_W0(a)Z +@ cdecl -arch=win64 ?_Symlink(a)sys@tr2(a)std@@YAHPEB_W0(a)Z(wstr wstr) msvcp120.?_Symlink(a)sys@tr2(a)std@@YAHPEB_W0(a)Z @ extern ?_Sync(a)ios_base@std@@0_NA msvcp120.?_Sync(a)ios_base@std@@0_NA @ stub -arch=win32 ?_Syserror_map(a)std@@YAPBDH(a)Z @ stub -arch=win64 ?_Syserror_map(a)std@@YAPEBDH(a)Z diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 74ff305..5409853 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3716,7 +3716,7 @@ @ cdecl _Stoulx(ptr ptr long ptr) _Stoulx @ cdecl _Strcoll(ptr ptr ptr ptr ptr) _Strcoll @ stub _Strxfrm -@ stub _Symlink +@ cdecl _Symlink(wstr wstr) tr2_sys__Symlink_wchar @ stub _Symlink_get @ stub _Temp_get @ stub _Thrd_abort diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 36e5067..c6f06ff 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -15049,6 +15049,20 @@ int __cdecl tr2_sys__Symlink(char const* existing_file_name, char const* file_na return GetLastError(); } +/* ?_Symlink(a)sys@tr2(a)std@@YAHPB_W0(a)Z */ +/* ?_Symlink(a)sys@tr2(a)std@@YAHPEB_W0(a)Z */ +/* _Symlink */ +int __cdecl tr2_sys__Symlink_wchar(WCHAR const* existing_file_name, WCHAR const* file_name) +{ + TRACE("(%s %s)\n", debugstr_w(existing_file_name), debugstr_w(file_name)); + if(!existing_file_name || !file_name) + return ERROR_INVALID_PARAMETER; + + if(CreateSymbolicLinkW(file_name, existing_file_name, 0)) + return ERROR_SUCCESS; + return GetLastError(); +} + /* ?_Unlink(a)sys@tr2(a)std@@YAHPBD(a)Z */ /* ?_Unlink(a)sys@tr2(a)std@@YAHPEBD(a)Z */ int __cdecl tr2_sys__Unlink(char const* path)

1 0

Stefan Dösinger : msvcp: Implement the WCHAR version of _Link.
by Alexandre Julliard 10 Oct '17

10 Oct '17

Module: wine Branch: master Commit: 96fcf4cc037c8e8fd204591c009517b55d244092 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96fcf4cc037c8e8fd204591c0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Oct 10 17:09:45 2017 +0200 msvcp: Implement the WCHAR version of _Link. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/msvcp120.spec | 4 ++-- dlls/msvcp120_app/msvcp120_app.spec | 4 ++-- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp90/ios.c | 14 ++++++++++++++ 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 3b29e73..ae1ac57 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1533,8 +1533,8 @@ @ cdecl -arch=win64 ?_Launch(a)_Pad@std@@QEAAXPEAU_Thrd_imp_t@@@Z(ptr ptr) _Pad__Launch @ cdecl -arch=win32 ?_Link(a)sys@tr2(a)std@@YAHPBD0(a)Z(str str) tr2_sys__Link @ cdecl -arch=win64 ?_Link(a)sys@tr2(a)std@@YAHPEBD0(a)Z(str str) tr2_sys__Link -@ stub -arch=win32 ?_Link(a)sys@tr2(a)std@@YAHPB_W0(a)Z -@ stub -arch=win64 ?_Link(a)sys@tr2(a)std@@YAHPEB_W0(a)Z +@ cdecl -arch=win32 ?_Link(a)sys@tr2(a)std@@YAHPB_W0(a)Z(wstr wstr) tr2_sys__Link_wchar +@ cdecl -arch=win64 ?_Link(a)sys@tr2(a)std@@YAHPEB_W0(a)Z(wstr wstr) tr2_sys__Link_wchar @ cdecl -arch=win32 ?_Locimp_Addfac(a)_Locimp@locale(a)std@@CAXPAV123(a)PAVfacet@23(a)I@Z(ptr ptr long) locale__Locimp__Locimp_Addfac @ cdecl -arch=win64 ?_Locimp_Addfac(a)_Locimp@locale(a)std@@CAXPEAV123(a)PEAVfacet@23(a)_K@Z(ptr ptr long) locale__Locimp__Locimp_Addfac @ cdecl -arch=win32 ?_Locimp_ctor(a)_Locimp@locale(a)std@@CAXPAV123(a)ABV123@@Z(ptr ptr) locale__Locimp__Locimp_ctor diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 7a6dc58..56bed79 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1533,8 +1533,8 @@ @ cdecl -arch=win64 ?_Launch(a)_Pad@std@@QEAAXPEAU_Thrd_imp_t@@@Z(ptr ptr) msvcp120.?_Launch(a)_Pad@std@@QEAAXPEAU_Thrd_imp_t@@@Z @ cdecl -arch=win32 ?_Link(a)sys@tr2(a)std@@YAHPBD0(a)Z(str str) msvcp120.?_Link(a)sys@tr2(a)std@@YAHPBD0(a)Z @ cdecl -arch=win64 ?_Link(a)sys@tr2(a)std@@YAHPEBD0(a)Z(str str) msvcp120.?_Link(a)sys@tr2(a)std@@YAHPEBD0(a)Z -@ stub -arch=win32 ?_Link(a)sys@tr2(a)std@@YAHPB_W0(a)Z -@ stub -arch=win64 ?_Link(a)sys@tr2(a)std@@YAHPEB_W0(a)Z +@ cdecl -arch=win32 ?_Link(a)sys@tr2(a)std@@YAHPB_W0(a)Z(wstr wstr) msvcp120.?_Link(a)sys@tr2(a)std@@YAHPB_W0(a)Z +@ cdecl -arch=win64 ?_Link(a)sys@tr2(a)std@@YAHPEB_W0(a)Z(wstr wstr) msvcp120.?_Link(a)sys@tr2(a)std@@YAHPEB_W0(a)Z @ cdecl -arch=win32 ?_Locimp_Addfac(a)_Locimp@locale(a)std@@CAXPAV123(a)PAVfacet@23(a)I@Z(ptr ptr long) msvcp120.?_Locimp_Addfac(a)_Locimp@locale(a)std@@CAXPAV123(a)PAVfacet@23(a)I@Z @ cdecl -arch=win64 ?_Locimp_Addfac(a)_Locimp@locale(a)std@@CAXPEAV123(a)PEAVfacet@23(a)_K@Z(ptr ptr long) msvcp120.?_Locimp_Addfac(a)_Locimp@locale(a)std@@CAXPEAV123(a)PEAVfacet@23(a)_K@Z @ cdecl -arch=win32 ?_Locimp_ctor(a)_Locimp@locale(a)std@@CAXPAV123(a)ABV123@@Z(ptr ptr) msvcp120.?_Locimp_ctor(a)_Locimp@locale(a)std@@CAXPAV123(a)ABV123@@Z diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 5409853..08f1ff4 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3667,7 +3667,7 @@ @ stub _LSinh @ extern _LSnan _LSnan @ stub _Last_write_time -@ stub _Link +@ cdecl _Link(wstr wstr) tr2_sys__Link_wchar @ cdecl _Lock_shared_ptr_spin_lock() @ cdecl _Lstat(wstr ptr) @ cdecl _Make_dir(wstr) tr2_sys__Make_dir_wchar diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index c6f06ff..5d2f0ca 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -15036,6 +15036,20 @@ int __cdecl tr2_sys__Link(char const* existing_path, char const* new_path) return GetLastError(); } +/* ?_Link(a)sys@tr2(a)std@@YAHPB_W0(a)Z */ +/* ?_Link(a)sys@tr2(a)std@@YAHPEB_W0(a)Z */ +/* _Link */ +int __cdecl tr2_sys__Link_wchar(WCHAR const* existing_path, WCHAR const* new_path) +{ + TRACE("(%s %s)\n", debugstr_w(existing_path), debugstr_w(new_path)); + if(!existing_path || !new_path) + return ERROR_INVALID_PARAMETER; + + if(CreateHardLinkW(new_path, existing_path, NULL)) + return ERROR_SUCCESS; + return GetLastError(); +} + /* ?_Symlink(a)sys@tr2(a)std@@YAHPBD0(a)Z */ /* ?_Symlink(a)sys@tr2(a)std@@YAHPEBD0(a)Z */ int __cdecl tr2_sys__Symlink(char const* existing_file_name, char const* file_name)

1 0

Stefan Dösinger : msvcp140/tests: Port test_Unlink to msvcp140.
by Alexandre Julliard 10 Oct '17

10 Oct '17

Module: wine Branch: master Commit: b91fdc7700e79661bfca3aee3dc0be2226ec9d92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b91fdc7700e79661bfca3aee3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Oct 10 17:09:46 2017 +0200 msvcp140/tests: Port test_Unlink to msvcp140. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/tests/msvcp140.c | 84 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 9b1d7b1..620e931 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -169,12 +169,17 @@ static void (__cdecl *p_Close_dir)(void*); static MSVCP_bool (__cdecl *p_Current_get)(WCHAR *); static MSVCP_bool (__cdecl *p_Current_set)(WCHAR const *); static ULONGLONG (__cdecl *p_File_size)(WCHAR const *); +static int (__cdecl *p_Link)(WCHAR const*, WCHAR const*); static enum file_type (__cdecl *p_Lstat)(WCHAR const *, int *); +static int (__cdecl *p_Make_dir)(WCHAR const*); static void* (__cdecl *p_Open_dir)(WCHAR*, WCHAR const*, int *, enum file_type*); static WCHAR* (__cdecl *p_Read_dir)(WCHAR*, void*, enum file_type*); +static MSVCP_bool (__cdecl *p_Remove_dir)(WCHAR const*); static enum file_type (__cdecl *p_Stat)(WCHAR const *, int *); +static int (__cdecl *p_Symlink)(WCHAR const*, WCHAR const*); static int (__cdecl *p_To_byte)(const WCHAR *src, char *dst); static int (__cdecl *p_To_wide)(const char *src, WCHAR *dst); +static int (__cdecl *p_Unlink)(WCHAR const*); static BOOLEAN (WINAPI *pCreateSymbolicLinkW)(const WCHAR *, const WCHAR *, DWORD); @@ -245,12 +250,17 @@ static BOOL init(void) SET(p_Current_get, "_Current_get"); SET(p_Current_set, "_Current_set"); SET(p_File_size, "_File_size"); + SET(p_Link, "_Link"); SET(p_Lstat, "_Lstat"); + SET(p_Make_dir, "_Make_dir"); SET(p_Open_dir, "_Open_dir"); SET(p_Read_dir, "_Read_dir"); + SET(p_Remove_dir, "_Remove_dir"); SET(p_Stat, "_Stat"); + SET(p_Symlink, "_Symlink"); SET(p_To_byte, "_To_byte"); SET(p_To_wide, "_To_wide"); + SET(p_Unlink, "_Unlink"); hdll = GetModuleHandleA("kernel32.dll"); pCreateSymbolicLinkW = (void*)GetProcAddress(hdll, "CreateSymbolicLinkW"); @@ -971,6 +981,79 @@ static void test_dir_operation(void) ok(SetCurrentDirectoryW(origin_path), "SetCurrentDirectoryW to origin_path failed\n"); } +static void test_Unlink(void) +{ + WCHAR temp_path[MAX_PATH], current_path[MAX_PATH]; + int ret, i; + HANDLE file; + LARGE_INTEGER file_size; + static const WCHAR f1_symlinkW[] = + {'w','i','n','e','_','t','e','s','t','_','d','i','r','\\','f','1','_','s','y','m','l','i','n','k',0}; + static const WCHAR f1_linkW[] = + {'w','i','n','e','_','t','e','s','t','_','d','i','r','\\','f','1','_','l','i','n','k',0}; + static const WCHAR f1W[] = + {'w','i','n','e','_','t','e','s','t','_','d','i','r','\\','f','1',0}; + static const WCHAR wine_test_dirW[] = + {'w','i','n','e','_','t','e','s','t','_','d','i','r',0}; + static const WCHAR not_existW[] = + {'n','o','t','_','e','x','i','s','t',0}; + static const WCHAR not_exist_fileW[] = + {'n','o','t','_','e','x','i','s','t','_','d','i','r','\\','n','o','t','_','e','x','i','s','t','_','f','i','l','e',0}; + struct { + WCHAR const *path; + int last_error; + MSVCP_bool is_todo; + } tests[] = { + { f1_symlinkW, ERROR_SUCCESS, TRUE }, + { f1_linkW, ERROR_SUCCESS, FALSE }, + { f1W, ERROR_SUCCESS, FALSE }, + { wine_test_dirW, ERROR_ACCESS_DENIED, FALSE }, + { not_existW, ERROR_FILE_NOT_FOUND, FALSE }, + { not_exist_fileW, ERROR_PATH_NOT_FOUND, FALSE }, + { NULL, ERROR_PATH_NOT_FOUND, FALSE } + }; + + GetCurrentDirectoryW(MAX_PATH, current_path); + GetTempPathW(MAX_PATH, temp_path); + ok(SetCurrentDirectoryW(temp_path), "SetCurrentDirectoryW to temp_path failed\n"); + + ret = p_Make_dir(wine_test_dirW); + ok(ret == 1, "_Make_dir(): expect 1 got %d\n", ret); + file = CreateFileW(f1W, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); + file_size.QuadPart = 7; + ok(SetFilePointerEx(file, file_size, NULL, FILE_BEGIN), "SetFilePointerEx failed\n"); + ok(SetEndOfFile(file), "SetEndOfFile failed\n"); + CloseHandle(file); + + ret = p_Symlink(f1W, f1_symlinkW); + if(ret==ERROR_PRIVILEGE_NOT_HELD || ret==ERROR_INVALID_FUNCTION || ret==ERROR_CALL_NOT_IMPLEMENTED) { + tests[0].last_error = ERROR_FILE_NOT_FOUND; + win_skip("Privilege not held or symbolic link not supported, skipping symbolic link tests.\n"); + }else { + ok(ret == ERROR_SUCCESS, "_Symlink(): expect: ERROR_SUCCESS, got %d\n", ret); + } + ret = p_Link(f1W, f1_linkW); + ok(ret == ERROR_SUCCESS, "_Link(): expect: ERROR_SUCCESS, got %d\n", ret); + + for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + errno = 0xdeadbeef; + ret = p_Unlink(tests[i].path); + todo_wine_if(tests[i].is_todo) + ok(ret == tests[i].last_error, "_Unlink(): test %d expect: %d, got %d\n", + i+1, tests[i].last_error, ret); + ok(errno == 0xdeadbeef, "_Unlink(): test %d errno expect: 0xdeadbeef, got %d\n", i+1, ret); + } + + ok(!DeleteFileW(f1W), "expect wine_test_dir/f1 not to exist\n"); + ok(!DeleteFileW(f1_linkW), "expect wine_test_dir/f1_link not to exist\n"); + ok(!DeleteFileW(f1_symlinkW), "expect wine_test_dir/f1_symlink not to exist\n"); + ret = p_Remove_dir(wine_test_dirW); + ok(ret == 1, "_Remove_dir(): expect 1 got %d\n", ret); + + ok(SetCurrentDirectoryW(current_path), "SetCurrentDirectoryW failed\n"); +} + START_TEST(msvcp140) { if(!init()) return; @@ -987,5 +1070,6 @@ START_TEST(msvcp140) test_Current_set(); test_Stat(); test_dir_operation(); + test_Unlink(); FreeLibrary(msvcp); }

1 0

Nikolay Sivov : comctl32/listview: Pass WM_NCCREATE down to default procedure.
by Alexandre Julliard 10 Oct '17

10 Oct '17

Module: wine Branch: master Commit: ee7ddd1ed38a3b2f41bdb676f42e3453021968c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee7ddd1ed38a3b2f41bdb676f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 10 20:37:18 2017 +0300 comctl32/listview: Pass WM_NCCREATE down to default procedure. Problem analyzed by Vadim Druzhin <cdslow(a)mail.ru>. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 7 ++++--- dlls/comctl32/tests/listview.c | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 73eceff..3587797 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -9473,7 +9473,7 @@ static VOID CALLBACK LISTVIEW_DelayedEditItem(HWND hwnd, UINT uMsg, UINT_PTR idE * Success: TRUE * Failure: FALSE */ -static LRESULT LISTVIEW_NCCreate(HWND hwnd, const CREATESTRUCTW *lpcs) +static LRESULT LISTVIEW_NCCreate(HWND hwnd, WPARAM wParam, const CREATESTRUCTW *lpcs) { LISTVIEW_INFO *infoPtr; LOGFONTW logFont; @@ -9532,7 +9532,8 @@ static LRESULT LISTVIEW_NCCreate(HWND hwnd, const CREATESTRUCTW *lpcs) if (!(infoPtr->hdpaPosX = DPA_Create(10))) goto fail; if (!(infoPtr->hdpaPosY = DPA_Create(10))) goto fail; if (!(infoPtr->hdpaColumns = DPA_Create(10))) goto fail; - return TRUE; + + return DefWindowProcW(hwnd, WM_NCCREATE, wParam, (LPARAM)lpcs); fail: DestroyWindow(infoPtr->hwndHeader); @@ -11691,7 +11692,7 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return LISTVIEW_Command(infoPtr, wParam, lParam); case WM_NCCREATE: - return LISTVIEW_NCCreate(hwnd, (LPCREATESTRUCTW)lParam); + return LISTVIEW_NCCreate(hwnd, wParam, (LPCREATESTRUCTW)lParam); case WM_CREATE: return LISTVIEW_Create(hwnd, (LPCREATESTRUCTW)lParam); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 4bc95bb..0c1d878 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1523,6 +1523,8 @@ static LRESULT CALLBACK create_test_wndproc(HWND hwnd, UINT uMsg, WPARAM wParam, static void test_create(void) { + static const WCHAR testtextW[] = {'t','e','s','t',' ','t','e','x','t',0}; + char buff[16]; HWND hList; HWND hHeader; LONG_PTR ret; @@ -1734,6 +1736,23 @@ static void test_create(void) ok_sequence(sequences, PARENT_SEQ_INDEX, create_ownerdrawfixed_parent_seq, "created with LVS_OWNERDRAWFIXED|LVS_REPORT - parent seq", FALSE); DestroyWindow(hList); + + /* Test that window text is preserved. */ + hList = CreateWindowExA(0, WC_LISTVIEWA, "test text", WS_CHILD | WS_BORDER | WS_VISIBLE, + 0, 0, 100, 100, hwndparent, NULL, GetModuleHandleA(NULL), NULL); + ok(hList != NULL, "Failed to create ListView window.\n"); + *buff = 0; + GetWindowTextA(hList, buff, sizeof(buff)); + ok(!strcmp(buff, "test text"), "Unexpected window text %s.\n", buff); + DestroyWindow(hList); + + hList = CreateWindowExW(0, WC_LISTVIEWW, testtextW, WS_CHILD | WS_BORDER | WS_VISIBLE, + 0, 0, 100, 100, hwndparent, NULL, GetModuleHandleA(NULL), NULL); + ok(hList != NULL, "Failed to create ListView window.\n"); + *buff = 0; + GetWindowTextA(hList, buff, sizeof(buff)); + ok(!strcmp(buff, "test text"), "Unexpected window text %s.\n", buff); + DestroyWindow(hList); } static void test_redraw(void)

1 0

Jacek Caban : shlwapi: Support NT prefix paths in PathGetDriveNumberW.
by Alexandre Julliard 10 Oct '17

10 Oct '17

Module: wine Branch: master Commit: 62c4ffb4d6b85280ac8406c1af73c1db07fe3130 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62c4ffb4d6b85280ac8406c1a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 9 23:57:53 2017 +0200 shlwapi: Support NT prefix paths in PathGetDriveNumberW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/path.c | 26 +++++++++++++++++--------- dlls/shlwapi/tests/path.c | 12 ++++++++++++ 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index 3c07bb8..89a3572 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -538,17 +538,25 @@ int WINAPI PathGetDriveNumberA(LPCSTR lpszPath) * * See PathGetDriveNumberA. */ -int WINAPI PathGetDriveNumberW(LPCWSTR lpszPath) +int WINAPI PathGetDriveNumberW(const WCHAR *path) { - TRACE ("(%s)\n",debugstr_w(lpszPath)); + WCHAR drive; - if (lpszPath) - { - WCHAR tl = tolowerW(lpszPath[0]); - if (tl >= 'a' && tl <= 'z' && lpszPath[1] == ':') - return tl - 'a'; - } - return -1; + static const WCHAR nt_prefixW[] = {'\\','\\','?','\\'}; + + TRACE("(%s)\n", debugstr_w(path)); + + if (!path) + return -1; + + if (!strncmpW(path, nt_prefixW, 4)) + path += 4; + + drive = tolowerW(path[0]); + if (drive < 'a' || drive > 'z' || path[1] != ':') + return -1; + + return drive - 'a'; } /************************************************************************* diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index f780a78..57fdfdd 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -1429,6 +1429,11 @@ static void test_PathGetDriveNumber(void) static const CHAR test2A[] = "file:////b:\\test.file"; static const CHAR test3A[] = "file:///c:\\test.file"; static const CHAR test4A[] = "file:\\\\c:\\test.file"; + static const CHAR test5A[] = "\\\\?\\C:\\dir\\file.txt"; + static const WCHAR test1W[] = + {'a',':','\\',0}; + static const WCHAR test5W[] = + {'\\','\\','?','\\','C',':','\\','d','i','r','\\','f','i','l','e',0}; int ret; SetLastError(0xdeadbeef); @@ -1438,12 +1443,19 @@ static void test_PathGetDriveNumber(void) ret = PathGetDriveNumberA(test1A); ok(ret == 0, "got %d\n", ret); + ret = PathGetDriveNumberW(test1W); + ok(ret == 0, "got %d\n", ret); ret = PathGetDriveNumberA(test2A); ok(ret == -1, "got %d\n", ret); ret = PathGetDriveNumberA(test3A); ok(ret == -1, "got %d\n", ret); ret = PathGetDriveNumberA(test4A); ok(ret == -1, "got %d\n", ret); + + ret = PathGetDriveNumberA(test5A); + ok(ret == -1, "got %d\n", ret); + ret = PathGetDriveNumberW(test5W); + ok(ret == 2 || broken(ret == -1) /* winxp */, "got = %d\n", ret); } static void test_PathUnExpandEnvStrings(void)

1 0

Alexandre Julliard : opengl32: Get WGL function definitions from the XML files.
by Alexandre Julliard 10 Oct '17

10 Oct '17

Module: wine Branch: master Commit: 17dffaac7d5a8fc595775d456bb85e343d5aa195 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17dffaac7d5a8fc595775d456… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 10 10:06:10 2017 +0200 opengl32: Get WGL function definitions from the XML files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/opengl.c | 4 +- dlls/opengl32/make_opengl | 147 ++++++++++++++++++++++++------------------ dlls/opengl32/opengl32.spec | 5 +- dlls/opengl32/opengl_norm.c | 18 +++--- dlls/opengl32/winegl.xml | 14 ++++ dlls/wineandroid.drv/opengl.c | 4 +- dlls/winemac.drv/opengl.c | 4 +- dlls/winex11.drv/opengl.c | 4 +- include/wine/wgl_driver.h | 10 +-- 9 files changed, 122 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=17dffaac7d5a8fc595775…

1 0

Alexandre Julliard : opengl32: Remove no longer used support for generating thread-safe thunks.
by Alexandre Julliard 10 Oct '17

10 Oct '17

Module: wine Branch: master Commit: 2abeb7634c07892606d7252d673e8a4300b13e08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2abeb7634c07892606d7252d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 10 10:10:41 2017 +0200 opengl32: Remove no longer used support for generating thread-safe thunks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/make_opengl | 29 ++++------------------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 502b9ae..81b7291 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -67,10 +67,6 @@ my $ext_file = "opengl_ext.c"; my $wgl_driver_file = "../../include/wine/wgl_driver.h"; my $wgl_file = "../../include/wine/wgl.h"; -# Set to 0 for removing the ENTER / LEAVE GL calls -my $gen_thread_safe = 0; -# Prefix used for the local variables -my $ext_prefix = "func_"; # If set to 1, generate TRACEs for each OpenGL function my $gen_traces = 1; @@ -299,9 +295,6 @@ sub GenerateThunk($$$) return "$ret) DECLSPEC_HIDDEN;\n" if $name eq "glGetStringi"; $ret .= ") {\n"; $ret .= " const struct opengl_funcs *funcs = NtCurrentTeb()->glTable;\n"; - if ($func_ref->[0] ne "void" && $gen_thread_safe) { - $ret .= " " . ConvertType($func_ref->[0]) . " ret_value;\n"; - } if ($gen_traces) { $ret .= " TRACE(\"($trace_arg)\\n\""; if ($trace_arg ne "") { @@ -309,25 +302,11 @@ sub GenerateThunk($$$) } $ret .= ");\n"; } - if ($gen_thread_safe) { - $ret .= " ENTER_GL();\n"; - $ret .= " "; - if ($func_ref->[0] ne "void") { - $ret .= "ret_value = "; - } - $ret .= "funcs->$prefix.p_$name( $call_arg);\n"; - $ret .= " LEAVE_GL();\n"; - if ($func_ref->[0] ne "void") { - $ret .= " return ret_value;\n" - } - } - else { - $ret .= " "; - if ($func_ref->[0] ne "void") { - $ret .= "return "; - } - $ret .= "funcs->$prefix.p_$name( $call_arg);\n"; + $ret .= " "; + if ($func_ref->[0] ne "void") { + $ret .= "return "; } + $ret .= "funcs->$prefix.p_$name( $call_arg);\n"; $ret .= "}\n"; # Return this string....

1 0

Alexandre Julliard : opengl32: Convert the XML parser to use XML::LibXML.
by Alexandre Julliard 10 Oct '17

10 Oct '17

Module: wine Branch: master Commit: fd3d5d6f829fe64f46f71960c108393daf6f9190 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd3d5d6f829fe64f46f71960c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 10 10:16:03 2017 +0200 opengl32: Convert the XML parser to use XML::LibXML. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/make_opengl | 369 +- dlls/opengl32/opengl_ext.c | 13233 +++++++++++++++++++++++++----------------- dlls/opengl32/opengl_norm.c | 5062 ++++++++-------- include/wine/wgl.h | 653 +-- include/wine/wgl_driver.h | 5888 +++++++++---------- 5 files changed, 14045 insertions(+), 11160 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fd3d5d6f829fe64f46f71…

1 0

Alexandre Julliard : opengl32: Get type definitions from the XML files.
by Alexandre Julliard 10 Oct '17

10 Oct '17

Module: wine Branch: master Commit: bbb71620cd32cfde52337f5f62eea5a362ca8b98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbb71620cd32cfde52337f5f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 9 15:21:31 2017 +0200 opengl32: Get type definitions from the XML files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/make_opengl | 234 ++++++++++++++++--------------------------- dlls/opengl32/opengl_ext.c | 14 +-- dlls/opengl32/opengl_norm.c | 14 +-- dlls/opengl32/tests/opengl.c | 1 - dlls/opengl32/winegl.xml | 18 ++++ include/wine/wgl.h | 90 +++++++++++------ include/wine/wgl_driver.h | 14 +-- include/wine/wglext.h | 28 ------ 8 files changed, 186 insertions(+), 227 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bbb71620cd32cfde52337…

1 0

Andrey Gusev : oleaut32: Remove redundant comparison.
by Alexandre Julliard 10 Oct '17

10 Oct '17

Module: wine Branch: master Commit: 307b3c8ed59acf2de2a049d27b5784a6a97733e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=307b3c8ed59acf2de2a049d27… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Oct 10 17:20:52 2017 +0300 oleaut32: Remove redundant comparison. Signed-off-by: Andrey Gusev <andrey.goosev(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 881fe20..eeef992 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -5372,7 +5372,7 @@ static HRESULT VARIANT_DI_normalize(VARIANT_DI * val, int exponent2, BOOL isDoub end of the bit representation, down to the precision guaranteed by the floating point number. */ if (isDouble) { - while (exponent10 < 0 && (val->bitsnum[2] != 0 || (val->bitsnum[2] == 0 && (val->bitsnum[1] & 0xFFE00000) != 0))) { + while (exponent10 < 0 && (val->bitsnum[2] != 0 || (val->bitsnum[1] & 0xFFE00000) != 0)) { int rem10; rem10 = VARIANT_int_divbychar(val->bitsnum, 3, 10);

1 0