February 2008 - Wine-Commits

Jeff Zaroyko : tidy appdb html to make it validate - try 4
by Chris Morgan Feb. 26, 2008

Feb. 26, 2008

1 0

Jeff Zaroyko : improve the look of notes,warnings,comments
by Chris Morgan Feb. 26, 2008

Feb. 26, 2008

Module: appdb Branch: master Commit: ccbc842d5ca1f1b4cc1adb8c849f4b505aafe52a URL: http://source.winehq.org/git/appdb.git/?a=commit;h=ccbc842d5ca1f1b4cc1adb8c… Author: Jeff Zaroyko <jeffzaroyko(a)gmail.com> Date: Thu Feb 21 19:59:19 2008 +1100 improve the look of notes,warnings,comments --- application.css | 2 +- include/note.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/application.css b/application.css index 4425bf0..a97b07a 100644 --- a/application.css +++ b/application.css @@ -57,7 +57,7 @@ tr.garbage { background-color: #999966; } tr.warning { background-color: #ff3333; } /* novascotia salmon */ tr.howto { background-color: green; } tr.defaultnote { background-color: #0066CC; } /* mid-light blue */ - +tr.notetitle { background-color: #cccccc; font-weight: bold; } /* classes for the version info pane */ /* version info pane is the right hand pane at the top of the version page */ div.version_info_pane p { margin:0px; } diff --git a/include/note.php b/include/note.php index 4dac990..9b80de6 100644 --- a/include/note.php +++ b/include/note.php @@ -224,7 +224,7 @@ class Note { $shOutput = html_frame_start("","98%",'',0); $shOutput .= "<table width=\"100%\" border=\"0\" cellspacing=\"0\">\n"; - $shOutput .= "<tr class=\"".$sClass."\" align=\"center\" valign=\"top\"><td><b>".$sTitle."</b></td></tr>\n"; + $shOutput .= "<tr class=\"".$sClass."\" align=\"center\" valign=\"top\"><td> </td></tr><tr class=\"notetitle\" valign=\"top\" align=\"center\"><td>".$sTitle."</td></tr>\n"; $shOutput .= "<tr><td class=\"note\">\n"; $shOutput .= $this->shDescription; $shOutput .= "</td></tr>\n";

1 0

Paul Vriens : setupapi/devinst: Struct size passed needs to be exact.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: 433ca7d8bd65c484107d2cd66cdc936275286b1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=433ca7d8bd65c484107d2cd66… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Feb 25 20:19:53 2008 +0100 setupapi/devinst: Struct size passed needs to be exact. --- dlls/setupapi/devinst.c | 5 ++--- dlls/setupapi/tests/devinst.c | 9 +++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 5d4b79e..0e5aad5 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -2885,9 +2885,8 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailA( SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - if (DeviceInterfaceDetailData && (DeviceInterfaceDetailData->cbSize < - offsetof(SP_DEVICE_INTERFACE_DETAIL_DATA_A, DevicePath) + sizeof(char) || - DeviceInterfaceDetailData->cbSize > sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_A))) + if (DeviceInterfaceDetailData && (DeviceInterfaceDetailData->cbSize != + offsetof(SP_DEVICE_INTERFACE_DETAIL_DATA_A, DevicePath) + sizeof(char))) { SetLastError(ERROR_INVALID_USER_BUFFER); return FALSE; diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 5dda333..dc6d9f7 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -641,6 +641,15 @@ static void testGetDeviceInterfaceDetail(void) ok(!ret && GetLastError() == ERROR_INVALID_USER_BUFFER, "Expected ERROR_INVALID_USER_BUFFER, got %08x\n", GetLastError()); detail->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_A); + SetLastError(0xdeadbeef); + ret = pSetupDiGetDeviceInterfaceDetailA(set, &interfaceData, detail, + size, &size, NULL); + ok(!ret && GetLastError() == ERROR_INVALID_USER_BUFFER, + "Expected ERROR_INVALID_USER_BUFFER, got %08x\n", GetLastError()); + /* Windows 2000 and up check for the exact size. Win9x returns ERROR_INVALID_PARAMETER + * on every call (so doesn't get here) and NT4 doesn't have this function. + */ + detail->cbSize = offsetof(SP_DEVICE_INTERFACE_DETAIL_DATA_A, DevicePath) + sizeof(char); ret = pSetupDiGetDeviceInterfaceDetailA(set, &interfaceData, detail, size, &size, NULL); ok(ret, "SetupDiGetDeviceInterfaceDetailA failed: %d\n",

1 0

Hans Leidekker : mscms: Implement TranslateColors and improve the other transformation functions.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: d91f3a93ae5832b8fb616576bd6d6600a6eafde8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d91f3a93ae5832b8fb616576b… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Feb 24 15:20:15 2008 +0100 mscms: Implement TranslateColors and improve the other transformation functions. --- dlls/mscms/mscms_priv.h | 2 + dlls/mscms/profile.c | 2 +- dlls/mscms/stub.c | 13 +-- dlls/mscms/transform.c | 243 ++++++++++++++++++++++++++++++++++++++++++---- 4 files changed, 227 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d91f3a93ae5832b8fb616…

1 0

Roderick Colenbrander : wgl: Add a test case for wglCreateContext.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: 675988633f698000796940b17b208b6da9ab08a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=675988633f698000796940b17… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Feb 23 18:18:08 2008 +0000 wgl: Add a test case for wglCreateContext. --- dlls/opengl32/tests/opengl.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 456bf79..3836ba7 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -374,6 +374,7 @@ START_TEST(opengl) HDC hdc; int iPixelFormat, res; HGLRC hglrc; + DWORD error; ShowWindow(hwnd, SW_SHOW); hdc = GetDC(hwnd); @@ -381,6 +382,12 @@ START_TEST(opengl) iPixelFormat = ChoosePixelFormat(hdc, &pfd); ok(iPixelFormat > 0, "No pixelformat found!\n"); /* This should never happen as ChoosePixelFormat always returns a closest match */ + /* We shouldn't be able to create a context from a hdc which doesn't have a pixel format set */ + hglrc = wglCreateContext(hdc); + ok(hglrc == NULL, "wglCreateContext should fail when no pixel format has been set, but it passed"); + error = GetLastError(); + ok(error == ERROR_INVALID_PIXEL_FORMAT, "expected ERROR_INVALID_PIXEL_FORMAT for wglCreateContext without a pixelformat set, but recevied %#x", error); + res = SetPixelFormat(hdc, iPixelFormat, &pfd); ok(res, "SetPixelformat failed: %x\n", GetLastError());

1 0

Hans Leidekker : wineprefixcreate: Create the color directory.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: e9bf3241e11fc37ece2c4dcc1e144279b991dafc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9bf3241e11fc37ece2c4dcc1… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat Feb 23 22:55:47 2008 +0100 wineprefixcreate: Create the color directory. --- tools/wineprefixcreate.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wineprefixcreate.in b/tools/wineprefixcreate.in index fb60140..d43330d 100644 --- a/tools/wineprefixcreate.in +++ b/tools/wineprefixcreate.in @@ -161,6 +161,7 @@ for i in \ "$CROOT/windows/system32/drivers" \ "$CROOT/windows/system32/spool" \ "$CROOT/windows/system32/spool/drivers" \ + "$CROOT/windows/system32/spool/drivers/color" \ "$CROOT/windows/temp" do [ -d "$i" ] || mkdir "$i"

1 0

Roy Shea : qmgr: Implement IBackgroundCopyJob_GetId with test.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: 575b1bfcc7919966064fc3ef2fe29e14b89c456b URL: http://source.winehq.org/git/wine.git/?a=commit;h=575b1bfcc7919966064fc3ef2… Author: Roy Shea <roy(a)cs.hmc.edu> Date: Fri Feb 22 15:07:12 2008 -0800 qmgr: Implement IBackgroundCopyJob_GetId with test. --- dlls/qmgr/job.c | 5 +- dlls/qmgr/tests/Makefile.in | 1 + dlls/qmgr/tests/job.c | 109 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 113 insertions(+), 2 deletions(-) diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index 1a554de..8357b87 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -124,8 +124,9 @@ static HRESULT WINAPI BITS_IBackgroundCopyJob_GetId( IBackgroundCopyJob* iface, GUID *pVal) { - FIXME("Not implemented\n"); - return E_NOTIMPL; + BackgroundCopyJobImpl *This = (BackgroundCopyJobImpl *) iface; + memcpy(pVal, &This->jobId, sizeof *pVal); + return S_OK; } static HRESULT WINAPI BITS_IBackgroundCopyJob_GetType( diff --git a/dlls/qmgr/tests/Makefile.in b/dlls/qmgr/tests/Makefile.in index e16d5fc..0508656 100644 --- a/dlls/qmgr/tests/Makefile.in +++ b/dlls/qmgr/tests/Makefile.in @@ -6,6 +6,7 @@ TESTDLL = qmgr.dll IMPORTS = ole32 kernel32 CTESTS = \ + job.c \ qmgr.c @MAKE_TEST_RULES@ diff --git a/dlls/qmgr/tests/job.c b/dlls/qmgr/tests/job.c new file mode 100644 index 0000000..71c0759 --- /dev/null +++ b/dlls/qmgr/tests/job.c @@ -0,0 +1,109 @@ +/* + * Unit test suite for Background Copy Job Interface + * + * Copyright 2007 Google (Roy Shea) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdio.h> + +#define COBJMACROS + +#include "wine/test.h" +#include "bits.h" + +/* Globals used by many tests */ +static const WCHAR test_displayName[] = {'T', 'e', 's', 't', 0}; +static IBackgroundCopyManager *test_manager; +static IBackgroundCopyJob *test_job; +static GUID test_jobId; +static BG_JOB_TYPE test_type; + +/* Generic test setup */ +static BOOL setup(void) +{ + HRESULT hres; + + test_manager = NULL; + test_job = NULL; + memset(&test_jobId, 0, sizeof test_jobId); + test_type = BG_JOB_TYPE_DOWNLOAD; + + hres = CoCreateInstance(&CLSID_BackgroundCopyManager, NULL, + CLSCTX_LOCAL_SERVER, + &IID_IBackgroundCopyManager, + (void **) &test_manager); + if(hres != S_OK) + return FALSE; + + hres = IBackgroundCopyManager_CreateJob(test_manager, test_displayName, + test_type, &test_jobId, &test_job); + if(hres != S_OK) + { + IBackgroundCopyManager_Release(test_manager); + return FALSE; + } + + return TRUE; +} + +/* Generic test cleanup */ +static void teardown(void) +{ + IBackgroundCopyJob_Release(test_job); + IBackgroundCopyManager_Release(test_manager); +} + +/* Test that the jobId is properly set */ +static void test_GetId(void) +{ + HRESULT hres; + GUID tmpId; + + hres = IBackgroundCopyJob_GetId(test_job, &tmpId); + ok(hres == S_OK, "GetId failed: %08x\n", hres); + if(hres != S_OK) + { + skip("Unable to get ID of test_job.\n"); + return; + } + ok(memcmp(&tmpId, &test_jobId, sizeof tmpId) == 0, "Got incorrect GUID\n"); +} + +typedef void (*test_t)(void); + +START_TEST(job) +{ + static const test_t tests[] = { + test_GetId, + 0 + }; + const test_t *test; + + CoInitialize(NULL); + for (test = tests; *test; ++test) + { + /* Keep state seperate between tests. */ + if (!setup()) + { + skip("Unable to setup test\n"); + break; + } + (*test)(); + teardown(); + } + CoUninitialize(); +}

1 0

Roy Shea : qmgr: Implement the IUnknown interface for IBackgroundCopyJob and stubs for the rest of the methods .
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: fee94bbc9e4098930822bb62317ea1bf1685fa06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fee94bbc9e4098930822bb623… Author: Roy Shea <roy(a)cs.hmc.edu> Date: Fri Feb 22 15:05:26 2008 -0800 qmgr: Implement the IUnknown interface for IBackgroundCopyJob and stubs for the rest of the methods. --- dlls/qmgr/Makefile.in | 1 + dlls/qmgr/job.c | 363 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/qmgr/qmgr.h | 7 + 3 files changed, 371 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fee94bbc9e4098930822b…

1 0

Roy Shea : qmgr: Implement IBackgroundCopyManager_CreateJob with test.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: 111e6929ac9067694efd55c710c7609e1d988522 URL: http://source.winehq.org/git/wine.git/?a=commit;h=111e6929ac9067694efd55c71… Author: Roy Shea <roy(a)cs.hmc.edu> Date: Fri Feb 22 15:06:17 2008 -0800 qmgr: Implement IBackgroundCopyManager_CreateJob with test. --- dlls/qmgr/job.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/qmgr/qmgr.c | 5 +++-- dlls/qmgr/qmgr.h | 5 +++++ dlls/qmgr/tests/qmgr.c | 37 +++++++++++++++++++++++++++++++++++++ 4 files changed, 85 insertions(+), 2 deletions(-) diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index ef7dd53..1a554de 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -25,6 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(qmgr); static void BackgroundCopyJobDestructor(BackgroundCopyJobImpl *This) { + HeapFree(GetProcessHeap(), 0, This->displayName); HeapFree(GetProcessHeap(), 0, This); } @@ -361,3 +362,42 @@ static const IBackgroundCopyJobVtbl BITS_IBackgroundCopyJob_Vtbl = BITS_IBackgroundCopyJob_GetProxySettings, BITS_IBackgroundCopyJob_TakeOwnership, }; + +HRESULT BackgroundCopyJobConstructor(LPCWSTR displayName, BG_JOB_TYPE type, + GUID *pJobId, LPVOID *ppObj) +{ + HRESULT hr; + BackgroundCopyJobImpl *This; + int n; + + TRACE("(%s,%d,%p)\n", debugstr_w(displayName), type, ppObj); + + This = HeapAlloc(GetProcessHeap(), 0, sizeof *This); + if (!This) + return E_OUTOFMEMORY; + + This->lpVtbl = &BITS_IBackgroundCopyJob_Vtbl; + This->ref = 1; + This->type = type; + + n = (lstrlenW(displayName) + 1) * sizeof *displayName; + This->displayName = HeapAlloc(GetProcessHeap(), 0, n); + if (!This->displayName) + { + HeapFree(GetProcessHeap(), 0, This); + return E_OUTOFMEMORY; + } + memcpy(This->displayName, displayName, n); + + hr = CoCreateGuid(&This->jobId); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, This->displayName); + HeapFree(GetProcessHeap(), 0, This); + return hr; + } + memcpy(pJobId, &This->jobId, sizeof(GUID)); + + *ppObj = &This->lpVtbl; + return S_OK; +} diff --git a/dlls/qmgr/qmgr.c b/dlls/qmgr/qmgr.c index b257a16..e274159 100644 --- a/dlls/qmgr/qmgr.c +++ b/dlls/qmgr/qmgr.c @@ -91,8 +91,9 @@ static HRESULT WINAPI BITS_IBackgroundCopyManager_CreateJob( GUID *pJobId, IBackgroundCopyJob **ppJob) { - FIXME("Not implemented\n"); - return E_NOTIMPL; + TRACE("\n"); + return BackgroundCopyJobConstructor(DisplayName, Type, pJobId, + (LPVOID *) ppJob); } static HRESULT WINAPI BITS_IBackgroundCopyManager_GetJob( diff --git a/dlls/qmgr/qmgr.h b/dlls/qmgr/qmgr.h index 1118e2b..178fda1 100644 --- a/dlls/qmgr/qmgr.h +++ b/dlls/qmgr/qmgr.h @@ -34,6 +34,9 @@ typedef struct { const IBackgroundCopyJobVtbl *lpVtbl; LONG ref; + LPWSTR displayName; + BG_JOB_TYPE type; + GUID jobId; } BackgroundCopyJobImpl; /* Background copy manager vtbl and related data */ @@ -51,6 +54,8 @@ typedef struct extern ClassFactoryImpl BITS_ClassFactory; HRESULT BackgroundCopyManagerConstructor(IUnknown *pUnkOuter, LPVOID *ppObj); +HRESULT BackgroundCopyJobConstructor(LPCWSTR displayName, BG_JOB_TYPE type, + GUID *pJobId, LPVOID *ppObj); /* Little helper functions */ static inline char * diff --git a/dlls/qmgr/tests/qmgr.c b/dlls/qmgr/tests/qmgr.c index 0051751..e36ff36 100644 --- a/dlls/qmgr/tests/qmgr.c +++ b/dlls/qmgr/tests/qmgr.c @@ -48,9 +48,46 @@ test_CreateInstance(void) } +static void test_CreateJob(void) +{ + /* Job information */ + static const WCHAR copyNameW[] = {'T', 'e', 's', 't', 0}; + IBackgroundCopyJob* job = NULL; + GUID tmpId; + HRESULT hres; + ULONG res; + IBackgroundCopyManager* manager = NULL; + + /* Setup */ + hres = CoCreateInstance(&CLSID_BackgroundCopyManager, NULL, + CLSCTX_LOCAL_SERVER, &IID_IBackgroundCopyManager, + (void **) &manager); + if(hres != S_OK) + { + skip("Unable to create bits instance required for test.\n"); + return; + } + + /* Create bits job */ + hres = IBackgroundCopyManager_CreateJob(manager, copyNameW, + BG_JOB_TYPE_DOWNLOAD, &tmpId, + &job); + ok(hres == S_OK, "CreateJob failed: %08x\n", hres); + if(hres != S_OK) + skip("Unable to create bits job.\n"); + else + { + res = IBackgroundCopyJob_Release(job); + ok(res == 0, "Bad ref count on release: %u\n", res); + } + + IBackgroundCopyManager_Release(manager); +} + START_TEST(qmgr) { CoInitialize(NULL); test_CreateInstance(); + test_CreateJob(); CoUninitialize(); }

1 0

Günther Brammer : ddraw: Return a nullpointer as lpSurface in Lock() if the rect is invalid.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: df5116cc7da2dbd26abf58b3442bdd889595d8f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df5116cc7da2dbd26abf58b34… Author: Günther Brammer <GBrammer(a)gmx.de> Date: Mon Feb 25 16:22:41 2008 +0100 ddraw: Return a nullpointer as lpSurface in Lock() if the rect is invalid. --- dlls/ddraw/surface.c | 32 ++++++++++++++++++-------------- dlls/ddraw/tests/dsurface.c | 4 ++++ 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index a167806..ae57bb4 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -577,20 +577,6 @@ IDirectDrawSurfaceImpl_Lock(IDirectDrawSurface7 *iface, /* This->surface_desc.dwWidth and dwHeight are changeable, thus lock */ EnterCriticalSection(&ddraw_cs); - if (Rect) - { - if ((Rect->left < 0) - || (Rect->top < 0) - || (Rect->left > Rect->right) - || (Rect->top > Rect->bottom) - || (Rect->right > This->surface_desc.dwWidth) - || (Rect->bottom > This->surface_desc.dwHeight)) - { - WARN("Trying to lock an invalid rectangle, returning DDERR_INVALIDPARAMS\n"); - LeaveCriticalSection(&ddraw_cs); - return DDERR_INVALIDPARAMS; - } - } /* Should I check for the handle to be NULL? * @@ -606,6 +592,24 @@ IDirectDrawSurfaceImpl_Lock(IDirectDrawSurface7 *iface, return DDERR_INVALIDPARAMS; } + /* Windows zeroes this if the rect is invalid */ + DDSD->lpSurface = 0; + + if (Rect) + { + if ((Rect->left < 0) + || (Rect->top < 0) + || (Rect->left > Rect->right) + || (Rect->top > Rect->bottom) + || (Rect->right > This->surface_desc.dwWidth) + || (Rect->bottom > This->surface_desc.dwHeight)) + { + WARN("Trying to lock an invalid rectangle, returning DDERR_INVALIDPARAMS\n"); + LeaveCriticalSection(&ddraw_cs); + return DDERR_INVALIDPARAMS; + } + } + hr = IWineD3DSurface_LockRect(This->WineD3DSurface, &LockedRect, Rect, diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index cc7760e..cf3ae6f 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -1652,10 +1652,14 @@ static void test_lockrect_invalid(void) { RECT *rect = &invalid[i]; + memset(&locked_desc, 1, sizeof(locked_desc)); + locked_desc.dwSize = sizeof(locked_desc); + hr = IDirectDrawSurface_Lock(surface, rect, &locked_desc, DDLOCK_WAIT, NULL); ok(hr == DDERR_INVALIDPARAMS, "Lock returned 0x%08x for rect [%d, %d]->[%d, %d]" ", expected DDERR_INVALIDPARAMS (0x%08x)\n", hr, rect->left, rect->top, rect->right, rect->bottom, DDERR_INVALIDPARAMS); + ok(!locked_desc.lpSurface, "IDirectDrawSurface_Lock did not set lpSurface in the surface desc to zero.\n"); } hr = IDirectDrawSurface_Lock(surface, NULL, &locked_desc, DDLOCK_WAIT, NULL);

1 0