October 2009 - Wine-commits

Henri Verbeet : d3d9: Always pass "struct event_data" to "event_fn" in the stateblock tests.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 54e28991fc9584324d75c5f56d9a3d3103144d1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=54e28991fc9584324d75c5f56… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 5 09:47:35 2009 +0200 d3d9: Always pass "struct event_data" to "event_fn" in the stateblock tests. --- dlls/d3d9/tests/stateblock.c | 73 ++++++++++++++++++----------------------- 1 files changed, 32 insertions(+), 41 deletions(-) diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index bd85535..22fa1de 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -156,10 +156,17 @@ struct state_test #define EVENT_ERROR 0x08 #define EVENT_APPLY_DATA 0x10 +struct event_data +{ + IDirect3DStateBlock9 *stateblock; + IDirect3DSurface9 *original_render_target; + IDirect3DSwapChain9 *new_swap_chain; +}; + struct event { - int (*event_fn) (IDirect3DDevice9* device, void* arg); - int status; + int (*event_fn)(IDirect3DDevice9 *device, struct event_data *event_data); + int status; }; /* This is an event-machine, which tests things. @@ -167,7 +174,7 @@ struct event * results from the event function, which directs what's to be done */ static void execute_test_chain(IDirect3DDevice9 *device, struct state_test *test, - unsigned int ntests, struct event *event, unsigned int nevents, void *event_arg) + unsigned int ntests, struct event *event, unsigned int nevents, struct event_data *event_data) { int outcome; unsigned int i = 0, j; @@ -178,7 +185,7 @@ static void execute_test_chain(IDirect3DDevice9 *device, struct state_test *test /* Execute the next event handler (if available) or just set the supplied status */ outcome = event[j].status; if (event[j].event_fn) - outcome |= event[j].event_fn(device, event_arg); + outcome |= event[j].event_fn(device, event_data); /* Now verify correct outcome depending on what was signaled by the handler. * An EVENT_CHECK_TEST signal means check the returned data against the test_data (out). @@ -253,20 +260,12 @@ static void execute_test_chain(IDirect3DDevice9 *device, struct state_test *test test[i].set_handler(device, &test[i], test[i].default_data); } -struct event_data -{ - IDirect3DStateBlock9* stateblock; - IDirect3DSurface9* original_render_target; - IDirect3DSwapChain9* new_swap_chain; -}; - -static int switch_render_target(IDirect3DDevice9 *device, void *data) +static int switch_render_target(IDirect3DDevice9 *device, struct event_data *event_data) { HRESULT hret; D3DPRESENT_PARAMETERS present_parameters; IDirect3DSwapChain9* swapchain = NULL; IDirect3DSurface9* backbuffer = NULL; - struct event_data* edata = data; /* Parameters for new swapchain */ ZeroMemory(&present_parameters, sizeof(present_parameters)); @@ -284,7 +283,7 @@ static int switch_render_target(IDirect3DDevice9 *device, void *data) if (hret != D3D_OK) goto error; /* Save the current render target */ - hret = IDirect3DDevice9_GetRenderTarget(device, 0, &edata->original_render_target); + hret = IDirect3DDevice9_GetRenderTarget(device, 0, &event_data->original_render_target); ok (hret == D3D_OK, "GetRenderTarget returned %#x.\n", hret); if (hret != D3D_OK) goto error; @@ -294,7 +293,7 @@ static int switch_render_target(IDirect3DDevice9 *device, void *data) if (hret != D3D_OK) goto error; IUnknown_Release(backbuffer); - edata->new_swap_chain = swapchain; + event_data->new_swap_chain = swapchain; return EVENT_OK; error: @@ -303,79 +302,71 @@ static int switch_render_target(IDirect3DDevice9 *device, void *data) return EVENT_ERROR; } -static int revert_render_target(IDirect3DDevice9 *device, void *data) +static int revert_render_target(IDirect3DDevice9 *device, struct event_data *event_data) { - struct event_data *edata = data; HRESULT hret; /* Reset the old render target */ - hret = IDirect3DDevice9_SetRenderTarget(device, 0, edata->original_render_target); + hret = IDirect3DDevice9_SetRenderTarget(device, 0, event_data->original_render_target); ok (hret == D3D_OK, "SetRenderTarget returned %#x.\n", hret); if (hret != D3D_OK) { - IUnknown_Release(edata->original_render_target); + IUnknown_Release(event_data->original_render_target); return EVENT_ERROR; } - IUnknown_Release(edata->original_render_target); + IUnknown_Release(event_data->original_render_target); + IUnknown_Release(event_data->new_swap_chain); - IUnknown_Release(edata->new_swap_chain); return EVENT_OK; } -static int begin_stateblock( - IDirect3DDevice9* device, - void* data) { - +static int begin_stateblock(IDirect3DDevice9 *device, struct event_data *event_data) +{ HRESULT hret; - data = NULL; hret = IDirect3DDevice9_BeginStateBlock(device); ok(hret == D3D_OK, "BeginStateBlock returned %#x.\n", hret); if (hret != D3D_OK) return EVENT_ERROR; return EVENT_OK; } -static int end_stateblock(IDirect3DDevice9 *device, void *data) +static int end_stateblock(IDirect3DDevice9 *device, struct event_data *event_data) { - struct event_data *edata = data; HRESULT hret; - hret = IDirect3DDevice9_EndStateBlock(device, &edata->stateblock); + hret = IDirect3DDevice9_EndStateBlock(device, &event_data->stateblock); ok(hret == D3D_OK, "EndStateBlock returned %#x.\n", hret); if (hret != D3D_OK) return EVENT_ERROR; return EVENT_OK; } -static int abort_stateblock(IDirect3DDevice9 *device, void *data) +static int abort_stateblock(IDirect3DDevice9 *device, struct event_data *event_data) { - struct event_data *edata = data; - - IUnknown_Release(edata->stateblock); + IUnknown_Release(event_data->stateblock); return EVENT_OK; } -static int apply_stateblock(IDirect3DDevice9 *device, void *data) +static int apply_stateblock(IDirect3DDevice9 *device, struct event_data *event_data) { - struct event_data *edata = data; HRESULT hret; - hret = IDirect3DStateBlock9_Apply(edata->stateblock); + hret = IDirect3DStateBlock9_Apply(event_data->stateblock); ok(hret == D3D_OK, "Apply returned %#x.\n", hret); if (hret != D3D_OK) { - IUnknown_Release(edata->stateblock); + IUnknown_Release(event_data->stateblock); return EVENT_ERROR; } - IUnknown_Release(edata->stateblock); + IUnknown_Release(event_data->stateblock); + return EVENT_OK; } -static int capture_stateblock(IDirect3DDevice9 *device, void *data) +static int capture_stateblock(IDirect3DDevice9 *device, struct event_data *event_data) { - struct event_data *edata = data; HRESULT hret; - hret = IDirect3DStateBlock9_Capture(edata->stateblock); + hret = IDirect3DStateBlock9_Capture(event_data->stateblock); ok(hret == D3D_OK, "Capture returned %#x.\n", hret); if (hret != D3D_OK) return EVENT_ERROR;

1 0

Henri Verbeet : d3d8: Always pass "struct event_data" to "event_fn" in the stateblock tests.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: d818e4edf6f0b57f71fae79769344afba3cbef69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d818e4edf6f0b57f71fae7976… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 5 09:47:36 2009 +0200 d3d8: Always pass "struct event_data" to "event_fn" in the stateblock tests. --- dlls/d3d8/tests/stateblock.c | 65 ++++++++++++++++++----------------------- 1 files changed, 29 insertions(+), 36 deletions(-) diff --git a/dlls/d3d8/tests/stateblock.c b/dlls/d3d8/tests/stateblock.c index a6ad662..a197b20 100644 --- a/dlls/d3d8/tests/stateblock.c +++ b/dlls/d3d8/tests/stateblock.c @@ -154,17 +154,24 @@ struct state_test #define EVENT_ERROR 0x08 #define EVENT_APPLY_DATA 0x10 +struct event_data +{ + DWORD stateblock; + IDirect3DSurface8 *original_render_target; + IDirect3DSwapChain8 *new_swap_chain; +}; + struct event { - int (*event_fn)(IDirect3DDevice8 *device, void *arg); - int status; + int (*event_fn)(IDirect3DDevice8 *device, struct event_data *event_data); + int status; }; /* This is an event-machine, which tests things. * It tests get and set operations for a batch of states, based on * results from the event function, which directs what's to be done */ static void execute_test_chain(IDirect3DDevice8 *device, struct state_test *test, - unsigned int ntests, struct event *event, unsigned int nevents, void *event_arg) + unsigned int ntests, struct event *event, unsigned int nevents, struct event_data *event_data) { unsigned int i = 0, j; int outcome; @@ -174,7 +181,7 @@ static void execute_test_chain(IDirect3DDevice8 *device, struct state_test *test { /* Execute the next event handler (if available) or just set the supplied status */ outcome = event[j].status; - if (event[j].event_fn) outcome |= event[j].event_fn(device, event_arg); + if (event[j].event_fn) outcome |= event[j].event_fn(device, event_data); /* Now verify correct outcome depending on what was signaled by the handler. * An EVENT_CHECK_TEST signal means check the returned data against the test_data (out). @@ -256,19 +263,11 @@ static void execute_test_chain(IDirect3DDevice8 *device, struct state_test *test } } -struct event_data -{ - DWORD stateblock; - IDirect3DSurface8 *original_render_target; - IDirect3DSwapChain8 *new_swap_chain; -}; - -static int switch_render_target(IDirect3DDevice8* device, void *data) +static int switch_render_target(IDirect3DDevice8* device, struct event_data *event_data) { D3DPRESENT_PARAMETERS present_parameters; IDirect3DSwapChain8 *swapchain = NULL; IDirect3DSurface8 *backbuffer = NULL; - struct event_data *edata = data; D3DDISPLAYMODE d3ddm; HRESULT hr; @@ -290,7 +289,7 @@ static int switch_render_target(IDirect3DDevice8* device, void *data) if (FAILED(hr)) goto error; /* Save the current render target */ - hr = IDirect3DDevice8_GetRenderTarget(device, &edata->original_render_target); + hr = IDirect3DDevice8_GetRenderTarget(device, &event_data->original_render_target); ok(SUCCEEDED(hr), "GetRenderTarget returned %#x.\n", hr); if (FAILED(hr)) goto error; @@ -300,7 +299,7 @@ static int switch_render_target(IDirect3DDevice8* device, void *data) if (FAILED(hr)) goto error; IDirect3DSurface8_Release(backbuffer); - edata->new_swap_chain = swapchain; + event_data->new_swap_chain = swapchain; return EVENT_OK; error: @@ -309,26 +308,25 @@ error: return EVENT_ERROR; } -static int revert_render_target(IDirect3DDevice8 *device, void *data) +static int revert_render_target(IDirect3DDevice8 *device, struct event_data *event_data) { - struct event_data *edata = data; HRESULT hr; /* Reset the old render target */ - hr = IDirect3DDevice8_SetRenderTarget(device, edata->original_render_target, NULL); + hr = IDirect3DDevice8_SetRenderTarget(device, event_data->original_render_target, NULL); ok(SUCCEEDED(hr), "SetRenderTarget returned %#x.\n", hr); if (FAILED(hr)) { - IDirect3DSurface8_Release(edata->original_render_target); + IDirect3DSurface8_Release(event_data->original_render_target); return EVENT_ERROR; } - IDirect3DSurface8_Release(edata->original_render_target); - IDirect3DSwapChain8_Release(edata->new_swap_chain); + IDirect3DSurface8_Release(event_data->original_render_target); + IDirect3DSwapChain8_Release(event_data->new_swap_chain); return EVENT_OK; } -static int begin_stateblock(IDirect3DDevice8 *device, void *data) +static int begin_stateblock(IDirect3DDevice8 *device, struct event_data *event_data) { HRESULT hr; @@ -338,44 +336,39 @@ static int begin_stateblock(IDirect3DDevice8 *device, void *data) return EVENT_OK; } -static int end_stateblock(IDirect3DDevice8 *device, void *data) +static int end_stateblock(IDirect3DDevice8 *device, struct event_data *event_data) { - struct event_data *edata = data; HRESULT hr; - hr = IDirect3DDevice8_EndStateBlock(device, &edata->stateblock); + hr = IDirect3DDevice8_EndStateBlock(device, &event_data->stateblock); ok(SUCCEEDED(hr), "EndStateBlock returned %#x.\n", hr); if (FAILED(hr)) return EVENT_ERROR; return EVENT_OK; } -static int abort_stateblock(IDirect3DDevice8 *device, void *data) +static int abort_stateblock(IDirect3DDevice8 *device, struct event_data *event_data) { - struct event_data *edata = data; - - IDirect3DDevice8_DeleteStateBlock(device, edata->stateblock); + IDirect3DDevice8_DeleteStateBlock(device, event_data->stateblock); return EVENT_OK; } -static int apply_stateblock(IDirect3DDevice8 *device, void *data) +static int apply_stateblock(IDirect3DDevice8 *device, struct event_data *event_data) { - struct event_data *edata = data; HRESULT hr; - hr = IDirect3DDevice8_ApplyStateBlock(device, edata->stateblock); + hr = IDirect3DDevice8_ApplyStateBlock(device, event_data->stateblock); ok(SUCCEEDED(hr), "Apply returned %#x.\n", hr); - IDirect3DDevice8_DeleteStateBlock(device, edata->stateblock); + IDirect3DDevice8_DeleteStateBlock(device, event_data->stateblock); if (FAILED(hr)) return EVENT_ERROR; return EVENT_OK; } -static int capture_stateblock(IDirect3DDevice8 *device, void *data) +static int capture_stateblock(IDirect3DDevice8 *device, struct event_data *event_data) { - struct event_data *edata = data; HRESULT hr; - hr = IDirect3DDevice8_CaptureStateBlock(device, edata->stateblock); + hr = IDirect3DDevice8_CaptureStateBlock(device, event_data->stateblock); ok(SUCCEEDED(hr), "Capture returned %#x.\n", hr); if (FAILED(hr)) return EVENT_ERROR;

1 0

Henri Verbeet : d3d8: Make the individual stateblock tests responsible for checking data.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 6dd6074f601b121f6fc8a06f37e30ff4f9d0dd24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dd6074f601b121f6fc8a06f3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 5 09:47:37 2009 +0200 d3d8: Make the individual stateblock tests responsible for checking data. --- dlls/d3d8/tests/stateblock.c | 468 ++++++++++++++++++++---------------------- 1 files changed, 227 insertions(+), 241 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6dd6074f601b121f6fc8a…

1 0

Maarten Lankhorst : winealsa.drv: Small capture fixes.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: b0e45368d7385c77622abe5d86c1772a2866aa29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0e45368d7385c77622abe5d8… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Sep 22 13:49:27 2009 +0200 winealsa.drv: Small capture fixes. Deadlock, off-by-one and forgetting to declare that we want MMAP access, so accelerated mode wouldn't work at all but fail silently. --- dlls/winealsa.drv/dscapture.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/dscapture.c b/dlls/winealsa.drv/dscapture.c index 304a5eb..a15c369 100644 --- a/dlls/winealsa.drv/dscapture.c +++ b/dlls/winealsa.drv/dscapture.c @@ -134,7 +134,8 @@ static void CALLBACK Capture_Notify(UINT timerID, UINT msg, DWORD_PTR dwUser, DW PIDSCDRIVERBUFFER iface = (PIDSCDRIVERBUFFER)This; /* **** */ - EnterCriticalSection(&This->pcm_crst); + /* Don't deadlock since there is a critical section can be held by the timer api itself while running this code */ + if (!TryEnterCriticalSection(&This->pcm_crst)) return; IDsDriverBuffer_GetPosition(iface, &playpos, NULL); last_playpos = This->notify->playpos; @@ -555,7 +556,7 @@ static HRESULT WINAPI IDsCaptureDriverBufferImpl_Lock(PIDSCDRIVERBUFFER iface, L if (ppvAudio1) *ppvAudio1 = (LPBYTE)This->presented_buffer + dwWritePosition; - if (dwWritePosition + dwWriteLen < This->mmap_buflen_bytes) { + if (dwWritePosition + dwWriteLen <= This->mmap_buflen_bytes) { if (pdwLen1) *pdwLen1 = dwWriteLen; if (ppvAudio2) @@ -631,6 +632,9 @@ static HRESULT WINAPI IDsCaptureDriverBufferImpl_SetFormat(PIDSCDRIVERBUFFER ifa /* Set some defaults */ snd_pcm_hw_params_any(pcm, hw_params); + err = snd_pcm_hw_params_set_access (pcm, hw_params, SND_PCM_ACCESS_MMAP_INTERLEAVED); + if (err < 0) goto err; + err = snd_pcm_hw_params_set_channels(pcm, hw_params, pwfx->nChannels); if (err < 0) { WARN("Could not set channels to %d\n", pwfx->nChannels); goto err; }

1 0

Vincent Povirk : ole32: Remove useless comments.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: b41822b1dcdb640206be54ef01e75faaa5a7cae5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b41822b1dcdb640206be54ef0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Oct 2 17:21:33 2009 -0500 ole32: Remove useless comments. --- dlls/ole32/storage32.c | 172 +----------------------------------------------- 1 files changed, 2 insertions(+), 170 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b41822b1dcdb640206be5…

1 0

Austin English : comctl32: Add missing prototype.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: a19754ab66cfb5f47cbe395e68a1faeaa82da909 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a19754ab66cfb5f47cbe395e6… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Oct 3 03:00:45 2009 -0500 comctl32: Add missing prototype. --- dlls/comctl32/toolbar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index d95dc7d..d05a40d 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -6434,7 +6434,7 @@ TOOLBAR_StyleChanged (TOOLBAR_INFO *infoPtr, INT nType, const STYLESTRUCT *lpSty static LRESULT -TOOLBAR_SysColorChange () +TOOLBAR_SysColorChange (void) { COMCTL32_RefreshSysColors();

1 0

Austin English : jscript: Add missing prototype.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 8bbaeb89fa357f84ce39ce0d159600742718231b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bbaeb89fa357f84ce39ce0d1… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Oct 3 03:02:43 2009 -0500 jscript: Add missing prototype. --- dlls/jscript/jscript.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 533be57..4451669 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -369,7 +369,7 @@ static inline void num_set_nan(VARIANT *v) #endif } -static inline DOUBLE ret_nan() +static inline DOUBLE ret_nan(void) { VARIANT v; num_set_nan(&v);

1 0

Austin English : atl: Add missing prototypes.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 982608214343bef7389cdc7ccc7aac923f2147d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=982608214343bef7389cdc7cc… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Oct 3 03:01:03 2009 -0500 atl: Add missing prototypes. --- dlls/atl/atlbase.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/atl/atlbase.h b/dlls/atl/atlbase.h index ad7acfa..49c13e4 100644 --- a/dlls/atl/atlbase.h +++ b/dlls/atl/atlbase.h @@ -28,9 +28,9 @@ typedef HRESULT (WINAPI _ATL_CREATORFUNC)(void* pv, REFIID riid, LPVOID* ppv); typedef HRESULT (WINAPI _ATL_CREATORARGFUNC)(void* pv, REFIID riid, LPVOID* ppv, DWORD dw); typedef HRESULT (WINAPI _ATL_MODULEFUNC)(DWORD dw); -typedef LPCSTR (WINAPI _ATL_DESCRIPTIONFUNCA)(); -typedef LPCWSTR (WINAPI _ATL_DESCRIPTIONFUNCW)(); -typedef const struct _ATL_CATMAP_ENTRY* (_ATL_CATMAPFUNC)(); +typedef LPCSTR (WINAPI _ATL_DESCRIPTIONFUNCA)(void); +typedef LPCWSTR (WINAPI _ATL_DESCRIPTIONFUNCW)(void); +typedef const struct _ATL_CATMAP_ENTRY* (_ATL_CATMAPFUNC)(void); typedef void (WINAPI _ATL_TERMFUNC)(DWORD dw); typedef struct _ATL_OBJMAP_ENTRYA_TAG

1 0

Paul Vriens : comctl32/tests: Fix some test failures on older comctl32 versions.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 1dbab053649823c36b52f81ae92e29dc2e18944b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dbab053649823c36b52f81ae… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Oct 3 14:44:34 2009 +0200 comctl32/tests: Fix some test failures on older comctl32 versions. --- dlls/comctl32/tests/monthcal.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 28b3646..fc61fee 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -331,9 +331,15 @@ static void test_monthcal(void) memset(&st, 0xcc, sizeof(st)); ok(SendMessage(hwnd, MCM_GETRANGE, 0, (LPARAM)st) == 0, "No limits should be set\n"); - expect(0, st[0].wYear); - expect(0, st[0].wMonth); - expect(0, st[0].wDay); + ok(0 == st[0].wYear || + broken(1752 == st[0].wYear), /* comctl32 <= 4.72 */ + "Expected 0, got %d\n", st[0].wYear); + ok(0 == st[0].wMonth || + broken(9 == st[0].wMonth), /* comctl32 <= 4.72 */ + "Expected 0, got %d\n", st[0].wMonth); + ok(0 == st[0].wDay || + broken(14 == st[0].wDay), /* comctl32 <= 4.72 */ + "Expected 0, got %d\n", st[0].wDay); expect(0, st[0].wDayOfWeek); expect(0, st[0].wHour); expect(0, st[0].wMinute);

1 0

Paul Vriens : comctl32/tests: Fix some test failures ( MCM_SETRANGE and MCM_GETRANGE).
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 0d726970c6b4a6c4b564db2b3a661d71c5866a73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d726970c6b4a6c4b564db2b3… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Oct 3 14:51:09 2009 +0200 comctl32/tests: Fix some test failures (MCM_SETRANGE and MCM_GETRANGE). --- dlls/comctl32/tests/monthcal.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index fc61fee..eaabc47 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -322,6 +322,7 @@ static void test_monthcal(void) HWND hwnd; SYSTEMTIME st[2], st1[2], today; int res, month_range; + DWORD limits; hwnd = CreateWindowA(MONTHCAL_CLASSA, "MonthCal", WS_POPUP | WS_VISIBLE, CW_USEDEFAULT, 0, 300, 300, 0, 0, NULL, NULL); @@ -329,7 +330,16 @@ static void test_monthcal(void) /* test range just after creation */ memset(&st, 0xcc, sizeof(st)); - ok(SendMessage(hwnd, MCM_GETRANGE, 0, (LPARAM)st) == 0, "No limits should be set\n"); + limits = SendMessage(hwnd, MCM_GETRANGE, 0, (LPARAM)st); + ok(limits == 0 || + broken(limits == GDTR_MIN), /* comctl32 <= 4.70 */ + "No limits should be set (%d)\n", limits); + if (limits == GDTR_MIN) + { + win_skip("comctl32 <= 4.70 is broken\n"); + DestroyWindow(hwnd); + return; + } ok(0 == st[0].wYear || broken(1752 == st[0].wYear), /* comctl32 <= 4.72 */

1 0