December 2008 - Wine-commits

Christian Costa : d3dxof: Make FileEnumObject keep references to top level objects. Add corresponding test.
by Alexandre Julliard 23 Dec '08

23 Dec '08

Module: wine Branch: master Commit: ce578075bc8cddc9ac56e535807597d1cd431888 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce578075bc8cddc9ac56e5358… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Dec 23 12:47:48 2008 +0100 d3dxof: Make FileEnumObject keep references to top level objects. Add corresponding test. --- dlls/d3dxof/d3dxof.c | 7 +++++ dlls/d3dxof/d3dxof_private.h | 1 + dlls/d3dxof/tests/d3dxof.c | 51 +++++++++++++++++++++++++++++++++++++---- 3 files changed, 54 insertions(+), 5 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 0dc93af..46f3db9 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -1909,6 +1909,9 @@ static ULONG WINAPI IDirectXFileEnumObjectImpl_Release(IDirectXFileEnumObject* i if (!ref) { + int i; + for (i = 0; i < This->nb_xobjects; i++) + IDirectXFileData_Release(This->pRefObjects[i]); if (This->source == DXFILELOAD_FROMFILE) HeapFree(GetProcessHeap(), 0, This->buf.buffer); if (This->hFile != INVALID_HANDLE_VALUE) @@ -2302,6 +2305,10 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE *ppDataObj = (LPDIRECTXFILEDATA)object; + /* Get a reference to created object */ + This->pRefObjects[This->nb_xobjects] = (LPDIRECTXFILEDATA)object; + IDirectXFileData_AddRef(This->pRefObjects[This->nb_xobjects]); + This->nb_xobjects++; return DXFILE_OK; diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h index 58b0416..bc78bc0 100644 --- a/dlls/d3dxof/d3dxof_private.h +++ b/dlls/d3dxof/d3dxof_private.h @@ -151,6 +151,7 @@ typedef struct { IDirectXFileImpl* pDirectXFile; ULONG nb_xobjects; xobject* xobjects[MAX_OBJECTS]; + IDirectXFileData* pRefObjects[MAX_OBJECTS]; } IDirectXFileEnumObjectImpl; typedef struct { diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index f707586..12df0c6 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -46,6 +46,13 @@ char template[] = "DWORD flags;\n" "}\n"; +char object[] = +"xof 0302txt 0064\n" +"Header Object\n" +"{\n" +"1; 2; 3;\n" +"}\n"; + static void init_function_pointers(void) { /* We have to use LoadLibrary as no d3dxof functions are referenced directly */ @@ -60,11 +67,14 @@ static unsigned long getRefcount(IUnknown *iface) return IUnknown_Release(iface); } -static void test_d3dxof(void) +static void test_refcount(void) { HRESULT hr; unsigned long ref; LPDIRECTXFILE lpDirectXFile = NULL; + LPDIRECTXFILEENUMOBJECT lpdxfeo; + LPDIRECTXFILEDATA lpdxfd; + DXFILELOADMEMORY dxflm; if (!pDirectXFileCreate) { @@ -82,18 +92,49 @@ static void test_d3dxof(void) ref = getRefcount( (IUnknown *) lpDirectXFile); ok(ref == 1, "Got refcount %ld, expected 1\n", ref); - ref = IDirectXFile_AddRef(lpDirectXFile); ok(ref == 2, "Got refcount %ld, expected 1\n", ref); - ref = IDirectXFile_Release(lpDirectXFile); ok(ref == 1, "Got refcount %ld, expected 1\n", ref); hr = IDirectXFile_RegisterTemplates(lpDirectXFile, template, strlen(template)); ok(hr == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); + dxflm.lpMemory = &object; + dxflm.dSize = strlen(object); + hr = IDirectXFile_CreateEnumObject(lpDirectXFile, &dxflm, DXFILELOAD_FROMMEMORY, &lpdxfeo); + ok(hr == DXFILE_OK, "IDirectXFile_CreateEnumObject: %x\n", hr); + ref = getRefcount( (IUnknown *) lpDirectXFile); + ok(ref == 1, "Got refcount %ld, expected 1\n", ref); + ref = getRefcount( (IUnknown *) lpdxfeo); + ok(ref == 1, "Got refcount %ld, expected 1\n", ref); + + hr = IDirectXFileEnumObject_GetNextDataObject(lpdxfeo, &lpdxfd); + ok(hr == DXFILE_OK, "IDirectXFileEnumObject_GetNextDataObject: %x\n", hr); + ref = getRefcount( (IUnknown *) lpDirectXFile); + ok(ref == 1, "Got refcount %ld, expected 1\n", ref); + ref = getRefcount( (IUnknown *) lpdxfeo); + ok(ref == 1, "Got refcount %ld, expected 1\n", ref); + /* Enum object gets references to all top level objects */ + ref = getRefcount( (IUnknown *) lpdxfd); + ok(ref == 2, "Got refcount %ld, expected 2\n", ref); + ref = IDirectXFile_Release(lpDirectXFile); - ok(ref == 0, "Got refcount %ld, expected 1\n", ref); + ok(ref == 0, "Got refcount %ld, expected 0\n", ref); + /* Nothing changes for all other objects */ + ref = getRefcount( (IUnknown *) lpdxfeo); + ok(ref == 1, "Got refcount %ld, expected 1\n", ref); + ref = getRefcount( (IUnknown *) lpdxfd); + ok(ref == 2, "Got refcount %ld, expected 1\n", ref); + + ref = IDirectXFileEnumObject_Release(lpdxfeo); + ok(ref == 0, "Got refcount %ld, expected 0\n", ref); + /* Enum object releases references to all top level objects */ + ref = getRefcount( (IUnknown *) lpdxfd); + ok(ref == 1, "Got refcount %ld, expected 1\n", ref); + + ref = IDirectXFileData_Release(lpdxfd); + ok(ref == 0, "Got refcount %ld, expected 0\n", ref); } /* Set it to 1 to expand the string when dumping the object. This is usefull when there is @@ -268,7 +309,7 @@ START_TEST(d3dxof) { init_function_pointers(); - test_d3dxof(); + test_refcount(); test_dump(); FreeLibrary(hd3dxof);

1 0

Christian Costa : d3dxof: Allocate subobjects at object creation time.
by Alexandre Julliard 23 Dec '08

23 Dec '08

Module: wine Branch: master Commit: 23a3552d0dfaafb22cad8def66bbe46ef33e34a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23a3552d0dfaafb22cad8def6… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Dec 23 11:56:27 2008 +0100 d3dxof: Allocate subobjects at object creation time. --- dlls/d3dxof/d3dxof.c | 22 +++++++++++++++------- dlls/d3dxof/d3dxof_private.h | 4 ++-- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 6ca6e98..6004ed6 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -2109,9 +2109,9 @@ static BOOL parse_object_parts(parse_buffer * buf, BOOL allow_optional) TRACE("Found optional reference %s\n", (char*)buf->value); for (i = 0; i < buf->nb_pxo_globals; i++) { - for (j = 0; j < buf->pxo_globals[i*MAX_SUBOBJECTS].nb_subobjects; j++) + for (j = 0; j < (buf->pxo_globals[i])[0].nb_subobjects; j++) { - if (!strcmp(buf->pxo_globals[i*MAX_SUBOBJECTS+j].name, (char*)buf->value)) + if (!strcmp((buf->pxo_globals[i])[j].name, (char*)buf->value)) goto _exit; } } @@ -2122,7 +2122,7 @@ _exit: return FALSE; } buf->pxo->childs[buf->pxo->nb_childs] = &buf->pxo_tab[buf->cur_subobject++]; - buf->pxo->childs[buf->pxo->nb_childs]->ptarget = &buf->pxo_globals[i*MAX_SUBOBJECTS+j]; + buf->pxo->childs[buf->pxo->nb_childs]->ptarget = &(buf->pxo_globals[i])[j]; buf->pxo->nb_childs++; } else if (check_TOKEN(buf) == TOKEN_NAME) @@ -2237,13 +2237,20 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE if (FAILED(hr)) return hr; - This->buf.pxo_globals = &This->xobjects[0][0]; + This->buf.pxo_globals = This->xobjects; This->buf.nb_pxo_globals = This->nb_xobjects; - This->buf.pxo_tab = &This->xobjects[This->nb_xobjects][0]; - This->buf.cur_subobject = 0; - This->buf.pxo = &This->buf.pxo_tab[This->buf.cur_subobject++]; + This->buf.cur_subobject = 1; This->buf.level = 0; + This->buf.pxo_tab = HeapAlloc(GetProcessHeap(), 0, sizeof(xobject)*MAX_SUBOBJECTS); + if (!This->buf.pxo_tab) + { + ERR("Out of memory\n"); + hr = DXFILEERR_BADALLOC; + goto error; + } + This->buf.pxo = This->xobjects[This->nb_xobjects] = This->buf.pxo_tab; + pdata = HeapAlloc(GetProcessHeap(), 0, MAX_DATA_SIZE); if (!pdata) { @@ -2291,6 +2298,7 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE error: + HeapFree(GetProcessHeap(), 0, This->buf.pxo_tab); HeapFree(GetProcessHeap(), 0, pdata); HeapFree(GetProcessHeap(), 0, pstrings); diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h index 7cb82cd..d7cd9c8 100644 --- a/dlls/d3dxof/d3dxof_private.h +++ b/dlls/d3dxof/d3dxof_private.h @@ -130,7 +130,7 @@ typedef struct { LPBYTE cur_pdata; LPBYTE cur_pstrings; BYTE value[100]; - xobject* pxo_globals; + xobject** pxo_globals; ULONG nb_pxo_globals; xobject* pxo_tab; IDirectXFileImpl* pdxf; @@ -149,7 +149,7 @@ typedef struct { parse_buffer buf; IDirectXFileImpl* pDirectXFile; ULONG nb_xobjects; - xobject xobjects[MAX_OBJECTS][MAX_SUBOBJECTS]; + xobject* xobjects[MAX_OBJECTS]; } IDirectXFileEnumObjectImpl; typedef struct {

1 0

Christian Costa : d3dxof: Release properly all allocated resources.
by Alexandre Julliard 23 Dec '08

23 Dec '08

Module: wine Branch: master Commit: 29d4ab1316f6b40241b07ac9bfeb075ce0277205 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29d4ab1316f6b40241b07ac9b… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Dec 23 11:57:32 2008 +0100 d3dxof: Release properly all allocated resources. --- dlls/d3dxof/d3dxof.c | 16 +++++++++++++--- dlls/d3dxof/d3dxof_private.h | 1 + 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 6004ed6..0dc93af 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -1538,7 +1538,14 @@ static ULONG WINAPI IDirectXFileDataImpl_Release(IDirectXFileData* iface) TRACE("(%p/%p): ReleaseRef to %d\n", iface, This, ref); if (!ref) + { + if (!This->level) + { + HeapFree(GetProcessHeap(), 0, This->pdata); + HeapFree(GetProcessHeap(), 0, This->pstrings); + } HeapFree(GetProcessHeap(), 0, This); + } return ref; } @@ -1902,7 +1909,10 @@ static ULONG WINAPI IDirectXFileEnumObjectImpl_Release(IDirectXFileEnumObject* i if (!ref) { - CloseHandle(This->hFile); + if (This->source == DXFILELOAD_FROMFILE) + HeapFree(GetProcessHeap(), 0, This->buf.buffer); + if (This->hFile != INVALID_HANDLE_VALUE) + CloseHandle(This->hFile); HeapFree(GetProcessHeap(), 0, This); } @@ -2258,7 +2268,7 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE hr = DXFILEERR_BADALLOC; goto error; } - This->buf.cur_pdata = This->buf.pdata = pdata; + This->buf.cur_pdata = This->buf.pdata = object->pdata = pdata; pstrings = HeapAlloc(GetProcessHeap(), 0, MAX_STRINGS_BUFFER); if (!pstrings) @@ -2267,7 +2277,7 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE hr = DXFILEERR_BADALLOC; goto error; } - This->buf.cur_pstrings = This->buf.pstrings = pstrings; + This->buf.cur_pstrings = This->buf.pstrings = object->pstrings = pstrings; if (!parse_object(&This->buf)) { diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h index d7cd9c8..58b0416 100644 --- a/dlls/d3dxof/d3dxof_private.h +++ b/dlls/d3dxof/d3dxof_private.h @@ -104,6 +104,7 @@ typedef struct { int cur_enum_object; BOOL from_ref; ULONG level; + LPBYTE pdata; LPBYTE pstrings; } IDirectXFileDataImpl;

1 0

Juan Lang : crypt32: Don' t crash when querying the length of the hash of a CRL or a CTL.
by Alexandre Julliard 23 Dec '08

23 Dec '08

Module: wine Branch: master Commit: 00c50a6732fa009596aaf4f96e94cb933a196b85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00c50a6732fa009596aaf4f96… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Dec 22 19:32:41 2008 -0800 crypt32: Don't crash when querying the length of the hash of a CRL or a CTL. --- dlls/crypt32/crl.c | 2 +- dlls/crypt32/ctl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c index 9ae0d5d..a1138b5 100644 --- a/dlls/crypt32/crl.c +++ b/dlls/crypt32/crl.c @@ -275,7 +275,7 @@ static BOOL CRLContext_GetHashProp(PCCRL_CONTEXT context, DWORD dwPropId, { BOOL ret = CryptHashCertificate(0, algID, 0, toHash, toHashLen, pvData, pcbData); - if (ret) + if (ret && pvData) { CRYPT_DATA_BLOB blob = { *pcbData, pvData }; diff --git a/dlls/crypt32/ctl.c b/dlls/crypt32/ctl.c index 65691bb..42abcd7 100644 --- a/dlls/crypt32/ctl.c +++ b/dlls/crypt32/ctl.c @@ -505,7 +505,7 @@ static BOOL CTLContext_GetHashProp(PCCTL_CONTEXT context, DWORD dwPropId, { BOOL ret = CryptHashCertificate(0, algID, 0, toHash, toHashLen, pvData, pcbData); - if (ret) + if (ret && pvData) { CRYPT_DATA_BLOB blob = { *pcbData, pvData };

1 0

Christian Costa : d3dxof: Simplify error handling in IDirectXFileEnumObjectImpl_GetNextDataObject.
by Alexandre Julliard 23 Dec '08

23 Dec '08

Module: wine Branch: master Commit: 4c68fdbf40ff92e6c6a9431de244fc696b83594f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c68fdbf40ff92e6c6a9431de… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Dec 23 11:55:36 2008 +0100 d3dxof: Simplify error handling in IDirectXFileEnumObjectImpl_GetNextDataObject. --- dlls/d3dxof/d3dxof.c | 26 +++++++++++++++++--------- 1 files changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index d7892d4..6ca6e98 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -2219,8 +2219,8 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE IDirectXFileEnumObjectImpl *This = (IDirectXFileEnumObjectImpl *)iface; IDirectXFileDataImpl* object; HRESULT hr; - LPBYTE pdata; - LPBYTE pstrings; + LPBYTE pdata = NULL; + LPBYTE pstrings = NULL; TRACE("(%p/%p)->(%p)\n", This, iface, ppDataObj); @@ -2248,7 +2248,8 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE if (!pdata) { ERR("Out of memory\n"); - return DXFILEERR_BADALLOC; + hr = DXFILEERR_BADALLOC; + goto error; } This->buf.cur_pdata = This->buf.pdata = pdata; @@ -2256,24 +2257,24 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE if (!pstrings) { ERR("Out of memory\n"); - HeapFree(GetProcessHeap(), 0, This->buf.pxo->pdata); - return DXFILEERR_BADALLOC; + hr = DXFILEERR_BADALLOC; + goto error; } This->buf.cur_pstrings = This->buf.pstrings = pstrings; if (!parse_object(&This->buf)) { TRACE("Object is not correct\n"); - HeapFree(GetProcessHeap(), 0, This->buf.pxo->pdata); - HeapFree(GetProcessHeap(), 0, This->buf.pstrings); - return DXFILEERR_PARSEERROR; + hr = DXFILEERR_PARSEERROR; + goto error; } This->buf.pxo->nb_subobjects = This->buf.cur_subobject; if (This->buf.cur_subobject > MAX_SUBOBJECTS) { FIXME("Too many suobjects %d\n", This->buf.cur_subobject); - return DXFILEERR_BADALLOC; + hr = DXFILEERR_BADALLOC; + goto error; } object->pstrings = pstrings; @@ -2287,6 +2288,13 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE This->nb_xobjects++; return DXFILE_OK; + +error: + + HeapFree(GetProcessHeap(), 0, pdata); + HeapFree(GetProcessHeap(), 0, pstrings); + + return hr; } static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetDataObjectById(IDirectXFileEnumObject* iface, REFGUID rguid, LPDIRECTXFILEDATA* ppDataObj)

1 0

Vincent Pelletier : d3d9: Set IDirect3DDevice9Impl_GetVertexShader return value to NULL on error.
by Alexandre Julliard 23 Dec '08

23 Dec '08

Module: wine Branch: master Commit: defe6417259344447b4e74ba80b13b5db4d083e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=defe6417259344447b4e74ba8… Author: Vincent Pelletier <plr.vincent(a)gmail.com> Date: Mon Dec 22 23:25:04 2008 +0100 d3d9: Set IDirect3DDevice9Impl_GetVertexShader return value to NULL on error. --- dlls/d3d9/vertexshader.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/vertexshader.c b/dlls/d3d9/vertexshader.c index 66ce286..6172225 100644 --- a/dlls/d3d9/vertexshader.c +++ b/dlls/d3d9/vertexshader.c @@ -170,6 +170,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetVertexShader(LPDIRECT3DDEVICE9EX iface, I hrc = IWineD3DVertexShader_GetParent(pShader, (IUnknown **)ppShader); IWineD3DVertexShader_Release(pShader); } else { + *ppShader = NULL; WARN("(%p) : Call to IWineD3DDevice_GetVertexShader failed %u (device %p)\n", This, hrc, This->WineD3DDevice); } LeaveCriticalSection(&d3d9_cs);

1 0

Vincent Pelletier : user32: Fix SPI_GETMOUSESPEED and SPI_SETMOUSESPEED.
by Alexandre Julliard 23 Dec '08

23 Dec '08

Module: wine Branch: master Commit: 878c2a83325b66cea79c24dc7379e5a6ee976044 URL: http://source.winehq.org/git/wine.git/?a=commit;h=878c2a83325b66cea79c24dc7… Author: Vincent Pelletier <plr.vincent(a)gmail.com> Date: Mon Dec 22 21:56:14 2008 +0100 user32: Fix SPI_GETMOUSESPEED and SPI_SETMOUSESPEED. --- dlls/user32/sysparams.c | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 4e48299..9d72688 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -85,6 +85,7 @@ enum spi_index SPI_MINIMIZEDMETRICS_IDX, SPI_SETFOREGROUNDLOCKTIMEOUT_IDX, SPI_CARETWIDTH_IDX, + SPI_SETMOUSESPEED_IDX, SPI_INDEX_COUNT }; @@ -221,6 +222,8 @@ static const WCHAR SPI_SETFOREGROUNDLOCKTIMEOUT_REGKEY[]= {'C','o','n','t',' static const WCHAR SPI_SETFOREGROUNDLOCKTIMEOUT_VALNAME[]= {'F','o','r','e','g','r','o','u','n','d','L','o','c','k','T','i','m','e','o','u','t',0}; static const WCHAR SPI_CARETWIDTH_REGKEY[]= {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','D','e','s','k','t','o','p',0}; static const WCHAR SPI_CARETWIDTH_VALNAME[]= {'C','a','r','e','t','W','i','d','t','h',0}; +static const WCHAR SPI_SETMOUSESPEED_REGKEY[]= {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','M','o','u','s','e',0}; +static const WCHAR SPI_SETMOUSESPEED_VALNAME[]= {'M','o','u','s','e','S','e','n','s','i','t','i','v','i','t','y',0}; /* FIXME - real values */ static const WCHAR SPI_SETSCREENSAVERRUNNING_REGKEY[]= {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','D','e','s','k','t','o','p',0}; @@ -312,6 +315,7 @@ static BOOL snap_to_default_button = FALSE; static BOOL swap_buttons = FALSE; static UINT foreground_lock_timeout = 0; static UINT caret_width = 1; +static UINT mouse_sensitivity = 10; static BYTE user_prefs[4]; static MINIMIZEDMETRICS minimized_metrics = @@ -2159,20 +2163,20 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, WINE_SPI_FIXME(SPI_SETSHOWIMEUI); /* 111 _WIN32_WINNT >= 0x400 || _WIN32_WINDOW > 0x400 */ case SPI_GETMOUSESPEED: /* 112 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ - { - int buf[3]; - ret = SystemParametersInfoW (SPI_GETMOUSE, 0, buf, fWinIni); - *(INT *)pvParam = buf[2]; + ret = get_uint_param( SPI_SETMOUSESPEED_IDX, + SPI_SETMOUSESPEED_REGKEY, + SPI_SETMOUSESPEED_VALNAME, + &mouse_sensitivity, pvParam ); break; - } case SPI_SETMOUSESPEED: /* 113 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ - { - ret = save_int_param( SPI_SETMOUSE_REGKEY, SPI_SETMOUSE_VALNAME3, - &mouse_speed, PtrToInt(pvParam), fWinIni); + if (!pvParam) return FALSE; + ret = set_uint_param( SPI_SETMOUSESPEED_IDX, + SPI_SETMOUSESPEED_REGKEY, + SPI_SETMOUSESPEED_VALNAME, + &mouse_sensitivity, *(UINT *) pvParam, fWinIni ); break; - } case SPI_GETSCREENSAVERRUNNING: ret = get_bool_param( SPI_SETSCREENSAVERRUNNING_IDX,

1 0

Rico Schüller : ddraw/tests: Fis some ok() lines in alpha_test().
by Alexandre Julliard 23 Dec '08

23 Dec '08

Module: wine Branch: master Commit: a14fe082bf99e613d9cb816dd09747de285be2fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=a14fe082bf99e613d9cb816dd… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Dec 22 21:23:35 2008 +0100 ddraw/tests: Fis some ok() lines in alpha_test(). --- dlls/ddraw/tests/visual.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 030354a..c200623 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -739,28 +739,28 @@ static void alpha_test(IDirect3DDevice7 *device) green = (color & 0x0000ff00) >> 8; blue = (color & 0x000000ff); ok(red >= 0xbe && red <= 0xc0 && green >= 0x39 && green <= 0x41 && blue == 0x00, - "SRCALPHA on frame buffer returned color %08x, expected 0x00bf4000\n", color); + "SRCALPHA on frame buffer returned color 0x%08x, expected 0x00bf4000\n", color); color = getPixelColor(device, 160, 120); red = (color & 0x00ff0000) >> 16; green = (color & 0x0000ff00) >> 8; blue = (color & 0x000000ff); ok(red == 0x00 && green == 0x00 && blue >= 0xfe && blue <= 0xff , - "DSTALPHA on frame buffer returned color %08x, expected 0x00ff0000\n", color); + "DSTALPHA on frame buffer returned color 0x%08x, expected 0x000000ff\n", color); color = getPixelColor(device, 480, 360); red = (color & 0x00ff0000) >> 16; green = (color & 0x0000ff00) >> 8; blue = (color & 0x000000ff); ok(red >= 0xbe && red <= 0xc0 && green >= 0x39 && green <= 0x41 && blue == 0x00, - "SRCALPHA on texture returned color %08x, expected bar\n", color); + "SRCALPHA on texture returned color 0x%08x, expected 0x00bf4000\n", color); color = getPixelColor(device, 480, 120); red = (color & 0x00ff0000) >> 16; green = (color & 0x0000ff00) >> 8; blue = (color & 0x000000ff); ok(red >= 0x7e && red <= 0x81 && green == 0x00 && blue >= 0x7e && blue <= 0x81, - "DSTALPHA on texture returned color %08x, expected foo\n", color); + "DSTALPHA on texture returned color 0x%08x, expected 0x00800080\n", color); out: if(offscreen) IDirectDrawSurface7_Release(offscreen);

1 0

Rico Schüller : ddraw/tests: Fix alpha_test and offscreen_test on geforce 8800 on XP.
by Alexandre Julliard 23 Dec '08

23 Dec '08

Module: wine Branch: master Commit: 26b9f8ef26381a2ecf95c7412f9fddd6000ddde0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26b9f8ef26381a2ecf95c7412… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Dec 22 21:29:42 2008 +0100 ddraw/tests: Fix alpha_test and offscreen_test on geforce 8800 on XP. --- dlls/ddraw/tests/visual.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index c200623..7820e5e 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -185,6 +185,21 @@ out: return ret; } +/* + * Helper function to get and set the viewport - needed on geforce 8800 on XP - driver bug? + * This is needed after IDirect3DDevice7_SetRenderTarget in combination with offscreen to backbuffer rendering. + */ +static void set_the_same_viewport_again(IDirect3DDevice7 *device) +{ + D3DVIEWPORT7 vp = {0}; + HRESULT hr; + hr = IDirect3DDevice7_GetViewport(device,&vp); + ok(hr == D3D_OK && vp.dwWidth == 640 && vp.dwHeight == 480, "IDirect3DDevice7_SetViewport returned %08x\n", hr); + hr = IDirect3DDevice7_SetViewport(device, &vp); + ok(hr == D3D_OK, "IDirect3DDevice7_SetViewport returned %08x\n", hr); + return; +} + struct vertex { float x, y, z; @@ -559,6 +574,8 @@ static void offscreen_test(IDirect3DDevice7 *device) hr = IDirect3DDevice7_SetRenderTarget(device, backbuffer, 0); ok(hr == D3D_OK, "SetRenderTarget failed, hr = %08x\n", hr); + set_the_same_viewport_again(device); + hr = IDirect3DDevice7_SetTexture(device, 0, offscreen); ok(hr == D3D_OK, "SetTexture failed, %08x\n", hr); @@ -716,6 +733,7 @@ static void alpha_test(IDirect3DDevice7 *device) hr = IDirect3DDevice7_SetRenderTarget(device, backbuffer, 0); ok(hr == D3D_OK, "Can't get back buffer, hr = %08x\n", hr); + set_the_same_viewport_again(device); /* Render the offscreen texture onto the frame buffer to be able to compare it regularly. * Disable alpha blending for the final composition

1 0

Anders Jonsson : mciseq: Fix typo.
by Alexandre Julliard 23 Dec '08

23 Dec '08

Module: wine Branch: master Commit: 9eac931d2e25213ed19ca9578f7a6f94d9ae3fca URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eac931d2e25213ed19ca9578… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Tue Dec 23 11:54:51 2008 +0100 mciseq: Fix typo. --- dlls/mciseq/mcimidi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index f9273c7..2340de9 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -1470,7 +1470,7 @@ static DWORD MIDI_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpPar lpParms->dwReturn = wmm->dwTempo; break; default: - FIXME("Unknowm command %08X !\n", lpParms->dwItem); + FIXME("Unknown command %08X !\n", lpParms->dwItem); return MCIERR_UNRECOGNIZED_COMMAND; } } else {

1 0