September 2016 - Wine-Commits

Austin English : kernel32: Add SetDefaultDllDirectories stub.
by Alexandre Julliard Sept. 27, 2016

Sept. 27, 2016

Module: wine Branch: master Commit: 5003f15289e5a3a2b8dc27f412e3feb102a2a686 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5003f15289e5a3a2b8dc27f41… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Sep 26 16:17:37 2016 -0500 kernel32: Add SetDefaultDllDirectories stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-libraryloader-l1-1-0.spec | 2 +- .../api-ms-win-core-libraryloader-l1-1-1.spec | 2 +- .../api-ms-win-core-libraryloader-l1-2-0.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/path.c | 13 +++++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- 6 files changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/api-ms-win-core-libraryloader-l1-1-0/api-ms-win-core-libraryloader-l1-1-0.spec b/dlls/api-ms-win-core-libraryloader-l1-1-0/api-ms-win-core-libraryloader-l1-1-0.spec index 6c385b6..f322065 100644 --- a/dlls/api-ms-win-core-libraryloader-l1-1-0/api-ms-win-core-libraryloader-l1-1-0.spec +++ b/dlls/api-ms-win-core-libraryloader-l1-1-0/api-ms-win-core-libraryloader-l1-1-0.spec @@ -25,5 +25,5 @@ @ stdcall LoadStringW(long long ptr long) user32.LoadStringW @ stdcall LockResource(long) kernel32.LockResource @ stub RemoveDllDirectory -@ stub SetDefaultDllDirectories +@ stdcall SetDefaultDllDirectories(long) kernel32.SetDefaultDllDirectories @ stdcall SizeofResource(long long) kernel32.SizeofResource diff --git a/dlls/api-ms-win-core-libraryloader-l1-1-1/api-ms-win-core-libraryloader-l1-1-1.spec b/dlls/api-ms-win-core-libraryloader-l1-1-1/api-ms-win-core-libraryloader-l1-1-1.spec index afd1407..ba386a0 100644 --- a/dlls/api-ms-win-core-libraryloader-l1-1-1/api-ms-win-core-libraryloader-l1-1-1.spec +++ b/dlls/api-ms-win-core-libraryloader-l1-1-1/api-ms-win-core-libraryloader-l1-1-1.spec @@ -26,5 +26,5 @@ @ stdcall LockResource(long) kernel32.LockResource @ stub QueryOptionalDelayLoadedAPI @ stub RemoveDllDirectory -@ stub SetDefaultDllDirectories +@ stdcall SetDefaultDllDirectories(long) kernel32.SetDefaultDllDirectories @ stdcall SizeofResource(long long) kernel32.SizeofResource diff --git a/dlls/api-ms-win-core-libraryloader-l1-2-0/api-ms-win-core-libraryloader-l1-2-0.spec b/dlls/api-ms-win-core-libraryloader-l1-2-0/api-ms-win-core-libraryloader-l1-2-0.spec index 6c385b6..f322065 100644 --- a/dlls/api-ms-win-core-libraryloader-l1-2-0/api-ms-win-core-libraryloader-l1-2-0.spec +++ b/dlls/api-ms-win-core-libraryloader-l1-2-0/api-ms-win-core-libraryloader-l1-2-0.spec @@ -25,5 +25,5 @@ @ stdcall LoadStringW(long long ptr long) user32.LoadStringW @ stdcall LockResource(long) kernel32.LockResource @ stub RemoveDllDirectory -@ stub SetDefaultDllDirectories +@ stdcall SetDefaultDllDirectories(long) kernel32.SetDefaultDllDirectories @ stdcall SizeofResource(long long) kernel32.SizeofResource diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 2d82c71..3c25286 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1375,7 +1375,7 @@ @ stub SetDaylightFlag @ stdcall SetDefaultCommConfigA(str ptr long) @ stdcall SetDefaultCommConfigW(wstr ptr long) -# @ stub SetDefaultDllDirectories +@ stdcall SetDefaultDllDirectories(long) @ stdcall SetDllDirectoryA(str) @ stdcall SetDllDirectoryW(wstr) # @ stub SetDynamicTimeZoneInformation diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index eadd2e7..c746693 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -2072,9 +2072,22 @@ BOOL WINAPI CheckNameLegalDOS8Dot3W(const WCHAR *name, char *oemname, DWORD oemn return TRUE; } +/************************************************************************* + * SetSearchPathMode (KERNEL32.@) + */ BOOL WINAPI SetSearchPathMode(DWORD flags) { FIXME("(%x): stub\n", flags); SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; } + +/************************************************************************* + * SetDefaultDllDirectories (KERNEL32.@) + */ +BOOL WINAPI SetDefaultDllDirectories(DWORD flags) +{ + FIXME("(%x): stub\n", flags); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index de9404c..a7aecff 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -506,7 +506,7 @@ @ stdcall SetCriticalSectionSpinCount(ptr long) kernel32.SetCriticalSectionSpinCount @ stdcall SetCurrentDirectoryA(str) kernel32.SetCurrentDirectoryA @ stdcall SetCurrentDirectoryW(wstr) kernel32.SetCurrentDirectoryW -@ stub SetDefaultDllDirectories +@ stdcall SetDefaultDllDirectories(long) kernel32.SetDefaultDllDirectories @ stdcall SetEndOfFile(long) kernel32.SetEndOfFile @ stub SetEnvironmentStringsW @ stdcall SetEnvironmentVariableA(str str) kernel32.SetEnvironmentVariableA

1 0

Sebastian Lackner : server: Fix leak of old clipboard data when replacing existing format.
by Alexandre Julliard Sept. 27, 2016

Sept. 27, 2016

Module: wine Branch: master Commit: 547d7eded393fb83f0d8eb08a9129ea23ecde5ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=547d7eded393fb83f0d8eb08a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Sep 27 17:05:05 2016 +0200 server: Fix leak of old clipboard data when replacing existing format. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/clipboard.c | 1 + 1 file changed, 1 insertion(+) diff --git a/server/clipboard.c b/server/clipboard.c index aa23b5f..d8b5f96 100644 --- a/server/clipboard.c +++ b/server/clipboard.c @@ -461,6 +461,7 @@ DECL_HANDLER(set_clipboard_data) } } + free( format->data ); format->from = 0; format->seqno = clipboard->seqno++; format->size = get_req_data_size();

1 0

Michael Stefaniuc : strmbase: Don't bother tracing the GUID pointers too.
by Alexandre Julliard Sept. 27, 2016

Sept. 27, 2016

Module: wine Branch: master Commit: 9e087cde4b57264dc07f96fc7278bce66f02ff10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e087cde4b57264dc07f96fc7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 27 10:01:12 2016 +0200 strmbase: Don't bother tracing the GUID pointers too. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pospass.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/strmbase/pospass.c b/dlls/strmbase/pospass.c index e547328..42900c6 100644 --- a/dlls/strmbase/pospass.c +++ b/dlls/strmbase/pospass.c @@ -77,7 +77,7 @@ static HRESULT WINAPI SeekInner_QueryInterface(IUnknown * iface, REFIID riid, LPVOID *ppvObj) { PassThruImpl *This = impl_from_IUnknown_inner(iface); - TRACE("(%p)->(%s (%p), %p)\n", This, debugstr_guid(riid), riid, ppvObj); + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppvObj); if (This->bAggregatable) This->bUnkOuterValid = TRUE; @@ -184,7 +184,7 @@ static HRESULT WINAPI SeekingPassThru_QueryInterface(ISeekingPassThru *iface, RE { PassThruImpl *This = impl_from_ISeekingPassThru(iface); - TRACE("(%p/%p)->(%s (%p), %p)\n", This, iface, debugstr_guid(riid), riid, ppvObj); + TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj); return SeekOuter_QueryInterface(This, riid, ppvObj); } @@ -276,7 +276,7 @@ static HRESULT WINAPI MediaSeekingPassThru_QueryInterface(IMediaSeeking *iface, { PassThruImpl *This = impl_from_IMediaSeeking(iface); - TRACE("(%p/%p)->(%s (%p), %p)\n", This, iface, debugstr_guid(riid), riid, ppvObj); + TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj); return SeekOuter_QueryInterface(This, riid, ppvObj); } @@ -659,7 +659,7 @@ static HRESULT WINAPI MediaPositionPassThru_QueryInterface(IMediaPosition *iface { PassThruImpl *This = impl_from_IMediaPosition(iface); - TRACE("(%p/%p)->(%s (%p), %p)\n", This, iface, debugstr_guid(riid), riid, ppvObj); + TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj); return SeekOuter_QueryInterface(This, riid, ppvObj); }

1 0

Alexandre Julliard : winex11: Remove support for exporting the CF_BITMAP, CF_PALETTE and CF_DIBV5 formats.
by Alexandre Julliard Sept. 27, 2016

Sept. 27, 2016

Module: wine Branch: master Commit: c837adf38e7ff94a4a9798eee082b5decf81c0de URL: http://source.winehq.org/git/wine.git/?a=commit;h=c837adf38e7ff94a4a9798eee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 27 21:41:06 2016 +0900 winex11: Remove support for exporting the CF_BITMAP, CF_PALETTE and CF_DIBV5 formats. They can be synthesized from CF_DIB. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 3 --- dlls/winex11.drv/x11drv.h | 4 ---- dlls/winex11.drv/x11drv_main.c | 4 ---- 3 files changed, 11 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 4ee8604..776e579 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -154,20 +154,17 @@ static const struct { 0, CF_UNICODETEXT, XATOM_COMPOUND_TEXT, import_compound_text, export_compound_text }, { 0, CF_UNICODETEXT, XA_STRING, import_string, export_string }, { 0, CF_UNICODETEXT, XATOM_text_plain, import_string, export_string }, - { 0, CF_BITMAP, XATOM_WCF_BITMAP, import_data, NULL }, { 0, CF_SYLK, XATOM_WCF_SYLK, import_data, export_data }, { 0, CF_DIF, XATOM_WCF_DIF, import_data, export_data }, { 0, CF_TIFF, XATOM_WCF_TIFF, import_data, export_data }, { 0, CF_OEMTEXT, XATOM_WCF_OEMTEXT, import_data, export_data }, { 0, CF_DIB, XA_PIXMAP, import_pixmap, export_pixmap }, - { 0, CF_PALETTE, XATOM_WCF_PALETTE, import_data, export_data }, { 0, CF_PENDATA, XATOM_WCF_PENDATA, import_data, export_data }, { 0, CF_RIFF, XATOM_WCF_RIFF, import_data, export_data }, { 0, CF_WAVE, XATOM_WCF_WAVE, import_data, export_data }, { 0, CF_ENHMETAFILE, XATOM_WCF_ENHMETAFILE, import_enhmetafile, export_enhmetafile }, { 0, CF_HDROP, XATOM_text_uri_list, import_text_uri_list, export_hdrop }, { 0, CF_LOCALE, XATOM_WCF_LOCALE, import_data, export_data }, - { 0, CF_DIBV5, XATOM_WCF_DIBV5, import_data, export_data }, { 0, CF_DIB, XATOM_image_bmp, import_image_bmp, export_image_bmp }, { RichTextFormatW, 0, XATOM_text_rtf, import_data, export_data }, { RichTextFormatW, 0, XATOM_text_richtext, import_data, export_data }, diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index f50b798..2cf2ed5 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -458,15 +458,11 @@ enum x11drv_atoms XATOM_XdndSelection, XATOM_XdndTypeList, XATOM_HTML_Format, - XATOM_WCF_BITMAP, - XATOM_WCF_DIB, - XATOM_WCF_DIBV5, XATOM_WCF_DIF, XATOM_WCF_ENHMETAFILE, XATOM_WCF_HDROP, XATOM_WCF_LOCALE, XATOM_WCF_OEMTEXT, - XATOM_WCF_PALETTE, XATOM_WCF_PENDATA, XATOM_WCF_RIFF, XATOM_WCF_SYLK, diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index e67b4c4..0b38b74 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -169,15 +169,11 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = "XdndSelection", "XdndTypeList", "HTML Format", - "WCF_BITMAP", - "WCF_DIB", - "WCF_DIBV5", "WCF_DIF", "WCF_ENHMETAFILE", "WCF_HDROP", "WCF_LOCALE", "WCF_OEMTEXT", - "WCF_PALETTE", "WCF_PENDATA", "WCF_RIFF", "WCF_SYLK",

1 0

Michael Stefaniuc : dpvoice: Use debugstr_guid() to trace GUIDs.
by Alexandre Julliard Sept. 27, 2016

Sept. 27, 2016

Module: wine Branch: master Commit: 169615e79c694f60f6638f24d52c8a3b20696d0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=169615e79c694f60f6638f24d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 27 09:59:35 2016 +0200 dpvoice: Use debugstr_guid() to trace GUIDs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpvoice/client.c | 3 ++- dlls/dpvoice/main.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dpvoice/client.c b/dlls/dpvoice/client.c index bdae160..7f6cf4a 100644 --- a/dlls/dpvoice/client.c +++ b/dlls/dpvoice/client.c @@ -286,7 +286,8 @@ static HRESULT WINAPI dpvtest_CheckAudioSetup(IDirectPlayVoiceTest *iface, const HWND hwndParent, DWORD dwFlags) { IDirectPlayVoiceTestImpl *This = impl_from_IDirectPlayVoiceTest(iface); - FIXME("%p %p %p %p %d\n", This, pguidPlaybackDevice, pguidCaptureDevice, hwndParent, dwFlags); + FIXME("%p %s %s %p %d\n", This, debugstr_guid(pguidPlaybackDevice), + debugstr_guid(pguidCaptureDevice), hwndParent, dwFlags); return E_NOTIMPL; } diff --git a/dlls/dpvoice/main.c b/dlls/dpvoice/main.c index aab0859..3a74e01 100644 --- a/dlls/dpvoice/main.c +++ b/dlls/dpvoice/main.c @@ -102,7 +102,7 @@ static IClassFactoryImpl DPVOICE_CFS[] = HRESULT WINAPI DirectPlayVoiceCreate(LPCGUID pIID, void **ppvInterface) { - FIXME("(%p, %p) stub\n", pIID, ppvInterface); + FIXME("(%s, %p) stub\n", debugstr_guid(pIID), ppvInterface); return E_NOTIMPL; }

1 0

Michael Stefaniuc : user32/tests: Use EqualRect() instead of open coding it.
by Alexandre Julliard Sept. 27, 2016

Sept. 27, 2016

Module: wine Branch: master Commit: 40fdd834897395e51c356852a8f7a0bbc8727f78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40fdd834897395e51c356852a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 27 09:50:25 2016 +0200 user32/tests: Use EqualRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dce.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/dce.c b/dlls/user32/tests/dce.c index 0ee1283..6ba234e 100644 --- a/dlls/user32/tests/dce.c +++ b/dlls/user32/tests/dce.c @@ -335,10 +335,8 @@ static void test_dc_visrgn(void) GetClipBox( hdc, &parent_rect ); ReleaseDC( hwnd_parent, hdc ); - ok( rect.left == parent_rect.left, "rect.left = %d, expected %d\n", rect.left, parent_rect.left ); - ok( rect.top == parent_rect.top, "rect.top = %d, expected %d\n", rect.top, parent_rect.top ); - ok( rect.right == parent_rect.right, "rect.right = %d, expected %d\n", rect.right, parent_rect.right ); - ok( rect.bottom == parent_rect.bottom, "rect.bottom = %d, expected %d\n", rect.bottom, parent_rect.bottom ); + ok( EqualRect( &rect, &parent_rect ), "rect = %s, expected %s\n", wine_dbgstr_rect( &rect ), + wine_dbgstr_rect( &parent_rect )); }

1 0

Alexandre Julliard : winex11: Remove support for exporting the CF_OEMTEXT and CF_LOCALE formats.
by Alexandre Julliard Sept. 27, 2016

Sept. 27, 2016

Module: wine Branch: master Commit: 0aa7d402d2326d8d3e3d79e9c498efa5106a660e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aa7d402d2326d8d3e3d79e9c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 27 21:41:31 2016 +0900 winex11: Remove support for exporting the CF_OEMTEXT and CF_LOCALE formats. They can be synthesized from CF_UNICODETEXT. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 2 -- dlls/winex11.drv/x11drv.h | 2 -- dlls/winex11.drv/x11drv_main.c | 2 -- 3 files changed, 6 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 776e579..314b916 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -157,14 +157,12 @@ static const struct { 0, CF_SYLK, XATOM_WCF_SYLK, import_data, export_data }, { 0, CF_DIF, XATOM_WCF_DIF, import_data, export_data }, { 0, CF_TIFF, XATOM_WCF_TIFF, import_data, export_data }, - { 0, CF_OEMTEXT, XATOM_WCF_OEMTEXT, import_data, export_data }, { 0, CF_DIB, XA_PIXMAP, import_pixmap, export_pixmap }, { 0, CF_PENDATA, XATOM_WCF_PENDATA, import_data, export_data }, { 0, CF_RIFF, XATOM_WCF_RIFF, import_data, export_data }, { 0, CF_WAVE, XATOM_WCF_WAVE, import_data, export_data }, { 0, CF_ENHMETAFILE, XATOM_WCF_ENHMETAFILE, import_enhmetafile, export_enhmetafile }, { 0, CF_HDROP, XATOM_text_uri_list, import_text_uri_list, export_hdrop }, - { 0, CF_LOCALE, XATOM_WCF_LOCALE, import_data, export_data }, { 0, CF_DIB, XATOM_image_bmp, import_image_bmp, export_image_bmp }, { RichTextFormatW, 0, XATOM_text_rtf, import_data, export_data }, { RichTextFormatW, 0, XATOM_text_richtext, import_data, export_data }, diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 2cf2ed5..116e9ae 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -461,8 +461,6 @@ enum x11drv_atoms XATOM_WCF_DIF, XATOM_WCF_ENHMETAFILE, XATOM_WCF_HDROP, - XATOM_WCF_LOCALE, - XATOM_WCF_OEMTEXT, XATOM_WCF_PENDATA, XATOM_WCF_RIFF, XATOM_WCF_SYLK, diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 0b38b74..7e7835b 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -172,8 +172,6 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = "WCF_DIF", "WCF_ENHMETAFILE", "WCF_HDROP", - "WCF_LOCALE", - "WCF_OEMTEXT", "WCF_PENDATA", "WCF_RIFF", "WCF_SYLK",

1 0

Michael Stefaniuc : user32/tests: Use wine_dbgstr_rect() to print rects.
by Alexandre Julliard Sept. 27, 2016

Sept. 27, 2016

Module: wine Branch: master Commit: 3589cd921dc0da4d9258ec73b03eea74b63623c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3589cd921dc0da4d9258ec73b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 27 09:57:04 2016 +0200 user32/tests: Use wine_dbgstr_rect() to print rects. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/combo.c | 4 ++-- dlls/user32/tests/msg.c | 21 +++++++-------------- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/dlls/user32/tests/combo.c b/dlls/user32/tests/combo.c index 77eb678..f52efae 100644 --- a/dlls/user32/tests/combo.c +++ b/dlls/user32/tests/combo.c @@ -33,8 +33,8 @@ static HWND hMainWnd; #define expect_eq(expr, value, type, fmt); { type val = expr; ok(val == (value), #expr " expected " #fmt " got " #fmt "\n", (value), val); } #define expect_rect(r, _left, _top, _right, _bottom) ok(r.left == _left && r.top == _top && \ - r.bottom == _bottom && r.right == _right, "Invalid rect (%d,%d) (%d,%d) vs (%d,%d) (%d,%d)\n", \ - r.left, r.top, r.right, r.bottom, _left, _top, _right, _bottom); + r.bottom == _bottom && r.right == _right, "Invalid rect %s vs (%d,%d)-(%d,%d)\n", \ + wine_dbgstr_rect(&r), _left, _top, _right, _bottom); static HWND build_combo(DWORD style) { diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index b088d1c..9162aba 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -6463,7 +6463,7 @@ void dump_region(HRGN hrgn) GetRegionData( hrgn, size, data ); printf("%d rects:", data->rdh.nCount ); for (i = 0, rect = (RECT *)data->Buffer; i < data->rdh.nCount; i++, rect++) - printf( " (%d,%d)-(%d,%d)", rect->left, rect->top, rect->right, rect->bottom ); + printf( " %s", wine_dbgstr_rect( rect )); printf("\n"); HeapFree( GetProcessHeap(), 0, data ); } @@ -12067,9 +12067,8 @@ static void test_ShowWindow(void) SetLastError(0xdeadbeef); ret = pGetMonitorInfoA(hmon, &mi); ok(ret, "GetMonitorInfo error %u\n", GetLastError()); - trace("monitor (%d,%d-%d,%d), work (%d,%d-%d,%d)\n", - mi.rcMonitor.left, mi.rcMonitor.top, mi.rcMonitor.right, mi.rcMonitor.bottom, - mi.rcWork.left, mi.rcWork.top, mi.rcWork.right, mi.rcWork.bottom); + trace("monitor %s, work %s\n", wine_dbgstr_rect(&mi.rcMonitor), + wine_dbgstr_rect(&mi.rcWork)); work_rc = mi.rcWork; } @@ -12087,11 +12086,8 @@ static void test_ShowWindow(void) ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "expected -1,-1 got %d,%d\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); todo_wine_if (work_rc.left || work_rc.top) /* FIXME: remove once Wine is fixed */ - ok(EqualRect(&win_rc, &wp.rcNormalPosition), - "expected %d,%d-%d,%d got %d,%d-%d,%d\n", - win_rc.left, win_rc.top, win_rc.right, win_rc.bottom, - wp.rcNormalPosition.left, wp.rcNormalPosition.top, - wp.rcNormalPosition.right, wp.rcNormalPosition.bottom); + ok(EqualRect(&win_rc, &wp.rcNormalPosition), "expected %s got %s\n", wine_dbgstr_rect(&win_rc), + wine_dbgstr_rect(&wp.rcNormalPosition)); for (i = 0; i < sizeof(sw)/sizeof(sw[0]); i++) { @@ -12143,11 +12139,8 @@ static void test_ShowWindow(void) "expected %d,%d got %d,%d\n", sw[i].wp_max.x, sw[i].wp_max.y, wp.ptMaxPosition.x, wp.ptMaxPosition.y); if (0) /* FIXME: Wine behaves completely different here */ - ok(EqualRect(&win_rc, &wp.rcNormalPosition), - "expected %d,%d-%d,%d got %d,%d-%d,%d\n", - win_rc.left, win_rc.top, win_rc.right, win_rc.bottom, - wp.rcNormalPosition.left, wp.rcNormalPosition.top, - wp.rcNormalPosition.right, wp.rcNormalPosition.bottom); + ok(EqualRect(&win_rc, &wp.rcNormalPosition), "expected %s got %s\n", + wine_dbgstr_rect(&win_rc), wine_dbgstr_rect(&wp.rcNormalPosition)); } DestroyWindow(hwnd); flush_events();

1 0

Andrey Gusev : user32/tests: Fix incorrect usage of broken() function.
by Alexandre Julliard Sept. 27, 2016

Sept. 27, 2016

Module: wine Branch: master Commit: f669dc69cdcaf08aa197c98f68a1dfb4f8a265b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f669dc69cdcaf08aa197c98f6… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Sep 8 21:18:59 2016 +0300 user32/tests: Fix incorrect usage of broken() function. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 9162aba..b132dfe 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -15554,8 +15554,8 @@ static void test_layered_window(void) size.cx = 0; ret = pUpdateLayeredWindow( hwnd, 0, &pos, &size, hdc, &src, 0, NULL, ULW_OPAQUE ); ok( !ret, "UpdateLayeredWindow should fail on non-layered window\n" ); - ok( GetLastError() == ERROR_INVALID_PARAMETER || broken(ERROR_MR_MID_NOT_FOUND) /* win7 */, - "wrong error %u\n", GetLastError() ); + ok( GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == ERROR_MR_MID_NOT_FOUND) || + broken(GetLastError() == ERROR_GEN_FAILURE) /* win7 */, "wrong error %u\n", GetLastError() ); size.cx = 1; size.cy = -1; ret = pUpdateLayeredWindow( hwnd, 0, &pos, &size, hdc, &src, 0, NULL, ULW_OPAQUE );

1 0

Michael Stefaniuc : user32/tests: Remove two commented out printf().
by Alexandre Julliard Sept. 27, 2016

Sept. 27, 2016

Module: wine Branch: master Commit: e974731117415b75a904a830d977ab994f76c136 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e974731117415b75a904a830d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 27 09:49:35 2016 +0200 user32/tests: Remove two commented out printf(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/wsprintf.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/user32/tests/wsprintf.c b/dlls/user32/tests/wsprintf.c index 15e4af0..f0e80b2 100644 --- a/dlls/user32/tests/wsprintf.c +++ b/dlls/user32/tests/wsprintf.c @@ -119,7 +119,6 @@ static void CharUpperTest(void) for (i=0;i<256;i++) { out = (INT_PTR)CharUpperA((LPSTR)i); - /* printf("%0x ",out); */ if ((out >> 16) != 0) { failed = TRUE; @@ -137,7 +136,6 @@ static void CharLowerTest(void) for (i=0;i<256;i++) { out = (INT_PTR)CharLowerA((LPSTR)i); - /* printf("%0x ",out); */ if ((out >> 16) != 0) { failed = TRUE;

1 0