wine-commits April 2016

wine-commits@winehq.org

2 participants
750 discussions

Nikolay Sivov : ole2disp: Implement SafeArrayGetElemsize().
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: f3ad9396e93f03ffdf568d1582ca2087bcd04897 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3ad9396e93f03ffdf568d158… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 13 12:25:48 2016 +0300 ole2disp: Implement SafeArrayGetElemsize(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5f8f19299834ae03d46fc436925d8fd8fa2c0932) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ole2disp.dll16/ole2disp.c | 9 +++++++++ dlls/ole2disp.dll16/ole2disp.dll16.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ole2disp.dll16/ole2disp.c b/dlls/ole2disp.dll16/ole2disp.c index 0c033cd..20b7b6c 100644 --- a/dlls/ole2disp.dll16/ole2disp.c +++ b/dlls/ole2disp.dll16/ole2disp.c @@ -99,6 +99,15 @@ USHORT WINAPI SafeArrayGetDim16(SAFEARRAY16 *sa) } /****************************************************************************** + * SafeArrayGetElemsize [OLE2DISP.18] + */ +USHORT WINAPI SafeArrayGetElemsize16(SAFEARRAY16 *sa) +{ + TRACE("(%p)\n", sa); + return sa->cbElements; +} + +/****************************************************************************** * SafeArrayAllocDescriptor [OLE2DISP.38] */ HRESULT WINAPI SafeArrayAllocDescriptor16(UINT16 dims, SEGPTR *ret) diff --git a/dlls/ole2disp.dll16/ole2disp.dll16.spec b/dlls/ole2disp.dll16/ole2disp.dll16.spec index 1fd2b0b..ca884a0 100644 --- a/dlls/ole2disp.dll16/ole2disp.dll16.spec +++ b/dlls/ole2disp.dll16/ole2disp.dll16.spec @@ -15,7 +15,7 @@ 15 stub SAFEARRAYCREATE 16 stub SAFEARRAYDESTROY 17 pascal -ret16 SafeArrayGetDim(ptr) SafeArrayGetDim16 -18 stub SAFEARRAYGETELEMSIZE +18 pascal -ret16 SafeArrayGetElemsize(ptr) SafeArrayGetElemsize16 19 stub SAFEARRAYGETUBOUND 20 stub SAFEARRAYGETLBOUND 21 stub SAFEARRAYLOCK

1 0

Nikolay Sivov : ole2disp: Implement SafeArrayGetDim().
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: c33584a711573b27a5895a17216d61f2946f00a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c33584a711573b27a5895a172… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 13 12:25:47 2016 +0300 ole2disp: Implement SafeArrayGetDim(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 332dd07fad031a51f5d921d6d348f3345b9ae061) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ole2disp.dll16/ole2disp.c | 9 +++++++++ dlls/ole2disp.dll16/ole2disp.dll16.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ole2disp.dll16/ole2disp.c b/dlls/ole2disp.dll16/ole2disp.c index 5831d86..0c033cd 100644 --- a/dlls/ole2disp.dll16/ole2disp.c +++ b/dlls/ole2disp.dll16/ole2disp.c @@ -90,6 +90,15 @@ static ULONG safearray_getcellcount(const SAFEARRAY16 *sa) } /****************************************************************************** + * SafeArrayGetDim [OLE2DISP.17] + */ +USHORT WINAPI SafeArrayGetDim16(SAFEARRAY16 *sa) +{ + TRACE("(%p)\n", sa); + return sa->cDims; +} + +/****************************************************************************** * SafeArrayAllocDescriptor [OLE2DISP.38] */ HRESULT WINAPI SafeArrayAllocDescriptor16(UINT16 dims, SEGPTR *ret) diff --git a/dlls/ole2disp.dll16/ole2disp.dll16.spec b/dlls/ole2disp.dll16/ole2disp.dll16.spec index 919583d..1fd2b0b 100644 --- a/dlls/ole2disp.dll16/ole2disp.dll16.spec +++ b/dlls/ole2disp.dll16/ole2disp.dll16.spec @@ -14,7 +14,7 @@ 14 stub DOSDATETIMETOVARIANTTIME 15 stub SAFEARRAYCREATE 16 stub SAFEARRAYDESTROY -17 stub SAFEARRAYGETDIM +17 pascal -ret16 SafeArrayGetDim(ptr) SafeArrayGetDim16 18 stub SAFEARRAYGETELEMSIZE 19 stub SAFEARRAYGETUBOUND 20 stub SAFEARRAYGETLBOUND

1 0

Francois Gouget : wined3d: Fix a typo in an error message.
by Alexandre Julliard 11 Apr '16

11 Apr '16

Module: wine Branch: master Commit: 1c201a96c57a68caaf6c976d7f3732738c9d9ac8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c201a96c57a68caaf6c976d7… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 11 12:20:46 2016 +0200 wined3d: Fix a typo in an error message. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index afb47e1..06163ab 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -81,7 +81,7 @@ static const char *arb_get_helper_value(enum wined3d_shader_type shader, enum ar { if (shader != WINED3D_SHADER_TYPE_VERTEX && shader != WINED3D_SHADER_TYPE_PIXEL) { - ERR("Unsupported shader type '%s'.\n.", debug_shader_type(shader)); + ERR("Unsupported shader type '%s'.\n", debug_shader_type(shader)); return "bad"; }

1 0

Jacek Caban : user32: Added more tests of handling parent/owner by dialog.
by Alexandre Julliard 11 Apr '16

11 Apr '16

Module: wine Branch: master Commit: ae39337e77f845dfe70d0279cad199bb2fb798ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae39337e77f845dfe70d0279c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 6 14:41:34 2016 +0200 user32: Added more tests of handling parent/owner by dialog. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 228 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 228 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ae39337e77f845dfe70d0…

1 0

Jacek Caban : user32: Use the original owner used to create the dialog for WM_ENTERIDLE messages.
by Alexandre Julliard 11 Apr '16

11 Apr '16

Module: wine Branch: master Commit: 36b64321b2d6f2e80c78129dac2a4ffe4881d2bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=36b64321b2d6f2e80c78129da… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 6 14:41:27 2016 +0200 user32: Use the original owner used to create the dialog for WM_ENTERIDLE messages. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user.exe16/dialog.c | 4 ++-- dlls/user.exe16/user_private.h | 2 +- dlls/user32/controls.h | 4 ++-- dlls/user32/dialog.c | 22 +++++++++++----------- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/user.exe16/dialog.c b/dlls/user.exe16/dialog.c index 766a468..e5bf7b9 100644 --- a/dlls/user.exe16/dialog.c +++ b/dlls/user.exe16/dialog.c @@ -744,7 +744,7 @@ INT16 WINAPI DialogBoxParam16( HINSTANCE16 hInst, LPCSTR template, { HWND owner = WIN_Handle32(owner16); hwnd = DIALOG_CreateIndirect16( hInst, data, owner, dlgProc, param, TRUE ); - if (hwnd) ret = wow_handlers32.dialog_box_loop( hwnd ); + if (hwnd) ret = wow_handlers32.dialog_box_loop( hwnd, owner ); GlobalUnlock16( hmem ); } FreeResource16( hmem ); @@ -764,7 +764,7 @@ INT16 WINAPI DialogBoxIndirectParam16( HINSTANCE16 hInst, HANDLE16 dlgTemplate, if (!(ptr = GlobalLock16( dlgTemplate ))) return -1; hwnd = DIALOG_CreateIndirect16( hInst, ptr, owner, dlgProc, param, TRUE ); GlobalUnlock16( dlgTemplate ); - if (hwnd) return wow_handlers32.dialog_box_loop( hwnd ); + if (hwnd) return wow_handlers32.dialog_box_loop( hwnd, owner ); return -1; } diff --git a/dlls/user.exe16/user_private.h b/dlls/user.exe16/user_private.h index 3d97546..7c91afb 100644 --- a/dlls/user.exe16/user_private.h +++ b/dlls/user.exe16/user_private.h @@ -63,7 +63,7 @@ struct wow_handlers32 HWND (*get_win_handle)(HWND); WNDPROC (*alloc_winproc)(WNDPROC,BOOL); struct tagDIALOGINFO *(*get_dialog_info)(HWND,BOOL); - INT (*dialog_box_loop)(HWND); + INT (*dialog_box_loop)(HWND,HWND); ULONG_PTR (*get_icon_param)(HICON); ULONG_PTR (*set_icon_param)(HICON,ULONG_PTR); }; diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 4fdab62..1641645 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -121,7 +121,7 @@ struct wow_handlers32 HWND (*get_win_handle)(HWND); WNDPROC (*alloc_winproc)(WNDPROC,BOOL); struct tagDIALOGINFO *(*get_dialog_info)(HWND,BOOL); - INT (*dialog_box_loop)(HWND); + INT (*dialog_box_loop)(HWND,HWND); ULONG_PTR (*get_icon_param)(HICON); ULONG_PTR (*set_icon_param)(HICON,ULONG_PTR); }; @@ -243,7 +243,7 @@ typedef struct tagDIALOGINFO #define DF_END 0x0001 extern DIALOGINFO *DIALOG_get_info( HWND hwnd, BOOL create ) DECLSPEC_HIDDEN; -extern INT DIALOG_DoDialogBox( HWND hwnd ) DECLSPEC_HIDDEN; +extern INT DIALOG_DoDialogBox( HWND hwnd, HWND owner ) DECLSPEC_HIDDEN; HRGN set_control_clipping( HDC hdc, const RECT *rect ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index b5ed902..9cb4b8d 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -445,7 +445,7 @@ static LPCSTR DIALOG_ParseTemplate32( LPCSTR template, DLG_TEMPLATE * result ) */ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, HWND owner, DLGPROC dlgProc, LPARAM param, - BOOL unicode, BOOL modal ) + BOOL unicode, HWND *modal_owner ) { HWND hwnd; RECT rect; @@ -584,7 +584,7 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, } } - if (modal && owner) + if (modal_owner && owner) { HWND parent; /* @@ -599,6 +599,7 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, if (!parent || parent == GetDesktopWindow()) break; owner = parent; } + *modal_owner = owner; if (IsWindowEnabled( owner )) { disabled_owner = owner; @@ -768,9 +769,8 @@ HWND WINAPI CreateDialogIndirectParamW( HINSTANCE hInst, LPCDLGTEMPLATEW dlgTemp /*********************************************************************** * DIALOG_DoDialogBox */ -INT DIALOG_DoDialogBox( HWND hwnd ) +INT DIALOG_DoDialogBox( HWND hwnd, HWND owner ) { - HWND owner = GetWindow( hwnd, GW_OWNER ); DIALOGINFO * dlgInfo; MSG msg; INT retval; @@ -792,7 +792,7 @@ INT DIALOG_DoDialogBox( HWND hwnd ) bFirstEmpty = FALSE; } if (!(GetWindowLongW( hwnd, GWL_STYLE ) & DS_NOIDLEMSG)) - { + { /* No message present -> send ENTERIDLE and wait */ SendMessageW( owner, WM_ENTERIDLE, MSGF_DIALOGBOX, (LPARAM)hwnd ); } @@ -839,8 +839,8 @@ INT_PTR WINAPI DialogBoxParamA( HINSTANCE hInst, LPCSTR name, if (!(hrsrc = FindResourceA( hInst, name, (LPSTR)RT_DIALOG ))) return -1; if (!(ptr = LoadResource(hInst, hrsrc))) return -1; - hwnd = DIALOG_CreateIndirect( hInst, ptr, owner, dlgProc, param, FALSE, TRUE ); - if (hwnd) return DIALOG_DoDialogBox( hwnd ); + hwnd = DIALOG_CreateIndirect( hInst, ptr, owner, dlgProc, param, FALSE, &owner ); + if (hwnd) return DIALOG_DoDialogBox( hwnd, owner ); return 0; } @@ -857,8 +857,8 @@ INT_PTR WINAPI DialogBoxParamW( HINSTANCE hInst, LPCWSTR name, if (!(hrsrc = FindResourceW( hInst, name, (LPWSTR)RT_DIALOG ))) return -1; if (!(ptr = LoadResource(hInst, hrsrc))) return -1; - hwnd = DIALOG_CreateIndirect( hInst, ptr, owner, dlgProc, param, TRUE, TRUE ); - if (hwnd) return DIALOG_DoDialogBox( hwnd ); + hwnd = DIALOG_CreateIndirect( hInst, ptr, owner, dlgProc, param, TRUE, &owner ); + if (hwnd) return DIALOG_DoDialogBox( hwnd, owner ); return 0; } @@ -870,8 +870,8 @@ INT_PTR WINAPI DialogBoxIndirectParamAorW( HINSTANCE hInstance, LPCVOID template HWND owner, DLGPROC dlgProc, LPARAM param, DWORD flags ) { - HWND hwnd = DIALOG_CreateIndirect( hInstance, template, owner, dlgProc, param, !flags, TRUE ); - if (hwnd) return DIALOG_DoDialogBox( hwnd ); + HWND hwnd = DIALOG_CreateIndirect( hInstance, template, owner, dlgProc, param, !flags, &owner ); + if (hwnd) return DIALOG_DoDialogBox( hwnd, owner ); return -1; }

1 0

Jacek Caban : user32: Don't enable owner in DIALOG_DoDialogBox.
by Alexandre Julliard 11 Apr '16

11 Apr '16

Module: wine Branch: master Commit: fc4b906d784db3681d1626d29becb886cf1a6d2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc4b906d784db3681d1626d29… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 6 14:41:10 2016 +0200 user32: Don't enable owner in DIALOG_DoDialogBox. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/controls.h | 1 - dlls/user32/dialog.c | 2 -- 2 files changed, 3 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 542bf39..4fdab62 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -241,7 +241,6 @@ typedef struct tagDIALOGINFO } DIALOGINFO; #define DF_END 0x0001 -#define DF_OWNERENABLED 0x0002 extern DIALOGINFO *DIALOG_get_info( HWND hwnd, BOOL create ) DECLSPEC_HIDDEN; extern INT DIALOG_DoDialogBox( HWND hwnd ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 2804ed2..b5ed902 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -601,7 +601,6 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, } if (IsWindowEnabled( owner )) { - flags |= DF_OWNERENABLED; disabled_owner = owner; EnableWindow( disabled_owner, FALSE ); } @@ -822,7 +821,6 @@ INT DIALOG_DoDialogBox( HWND hwnd ) } } } - if (dlgInfo->flags & DF_OWNERENABLED) EnableWindow( owner, TRUE ); retval = dlgInfo->idResult; DestroyWindow( hwnd ); return retval;

1 0

Jacek Caban : user32: Use GWLP_HWNDPARENT to find an owner in EndDialog.
by Alexandre Julliard 11 Apr '16

11 Apr '16

Module: wine Branch: master Commit: 2f8f9d20aa50b5ae0c65f42196d3c7f513a61fe6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f8f9d20aa50b5ae0c65f4219… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 6 14:41:03 2016 +0200 user32: Use GWLP_HWNDPARENT to find an owner in EndDialog. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/dialog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 2bacf4d..2804ed2 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -914,7 +914,7 @@ BOOL WINAPI EndDialog( HWND hwnd, INT_PTR retval ) dlgInfo->idResult = retval; dlgInfo->flags |= DF_END; - owner = GetWindow( hwnd, GW_OWNER ); + owner = (HWND)GetWindowLongPtrA( hwnd, GWLP_HWNDPARENT ); if (owner) EnableWindow( owner, TRUE );

1 0

Jacek Caban : user32: Use top level window as dialog parent for modal dialogs.
by Alexandre Julliard 11 Apr '16

11 Apr '16

Module: wine Branch: master Commit: 9da0c00a68c43348c2c00878f9a874dbb260147f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9da0c00a68c43348c2c00878f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 6 14:40:54 2016 +0200 user32: Use top level window as dialog parent for modal dialogs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/dialog.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 3ea426d..2bacf4d 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -587,24 +587,24 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, if (modal && owner) { HWND parent; - disabled_owner = owner; /* * Owner needs to be top level window. We need to duplicate the logic from server, - * because we need to disable it before creating dialog window. + * because we need to disable it before creating dialog window. Note that we do that + * even if dialog has WS_CHILD, but only for modal dialogs, which matched what + * Windows does. */ - while ((GetWindowLongW( disabled_owner, GWL_STYLE ) & (WS_POPUP|WS_CHILD)) == WS_CHILD) + while ((GetWindowLongW( owner, GWL_STYLE ) & (WS_POPUP|WS_CHILD)) == WS_CHILD) { - parent = GetParent( disabled_owner ); + parent = GetParent( owner ); if (!parent || parent == GetDesktopWindow()) break; - disabled_owner = parent; + owner = parent; } - if (IsWindowEnabled( disabled_owner )) + if (IsWindowEnabled( owner )) { flags |= DF_OWNERENABLED; + disabled_owner = owner; EnableWindow( disabled_owner, FALSE ); } - else - disabled_owner = NULL; } if (unicode)

1 0

Rodrigo Rivas Costa : user32: Make DeferWindowPos() fail on invalid window handles.
by Alexandre Julliard 11 Apr '16

11 Apr '16

Module: wine Branch: master Commit: 5e65b65219bd56a5991c2c54df99b524e379846a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e65b65219bd56a5991c2c54d… Author: Rodrigo Rivas Costa <rodrigorivascosta(a)gmail.com> Date: Sat Apr 9 09:09:20 2016 +0300 user32: Make DeferWindowPos() fail on invalid window handles. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 35 +++++++++++++++++++++++++++++++++++ dlls/user32/winpos.c | 6 +++++- 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 957e8a1d..918e1ef 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -8821,6 +8821,40 @@ static void test_winproc_limit(void) ok(i == 1, "winproc should be called once (%d)\n", i); } +static void test_deferwindowpos(void) +{ + HDWP hdwp, hdwp2; + BOOL ret; + + hdwp = BeginDeferWindowPos(0); + ok(hdwp != NULL, "got %p\n", hdwp); + + ret = EndDeferWindowPos(NULL); + ok(!ret, "got %d\n", ret); + + hdwp2 = DeferWindowPos(NULL, NULL, NULL, 0, 0, 10, 10, 0); +todo_wine + ok(hdwp2 == NULL && ((GetLastError() == ERROR_INVALID_DWP_HANDLE) || + broken(GetLastError() == ERROR_INVALID_WINDOW_HANDLE) /* before win8 */), "got %p, error %d\n", hdwp2, GetLastError()); + + hdwp2 = DeferWindowPos((HDWP)0xdead, GetDesktopWindow(), NULL, 0, 0, 10, 10, 0); +todo_wine + ok(hdwp2 == NULL && ((GetLastError() == ERROR_INVALID_DWP_HANDLE) || + broken(GetLastError() == ERROR_INVALID_WINDOW_HANDLE) /* before win8 */), "got %p, error %d\n", hdwp2, GetLastError()); + + hdwp2 = DeferWindowPos(hdwp, NULL, NULL, 0, 0, 10, 10, 0); + ok(hdwp2 == NULL && GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "got %p, error %d\n", hdwp2, GetLastError()); + + hdwp2 = DeferWindowPos(hdwp, GetDesktopWindow(), NULL, 0, 0, 10, 10, 0); + ok(hdwp2 == NULL && GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "got %p, error %d\n", hdwp2, GetLastError()); + + hdwp2 = DeferWindowPos(hdwp, (HWND)0xdead, NULL, 0, 0, 10, 10, 0); + ok(hdwp2 == NULL && GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "got %p, error %d\n", hdwp2, GetLastError()); + + ret = EndDeferWindowPos(hdwp); + ok(ret, "got %d\n", ret); +} + START_TEST(win) { char **argv; @@ -8963,6 +8997,7 @@ START_TEST(win) test_GetMessagePos(); test_activateapp(hwndMain); test_winproc_handles(argv[0]); + test_deferwindowpos(); /* add the tests above this line */ if (hhook) UnhookWindowsHookEx(hhook); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index f92a3dc..4915aad 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2348,7 +2348,11 @@ HDWP WINAPI DeferWindowPos( HDWP hdwp, HWND hwnd, HWND hwndAfter, hdwp, hwnd, hwndAfter, x, y, cx, cy, flags); hwnd = WIN_GetFullHandle( hwnd ); - if (is_desktop_window( hwnd )) return 0; + if (is_desktop_window( hwnd ) || !IsWindow( hwnd )) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return 0; + } if (!(pDWP = get_user_handle_ptr( hdwp, USER_DWP ))) return 0; if (pDWP == OBJ_OTHER_PROCESS)

1 0

Nikolay Sivov : dwrite: Always return non-zero metrics for strikethrough/ underline thickness.
by Alexandre Julliard 11 Apr '16

11 Apr '16

Module: wine Branch: master Commit: 137030bf7781a1ae9797667e555d2df46ab59920 URL: http://source.winehq.org/git/wine.git/?a=commit;h=137030bf7781a1ae9797667e5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 10 23:59:11 2016 +0300 dwrite: Always return non-zero metrics for strikethrough/underline thickness. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 12 ++++++++++++ dlls/dwrite/tests/font.c | 2 -- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 97a786d..b9bddea 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1204,6 +1204,18 @@ void opentype_get_font_metrics(IDWriteFontFileStream *stream, DWRITE_FONT_FACE_T metrics->underlineThickness = GET_BE_WORD(tt_post->underlineThickness); } + /* use any of thickness values if another one is zero, if both are zero use estimate */ + if (metrics->strikethroughThickness || metrics->underlineThickness) { + if (!metrics->strikethroughThickness) + metrics->strikethroughThickness = metrics->underlineThickness; + if (!metrics->underlineThickness) + metrics->underlineThickness = metrics->strikethroughThickness; + } + else { + metrics->strikethroughThickness = metrics->designUnitsPerEm / 14; + metrics->underlineThickness = metrics->designUnitsPerEm / 14; + } + /* estimate missing metrics */ if (metrics->xHeight == 0) metrics->xHeight = metrics->designUnitsPerEm / 2; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 0c060b8..5591913 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1576,12 +1576,10 @@ static void check_font_metrics(const WCHAR *nameW, const DWRITE_FONT_METRICS *go wine_dbgstr_w(nameW), got->designUnitsPerEm, expected->designUnitsPerEm); ok(got->underlinePosition == expected->underlinePosition, "font %s: underlinePosition %d, expected %d\n", wine_dbgstr_w(nameW), got->underlinePosition, expected->underlinePosition); -todo_wine_if(got->underlineThickness == 0) ok(got->underlineThickness == expected->underlineThickness, "font %s: underlineThickness %u, " "expected %u\n", wine_dbgstr_w(nameW), got->underlineThickness, expected->underlineThickness); ok(got->strikethroughPosition == expected->strikethroughPosition, "font %s: strikethroughPosition %d, expected %d\n", wine_dbgstr_w(nameW), got->strikethroughPosition, expected->strikethroughPosition); -todo_wine_if(got->strikethroughThickness == 0) ok(got->strikethroughThickness == expected->strikethroughThickness, "font %s: strikethroughThickness %u, " "expected %u\n", wine_dbgstr_w(nameW), got->strikethroughThickness, expected->strikethroughThickness); }

1 0

← Newer
1
...
54
55
56
57
58
59
60
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2016