January 2018 - Wine-Devel - list.winehq.org

[PATCH] user32: Convert dialog procedure arguments basing on window type not procedure type
by Nikolay Sivov Jan. 21, 2018

Jan. 21, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/tests/dialog.c | 6 ------ dlls/user32/winproc.c | 28 +++++++++++++++++++--------- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index cbe4b2b1d8..900ffc7b9c 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -1252,10 +1252,8 @@ static INT_PTR CALLBACK test_aw_conversion_dlgprocA(HWND hdlg, UINT msg, WPARAM case LB_ADDFILE: case EM_REPLACESEL: if (IsWindowUnicode(hdlg)) - todo_wine ok(!lstrcmpW(text, testtextW), "Unexpected text %s.\n", wine_dbgstr_w(text)); else - todo_wine ok(!strcmp(textA, "WndText"), "Unexpected text %s.\n", textA); break; }; @@ -1333,13 +1331,11 @@ static INT_PTR CALLBACK test_aw_conversion_dlgproc(HWND hdlg, UINT msg, WPARAM w memset(buff, 'A', sizeof(buff)); len = GetWindowTextA(hdlg, buff, sizeof(buff)); - todo_wine ok(buff[0] == 0 && buff[1] == 'A' && len == 0, "Unexpected window text %#x, %#x, len %d\n", (BYTE)buff[0], (BYTE)buff[1], len); memset(buffW, 0xff, sizeof(buffW)); len = GetWindowTextW(hdlg, buffW, 64); - todo_wine ok(!lstrcmpW(buffW, testtextW) && len == 0, "Unexpected window text %s, len %d\n", wine_dbgstr_w(buffW), len); dlg_test_aw_message(hdlg, WM_WININICHANGE); @@ -1449,12 +1445,10 @@ static INT_PTR CALLBACK test_aw_conversion_dlgproc2(HWND hdlg, UINT msg, WPARAM memset(buff, 'A', sizeof(buff)); len = GetWindowTextA(hdlg, buff, sizeof(buff)); - todo_wine ok(!strcmp(buff, "WndText") && len == 0, "Unexpected window text %s, len %d\n", buff, len); memset(buffW, 0xff, sizeof(buffW)); len = GetWindowTextW(hdlg, buffW, sizeof(buffW)/sizeof(buffW[0])); - todo_wine ok(buffW[0] == 0 && buffW[1] == 0xffff && len == 0, "Unexpected window text %#x, %#x, len %d\n", buffW[0], buffW[1], len); diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 73bbe95028..3d00a09233 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -993,6 +993,10 @@ LRESULT WINAPI CallWindowProcW( WNDPROC func, HWND hwnd, UINT msg, return result; } +static WNDPROC WINPROC_GetDlgProcFunc(const WINDOWPROC *proc) +{ + return proc->procW ? proc->procW : proc->procA; +} /********************************************************************** * WINPROC_CallDlgProcA @@ -1006,20 +1010,23 @@ INT_PTR WINPROC_CallDlgProcA( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, if (!func) return 0; if (!(proc = handle_to_proc( func ))) - ret = call_dialog_proc( hwnd, msg, wParam, lParam, &result, func ); + return call_dialog_proc( hwnd, msg, wParam, lParam, &result, func ); else if (proc == WINPROC_PROC16) { ret = wow_handlers.call_dialog_proc( hwnd, msg, wParam, lParam, &result, func ); SetWindowLongPtrW( hwnd, DWLP_MSGRESULT, result ); + return ret; } - else if (proc->procW) + + if (IsWindowUnicode( hwnd )) { ret = WINPROC_CallProcAtoW( call_dialog_proc, hwnd, msg, wParam, lParam, &result, - proc->procW, WMCHAR_MAP_CALLWINDOWPROC ); + WINPROC_GetDlgProcFunc( proc ), WMCHAR_MAP_CALLWINDOWPROC ); SetWindowLongPtrW( hwnd, DWLP_MSGRESULT, result ); } else - ret = call_dialog_proc( hwnd, msg, wParam, lParam, &result, proc->procA ); + ret = call_dialog_proc( hwnd, msg, wParam, lParam, &result, WINPROC_GetDlgProcFunc( proc )); + return ret; } @@ -1036,19 +1043,22 @@ INT_PTR WINPROC_CallDlgProcW( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, if (!func) return 0; if (!(proc = handle_to_proc( func ))) - ret = call_dialog_proc( hwnd, msg, wParam, lParam, &result, func ); + return call_dialog_proc( hwnd, msg, wParam, lParam, &result, func ); else if (proc == WINPROC_PROC16) { ret = WINPROC_CallProcWtoA( wow_handlers.call_dialog_proc, hwnd, msg, wParam, lParam, &result, func ); SetWindowLongPtrW( hwnd, DWLP_MSGRESULT, result ); + return ret; } - else if (proc->procA) + + if (IsWindowUnicode( hwnd )) + ret = call_dialog_proc( hwnd, msg, wParam, lParam, &result, WINPROC_GetDlgProcFunc( proc )); + else { - ret = WINPROC_CallProcWtoA( call_dialog_proc, hwnd, msg, wParam, lParam, &result, proc->procA ); + ret = WINPROC_CallProcWtoA( call_dialog_proc, hwnd, msg, wParam, lParam, &result, WINPROC_GetDlgProcFunc( proc )); SetWindowLongPtrW( hwnd, DWLP_MSGRESULT, result ); } - else - ret = call_dialog_proc( hwnd, msg, wParam, lParam, &result, proc->procW ); + return ret; } -- 2.15.1

1 0

[PATCH] comctl32/updown: Remove window subclass right before window is destroyed
by Nikolay Sivov Jan. 21, 2018

Jan. 21, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/updown.c | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index 4f44b9032a..67b646da0e 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -592,14 +592,22 @@ UPDOWN_Buddy_SubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, switch(uMsg) { case WM_KEYDOWN: - UPDOWN_KeyPressed(infoPtr, (int)wParam); - if ((wParam == VK_UP) || (wParam == VK_DOWN)) return 0; - break; + if (infoPtr) + { + UPDOWN_KeyPressed(infoPtr, (int)wParam); + if (wParam == VK_UP || wParam == VK_DOWN) + return 0; + } + break; case WM_MOUSEWHEEL: - UPDOWN_MouseWheel(infoPtr, (int)wParam); - break; + if (infoPtr) + UPDOWN_MouseWheel(infoPtr, (int)wParam); + break; + case WM_NCDESTROY: + RemoveWindowSubclass(hwnd, UPDOWN_Buddy_SubclassProc, BUDDY_SUBCLASSID); + break; default: break; } @@ -607,6 +615,11 @@ UPDOWN_Buddy_SubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, return DefSubclassProc(hwnd, uMsg, wParam, lParam); } +static void UPDOWN_ResetSubclass (UPDOWN_INFO *infoPtr) +{ + SetWindowSubclass(infoPtr->Buddy, UPDOWN_Buddy_SubclassProc, BUDDY_SUBCLASSID, 0); +} + /*********************************************************************** * UPDOWN_SetBuddy * @@ -628,9 +641,8 @@ static HWND UPDOWN_SetBuddy (UPDOWN_INFO* infoPtr, HWND bud) old_buddy = infoPtr->Buddy; - /* there is already a buddy assigned */ - if (infoPtr->Buddy) RemoveWindowSubclass(infoPtr->Buddy, UPDOWN_Buddy_SubclassProc, - BUDDY_SUBCLASSID); + UPDOWN_ResetSubclass (infoPtr); + if (!IsWindow(bud)) bud = NULL; /* Store buddy window handle */ @@ -942,10 +954,7 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L case WM_DESTROY: Free (infoPtr->AccelVect); - - if (infoPtr->Buddy) - RemoveWindowSubclass(infoPtr->Buddy, UPDOWN_Buddy_SubclassProc, - BUDDY_SUBCLASSID); + UPDOWN_ResetSubclass (infoPtr); Free (infoPtr); SetWindowLongPtrW (hwnd, 0, 0); theme = GetWindowTheme (hwnd); -- 2.15.1

1 0

[PATCH] ws2_32/tests: Fix the printed value in a few ok lines.
by Stefan Dösinger Jan. 21, 2018

Jan. 21, 2018

--- dlls/ws2_32/tests/sock.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 96631aea37..e188724203 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1768,8 +1768,8 @@ todo_wine ok(!csinfoA.cs.LocalAddr.iSockaddrLength, "Expected 0, got %d\n", csinfoA.cs.LocalAddr.iSockaddrLength); ok(csinfoA.cs.LocalAddr.lpSockaddr == NULL, "Expected NULL, got %p\n", csinfoA.cs.LocalAddr.lpSockaddr); /* Socket is not connected, no information provided */ - ok(!csinfoA.cs.RemoteAddr.iSockaddrLength, "Expected 0, got %d\n", csinfoA.cs.LocalAddr.iSockaddrLength); - ok(csinfoA.cs.RemoteAddr.lpSockaddr == NULL, "Expected NULL, got %p\n", csinfoA.cs.LocalAddr.lpSockaddr); + ok(!csinfoA.cs.RemoteAddr.iSockaddrLength, "Expected 0, got %d\n", csinfoA.cs.RemoteAddr.iSockaddrLength); + ok(csinfoA.cs.RemoteAddr.lpSockaddr == NULL, "Expected NULL, got %p\n", csinfoA.cs.RemoteAddr.lpSockaddr); err = bind(s, (struct sockaddr*)&saddr, sizeof(saddr)); ok(!err, "Expected 0, got %d\n", err); @@ -1781,8 +1781,8 @@ todo_wine ok(csinfoA.cs.LocalAddr.iSockaddrLength, "Expected non-zero\n"); ok(csinfoA.cs.LocalAddr.lpSockaddr != NULL, "Expected non-null\n"); /* Socket is not connected, no information provided */ - ok(!csinfoA.cs.RemoteAddr.iSockaddrLength, "Expected 0, got %d\n", csinfoA.cs.LocalAddr.iSockaddrLength); - ok(csinfoA.cs.RemoteAddr.lpSockaddr == NULL, "Expected NULL, got %p\n", csinfoA.cs.LocalAddr.lpSockaddr); + ok(!csinfoA.cs.RemoteAddr.iSockaddrLength, "Expected 0, got %d\n", csinfoA.cs.RemoteAddr.iSockaddrLength); + ok(csinfoA.cs.RemoteAddr.lpSockaddr == NULL, "Expected NULL, got %p\n", csinfoA.cs.RemoteAddr.lpSockaddr); err = bind(s2, (struct sockaddr*)&saddr, sizeof(saddr)); ok(!err, "Expected 0, got %d\n", err); -- 2.13.6

1 0

[PATCH] comctl32/treeview: Make textWidth in struct _TREEITEM compatible with native one.
by Zhiyi Zhang Jan. 20, 2018

Jan. 20, 2018

Hi Nikolay, This fixes https://bugs.winehq.org/show_bug.cgi?id=35127 As I was working through bug 35127, I noticed that you had once changed the layout of struct _TREEITEM in commit 6ec621e835e03f715d5fee27c5de5b0d361814de. Now I am sure that textWidth in struct _TREEITEM is a WORD and is at the offset 0x1a. You can check out the bug comments for details. I tried to find out what is at 0x18 but no luck, thus I am adding a unknown member to make textWidth at the right offset. What do you think of the patch? Do you know what member is at struct _TREEITEM+0x18? I can use your opinion with this patch. Thanks, Zhiyi Zhang Signed-off-by: Zhiyi Zhang <yi.gd.cn(a)gmail.com> --- dlls/comctl32/tests/treeview.c | 58 ++++++++++++++++++++++++++++++++++++------ dlls/comctl32/treeview.c | 3 ++- 2 files changed, 52 insertions(+), 9 deletions(-)

3 3

[PATCH] quartz: Wait for the PullPin thread to terminate.
by Zebediah Figura Jan. 19, 2018

Jan. 19, 2018

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/pin.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 355d87d..5197d5c 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -541,11 +541,7 @@ static void PullPin_Thread_Stop(PullPin *This) TRACE("(%p)->()\n", This); EnterCriticalSection(This->pin.pCritSec); - { - CloseHandle(This->hThread); - This->hThread = NULL; - SetEvent(This->hEventStateChanged); - } + SetEvent(This->hEventStateChanged); LeaveCriticalSection(This->pin.pCritSec); IBaseFilter_Release(This->pin.pinInfo.pFilter); @@ -831,6 +827,10 @@ HRESULT WINAPI PullPin_Disconnect(IPin *iface) } LeaveCriticalSection(This->pin.pCritSec); + WaitForSingleObject(This->hThread, INFINITE); + CloseHandle(This->hThread); + This->hThread = NULL; + return hr; } -- 2.7.4

1 0

[PATCH 3/3] winex11: Failing to create a context in X11DRV_wglCreateContextAttribsARB() is not an internal error.
by Henri Verbeet Jan. 19, 2018

Jan. 19, 2018

In particular, without WGL_WINE_query_renderer, the only way to determine whether a particular context version is supported or not is by attempting to create a context with that version. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/winex11.drv/opengl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 5a7cfcc7a9c..e6652867800 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -2143,7 +2143,7 @@ static struct wgl_context *X11DRV_wglCreateContextAttribsARB( HDC hdc, struct wg if ((err = X11DRV_check_error()) || !ret->ctx) { /* In the future we should convert the GLX error to a win32 one here if needed */ - ERR("Context creation failed (error %x)\n", err); + WARN("Context creation failed (error %#x).\n", err); HeapFree( GetProcessHeap(), 0, ret ); ret = NULL; } -- 2.11.0

1 0

[PATCH 2/3] d3d11: Validate the DXBC version.
by Henri Verbeet Jan. 19, 2018

Jan. 19, 2018

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/utils.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index c9e137c66e5..c72216def53 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -789,6 +789,7 @@ HRESULT parse_dxbc(const char *data, SIZE_T data_size, DWORD chunk_count; DWORD total_size; unsigned int i; + DWORD version; DWORD tag; read_dword(&ptr, &tag); @@ -803,7 +804,13 @@ HRESULT parse_dxbc(const char *data, SIZE_T data_size, WARN("Ignoring DXBC checksum.\n"); skip_dword_unknown(&ptr, 4); - skip_dword_unknown(&ptr, 1); /* It seems to always be 0x00000001. */ + read_dword(&ptr, &version); + TRACE("version: %#x.\n", version); + if (version != 0x00000001) + { + WARN("Got unexpected DXBC version %#x.\n", version); + return E_INVALIDARG; + } read_dword(&ptr, &total_size); TRACE("total size: %#x\n", total_size); -- 2.11.0

1 0

[PATCH 1/3] d3d10: Validate the DXBC version.
by Henri Verbeet Jan. 19, 2018

Jan. 19, 2018

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d10/utils.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10/utils.c b/dlls/d3d10/utils.c index 39b0902184b..223b33a8017 100644 --- a/dlls/d3d10/utils.c +++ b/dlls/d3d10/utils.c @@ -159,6 +159,7 @@ HRESULT parse_dxbc(const char *data, SIZE_T data_size, DWORD chunk_count; DWORD total_size; unsigned int i; + DWORD version; DWORD tag; if (!data) @@ -179,7 +180,13 @@ HRESULT parse_dxbc(const char *data, SIZE_T data_size, /* checksum? */ skip_dword_unknown("DXBC header", &ptr, 4); - skip_dword_unknown("DXBC header", &ptr, 1); + read_dword(&ptr, &version); + TRACE("version: %#x.\n", version); + if (version != 0x00000001) + { + WARN("Got unexpected DXBC version %#x.\n", version); + return E_FAIL; + } read_dword(&ptr, &total_size); TRACE("total size: %#x\n", total_size); -- 2.11.0

1 0

[PATCH 2/2] schtests: Added /create command implementation.
by Jacek Caban Jan. 19, 2018

Jan. 19, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/schtasks/schtasks.c | 127 +++++++++++++++++++++++++++++++++++++ programs/schtasks/tests/schtasks.c | 72 ++++++++++++++++----- 2 files changed, 182 insertions(+), 17 deletions(-)

1 0

[PATCH 1/2] schtasks: Added /delete command implementation.
by Jacek Caban Jan. 19, 2018

Jan. 19, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/schtasks/schtasks.c | 87 +++++++++++++++++++++++++++++++++----- programs/schtasks/tests/schtasks.c | 3 +- 2 files changed, 79 insertions(+), 11 deletions(-)

1 0