April 2016 - Wine-Commits - list.winehq.org

Francois Gouget : msvcp120/tests: A spelling fix and rewording for an msvcp120 ok() message.
by Alexandre Julliard April 20, 2016

April 20, 2016

Module: wine Branch: master Commit: 8c0c34b491643b16dae12907ad4b91a4e202e7f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c0c34b491643b16dae12907a… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 20 08:55:04 2016 +0200 msvcp120/tests: A spelling fix and rewording for an msvcp120 ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 8c7c093..86162bc 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -1359,7 +1359,7 @@ static void test_tr2_sys__Last_write_time(void) newtime = last_write_time + 123456789; p_tr2_sys__Last_write_time_set("tr2_test_dir/f1", newtime); todo_wine ok(last_write_time == p_tr2_sys__Last_write_time("tr2_test_dir/f1"), - "last_write_time before modfied should not equal to last_write_time %s\n", + "last_write_time should have changed: %s\n", debugstr_longlong(last_write_time)); errno = 0xdeadbeef;

1 0

Nikolay Sivov : dwrite/tests: Some basic tests for fontface references.
by Alexandre Julliard April 20, 2016

April 20, 2016

Module: wine Branch: master Commit: 8b8098461d8510364b414d21f8aae03a802b46bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b8098461d8510364b414d21f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 20 10:50:58 2016 +0300 dwrite/tests: Some basic tests for fontface references. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 58 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index e8ceca2..d5de80e 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -5797,7 +5797,9 @@ static void test_HasCharacter(void) static void test_CreateFontFaceReference(void) { static const WCHAR dummyW[] = {'d','u','m','m','y',0}; - IDWriteFontFaceReference *ref; + IDWriteFontFace3 *fontface, *fontface1; + IDWriteFontFaceReference *ref, *ref1; + IDWriteFontFile *file, *file1; IDWriteFactory3 *factory3; IDWriteFactory *factory; UINT32 index; @@ -5826,18 +5828,72 @@ todo_wine if (hr == S_OK) { index = IDWriteFontFaceReference_GetFontFaceIndex(ref); ok(index == 1, "got %u\n", index); + + hr = IDWriteFontFaceReference_GetFontFile(ref, &file); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFontFile_Release(file); + + hr = IDWriteFontFaceReference_CreateFontFace(ref, &fontface); + ok(hr == DWRITE_E_FILEFORMAT, "got 0x%08x\n", hr); + + IDWriteFontFaceReference_Release(ref); } /* path however has to be valid */ hr = IDWriteFactory3_CreateFontFaceReference(factory3, dummyW, NULL, 0, DWRITE_FONT_SIMULATIONS_NONE, &ref); todo_wine ok(hr == DWRITE_E_FILENOTFOUND, "got 0x%08x\n", hr); + EXPECT_REF(factory3, 1); hr = IDWriteFactory3_CreateFontFaceReference(factory3, path, NULL, 0, DWRITE_FONT_SIMULATIONS_NONE, &ref); todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); -if (hr == S_OK) +if (hr == S_OK) { + EXPECT_REF(factory3, 2); + + /* new file is returned */ + hr = IDWriteFontFaceReference_GetFontFile(ref, &file); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFaceReference_GetFontFile(ref, &file1); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(file != file1, "got %p, previous file %p\n", file1, file); + + IDWriteFontFile_Release(file); + IDWriteFontFile_Release(file1); + + /* references are not reused */ + hr = IDWriteFactory3_CreateFontFaceReference(factory3, path, NULL, 0, DWRITE_FONT_SIMULATIONS_NONE, &ref1); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(ref1 != ref, "got %p, previous ref %p\n", ref1, ref); + + /* created fontfaces are cached */ + hr = IDWriteFontFaceReference_CreateFontFace(ref, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFaceReference_CreateFontFace(ref1, &fontface1); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(fontface == fontface1, "got %p, expected %p\n", fontface1, fontface); + IDWriteFontFace3_Release(fontface); + IDWriteFontFace3_Release(fontface1); + + IDWriteFontFaceReference_Release(ref1); IDWriteFontFaceReference_Release(ref); + /* create reference from a file */ + hr = IDWriteFactory3_CreateFontFileReference(factory3, path, NULL, &file); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory3_CreateFontFaceReference_(factory3, file, 0, DWRITE_FONT_SIMULATIONS_NONE, &ref); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFaceReference_GetFontFile(ref, &file1); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(file != file1, "got %p, previous file %p\n", file1, file); + + IDWriteFontFaceReference_Release(ref); + IDWriteFontFile_Release(file); + IDWriteFontFile_Release(file1); +} IDWriteFactory3_Release(factory3); DELETE_FONTFILE(path); }

1 0

Stefan Dösinger : wined3d: Use wined3d_texture_prepare_location() in wined3d_volume_load_location().
by Alexandre Julliard April 20, 2016

April 20, 2016

Module: wine Branch: master Commit: 0dc88185bca47dda1d8ddf4474da2f2fe6982237 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dc88185bca47dda1d8ddf447… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 19 18:34:09 2016 +0200 wined3d: Use wined3d_texture_prepare_location() in wined3d_volume_load_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/volume.c | 10 +--------- dlls/wined3d/wined3d_private.h | 2 -- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 9798650..ce3809f 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -27,14 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); -/* Context activation is done by the caller. Context may be NULL in - * WINED3D_NO3D mode. */ -BOOL wined3d_volume_prepare_location(struct wined3d_volume *volume, - struct wined3d_context *context, DWORD location) -{ - return wined3d_texture_prepare_location(volume->container, volume->texture_level, context, location); -} - /* This call just uploads data, the caller is responsible for binding the * correct texture. */ /* Context activation is done by the caller. */ @@ -222,7 +214,7 @@ BOOL wined3d_volume_load_location(struct wined3d_volume *volume, return FALSE; } - if (!wined3d_volume_prepare_location(volume, context, location)) + if (!wined3d_texture_prepare_location(texture, sub_resource_idx, context, location)) return FALSE; if (sub_resource->locations & WINED3D_LOCATION_DISCARDED) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1f04484..1b3e368 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2610,8 +2610,6 @@ HRESULT wined3d_volume_init(struct wined3d_volume *volume, struct wined3d_textur const struct wined3d_resource_desc *desc, UINT level) DECLSPEC_HIDDEN; BOOL wined3d_volume_load_location(struct wined3d_volume *volume, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; -BOOL wined3d_volume_prepare_location(struct wined3d_volume *volume, - struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wined3d_context *context, const struct wined3d_const_bo_address *data) DECLSPEC_HIDDEN;

1 0

Francois Gouget : msvcp110/tests: A spelling fix and rewording for an msvcp110 ok() message.
by Alexandre Julliard April 20, 2016

April 20, 2016

Module: wine Branch: master Commit: 23e8d083fa91041cf79c529e33e31ce352b0233b URL: http://source.winehq.org/git/wine.git/?a=commit;h=23e8d083fa91041cf79c529e3… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 20 08:55:17 2016 +0200 msvcp110/tests: A spelling fix and rewording for an msvcp110 ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/tests/msvcp110.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp110/tests/msvcp110.c b/dlls/msvcp110/tests/msvcp110.c index 58db584..500d3cb 100644 --- a/dlls/msvcp110/tests/msvcp110.c +++ b/dlls/msvcp110/tests/msvcp110.c @@ -95,7 +95,7 @@ static void test_tr2_sys__Last_write_time(void) newtime = last_write_time + 222222; p_tr2_sys__Last_write_time_set("tr2_test_dir/f1", newtime); ok(last_write_time != p_tr2_sys__Last_write_time("tr2_test_dir/f1"), - "last_write_time before modfied should not equal to last_write_time %s\n", + "last_write_time should have changed: %s\n", debugstr_longlong(last_write_time)); /* test the formula */

1 0

Michael Stefaniuc : msi: Use wine_dbgstr_rect() to trace a RECT.
by Alexandre Julliard April 20, 2016

April 20, 2016

Module: wine Branch: master Commit: 148d0e4576265d1527416d40607876d29e855745 URL: http://source.winehq.org/git/wine.git/?a=commit;h=148d0e4576265d1527416d406… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 20 10:37:32 2016 +0200 msi: Use wine_dbgstr_rect() to trace a RECT. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/dialog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index b0f0e5d..fc9c24c 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -3609,7 +3609,7 @@ static void msi_dialog_adjust_dialog_pos( msi_dialog *dialog, MSIRECORD *rec, LP dialog->size.cx = sz.cx; dialog->size.cy = sz.cy; - TRACE("%u %u %u %u\n", pos->left, pos->top, pos->right, pos->bottom); + TRACE("%s\n", wine_dbgstr_rect(pos)); style = GetWindowLongPtrW( dialog->hwnd, GWL_STYLE ); AdjustWindowRect( pos, style, FALSE );

1 0

Nikolay Sivov : dwrite: Handle NULL path in CreateFontFileReference().
by Alexandre Julliard April 20, 2016

April 20, 2016

Module: wine Branch: master Commit: af18a098628fb60d3b296a689183c5a97e4afe1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=af18a098628fb60d3b296a689… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 20 10:50:59 2016 +0300 dwrite: Handle NULL path in CreateFontFileReference(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 3 +++ dlls/dwrite/main.c | 2 ++ dlls/dwrite/tests/font.c | 5 +++++ 3 files changed, 10 insertions(+) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index fef11e6..4d5f43c 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -4399,6 +4399,9 @@ HRESULT get_local_refkey(const WCHAR *path, const FILETIME *writetime, void **ke { struct local_refkey *refkey; + if (!path) + return E_INVALIDARG; + *size = FIELD_OFFSET(struct local_refkey, name) + (strlenW(path)+1)*sizeof(WCHAR); *key = NULL; diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 47f57d8..da12669 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -778,6 +778,8 @@ static HRESULT WINAPI dwritefactory_CreateFontFileReference(IDWriteFactory3 *ifa TRACE("(%p)->(%s %p %p)\n", This, debugstr_w(path), writetime, font_file); + *font_file = NULL; + if (!This->localfontfileloader) { hr = create_localfontfileloader(&This->localfontfileloader); diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index d5de80e..64e6a93 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2599,6 +2599,11 @@ static void test_CreateFontFileReference(void) path = create_testfontfile(test_fontfile); factory = create_factory(); + ffile = (void*)0xdeadbeef; + hr = IDWriteFactory_CreateFontFileReference(factory, NULL, NULL, &ffile); + ok(hr == E_INVALIDARG, "got 0x%08x\n",hr); + ok(ffile == NULL, "got %p\n", ffile); + hr = IDWriteFactory_CreateFontFileReference(factory, path, NULL, &ffile); ok(hr == S_OK, "got 0x%08x\n",hr);

1 0

Vincent Povirk : Revert "user32: Set capture earlier on popup menus.".
by Alexandre Julliard April 20, 2016

April 20, 2016

Module: wine Branch: master Commit: 3cc6a1acc31161be0f14d81c588faeb0022e2e6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cc6a1acc31161be0f14d81c5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 19 12:57:47 2016 -0500 Revert "user32: Set capture earlier on popup menus.". This reverts commit a9bff001a1e2c919b3f6e68d642abb8da957a2bf. We can't set capture this early because the popup menu isn't visible yet. To my knowledge, no applications depend on this, nor did the next patch in the series. It's only a theoretical issue revealed by a message test. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 7a49ac0..e42d8f7 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3003,6 +3003,7 @@ static BOOL MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y, INT executedMenuId = -1; MTRACKER mt; BOOL enterIdleSent = FALSE; + HWND capture_win; mt.trackFlags = 0; mt.hCurrentMenu = hmenu; @@ -3030,8 +3031,9 @@ static BOOL MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y, if (wFlags & TF_ENDMENU) fEndMenu = TRUE; - if (!(wFlags & TPM_POPUPMENU)) - set_capture_window( mt.hOwnerWnd, GUI_INMENUMODE, NULL ); + /* owner may not be visible when tracking a popup, so use the menu itself */ + capture_win = (wFlags & TPM_POPUPMENU) ? menu->hWnd : mt.hOwnerWnd; + set_capture_window( capture_win, GUI_INMENUMODE, NULL ); if ((wFlags & TPM_POPUPMENU) && menu->nItems == 0) return FALSE; @@ -3327,10 +3329,6 @@ static BOOL MENU_InitTracking(HWND hWnd, HMENU hMenu, BOOL bPopup, UINT wFlags) SendMessageW( hWnd, WM_SETCURSOR, (WPARAM)hWnd, HTCAPTION ); - if (bPopup) - /* owner may not be visible when tracking a popup, so use the menu itself */ - set_capture_window( menu->hWnd, GUI_INMENUMODE, NULL ); - if (!(wFlags & TPM_NONOTIFY)) { SendMessageW( hWnd, WM_INITMENU, (WPARAM)hMenu, 0 ); @@ -3484,9 +3482,6 @@ BOOL WINAPI TrackPopupMenuEx( HMENU hMenu, UINT wFlags, INT x, INT y, if (MENU_ShowPopup( hWnd, hMenu, 0, wFlags, x, y, 0, 0 )) ret = MENU_TrackMenu( hMenu, wFlags | TPM_POPUPMENU, 0, 0, hWnd, lpTpm ? &lpTpm->rcExclude : NULL ); - - set_capture_window( 0, GUI_INMENUMODE, NULL ); - MENU_ExitTracking(hWnd, TRUE); if (menu->hWnd)

1 0

Kim Malmo : wined3d: Add Nvidia 9700M GT.
by Alexandre Julliard April 20, 2016

April 20, 2016

Module: wine Branch: master Commit: 5f4c496480d2b07711e37185de616b4d8304e4e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f4c496480d2b07711e37185d… Author: Kim Malmo <berencamlost(a)msn.com> Date: Tue Apr 19 18:34:10 2016 +0200 wined3d: Add Nvidia 9700M GT. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a04e338..8f47b24 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1231,6 +1231,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9400GT, "NVIDIA GeForce 9400 GT", DRIVER_NVIDIA_GEFORCE8, 256 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9500GT, "NVIDIA GeForce 9500 GT", DRIVER_NVIDIA_GEFORCE8, 256 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9600GT, "NVIDIA GeForce 9600 GT", DRIVER_NVIDIA_GEFORCE8, 384 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9700MGT, "NVIDIA GeForce 9700M GT", DRIVER_NVIDIA_GEFORCE8, 512 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9800GT, "NVIDIA GeForce 9800 GT", DRIVER_NVIDIA_GEFORCE8, 512 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_210, "NVIDIA GeForce 210", DRIVER_NVIDIA_GEFORCE8, 512 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT220, "NVIDIA GeForce GT 220", DRIVER_NVIDIA_GEFORCE8, 512 }, @@ -1823,6 +1824,7 @@ cards_nvidia_binary[] = {"GTS 250", CARD_NVIDIA_GEFORCE_9800GT}, /* Geforce 9 - highend / Geforce 200 - midend */ {"GTS 150", CARD_NVIDIA_GEFORCE_9800GT}, /* Geforce 9 - highend / Geforce 200 - midend */ {"9800", CARD_NVIDIA_GEFORCE_9800GT}, /* Geforce 9 - highend / Geforce 200 - midend */ + {"9700M GT", CARD_NVIDIA_GEFORCE_9700MGT}, /* Geforce 9 - midend */ {"GT 140", CARD_NVIDIA_GEFORCE_9600GT}, /* Geforce 9 - midend */ {"9600", CARD_NVIDIA_GEFORCE_9600GT}, /* Geforce 9 - midend */ {"GT 130", CARD_NVIDIA_GEFORCE_9500GT}, /* Geforce 9 - midend low / Geforce 200 - low */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1b3e368..50034a3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1739,6 +1739,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_9400GT = 0x042c, CARD_NVIDIA_GEFORCE_9500GT = 0x0640, CARD_NVIDIA_GEFORCE_9600GT = 0x0622, + CARD_NVIDIA_GEFORCE_9700MGT = 0x064a, CARD_NVIDIA_GEFORCE_9800GT = 0x0614, CARD_NVIDIA_GEFORCE_210 = 0x0a23, CARD_NVIDIA_GEFORCE_GT220 = 0x0a20,

1 0

Alexander Lakhin : user32: Send the correct WM_CTLCOLOR* message in button WM_SETTEXT handler.
by Alexandre Julliard April 20, 2016

April 20, 2016

Module: wine Branch: master Commit: 35ab5f4499185f8df0504b95a99613fa4e30440a URL: http://source.winehq.org/git/wine.git/?a=commit;h=35ab5f4499185f8df0504b95a… Author: Alexander Lakhin <exclusion(a)gmail.com> Date: Tue Apr 19 22:14:49 2016 +0200 user32: Send the correct WM_CTLCOLOR* message in button WM_SETTEXT handler. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/button.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index 9c52147..efd74f9 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -389,13 +389,18 @@ LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, HBRUSH hbrush; RECT client, rc; HWND parent = GetParent(hWnd); + UINT message = (btn_type == BS_PUSHBUTTON || + btn_type == BS_DEFPUSHBUTTON || + btn_type == BS_USERBUTTON || + btn_type == BS_OWNERDRAW) ? + WM_CTLCOLORBTN : WM_CTLCOLORSTATIC; if (!parent) parent = hWnd; - hbrush = (HBRUSH)SendMessageW(parent, WM_CTLCOLORSTATIC, - (WPARAM)hdc, (LPARAM)hWnd); + hbrush = (HBRUSH)SendMessageW(parent, message, + (WPARAM)hdc, (LPARAM)hWnd); if (!hbrush) /* did the app forget to call DefWindowProc ? */ - hbrush = (HBRUSH)DefWindowProcW(parent, WM_CTLCOLORSTATIC, - (WPARAM)hdc, (LPARAM)hWnd); + hbrush = (HBRUSH)DefWindowProcW(parent, message, + (WPARAM)hdc, (LPARAM)hWnd); GetClientRect(hWnd, &client); rc = client;

1 0

Michael Stefaniuc : include: Remove unused wine_dbgstr_size().
by Alexandre Julliard April 20, 2016

April 20, 2016

Module: wine Branch: master Commit: 9182b24b81e861a12d9d93cf15a133fe09f3c09e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9182b24b81e861a12d9d93cf1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 20 10:39:18 2016 +0200 include: Remove unused wine_dbgstr_size(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/debug.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/include/wine/debug.h b/include/wine/debug.h index af5483c..5409d70 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -199,12 +199,6 @@ static inline const char *wine_dbgstr_point( const POINT *pt ) return wine_dbg_sprintf( "(%d,%d)", pt->x, pt->y ); } -static inline const char *wine_dbgstr_size( const SIZE *size ) -{ - if (!size) return "(null)"; - return wine_dbg_sprintf( "(%d,%d)", size->cx, size->cy ); -} - static inline const char *wine_dbgstr_rect( const RECT *rect ) { if (!rect) return "(null)";

1 0