November 2010 - Wine-Commits

David Adam : ddraw: Exclusive mode is the corner case for SetCooperative, not the normal mode.
by Alexandre Julliard Nov. 4, 2010

Nov. 4, 2010

Module: wine Branch: master Commit: 7661e8986c7bed0a6735f04d6be660cf0f6a7ed0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7661e8986c7bed0a6735f04d6… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Wed Nov 3 07:10:54 2010 +0100 ddraw: Exclusive mode is the corner case for SetCooperative, not the normal mode. --- dlls/ddraw/ddraw.c | 90 +++++++++++++---------------------------- dlls/ddraw/tests/ddrawmodes.c | 18 ++++---- 2 files changed, 37 insertions(+), 71 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index fd87071..20f743f 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -602,7 +602,7 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, return DDERR_INVALIDPARAMS; } - if( (This->cooperative_level & DDSCL_FULLSCREEN) && window ) + if( (This->cooperative_level & DDSCL_EXCLUSIVE) && window ) { TRACE("Setting DDSCL_SETFOCUSWINDOW with an already set window, returning DDERR_HWNDALREADYSET\n"); LeaveCriticalSection(&ddraw_cs); @@ -626,76 +626,42 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, LeaveCriticalSection(&ddraw_cs); return DD_OK; } - /* DDSCL_NORMAL or DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE */ - if(cooplevel & DDSCL_NORMAL) - { - /* Can't coexist with fullscreen or exclusive */ - if(cooplevel & (DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE) ) - { - TRACE("(%p) DDSCL_NORMAL is not compative with DDSCL_FULLSCREEN or DDSCL_EXCLUSIVE\n", This); - LeaveCriticalSection(&ddraw_cs); - return DDERR_INVALIDPARAMS; - } - - /* Switching from fullscreen? */ - if(This->cooperative_level & DDSCL_FULLSCREEN) - { - This->cooperative_level &= ~DDSCL_FULLSCREEN; - This->cooperative_level &= ~DDSCL_EXCLUSIVE; - This->cooperative_level &= ~DDSCL_ALLOWMODEX; - IWineD3DDevice_ReleaseFocusWindow(This->wineD3DDevice); - } - - /* Don't override focus windows or private device windows */ - if( hwnd && - !(This->focuswindow) && - !(This->devicewindow) && - (hwnd != window) ) - { - This->dest_window = hwnd; - } - } - else if(cooplevel & DDSCL_FULLSCREEN) + if(cooplevel & DDSCL_EXCLUSIVE) { - /* Needs DDSCL_EXCLUSIVE */ - if(!(cooplevel & DDSCL_EXCLUSIVE) ) + if( !(cooplevel & DDSCL_FULLSCREEN) || !hwnd ) { - TRACE("(%p) DDSCL_FULLSCREEN needs DDSCL_EXCLUSIVE\n", This); + TRACE("(%p) DDSCL_EXCLUSIVE needs DDSCL_FULLSCREEN and a window\n", This); LeaveCriticalSection(&ddraw_cs); return DDERR_INVALIDPARAMS; } - /* Need a HWND - if(hwnd == 0) - { - TRACE("(%p) DDSCL_FULLSCREEN needs a HWND\n", This); - return DDERR_INVALIDPARAMS; - } - */ - - This->cooperative_level &= ~DDSCL_NORMAL; - - /* Don't override focus windows or private device windows */ - if( hwnd && - !(This->focuswindow) && - !(This->devicewindow) && - (hwnd != window) ) - { - HRESULT hr = IWineD3DDevice_AcquireFocusWindow(This->wineD3DDevice, hwnd); - if (FAILED(hr)) - { - ERR("Failed to acquire focus window, hr %#x.\n", hr); - LeaveCriticalSection(&ddraw_cs); - return hr; - } - This->dest_window = hwnd; - } } - else if(cooplevel & DDSCL_EXCLUSIVE) + else if( !(cooplevel & DDSCL_NORMAL) ) { - TRACE("(%p) DDSCL_EXCLUSIVE needs DDSCL_FULLSCREEN\n", This); + TRACE("(%p) SetCooperativeLevel needs at least SetFocusWindow or Exclusive or Normal mode\n", This); LeaveCriticalSection(&ddraw_cs); return DDERR_INVALIDPARAMS; + } + + /* Do we switch from fullscreen to non-fullscreen ? */ + + if( !(cooplevel & DDSCL_FULLSCREEN) && (This->cooperative_level & DDSCL_FULLSCREEN) ) + IWineD3DDevice_ReleaseFocusWindow(This->wineD3DDevice); + + /* Don't override focus windows or private device windows */ + if( hwnd && !This->focuswindow && !This->devicewindow && (hwnd != window)) + { + if( cooplevel & DDSCL_FULLSCREEN ) + { + HRESULT hr = IWineD3DDevice_AcquireFocusWindow(This->wineD3DDevice, hwnd); + if (FAILED(hr)) + { + ERR("Failed to acquire focus window, hr %#x.\n", hr); + LeaveCriticalSection(&ddraw_cs); + return hr; + } + } + This->dest_window = hwnd; } if(cooplevel & DDSCL_CREATEDEVICEWINDOW) @@ -736,7 +702,7 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, WARN("(%p) Unhandled flag DDSCL_FPUSETUP, harmless\n", This); /* Store the cooperative_level */ - This->cooperative_level |= cooplevel; + This->cooperative_level = cooplevel; TRACE("SetCooperativeLevel retuning DD_OK\n"); LeaveCriticalSection(&ddraw_cs); return DD_OK; diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index b0b84d8..0ced9da 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -565,10 +565,10 @@ static void testcooperativelevels_normal(void) skip("Failed to create the second window\n"); rc = IDirectDraw_SetCooperativeLevel(lpDD, hwnd, DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE | DDSCL_NORMAL); - todo_wine ok(rc==DD_OK,"SetCooperativeLevel(DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE | DDSCL_NORMAL) returned: %x\n",rc); + ok(rc==DD_OK,"SetCooperativeLevel(DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE | DDSCL_NORMAL) returned: %x\n",rc); if(sfw) - todo_wine ok(GetForegroundWindow()==hwnd,"Expected the main windows (%p) for foreground, received the second one (%p)\n",hwnd, hwnd2); + ok(GetForegroundWindow()==hwnd,"Expected the main windows (%p) for foreground, received the second one (%p)\n",hwnd, hwnd2); /* Try creating a double buffered primary in fullscreen + exclusive + normal mode */ rc = IDirectDraw_CreateSurface(lpDD, &surfacedesc, &surface, NULL); @@ -577,8 +577,8 @@ static void testcooperativelevels_normal(void) skip("Unsupported mode\n"); else { - todo_wine ok(rc == DD_OK, "IDirectDraw_CreateSurface returned %08x\n", rc); - todo_wine ok(surface!=NULL, "Returned NULL surface pointer\n"); + ok(rc == DD_OK, "IDirectDraw_CreateSurface returned %08x\n", rc); + ok(surface!=NULL, "Returned NULL surface pointer\n"); } if(surface && surface != (IDirectDrawSurface *)0xdeadbeef) IDirectDrawSurface_Release(surface); @@ -592,13 +592,13 @@ static void testcooperativelevels_normal(void) if(hwnd2) sfw=SetForegroundWindow(hwnd2); rc = IDirectDraw_SetCooperativeLevel(lpDD, hwnd, DDSCL_FULLSCREEN | DDSCL_NORMAL); - todo_wine ok(rc==DD_OK,"SetCooperativeLevel(DDSCL_FULLSCREEN | DDSCL_NORMAL) returned: %x\n",rc); + ok(rc==DD_OK,"SetCooperativeLevel(DDSCL_FULLSCREEN | DDSCL_NORMAL) returned: %x\n",rc); if(sfw) ok(GetForegroundWindow()==hwnd2,"Expected the second windows (%p) for foreground, received the main one (%p)\n",hwnd2, hwnd); rc = IDirectDraw_SetCooperativeLevel(lpDD, NULL, DDSCL_FULLSCREEN | DDSCL_NORMAL); - todo_wine ok(rc==DD_OK, "Expected DD_OK, received %x\n", rc); + ok(rc==DD_OK, "Expected DD_OK, received %x\n", rc); /* Try creating a double buffered primary in fullscreen + normal mode */ rc = IDirectDraw_CreateSurface(lpDD, &surfacedesc, &surface, NULL); @@ -645,13 +645,13 @@ static void testcooperativelevels_normal(void) rc = IDirectDraw_SetCooperativeLevel(lpDD, hwnd, DDSCL_NORMAL | DDSCL_FULLSCREEN); - todo_wine ok(rc==DD_OK,"SetCooperativeLevel(DDSCL_NORMAL | FULLSCREEN) returned: %x\n",rc); + ok(rc==DD_OK,"SetCooperativeLevel(DDSCL_NORMAL | FULLSCREEN) returned: %x\n",rc); if(sfw) ok(GetForegroundWindow()==hwnd2,"Expected the second windows (%p) for foreground, received the main one (%p)\n",hwnd2, hwnd); rc = IDirectDraw_SetCooperativeLevel(lpDD, NULL, DDSCL_NORMAL | DDSCL_FULLSCREEN); - todo_wine ok(rc==DD_OK, "Expected DD_OK, received %x\n", rc); + ok(rc==DD_OK, "Expected DD_OK, received %x\n", rc); /* Set the focus window */ @@ -761,7 +761,7 @@ static void testcooperativelevels_exclusive(void) /* Full screen mode + exclusive mode */ rc = IDirectDraw_SetCooperativeLevel(lpDD, NULL, DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE); - todo_wine ok(rc==DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, received %x\n", rc); + ok(rc==DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, received %x\n", rc); sfw=FALSE; if(hwnd2)

1 0

Eryk Wieliczko : msvcrt: Implement _get_tzname.
by Alexandre Julliard Nov. 4, 2010

Nov. 4, 2010

Module: wine Branch: master Commit: 7b8ac6a255d3d53757087dd24222c3613be0fe47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b8ac6a255d3d53757087dd24… Author: Eryk Wieliczko <ewdevel(a)gmail.com> Date: Wed Nov 3 02:12:28 2010 +0100 msvcrt: Implement _get_tzname. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 1 + dlls/msvcrt/time.c | 38 ++++++++++++++++++++++++++++++++++++-- 5 files changed, 40 insertions(+), 5 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index e451db9..0356f07 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -690,7 +690,7 @@ @ stub _get_purecall_handler @ stub _get_terminate @ stub _get_timezone -@ stub _get_tzname +@ cdecl _get_tzname(ptr str long long) msvcrt._get_tzname @ stub _get_unexpected @ stub _get_wpgmptr @ stub _getc_nolock diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 1734c72..a1adb18 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -535,7 +535,7 @@ @ cdecl _get_sbh_threshold() msvcrt._get_sbh_threshold @ stub _get_terminate @ stub _get_timezone -@ stub _get_tzname +@ cdecl _get_tzname(ptr str long long) msvcrt._get_tzname @ stub _get_unexpected @ stub _get_winmajor @ stub _get_winminor diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index f188329..8ec604a 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -525,7 +525,7 @@ @ cdecl _get_sbh_threshold() msvcrt._get_sbh_threshold @ stub _get_terminate @ stub _get_timezone -@ stub _get_tzname +@ cdecl _get_tzname(ptr str long long) msvcrt._get_tzname @ stub _get_unexpected @ stub _get_wpgmptr @ stub _getc_nolock diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index a667ada..871023b 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -483,6 +483,7 @@ # stub _get_winver # stub _get_wpgmptr @ stub _get_terminate +@ cdecl _get_tzname(ptr str long long) MSVCRT__get_tzname @ stub _get_unexpected @ cdecl _getch() @ cdecl _getche() diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 9d59625..b345a7f 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -719,11 +719,45 @@ MSVCRT_long * CDECL MSVCRT___p__timezone(void) * must be large enough. The size is picked based on observation of * Windows XP. */ -static char tzname_std[64] = ""; -static char tzname_dst[64] = ""; +static char tzname_std[64] = "PST"; +static char tzname_dst[64] = "PDT"; char *MSVCRT__tzname[2] = { tzname_std, tzname_dst }; /********************************************************************* + * _get_tzname (MSVCRT.@) + */ +int CDECL MSVCRT__get_tzname(MSVCRT_size_t *ret, char *buf, MSVCRT_size_t bufsize, int index) +{ + char *timezone; + + switch(index) + { + case 0: + timezone = tzname_std; + break; + case 1: + timezone = tzname_dst; + break; + default: + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + + if(!ret || (!buf && bufsize > 0) || (buf && !bufsize)) + { + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + + *ret = strlen(timezone)+1; + if(!buf && !bufsize) + return 0; + + strcpy(buf, timezone); + return 0; +} + +/********************************************************************* * __p_tzname (MSVCRT.@) */ char ** CDECL __p__tzname(void)

1 0

Henri Verbeet : d3d9: Add some missing locking to IDirect3DDevice9Impl_EndStateBlock().
by Alexandre Julliard Nov. 4, 2010

Nov. 4, 2010

Module: wine Branch: master Commit: 41a76b958df09aa3c1662d9c2d3888292ec0af5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=41a76b958df09aa3c1662d9c2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 4 10:37:32 2010 +0100 d3d9: Add some missing locking to IDirect3DDevice9Impl_EndStateBlock(). Found by Michael Stefaniuc & Coccinelle. --- dlls/d3d9/device.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 349bde4..c0b8b74 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1551,7 +1551,9 @@ static HRESULT WINAPI IDirect3DDevice9Impl_EndStateBlock(IDirect3DDevice9Ex *ifa if (!object) { ERR("Failed to allocate stateblock memory.\n"); + wined3d_mutex_lock(); IWineD3DStateBlock_Release(wined3d_stateblock); + wined3d_mutex_unlock(); return E_OUTOFMEMORY; } @@ -1559,7 +1561,9 @@ static HRESULT WINAPI IDirect3DDevice9Impl_EndStateBlock(IDirect3DDevice9Ex *ifa if (FAILED(hr)) { WARN("Failed to initialize stateblock, hr %#x.\n", hr); + wined3d_mutex_lock(); IWineD3DStateBlock_Release(wined3d_stateblock); + wined3d_mutex_unlock(); HeapFree(GetProcessHeap(), 0, object); return hr; }

1 0

Henri Verbeet : d3d8/tests: Check for multiple expected messages in test_wndproc().
by Alexandre Julliard Nov. 4, 2010

Nov. 4, 2010

Module: wine Branch: master Commit: 6632d2c45c33df79c2bbab8b9b423155df692161 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6632d2c45c33df79c2bbab8b9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 4 10:37:30 2010 +0100 d3d8/tests: Check for multiple expected messages in test_wndproc(). --- dlls/d3d8/tests/device.c | 63 ++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 52 insertions(+), 11 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index a9ca496..2774b6a 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1520,11 +1520,21 @@ cleanup: } static HWND filter_messages; -static struct + +enum message_window +{ + DEVICE_WINDOW, + FOCUS_WINDOW, +}; + +struct message { - HWND window; UINT message; -} expect_message; + enum message_window window; +}; + +static const struct message *expect_messages; +static HWND device_window, focus_window; struct wndproc_thread_param { @@ -1541,7 +1551,27 @@ static LRESULT CALLBACK test_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM todo_wine ok(0, "Received unexpected message %#x for window %p.\n", message, hwnd); } - if (expect_message.window == hwnd && expect_message.message == message) expect_message.message = 0; + if (expect_messages) + { + HWND w; + + switch (expect_messages->window) + { + case DEVICE_WINDOW: + w = device_window; + break; + + case FOCUS_WINDOW: + w = focus_window; + break; + + default: + w = NULL; + break; + }; + + if (hwnd == w && expect_messages->message == message) ++expect_messages; + } return DefWindowProcA(hwnd, message, wparam, lparam); } @@ -1580,7 +1610,6 @@ static DWORD WINAPI wndproc_thread(void *param) static void test_wndproc(void) { struct wndproc_thread_param thread_params; - HWND device_window, focus_window, tmp; IDirect3DDevice8 *device; WNDCLASSA wc = {0}; IDirect3D8 *d3d8; @@ -1588,6 +1617,17 @@ static void test_wndproc(void) LONG_PTR proc; ULONG ref; DWORD res, tid; + HWND tmp; + + static const struct message messages[] = + { + {WM_ACTIVATE, FOCUS_WINDOW}, + {WM_SETFOCUS, FOCUS_WINDOW}, + {WM_WINDOWPOSCHANGING, DEVICE_WINDOW}, + {WM_MOVE, DEVICE_WINDOW}, + {WM_SIZE, DEVICE_WINDOW}, + {0, 0}, + }; if (!(d3d8 = pDirect3DCreate8(D3D_SDK_VERSION))) { @@ -1630,11 +1670,10 @@ static void test_wndproc(void) ok(tmp == thread_params.dummy_window, "Expected foreground window %p, got %p.\n", thread_params.dummy_window, tmp); - expect_message.window = focus_window; - expect_message.message = WM_SETFOCUS; - flush_events(); + expect_messages = messages; + device = create_device(d3d8, device_window, focus_window, FALSE); if (!device) { @@ -1642,8 +1681,10 @@ static void test_wndproc(void) goto done; } - ok(!expect_message.message, "Expected message %#x for window %p, but didn't receive it.\n", - expect_message.message, expect_message.window); + ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it.\n", + expect_messages->message, expect_messages->window); + expect_messages = NULL; + if (0) /* Disabled until we can make this work in a reliable way on Wine. */ { tmp = GetFocus(); @@ -1717,7 +1758,6 @@ done: static void test_wndproc_windowed(void) { struct wndproc_thread_param thread_params; - HWND device_window, focus_window, tmp; IDirect3DDevice8 *device; WNDCLASSA wc = {0}; IDirect3D8 *d3d8; @@ -1726,6 +1766,7 @@ static void test_wndproc_windowed(void) HRESULT hr; ULONG ref; DWORD res, tid; + HWND tmp; if (!(d3d8 = pDirect3DCreate8(D3D_SDK_VERSION))) {

1 0

Henri Verbeet : d3d9/tests: Check for multiple expected messages in test_wndproc().
by Alexandre Julliard Nov. 4, 2010

Nov. 4, 2010

Module: wine Branch: master Commit: 14b063a14f634e7dded9eea6d6a3b4dabf954032 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14b063a14f634e7dded9eea6d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 4 10:37:31 2010 +0100 d3d9/tests: Check for multiple expected messages in test_wndproc(). --- dlls/d3d9/tests/device.c | 60 +++++++++++++++++++++++++++++++++++++-------- 1 files changed, 49 insertions(+), 11 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 8de85e4..870ca49 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2364,11 +2364,21 @@ fail: } static HWND filter_messages; -static struct + +enum message_window +{ + DEVICE_WINDOW, + FOCUS_WINDOW, +}; + +struct message { - HWND window; UINT message; -} expect_message; + enum message_window window; +}; + +static const struct message *expect_messages; +static HWND device_window, focus_window; struct wndproc_thread_param { @@ -2385,7 +2395,27 @@ static LRESULT CALLBACK test_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM todo_wine ok( 0, "Received unexpected message %#x for window %p.\n", message, hwnd); } - if (expect_message.window == hwnd && expect_message.message == message) expect_message.message = 0; + if (expect_messages) + { + HWND w; + + switch (expect_messages->window) + { + case DEVICE_WINDOW: + w = device_window; + break; + + case FOCUS_WINDOW: + w = focus_window; + break; + + default: + w = NULL; + break; + }; + + if (hwnd == w && expect_messages->message == message) ++expect_messages; + } return DefWindowProcA(hwnd, message, wparam, lparam); } @@ -2424,7 +2454,6 @@ static DWORD WINAPI wndproc_thread(void *param) static void test_wndproc(void) { struct wndproc_thread_param thread_params; - HWND device_window, focus_window, tmp; IDirect3DDevice9 *device; WNDCLASSA wc = {0}; IDirect3D9 *d3d9; @@ -2432,6 +2461,14 @@ static void test_wndproc(void) LONG_PTR proc; ULONG ref; DWORD res, tid; + HWND tmp; + + static const struct message messages[] = + { + {WM_ACTIVATE, FOCUS_WINDOW}, + {WM_SETFOCUS, FOCUS_WINDOW}, + {0, 0}, + }; if (!(d3d9 = pDirect3DCreate9(D3D_SDK_VERSION))) { @@ -2474,11 +2511,10 @@ static void test_wndproc(void) ok(tmp == thread_params.dummy_window, "Expected foreground window %p, got %p.\n", thread_params.dummy_window, tmp); - expect_message.window = focus_window; - expect_message.message = WM_SETFOCUS; - flush_events(); + expect_messages = messages; + device = create_device(d3d9, device_window, focus_window, FALSE); if (!device) { @@ -2486,8 +2522,10 @@ static void test_wndproc(void) goto done; } - ok(!expect_message.message, "Expected message %#x for window %p, but didn't receive it.\n", - expect_message.message, expect_message.window); + ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it.\n", + expect_messages->message, expect_messages->window); + expect_messages = NULL; + if (0) /* Disabled until we can make this work in a reliable way on Wine. */ { tmp = GetFocus(); @@ -2561,7 +2599,6 @@ done: static void test_wndproc_windowed(void) { struct wndproc_thread_param thread_params; - HWND device_window, focus_window, tmp; IDirect3DDevice9 *device; WNDCLASSA wc = {0}; IDirect3D9 *d3d9; @@ -2570,6 +2607,7 @@ static void test_wndproc_windowed(void) HRESULT hr; ULONG ref; DWORD res, tid; + HWND tmp; if (!(d3d9 = pDirect3DCreate9(D3D_SDK_VERSION))) {

1 0

Henri Verbeet : krnl386.exe: Return the default value if the section wasn' t found in GetPrivateProfileString16().
by Alexandre Julliard Nov. 4, 2010

Nov. 4, 2010

Module: wine Branch: master Commit: c4c091d4b7c67487fbd332e7e606ec272d232f4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4c091d4b7c67487fbd332e7e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 4 10:37:33 2010 +0100 krnl386.exe: Return the default value if the section wasn't found in GetPrivateProfileString16(). Using GetPrivateProfileStringA() for removing trailing spaces etc. This restores behaviour from before 86c6021c71a563af88c1a8cc23ea489e92c8ca70. --- dlls/krnl386.exe16/file.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/krnl386.exe16/file.c b/dlls/krnl386.exe16/file.c index 507b28d..0a1098f 100644 --- a/dlls/krnl386.exe16/file.c +++ b/dlls/krnl386.exe16/file.c @@ -555,9 +555,8 @@ INT16 WINAPI GetPrivateProfileString16( LPCSTR section, LPCSTR entry, ret = GetPrivateProfileSectionA( section, data, size, filename ); if (!ret) { - if (len) *buffer = 0; HeapFree( GetProcessHeap(), 0, data ); - return 0; + return GetPrivateProfileStringA( section, entry, def_val, buffer, len, filename ); } if (ret != size - 2) break; /* overflow, try again */

1 0

Vincent Povirk : ole32: Cache all extended big block depot locations.
by Alexandre Julliard Nov. 4, 2010

Nov. 4, 2010

Module: wine Branch: master Commit: 8d101b269db5423d2f26ddf42869651f8a468661 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d101b269db5423d2f26ddf42… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Apr 19 16:07:09 2010 -0500 ole32: Cache all extended big block depot locations. --- dlls/ole32/storage32.c | 78 ++++++++++++++++++++++++++++++++++++----------- dlls/ole32/storage32.h | 2 + 2 files changed, 61 insertions(+), 19 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 5c58201..311f2ae 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2768,6 +2768,40 @@ static HRESULT StorageImpl_Construct( This->firstFreeSmallBlock = 0; + /* Read the extended big block depot locations. */ + if (This->extBigBlockDepotCount != 0) + { + ULONG current_block = This->extBigBlockDepotStart; + ULONG cache_size = This->extBigBlockDepotCount * 2; + int i; + + This->extBigBlockDepotLocations = HeapAlloc(GetProcessHeap(), 0, sizeof(ULONG) * cache_size); + if (!This->extBigBlockDepotLocations) + { + hr = E_OUTOFMEMORY; + goto end; + } + + This->extBigBlockDepotLocationsSize = cache_size; + + for (i=0; i<This->extBigBlockDepotCount; i++) + { + if (current_block == BLOCK_END_OF_CHAIN) + { + WARN("File has too few extended big block depot blocks.\n"); + hr = STG_E_DOCFILECORRUPT; + goto end; + } + This->extBigBlockDepotLocations[i] = current_block; + current_block = Storage32Impl_GetNextExtendedBlock(This, current_block); + } + } + else + { + This->extBigBlockDepotLocations = NULL; + This->extBigBlockDepotLocationsSize = 0; + } + /* * Create the block chain abstractions. */ @@ -2884,6 +2918,8 @@ static void StorageImpl_Destroy(StorageBaseImpl* iface) StorageImpl_Invalidate(iface); + HeapFree(GetProcessHeap(), 0, This->extBigBlockDepotLocations); + BlockChainStream_Destroy(This->smallBlockRootChain); BlockChainStream_Destroy(This->rootBlockChain); BlockChainStream_Destroy(This->smallBlockDepotChain); @@ -3097,18 +3133,14 @@ static ULONG Storage32Impl_GetExtDepotBlock(StorageImpl* This, ULONG depotIndex) ULONG extBlockCount = numExtBlocks / depotBlocksPerExtBlock; ULONG extBlockOffset = numExtBlocks % depotBlocksPerExtBlock; ULONG blockIndex = BLOCK_UNUSED; - ULONG extBlockIndex = This->extBigBlockDepotStart; + ULONG extBlockIndex; assert(depotIndex >= COUNT_BBDEPOTINHEADER); - if (This->extBigBlockDepotStart == BLOCK_END_OF_CHAIN) + if (extBlockCount >= This->extBigBlockDepotCount) return BLOCK_UNUSED; - while (extBlockCount > 0) - { - extBlockIndex = Storage32Impl_GetNextExtendedBlock(This, extBlockIndex); - extBlockCount--; - } + extBlockIndex = This->extBigBlockDepotLocations[extBlockCount]; if (extBlockIndex != BLOCK_UNUSED) StorageImpl_ReadDWordFromBigBlock(This, extBlockIndex, @@ -3130,15 +3162,13 @@ static void Storage32Impl_SetExtDepotBlock(StorageImpl* This, ULONG depotIndex, ULONG numExtBlocks = depotIndex - COUNT_BBDEPOTINHEADER; ULONG extBlockCount = numExtBlocks / depotBlocksPerExtBlock; ULONG extBlockOffset = numExtBlocks % depotBlocksPerExtBlock; - ULONG extBlockIndex = This->extBigBlockDepotStart; + ULONG extBlockIndex; assert(depotIndex >= COUNT_BBDEPOTINHEADER); - while (extBlockCount > 0) - { - extBlockIndex = Storage32Impl_GetNextExtendedBlock(This, extBlockIndex); - extBlockCount--; - } + assert(extBlockCount < This->extBigBlockDepotCount); + + extBlockIndex = This->extBigBlockDepotLocations[extBlockCount]; if (extBlockIndex != BLOCK_UNUSED) { @@ -3175,14 +3205,10 @@ static ULONG Storage32Impl_AddExtBlockDepot(StorageImpl* This) } else { - unsigned int i; /* - * Follow the chain to the last one. + * Find the last existing extended block. */ - for (i = 0; i < (numExtBlocks - 1); i++) - { - nextExtBlock = Storage32Impl_GetNextExtendedBlock(This, nextExtBlock); - } + nextExtBlock = This->extBigBlockDepotLocations[This->extBigBlockDepotCount-1]; /* * Add the new extended block to the chain. @@ -3197,6 +3223,20 @@ static ULONG Storage32Impl_AddExtBlockDepot(StorageImpl* This) memset(depotBuffer, BLOCK_UNUSED, This->bigBlockSize); StorageImpl_WriteBigBlock(This, index, depotBuffer); + /* Add the block to our cache. */ + if (This->extBigBlockDepotLocationsSize == numExtBlocks) + { + ULONG new_cache_size = (This->extBigBlockDepotLocationsSize+1)*2; + ULONG *new_cache = HeapAlloc(GetProcessHeap(), 0, sizeof(ULONG) * new_cache_size); + + memcpy(new_cache, This->extBigBlockDepotLocations, sizeof(ULONG) * This->extBigBlockDepotLocationsSize); + HeapFree(GetProcessHeap(), 0, This->extBigBlockDepotLocations); + + This->extBigBlockDepotLocations = new_cache; + This->extBigBlockDepotLocationsSize = new_cache_size; + } + This->extBigBlockDepotLocations[numExtBlocks] = index; + return index; } diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 36d0e2f..72a5fe7 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -353,6 +353,8 @@ struct StorageImpl ULONG smallBlockLimit; ULONG smallBlockDepotStart; ULONG extBigBlockDepotStart; + ULONG *extBigBlockDepotLocations; + ULONG extBigBlockDepotLocationsSize; ULONG extBigBlockDepotCount; ULONG bigBlockDepotStart[COUNT_BBDEPOTINHEADER];

1 0

Vijay Kiran Kamuju : include: Add missing defines for d3drmdef.h.
by Alexandre Julliard Nov. 4, 2010

Nov. 4, 2010

Module: wine Branch: master Commit: 51b2bde3c87c83d10fd401d36681a1083683e947 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51b2bde3c87c83d10fd401d36… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Nov 3 17:41:35 2010 -0400 include: Add missing defines for d3drmdef.h. --- include/d3drmdef.h | 202 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 200 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=51b2bde3c87c83d10fd40…

1 0

Adam Martinson : msxml3: Move the whitespace preservation bool into the domdoc_properties struct.
by Alexandre Julliard Nov. 4, 2010

Nov. 4, 2010

Module: wine Branch: master Commit: e95122162a68574323f72025a0384a9de592eba7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e95122162a68574323f72025a… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Wed Nov 3 16:13:45 2010 -0500 msxml3: Move the whitespace preservation bool into the domdoc_properties struct. --- dlls/msxml3/domdoc.c | 37 +++++++++++++++++++++---------------- 1 files changed, 21 insertions(+), 16 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index a5100f0..2596630 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -74,6 +74,7 @@ static const WCHAR PropValueXSLPatternW[] = {'X','S','L','P','a','t','t','e','r' * We need to preserve this when reloading a document, * and also need access to it from the libxml backend. */ typedef struct _domdoc_properties { + VARIANT_BOOL preserving; struct list selectNsList; xmlChar const* selectNsStr; LONG selectNsStr_len; @@ -114,7 +115,6 @@ struct domdoc VARIANT_BOOL async; VARIANT_BOOL validating; VARIANT_BOOL resolving; - VARIANT_BOOL preserving; domdoc_properties* properties; IXMLDOMSchemaCollection2* schema; bsc_t *bsc; @@ -244,6 +244,7 @@ static domdoc_properties * create_properties(const GUID *clsid) domdoc_properties *properties = heap_alloc(sizeof(domdoc_properties)); list_init( &properties->selectNsList ); + properties->preserving = VARIANT_FALSE; properties->selectNsStr = heap_alloc_zero(sizeof(xmlChar)); properties->selectNsStr_len = 0; properties->XPath = FALSE; @@ -268,6 +269,7 @@ static domdoc_properties* copy_properties(domdoc_properties const* properties) if (pcopy) { + pcopy->preserving = properties->preserving; pcopy->XPath = properties->XPath; pcopy->selectNsStr_len = properties->selectNsStr_len; list_init( &pcopy->selectNsList ); @@ -324,6 +326,16 @@ xmlNodePtr xmldoc_unlink_xmldecl(xmlDocPtr doc) return node; } +BOOL is_preserving_whitespace(xmlNodePtr node) +{ + domdoc_properties* properties = NULL; + /* during parsing the xmlDoc._private stuff is not there */ + if (priv_from_xmlDocPtr(node->doc)) + properties = properties_from_xmlDocPtr(node->doc); + return ((properties && properties->preserving == VARIANT_TRUE) || + xmlNodeGetSpacePreserve(node) == 1); +} + static inline BOOL strn_isspace(xmlChar const* str, int len) { for (; str && len > 0 && *str; ++str, --len) @@ -341,17 +353,11 @@ static void sax_characters(void *ctx, const xmlChar *ch, int len) pctx = (xmlParserCtxtPtr) ctx; This = (domdoc const*) pctx->_private; - if (!This->preserving) - { - xmlChar* ws = xmlGetNsProp(pctx->node, BAD_CAST "space", XML_XML_NAMESPACE); - if ((!ws || xmlStrcmp(ws, BAD_CAST "preserve") != 0) && - strn_isspace(ch, len)) - { - xmlFree(ws); - return; - } - xmlFree(ws); - } + /* during domdoc_loadXML() the xmlDocPtr->_private data is not available */ + if (!This->properties->preserving && + !is_preserving_whitespace(pctx->node) && + strn_isspace(ch, len)) + return; xmlSAX2Characters(ctx, ch, len); } @@ -2331,8 +2337,8 @@ static HRESULT WINAPI domdoc_get_preserveWhiteSpace( VARIANT_BOOL* isPreserving ) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - TRACE("(%p)->(%p: %d)\n", This, isPreserving, This->preserving); - *isPreserving = This->preserving; + TRACE("(%p)->(%p: %d)\n", This, isPreserving, This->properties->preserving); + *isPreserving = This->properties->preserving; return S_OK; } @@ -2343,7 +2349,7 @@ static HRESULT WINAPI domdoc_put_preserveWhiteSpace( { domdoc *This = impl_from_IXMLDOMDocument3( iface ); TRACE("(%p)->(%d)\n", This, isPreserving); - This->preserving = isPreserving; + This->properties->preserving = isPreserving; return S_OK; } @@ -3267,7 +3273,6 @@ HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **docu doc->async = VARIANT_TRUE; doc->validating = 0; doc->resolving = 0; - doc->preserving = 0; doc->properties = properties_from_xmlDocPtr(xmldoc); doc->error = S_OK; doc->schema = NULL;

1 0

André Hentschel : user32: Don' t paint new button styles instead of crashing.
by Alexandre Julliard Nov. 4, 2010

Nov. 4, 2010

Module: wine Branch: master Commit: e054fc23100f347ae3ed026d24f183aa85b8c802 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e054fc23100f347ae3ed026d2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 3 21:15:42 2010 +0100 user32: Don't paint new button styles instead of crashing. --- dlls/user32/button.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index 2fc4706..b15b36b 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -113,7 +113,7 @@ static void UB_Paint( HWND hwnd, HDC hDC, UINT action ); static void OB_Paint( HWND hwnd, HDC hDC, UINT action ); static void BUTTON_CheckAutoRadioButton( HWND hwnd ); -#define MAX_BTN_TYPE 12 +#define MAX_BTN_TYPE 16 static const WORD maxCheckState[MAX_BTN_TYPE] = { @@ -127,7 +127,7 @@ static const WORD maxCheckState[MAX_BTN_TYPE] = BUTTON_UNCHECKED, /* BS_GROUPBOX */ BUTTON_UNCHECKED, /* BS_USERBUTTON */ BUTTON_CHECKED, /* BS_AUTORADIOBUTTON */ - BUTTON_UNCHECKED, /* Not defined */ + BUTTON_UNCHECKED, /* BS_PUSHBOX */ BUTTON_UNCHECKED /* BS_OWNERDRAW */ }; @@ -145,7 +145,7 @@ static const pfPaint btnPaintFunc[MAX_BTN_TYPE] = GB_Paint, /* BS_GROUPBOX */ UB_Paint, /* BS_USERBUTTON */ CB_Paint, /* BS_AUTORADIOBUTTON */ - NULL, /* Not defined */ + NULL, /* BS_PUSHBOX */ OB_Paint /* BS_OWNERDRAW */ };

1 0