June 2013 - Wine-Commits - list.winehq.org

Nikolay Sivov : comctl32/tests: Remove useless message tracing.
by Alexandre Julliard June 6, 2013

June 6, 2013

Module: wine Branch: master Commit: f8ce7ed9781407a5ebcbacfe27fe342ca06e161e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8ce7ed9781407a5ebcbacfe2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 5 21:47:11 2013 +0400 comctl32/tests: Remove useless message tracing. --- dlls/comctl32/tests/comboex.c | 2 -- dlls/comctl32/tests/datetime.c | 2 -- dlls/comctl32/tests/header.c | 3 --- dlls/comctl32/tests/listview.c | 10 ++-------- dlls/comctl32/tests/monthcal.c | 4 ---- dlls/comctl32/tests/pager.c | 4 ---- dlls/comctl32/tests/propsheet.c | 2 -- 7 files changed, 2 insertions(+), 25 deletions(-) diff --git a/dlls/comctl32/tests/comboex.c b/dlls/comctl32/tests/comboex.c index 7cddbaf..cc17327 100644 --- a/dlls/comctl32/tests/comboex.c +++ b/dlls/comctl32/tests/comboex.c @@ -276,8 +276,6 @@ static void test_WM_LBUTTONDOWN(void) GetLastError()); hList = cbInfo.hwndList; - trace("hWnd=%p, hComboEx=%p, hCombo=%p, hList=%p, hEdit=%p\n", - hComboExParentWnd, hComboEx, hCombo, hList, hEdit); ok(GetFocus() == hComboExParentWnd, "Focus not on Main Window, instead on %p\n", GetFocus()); diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index ece61b4..3117e12 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -140,8 +140,6 @@ static LRESULT WINAPI datetime_subclass_proc(HWND hwnd, UINT message, WPARAM wPa LRESULT ret; struct message msg; - trace("datetime: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam); - msg.message = message; msg.flags = sent|wparam|lparam; if (defwndproc_counter) msg.flags |= defwinproc; diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 9b4d14f..6ad0aa8 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -403,7 +403,6 @@ static LRESULT WINAPI header_subclass_proc(HWND hwnd, UINT message, WPARAM wPara LRESULT ret; struct message msg; - trace("header: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam); msg.message = message; msg.flags = sent|wparam|lparam; if (defwndproc_counter) msg.flags |= defwinproc; @@ -435,8 +434,6 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP message != WM_DEVICECHANGE) { - trace("parent: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam); - msg.message = message; msg.flags = sent|wparam|lparam; if (defwndproc_counter) msg.flags |= defwinproc; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 1147c0b..1ac4333 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -395,8 +395,6 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP message != WM_GETICON && message != WM_DEVICECHANGE) { - trace("parent: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam); - add_message(sequences, PARENT_SEQ_INDEX, &msg); add_message(sequences, COMBINED_SEQ_INDEX, &msg); } @@ -583,8 +581,6 @@ static LRESULT WINAPI listview_subclass_proc(HWND hwnd, UINT message, WPARAM wPa LRESULT ret; struct message msg; - trace("listview: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam); - /* some debug output for style changing */ if ((message == WM_STYLECHANGING || message == WM_STYLECHANGED) && lParam) @@ -661,8 +657,6 @@ static LRESULT WINAPI header_subclass_proc(HWND hwnd, UINT message, WPARAM wPara LRESULT ret; struct message msg; - trace("header: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam); - msg.message = message; msg.flags = sent|wparam|lparam; if (defwndproc_counter) msg.flags |= defwinproc; @@ -1754,8 +1748,8 @@ static LRESULT WINAPI cd_wndproc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) if(msg == WM_NOTIFY) { NMHDR *nmhdr = (PVOID)lp; if(nmhdr->code == NM_CUSTOMDRAW) { - NMLVCUSTOMDRAW *nmlvcd = (PVOID)nmhdr; - trace("NMCUSTOMDRAW (0x%.8x)\n", nmlvcd->nmcd.dwDrawStage); + NMLVCUSTOMDRAW *nmlvcd = (NMLVCUSTOMDRAW*)nmhdr; + switch(nmlvcd->nmcd.dwDrawStage) { case CDDS_PREPAINT: SetBkColor(nmlvcd->nmcd.hdc, c0ffee); diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 0cd064f..5440f49 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -459,8 +459,6 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP message != WM_GETICON && message != WM_DEVICECHANGE) { - trace("parent: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam); - msg.message = message; msg.flags = sent|wparam|lparam; if (defwndproc_counter) msg.flags |= defwinproc; @@ -881,7 +879,6 @@ static void test_firstDay(void) /* check for locale first day */ if(GetLocaleInfoA(lcid, LOCALE_IFIRSTDAYOFWEEK, b, 128)){ fday = atoi(b); - trace("fday: %d\n", fday); res = SendMessage(hwnd, MCM_GETFIRSTDAYOFWEEK, 0, 0); expect(fday, res); prev = fday; @@ -1975,7 +1972,6 @@ static void test_sel_notify(void) for(i = 0; i < sizeof styles / sizeof styles[0]; i++) { - trace("%s\n", styles[i].name); hwnd = create_monthcal_control(styles[i].val); SetWindowLongPtr(hwnd, GWLP_ID, SEL_NOTIFY_TEST_ID); assert(hwnd); diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index 8ac062d..56cadaf 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -74,8 +74,6 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP message != WM_GETICON && message != WM_DEVICECHANGE) { - trace("parent: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam); - msg.message = message; msg.flags = sent|wparam|lparam|parent; if (defwndproc_counter) msg.flags |= defwinproc; @@ -124,8 +122,6 @@ static LRESULT WINAPI pager_subclass_proc(HWND hwnd, UINT message, WPARAM wParam WNDPROC oldproc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_USERDATA); struct message msg; - trace("pager: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam); - msg.message = message; msg.flags = sent|wparam|lparam; msg.wParam = wParam; diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index f235791..dc376d8 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -667,8 +667,6 @@ static void save_message(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, (message < WM_MOUSEFIRST || message > WM_MOUSEHWHEEL) && message != 0x90) { - /*trace("check_message: %04x, %04x\n", message, receiver);*/ - msg.message = message; msg.flags = sent|wparam|lparam|id; msg.wParam = wParam;

1 0

Francois Gouget : kernel32/tests: Add a trailing '\n' to a skip() call.
by Alexandre Julliard June 6, 2013

June 6, 2013

Module: wine Branch: master Commit: 1e53cb64833fda970a9fab42c152b64e76045623 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e53cb64833fda970a9fab42c… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jun 6 10:16:43 2013 +0200 kernel32/tests: Add a trailing '\n' to a skip() call. --- dlls/kernel32/tests/process.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 1fef8ac..b35481e 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2048,7 +2048,7 @@ static void test_DuplicateHandle(void) f = CreateFile("CONIN$", GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); if (!is_console(f)) { - skip("DuplicateHandle on console handle"); + skip("DuplicateHandle on console handle\n"); CloseHandle(f); return; }

1 0

Stefan Dösinger : ddraw/tests: Add EXCLUSIVE-> NORMAL coop level switching tests.
by Alexandre Julliard June 6, 2013

June 6, 2013

Module: wine Branch: master Commit: 89dd55c4a6dedebd23728d01dd1cf8569e0804d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89dd55c4a6dedebd23728d01d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jun 5 10:55:41 2013 +0200 ddraw/tests: Add EXCLUSIVE->NORMAL coop level switching tests. --- dlls/ddraw/tests/ddraw1.c | 28 +++++- dlls/ddraw/tests/ddraw2.c | 279 ++++++++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw4.c | 278 ++++++++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw7.c | 278 ++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 849 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=89dd55c4a6dedebd23728…

1 0

Stefan Dösinger : ddraw: Restore resolution on EXCLUSIVE->NORMAL switch.
by Alexandre Julliard June 6, 2013

June 6, 2013

Module: wine Branch: master Commit: 4e51195e0bba0cf55fdfdeab8cd5e5ae1e59ba42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e51195e0bba0cf55fdfdeab8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jun 5 10:55:40 2013 +0200 ddraw: Restore resolution on EXCLUSIVE->NORMAL switch. --- dlls/ddraw/ddraw.c | 256 ++++++++++++++++++++++++-------------------- dlls/ddraw/ddraw_private.h | 1 + 2 files changed, 141 insertions(+), 116 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4e51195e0bba0cf55fdfd…

1 0

Nikolay Sivov : oleaut32: Added proxy/stub body for CreateInstanceLic().
by Alexandre Julliard June 6, 2013

June 6, 2013

Module: wine Branch: master Commit: 4ee9aef018b2b75a8f3ce5fbc8ab95b2598c1693 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ee9aef018b2b75a8f3ce5fbc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 6 08:13:13 2013 +0400 oleaut32: Added proxy/stub body for CreateInstanceLic(). --- dlls/oleaut32/usrmarshal.c | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 2414a9e..495c257 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -2242,8 +2242,17 @@ HRESULT CALLBACK IClassFactory2_CreateInstanceLic_Proxy( BSTR bstrKey, PVOID *ppvObj) { - FIXME("not implemented\n"); - return E_NOTIMPL; + TRACE("(%p, %s, %p)\n", pUnkOuter, debugstr_guid(riid), ppvObj); + + *ppvObj = NULL; + + if (pUnkOuter) + { + ERR("aggregation is not allowed on remote objects\n"); + return CLASS_E_NOAGGREGATION; + } + + return IClassFactory2_RemoteCreateInstanceLic_Proxy(This, riid, bstrKey, (IUnknown**)ppvObj); } HRESULT __RPC_STUB IClassFactory2_CreateInstanceLic_Stub( @@ -2252,8 +2261,8 @@ HRESULT __RPC_STUB IClassFactory2_CreateInstanceLic_Stub( BSTR bstrKey, IUnknown **ppvObj) { - FIXME("not implemented\n"); - return E_NOTIMPL; + TRACE("(%s, %p)\n", debugstr_guid(riid), ppvObj); + return IClassFactory2_CreateInstanceLic(This, NULL, NULL, riid, bstrKey, (void**)ppvObj); } HRESULT CALLBACK IEnumConnections_Next_Proxy(

1 0

Sergey Guralnik : user32: Bring reference MDI child to bottom when switching to next.
by Alexandre Julliard June 6, 2013

June 6, 2013

Module: wine Branch: master Commit: e90418d31cc6fd299fed2afa972cc82433cf33db URL: http://source.winehq.org/git/wine.git/?a=commit;h=e90418d31cc6fd299fed2afa9… Author: Sergey Guralnik <serhio(a)etersoft.ru> Date: Thu Jun 6 08:17:15 2013 +0300 user32: Bring reference MDI child to bottom when switching to next. --- dlls/user32/mdi.c | 5 ++++- dlls/user32/tests/win.c | 2 -- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index c92eeb1..7b50fae 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -1156,8 +1156,11 @@ LRESULT MDIClientWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM case WM_MDINEXT: /* lParam != 0 means previous window */ { - HWND next = MDI_GetWindow( ci, WIN_GetFullHandle( (HWND)wParam ), !lParam, 0 ); + HWND hwnd = wParam ? WIN_GetFullHandle((HWND)wParam) : ci->hwndActiveChild; + HWND next = MDI_GetWindow( ci, hwnd, !lParam, 0 ); MDI_SwitchActiveChild( ci, next, TRUE ); + if(!lParam) + SetWindowPos(hwnd, HWND_BOTTOM, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE); break; } diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index a9467ce..2d9faaa 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -1545,7 +1545,6 @@ static void test_MDI_child_stack(HWND mdi_client) stack[1] = GetWindow(stack[0], GW_HWNDNEXT); stack[2] = GetWindow(stack[1], GW_HWNDNEXT); stack[3] = GetWindow(stack[2], GW_HWNDNEXT); -todo_wine ok(stack[0] == child_2 && stack[1] == child_4 && stack[2] == child_1 && stack[3] == child_3, "Broken MDI child stack:\nexpected: %p->%p->%p->%p, but got: %p->%p->%p->%p\n", @@ -1558,7 +1557,6 @@ todo_wine stack[1] = GetWindow(stack[0], GW_HWNDNEXT); stack[2] = GetWindow(stack[1], GW_HWNDNEXT); stack[3] = GetWindow(stack[2], GW_HWNDNEXT); -todo_wine ok(stack[0] == child_4 && stack[1] == child_2 && stack[2] == child_1 && stack[3] == child_3, "Broken MDI child stack:\nexpected: %p->%p->%p->%p, but got: %p->%p->%p->%p\n",

1 0

Stefan Dösinger : ddraw: Update the focus window after recreating the swapchain.
by Alexandre Julliard June 6, 2013

June 6, 2013

Module: wine Branch: master Commit: 6560135c64550343be95a83532cad78aa5787f5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6560135c64550343be95a8353… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jun 5 10:55:39 2013 +0200 ddraw: Update the focus window after recreating the swapchain. --- dlls/ddraw/ddraw.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index afb95c9..d285589 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -814,10 +814,6 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND windo This->focuswindow = NULL; } - if ((This->cooperative_level & DDSCL_EXCLUSIVE) - && (window != This->dest_window || !(cooplevel & DDSCL_EXCLUSIVE))) - wined3d_device_release_focus_window(This->wined3d_device); - if ((cooplevel & DDSCL_FULLSCREEN) != (This->cooperative_level & DDSCL_FULLSCREEN) || window != This->dest_window) { if (This->cooperative_level & DDSCL_FULLSCREEN) @@ -833,18 +829,6 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND windo } } - if ((cooplevel & DDSCL_EXCLUSIVE) - && (window != This->dest_window || !(This->cooperative_level & DDSCL_EXCLUSIVE))) - { - hr = wined3d_device_acquire_focus_window(This->wined3d_device, window); - if (FAILED(hr)) - { - ERR("Failed to acquire focus window, hr %#x.\n", hr); - wined3d_mutex_unlock(); - return hr; - } - } - if (cooplevel & DDSCL_MULTITHREADED && !(This->cooperative_level & DDSCL_MULTITHREADED)) wined3d_device_set_multithreaded(This->wined3d_device); @@ -896,6 +880,22 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND windo wined3d_stateblock_decref(stateblock); } + if ((This->cooperative_level & DDSCL_EXCLUSIVE) + && (window != This->dest_window || !(cooplevel & DDSCL_EXCLUSIVE))) + wined3d_device_release_focus_window(This->wined3d_device); + + if ((cooplevel & DDSCL_EXCLUSIVE) + && (window != This->dest_window || !(This->cooperative_level & DDSCL_EXCLUSIVE))) + { + hr = wined3d_device_acquire_focus_window(This->wined3d_device, window); + if (FAILED(hr)) + { + ERR("Failed to acquire focus window, hr %#x.\n", hr); + wined3d_mutex_unlock(); + return hr; + } + } + /* Unhandled flags */ if(cooplevel & DDSCL_ALLOWREBOOT) WARN("(%p) Unhandled flag DDSCL_ALLOWREBOOT, harmless\n", This);

1 0

Stefan Dösinger : ddraw: Update the SetCooperativeLevel comment.
by Alexandre Julliard June 6, 2013

June 6, 2013

Module: wine Branch: master Commit: 410151ca6a66a45b6392c9953b28e35074dd9108 URL: http://source.winehq.org/git/wine.git/?a=commit;h=410151ca6a66a45b6392c9953… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jun 5 10:55:42 2013 +0200 ddraw: Update the SetCooperativeLevel comment. --- dlls/ddraw/ddraw.c | 20 +++++++++----------- 1 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index c3e59f7..a3ac54c 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -738,23 +738,21 @@ static HRESULT WINAPI ddraw1_RestoreDisplayMode(IDirectDraw *iface) * fixme, be sure to run again with a +ddraw trace. * * What is known about cooperative levels (See the ddraw modes test): - * DDSCL_EXCLUSIVE and DDSCL_FULLSCREEN must be used with each other - * DDSCL_NORMAL is not compatible with DDSCL_EXCLUSIVE or DDSCL_FULLSCREEN + * DDSCL_EXCLUSIVE requires DDSCL_FULLSCREEN. + * DDSCL_NORMAL is not compatible with DDSCL_EXCLUSIVE. + * Unlike what msdn claims, DDSCL_NORMAL | DDSCL_FULLSCREEN is allowed. * DDSCL_SETFOCUSWINDOW can be passed only in DDSCL_NORMAL mode, but after that - * DDSCL_FULLSCREEN can be activated - * DDSCL_SETFOCUSWINDOW may only be used with DDSCL_NOWINDOWCHANGES + * DDSCL_EXCLUSIVE can be activated. + * DDSCL_SETFOCUSWINDOW may only be used with DDSCL_NOWINDOWCHANGES or + * DDSCL_CREATEDEVICEWINDOW. * * Handled flags: DDSCL_NORMAL, DDSCL_FULLSCREEN, DDSCL_EXCLUSIVE, + * DDSCL_CREATEDEVICEWINDOW, DDSCL_SETDEVICEWINDOW * DDSCL_SETFOCUSWINDOW (partially), * DDSCL_MULTITHREADED (work in progress) + * DDSCL_FPUPRESERVE (see device.c) * - * Unhandled flags, which should be implemented - * DDSCL_SETDEVICEWINDOW: Sets a window specially used for rendering (I don't - * expect any difference to a normal window for wine) - * DDSCL_CREATEDEVICEWINDOW: Tells ddraw to create its own window for - * rendering (Possible test case: Half-Life) - * - * Unsure about these: DDSCL_FPUSETUP DDSCL_FPURESERVE + * Unsure about this: DDSCL_FPUSETUP * * These don't seem very important for wine: * DDSCL_ALLOWREBOOT, DDSCL_NOWINDOWCHANGES, DDSCL_ALLOWMODEX

1 0

Stefan Dösinger : ddraw/tests: Fix a typo.
by Alexandre Julliard June 6, 2013

June 6, 2013

Module: wine Branch: master Commit: 831424ef8380fac498d4999bca859f0eb1eb8167 URL: http://source.winehq.org/git/wine.git/?a=commit;h=831424ef8380fac498d4999bc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jun 5 10:55:43 2013 +0200 ddraw/tests: Fix a typo. --- dlls/ddraw/tests/ddraw1.c | 28 ++++++++++++++-------------- dlls/ddraw/tests/ddraw2.c | 28 ++++++++++++++-------------- dlls/ddraw/tests/ddraw4.c | 28 ++++++++++++++-------------- dlls/ddraw/tests/ddraw7.c | 28 ++++++++++++++-------------- 4 files changed, 56 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=831424ef8380fac498d49…

1 0

Alexandre Julliard : joy.cpl: Return the correct id for the icon.
by Alexandre Julliard June 6, 2013

June 6, 2013

Module: wine Branch: master Commit: 6528aff97ba74fad20571acae33228a893bb4a7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6528aff97ba74fad20571acae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 6 11:33:10 2013 +0200 joy.cpl: Return the correct id for the icon. --- dlls/joy.cpl/joy.h | 2 ++ dlls/joy.cpl/main.c | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/joy.cpl/joy.h b/dlls/joy.cpl/joy.h index 16d7a0b..ec7af4f 100644 --- a/dlls/joy.cpl/joy.h +++ b/dlls/joy.cpl/joy.h @@ -94,6 +94,8 @@ struct JoystickData { #define IDC_FFSELECTCOMBO 2009 #define IDC_FFEFFECTLIST 2010 +#define ICO_MAIN 100 + /* constants */ #define TEST_POLL_TIME 100 diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index 8cb1824..d294e35 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -1009,6 +1009,7 @@ LONG CALLBACK CPlApplet(HWND hwnd, UINT command, LPARAM lParam1, LPARAM lParam2) { CPLINFO *appletInfo = (CPLINFO *) lParam2; + appletInfo->idIcon = ICO_MAIN; appletInfo->idName = IDS_CPL_NAME; appletInfo->idInfo = IDS_CPL_INFO; appletInfo->lData = 0;

1 0