January 2009 - Wine-commits

Dylan Smith : richedit: Zoom in and out with mouse wheel with control held.
by Alexandre Julliard 14 Jan '09

14 Jan '09

Module: wine Branch: master Commit: fcabbbf30fdf3da8c461cf4313a8e076af1fef51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcabbbf30fdf3da8c461cf431… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jan 13 13:39:32 2009 -0500 richedit: Zoom in and out with mouse wheel with control held. --- dlls/riched20/editor.c | 29 +++++++++++++++++++++++------ dlls/riched20/tests/editor.c | 12 ++++++------ 2 files changed, 29 insertions(+), 12 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index d022e17..3b25295 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4096,18 +4096,35 @@ static LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, { int gcWheelDelta; UINT pulScrollLines; + BOOL ctrl_is_down; if ((editor->nEventMask & ENM_MOUSEEVENTS) && !ME_FilterEvent(editor, msg, &wParam, &lParam)) return 0; - SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0); - gcWheelDelta = -GET_WHEEL_DELTA_WPARAM(wParam); - - if (abs(gcWheelDelta) >= WHEEL_DELTA && pulScrollLines) + ctrl_is_down = GetKeyState(VK_CONTROL) & 0x8000; + + gcWheelDelta = GET_WHEEL_DELTA_WPARAM(wParam); + + if (abs(gcWheelDelta) >= WHEEL_DELTA) { - /* FIXME follow the original */ - ME_ScrollDown(editor,pulScrollLines * (gcWheelDelta / WHEEL_DELTA) * 8); + if (ctrl_is_down) { + int numerator; + if (!editor->nZoomNumerator || !editor->nZoomDenominator) + { + numerator = 100; + } else { + numerator = editor->nZoomNumerator * 100 / editor->nZoomDenominator; + } + numerator = numerator + (gcWheelDelta / WHEEL_DELTA) * 10; + if (numerator >= 10 && numerator <= 500) + ME_SetZoom(editor, numerator, 100); + } else { + SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0); + /* FIXME follow the original */ + if (pulScrollLines) + ME_ScrollDown(editor,pulScrollLines * (-gcWheelDelta / WHEEL_DELTA) * 8); + } } break; } diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 7f99489..4165f5e 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -6292,8 +6292,8 @@ static void test_zoom(void) release_key(VK_CONTROL); ret = SendMessage(hwnd, EM_GETZOOM, (WPARAM)&numerator, (LPARAM)&denominator); - todo_wine ok(numerator == 110, "incorrect numerator is %d\n", numerator); - todo_wine ok(denominator == 100, "incorrect denominator is %d\n", denominator); + ok(numerator == 110, "incorrect numerator is %d\n", numerator); + ok(denominator == 100, "incorrect denominator is %d\n", denominator); ok(ret == TRUE, "EM_GETZOOM failed (%d).\n", ret); /* Test how much the mouse wheel can zoom in and out. */ @@ -6307,7 +6307,7 @@ static void test_zoom(void) release_key(VK_CONTROL); ret = SendMessage(hwnd, EM_GETZOOM, (WPARAM)&numerator, (LPARAM)&denominator); - todo_wine ok(numerator == 500, "incorrect numerator is %d\n", numerator); + ok(numerator == 500, "incorrect numerator is %d\n", numerator); ok(denominator == 100, "incorrect denominator is %d\n", denominator); ok(ret == TRUE, "EM_GETZOOM failed (%d).\n", ret); @@ -6335,7 +6335,7 @@ static void test_zoom(void) release_key(VK_CONTROL); ret = SendMessage(hwnd, EM_GETZOOM, (WPARAM)&numerator, (LPARAM)&denominator); - todo_wine ok(numerator == 10, "incorrect numerator is %d\n", numerator); + ok(numerator == 10, "incorrect numerator is %d\n", numerator); ok(denominator == 100, "incorrect denominator is %d\n", denominator); ok(ret == TRUE, "EM_GETZOOM failed (%d).\n", ret); @@ -6364,8 +6364,8 @@ static void test_zoom(void) release_key(VK_CONTROL); ret = SendMessage(hwnd, EM_GETZOOM, (WPARAM)&numerator, (LPARAM)&denominator); - todo_wine ok(numerator == 394, "incorrect numerator is %d\n", numerator); - todo_wine ok(denominator == 100, "incorrect denominator is %d\n", denominator); + ok(numerator == 394, "incorrect numerator is %d\n", numerator); + ok(denominator == 100, "incorrect denominator is %d\n", denominator); ok(ret == TRUE, "EM_GETZOOM failed (%d).\n", ret); /* Test bounds checking on EM_SETZOOM */

1 0

Andrey Turkin : ole32/tests: Add test for IContextCallback.
by Alexandre Julliard 14 Jan '09

14 Jan '09

Module: wine Branch: master Commit: 8ff76d24f6d2d74c135a2ca6d57838597c806046 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ff76d24f6d2d74c135a2ca6d… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Wed Jan 14 01:59:03 2009 +0300 ole32/tests: Add test for IContextCallback. --- dlls/ole32/tests/compobj.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 450db78..d74138f 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -29,6 +29,9 @@ #include "shlguid.h" #include "urlmon.h" /* for CLSID_FileProtocol */ +#include "initguid.h" +#include "ctxtcall.h" + #include "wine/test.h" /* functions that are not present on all versions of Windows */ @@ -967,6 +970,7 @@ static void test_CoGetObjectContext(void) HRESULT hr; ULONG refs; IComThreadingInfo *pComThreadingInfo; + IContextCallback *pContextCallback; APTTYPE apttype; THDTYPE thdtype; @@ -996,6 +1000,17 @@ static void test_CoGetObjectContext(void) refs = IComThreadingInfo_Release(pComThreadingInfo); ok(refs == 0, "pComThreadingInfo should have 0 refs instead of %d refs\n", refs); + hr = pCoGetObjectContext(&IID_IContextCallback, (void **)&pContextCallback); + todo_wine { + ok_ole_success(hr, "CoGetObjectContext(ContextCallback)"); + } + + if (hr == S_OK) + { + refs = IContextCallback_Release(pContextCallback); + ok(refs == 0, "pContextCallback should have 0 refs instead of %d refs\n", refs); + } + CoUninitialize(); pCoInitializeEx(NULL, COINIT_MULTITHREADED); @@ -1014,6 +1029,17 @@ static void test_CoGetObjectContext(void) refs = IComThreadingInfo_Release(pComThreadingInfo); ok(refs == 0, "pComThreadingInfo should have 0 refs instead of %d refs\n", refs); + hr = pCoGetObjectContext(&IID_IContextCallback, (void **)&pContextCallback); + todo_wine { + ok_ole_success(hr, "CoGetObjectContext(ContextCallback)"); + } + + if (hr == S_OK) + { + refs = IContextCallback_Release(pContextCallback); + ok(refs == 0, "pContextCallback should have 0 refs instead of %d refs\n", refs); + } + CoUninitialize(); }

1 0

Michael Stefaniuc : cryptnet: Remove superfluous pointer casts.
by Alexandre Julliard 14 Jan '09

14 Jan '09

Module: wine Branch: master Commit: a28052ab8abd1495267480aab980632431e03b08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a28052ab8abd1495267480aab… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 14 09:51:43 2009 +0100 cryptnet: Remove superfluous pointer casts. --- dlls/cryptnet/cryptnet_main.c | 18 +++++++++--------- dlls/cryptnet/tests/cryptnet.c | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 7a79371..83346a0 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -136,7 +136,7 @@ static BOOL WINAPI CRYPT_GetUrlFromCertificateCRLDistPoint(LPCSTR pszUrlOid, LPVOID pvPara, DWORD dwFlags, PCRYPT_URL_ARRAY pUrlArray, DWORD *pcbUrlArray, PCRYPT_URL_INFO pUrlInfo, DWORD *pcbUrlInfo, LPVOID pvReserved) { - PCCERT_CONTEXT cert = (PCCERT_CONTEXT)pvPara; + PCCERT_CONTEXT cert = pvPara; PCERT_EXTENSION ext; BOOL ret = FALSE; @@ -686,7 +686,7 @@ static void CALLBACK CRYPT_InetStatusCallback(HINTERNET hInt, switch (status) { case INTERNET_STATUS_REQUEST_COMPLETE: - result = (LPINTERNET_ASYNC_RESULT)statusInfo; + result = statusInfo; context->error = result->dwError; SetEvent(context->event); } @@ -1244,17 +1244,17 @@ static BOOL WINAPI CRYPT_CreateAny(LPCSTR pszObjectOid, { case CERT_QUERY_CONTENT_CERT: if (!CertAddCertificateContextToStore(store, - (PCCERT_CONTEXT)context, CERT_STORE_ADD_ALWAYS, NULL)) + context, CERT_STORE_ADD_ALWAYS, NULL)) ret = FALSE; break; case CERT_QUERY_CONTENT_CRL: if (!CertAddCRLContextToStore(store, - (PCCRL_CONTEXT)context, CERT_STORE_ADD_ALWAYS, NULL)) + context, CERT_STORE_ADD_ALWAYS, NULL)) ret = FALSE; break; case CERT_QUERY_CONTENT_CTL: if (!CertAddCTLContextToStore(store, - (PCCTL_CONTEXT)context, CERT_STORE_ADD_ALWAYS, NULL)) + context, CERT_STORE_ADD_ALWAYS, NULL)) ret = FALSE; break; default: @@ -1327,7 +1327,7 @@ typedef BOOL (*get_object_expiration_func)(void *pvContext, static BOOL CRYPT_GetExpirationFromCert(void *pvObject, FILETIME *expiration) { - PCCERT_CONTEXT cert = (PCCERT_CONTEXT)pvObject; + PCCERT_CONTEXT cert = pvObject; *expiration = cert->pCertInfo->NotAfter; return TRUE; @@ -1335,7 +1335,7 @@ static BOOL CRYPT_GetExpirationFromCert(void *pvObject, FILETIME *expiration) static BOOL CRYPT_GetExpirationFromCRL(void *pvObject, FILETIME *expiration) { - PCCRL_CONTEXT cert = (PCCRL_CONTEXT)pvObject; + PCCRL_CONTEXT cert = pvObject; *expiration = cert->pCrlInfo->NextUpdate; return TRUE; @@ -1343,7 +1343,7 @@ static BOOL CRYPT_GetExpirationFromCRL(void *pvObject, FILETIME *expiration) static BOOL CRYPT_GetExpirationFromCTL(void *pvObject, FILETIME *expiration) { - PCCTL_CONTEXT cert = (PCCTL_CONTEXT)pvObject; + PCCTL_CONTEXT cert = pvObject; *expiration = cert->pCtlInfo->NextUpdate; return TRUE; @@ -1518,7 +1518,7 @@ BOOL WINAPI CertDllVerifyRevocation(DWORD dwEncodingType, DWORD dwRevType, PCRL_ENTRY entry = NULL; CertFindCertificateInCRL( - (PCCERT_CONTEXT)rgpvContext[i], crl, 0, NULL, + rgpvContext[i], crl, 0, NULL, &entry); if (entry) { diff --git a/dlls/cryptnet/tests/cryptnet.c b/dlls/cryptnet/tests/cryptnet.c index 2a40ed6..5a4e773 100644 --- a/dlls/cryptnet/tests/cryptnet.c +++ b/dlls/cryptnet/tests/cryptnet.c @@ -329,7 +329,7 @@ static void test_retrieveObjectByUrl(void) CertFreeCRLContext(crl); store = (HCERTSTORE)0xdeadbeef; ret = CryptRetrieveObjectByUrlA(url, CONTEXT_OID_CAPI2_ANY, 0, 0, - (void **)&store, NULL, NULL, NULL, NULL); + &store, NULL, NULL, NULL, NULL); ok(ret, "CryptRetrieveObjectByUrlA failed: %d\n", GetLastError()); if (store && store != (HCERTSTORE)0xdeadbeef) {

1 0

Andrey Turkin : include: Add ctxtcall. idl file with IContextCallback interface definition.
by Alexandre Julliard 14 Jan '09

14 Jan '09

Module: wine Branch: master Commit: aa8f00895268952a8772b2d87b18d6e0b3c5c33b URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa8f00895268952a8772b2d87… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Wed Jan 14 01:58:41 2009 +0300 include: Add ctxtcall.idl file with IContextCallback interface definition. --- .gitignore | 1 + dlls/uuid/uuid.c | 1 + include/Makefile.in | 1 + include/ctxtcall.idl | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 52 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 531c2fc..4b61b4d 100644 --- a/.gitignore +++ b/.gitignore @@ -142,6 +142,7 @@ include/bits1_5.h include/comcat.h include/config.h include/control.h +include/ctxtcall.h include/d3d10.h include/ddstream.h include/dimm.h diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index ecac265..94f345e 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -41,6 +41,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "olectl.h" #include "ocidl.h" +#include "ctxtcall.h" #include "docobj.h" #include "exdisp.h" diff --git a/include/Makefile.in b/include/Makefile.in index 09d7b3c..2a990c0 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -18,6 +18,7 @@ PUBLIC_IDL_H_SRCS = \ bits1_5.idl \ comcat.idl \ control.idl \ + ctxtcall.idl \ d3d10.idl \ ddstream.idl \ dimm.idl \ diff --git a/include/ctxtcall.idl b/include/ctxtcall.idl new file mode 100644 index 0000000..f07dc1b --- /dev/null +++ b/include/ctxtcall.idl @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2008 Louis Lenders + * + * 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 + */ + +import "wtypes.idl"; +import "objidl.idl"; +import "unknwn.idl"; + +typedef struct tagComCallData +{ + DWORD dwDispid; + DWORD dwReserved; + void *pUserDefined; +} ComCallData; + +/*************************************************************************** + * IContextCallback + */ +[ + local, + object, + uuid(000001da-0000-0000-c000-000000000046), + pointer_default(unique) +] +interface IContextCallback : IUnknown +{ + typedef HRESULT (__stdcall *PFNCONTEXTCALL)(ComCallData *pParam); + + HRESULT ContextCallback( + [in] PFNCONTEXTCALL pCallback, + [in] ComCallData *pParam, + [in] REFIID riid, + [in] int iMethod, + [in] IUnknown *pUnk); +}

1 0

Michael Stefaniuc : dswave: Remove superfluous pointer casts.
by Alexandre Julliard 14 Jan '09

14 Jan '09

Module: wine Branch: master Commit: 02602bd3cfa33514c3b2fe2418001bd35977a506 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02602bd3cfa33514c3b2fe241… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 14 09:52:15 2009 +0100 dswave: Remove superfluous pointer casts. --- dlls/dswave/dswave.c | 8 ++++---- dlls/dswave/dswave_main.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dswave/dswave.c b/dlls/dswave/dswave.c index 0b37b24..6e0f985 100644 --- a/dlls/dswave/dswave.c +++ b/dlls/dswave/dswave.c @@ -41,21 +41,21 @@ static HRESULT WINAPI IDirectMusicWaveImpl_IUnknown_QueryInterface (LPUNKNOWN if TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = (LPVOID)&This->UnknownVtbl; + *ppobj = &This->UnknownVtbl; IDirectMusicWaveImpl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicSegment) || IsEqualIID (riid, &IID_IDirectMusicSegment2) || IsEqualIID (riid, &IID_IDirectMusicSegment8)) { - *ppobj = (LPVOID)&This->SegmentVtbl; + *ppobj = &This->SegmentVtbl; IDirectMusicWaveImpl_IDirectMusicSegment8_AddRef ((LPDIRECTMUSICSEGMENT8)&This->SegmentVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicObject)) { - *ppobj = (LPVOID)&This->ObjectVtbl; + *ppobj = &This->ObjectVtbl; IDirectMusicWaveImpl_IDirectMusicObject_AddRef ((LPDIRECTMUSICOBJECT)&This->ObjectVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IPersistStream)) { - *ppobj = (LPVOID)&This->PersistStreamVtbl; + *ppobj = &This->PersistStreamVtbl; IDirectMusicWaveImpl_IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicWavePRIVATE)) { diff --git a/dlls/dswave/dswave_main.c b/dlls/dswave/dswave_main.c index 69671c5..b907e9e 100644 --- a/dlls/dswave/dswave_main.c +++ b/dlls/dswave/dswave_main.c @@ -119,7 +119,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { TRACE("(%s, %s, %p)\n", debugstr_dmguid(rclsid), debugstr_dmguid(riid), ppv); if (IsEqualCLSID (rclsid, &CLSID_DirectSoundWave) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = (LPVOID) &Wave_CF; + *ppv = &Wave_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; }

1 0

Michael Stefaniuc : d3d8: Remove superfluous pointer casts.
by Alexandre Julliard 14 Jan '09

14 Jan '09

Module: wine Branch: master Commit: 357c3f4a2cac33d81cccedd32e2e29b198f90c09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=357c3f4a2cac33d81cccedd32… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 14 09:51:52 2009 +0100 d3d8: Remove superfluous pointer casts. --- dlls/d3d8/device.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index ae62f07..6366a8c 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -764,11 +764,11 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CopyRects(LPDIRECT3DDEVICE8 iface, ID /* Copy rect by rect */ if (NULL != pSourceRects && NULL != pDestPoints) { for (i = 0; i < cRects; ++i) { - IWineD3DSurface_BltFast(Dest->wineD3DSurface, pDestPoints[i].x, pDestPoints[i].y, Source->wineD3DSurface, (RECT *) &pSourceRects[i], WINEDDBLTFAST_NOCOLORKEY); + IWineD3DSurface_BltFast(Dest->wineD3DSurface, pDestPoints[i].x, pDestPoints[i].y, Source->wineD3DSurface, &pSourceRects[i], WINEDDBLTFAST_NOCOLORKEY); } } else { for (i = 0; i < cRects; ++i) { - IWineD3DSurface_BltFast(Dest->wineD3DSurface, 0, 0, Source->wineD3DSurface, (RECT *) &pSourceRects[i], WINEDDBLTFAST_NOCOLORKEY); + IWineD3DSurface_BltFast(Dest->wineD3DSurface, 0, 0, Source->wineD3DSurface, &pSourceRects[i], WINEDDBLTFAST_NOCOLORKEY); } } } @@ -1778,7 +1778,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetVertexShaderConstant(LPDIRECT3DDEV TRACE("(%p) : Relay\n", This); EnterCriticalSection(&d3d8_cs); - hr = IWineD3DDevice_SetVertexShaderConstantF(This->WineD3DDevice, Register, (CONST float *)pConstantData, ConstantCount); + hr = IWineD3DDevice_SetVertexShaderConstantF(This->WineD3DDevice, Register, pConstantData, ConstantCount); LeaveCriticalSection(&d3d8_cs); return hr; } @@ -1789,7 +1789,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetVertexShaderConstant(LPDIRECT3DDEV TRACE("(%p) : Relay\n", This); EnterCriticalSection(&d3d8_cs); - hr = IWineD3DDevice_GetVertexShaderConstantF(This->WineD3DDevice, Register, (float *)pConstantData, ConstantCount); + hr = IWineD3DDevice_GetVertexShaderConstantF(This->WineD3DDevice, Register, pConstantData, ConstantCount); LeaveCriticalSection(&d3d8_cs); return hr; } @@ -2032,7 +2032,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetPixelShaderConstant(LPDIRECT3DDE TRACE("(%p) Relay\n", This); EnterCriticalSection(&d3d8_cs); - hr = IWineD3DDevice_SetPixelShaderConstantF(This->WineD3DDevice, Register, (CONST float *)pConstantData, ConstantCount); + hr = IWineD3DDevice_SetPixelShaderConstantF(This->WineD3DDevice, Register, pConstantData, ConstantCount); LeaveCriticalSection(&d3d8_cs); return hr; } @@ -2043,7 +2043,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetPixelShaderConstant(LPDIRECT3DDEVI TRACE("(%p) Relay\n", This); EnterCriticalSection(&d3d8_cs); - hr = IWineD3DDevice_GetPixelShaderConstantF(This->WineD3DDevice, Register, (float *)pConstantData, ConstantCount); + hr = IWineD3DDevice_GetPixelShaderConstantF(This->WineD3DDevice, Register, pConstantData, ConstantCount); LeaveCriticalSection(&d3d8_cs); return hr; }

1 0

Michael Stefaniuc : gdiplus: Remove superfluous pointer casts.
by Alexandre Julliard 14 Jan '09

14 Jan '09

Module: wine Branch: master Commit: b53877d92e3d33b60841f6a5585c76165d1f520b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b53877d92e3d33b60841f6a55… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 14 09:52:24 2009 +0100 gdiplus: Remove superfluous pointer casts. --- dlls/gdiplus/graphics.c | 2 +- dlls/gdiplus/image.c | 2 +- dlls/gdiplus/tests/image.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index b19c7bb..5193334 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3229,7 +3229,7 @@ GpStatus WINGDIPAPI GdipMultiplyWorldTransform(GpGraphics *graphics, GDIPCONST G m = *(graphics->worldtrans); - ret = GdipMultiplyMatrix(&m, (GpMatrix*)matrix, order); + ret = GdipMultiplyMatrix(&m, matrix, order); if(ret == Ok) *(graphics->worldtrans) = m; diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 0c61056..1fb8824 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1180,7 +1180,7 @@ static GpStatus encode_image_BMP(LPVOID bitmap_bits, LPBITMAPINFO bitmap_info, *output = GdipAlloc(*output_size); - bmp_file_hdr = (BITMAPFILEHEADER*) *output; + bmp_file_hdr = *output; bmp_file_hdr->bfType = BITMAP_FORMAT_BMP; bmp_file_hdr->bfSize = *output_size; bmp_file_hdr->bfOffBits = diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 6000dde..19f0500 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -455,7 +455,7 @@ static void test_GdipCreateBitmapFromHBITMAP(void) LogPal = GdipAlloc(sizeof(LOGPALETTE)); ok(LogPal != NULL, "unable to allocate LOGPALETTE\n"); LogPal->palVersion = 0x300; - hpal = CreatePalette((const LOGPALETTE*) LogPal); + hpal = CreatePalette(LogPal); ok(hpal != NULL, "CreatePalette failed\n"); GdipFree(LogPal);

1 0

Henri Verbeet : wined3d: Remove AddDirtyRect() from the public interface.
by Alexandre Julliard 14 Jan '09

14 Jan '09

Module: wine Branch: master Commit: 9440dfedf4a241550c428bdf12c4cbd9542cfdea URL: http://source.winehq.org/git/wine.git/?a=commit;h=9440dfedf4a241550c428bdf1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 14 10:01:11 2009 +0100 wined3d: Remove AddDirtyRect() from the public interface. --- dlls/wined3d/cubetexture.c | 10 +++--- dlls/wined3d/device.c | 2 +- dlls/wined3d/surface.c | 74 ++++++++++++++++++++------------------- dlls/wined3d/surface_gdi.c | 9 ----- dlls/wined3d/texture.c | 6 ++- dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.idl | 3 -- 7 files changed, 49 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9440dfedf4a241550c428…

1 0

Henri Verbeet : wined3d: Get rid of D3DCREATEOBJECTINSTANCE.
by Alexandre Julliard 14 Jan '09

14 Jan '09

Module: wine Branch: master Commit: c8c073fc9bb16c915df39659d1e52c16a8d297da URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8c073fc9bb16c915df39659d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 14 10:01:11 2009 +0100 wined3d: Get rid of D3DCREATEOBJECTINSTANCE. --- dlls/wined3d/device.c | 80 ++++++++++++++++++++++++++++++++++++------------- 1 files changed, 59 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 45b579b..dc18b22 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -54,19 +54,6 @@ const WINED3DLIGHT WINED3D_default_light = { /* static function declarations */ static void IWineD3DDeviceImpl_AddResource(IWineD3DDevice *iface, IWineD3DResource *resource); -/* helper macros */ -#define D3DMEMCHECK(object, ppResult) if(NULL == object) { *ppResult = NULL; ERR("Out of memory\n"); return WINED3DERR_OUTOFVIDEOMEMORY;} - -#define D3DCREATEOBJECTINSTANCE(object, type) { \ - object=HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IWineD3D##type##Impl)); \ - D3DMEMCHECK(object, pp##type); \ - object->lpVtbl = &IWineD3D##type##_Vtbl; \ - object->wineD3DDevice = This; \ - object->parent = parent; \ - object->ref = 1; \ - *pp##type = (IWineD3D##type *) object; \ -} - /********************************************************** * Global variable / Constants follow **********************************************************/ @@ -326,8 +313,21 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateStateBlock(IWineD3DDevice* iface, int i, j; HRESULT temp_result; - D3DCREATEOBJECTINSTANCE(object, StateBlock) - object->blockType = Type; + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if(!object) + { + ERR("Out of memory\n"); + *ppStateBlock = NULL; + return WINED3DERR_OUTOFVIDEOMEMORY; + } + + object->lpVtbl = &IWineD3DStateBlock_Vtbl; + object->wineD3DDevice = This; + object->parent = parent; + object->ref = 1; + object->blockType = Type; + + *ppStateBlock = (IWineD3DStateBlock *)object; for(i = 0; i < LIGHTMAP_SIZE; i++) { list_init(&object->lightMap[i]); @@ -1339,10 +1339,23 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateQuery(IWineD3DDevice *iface, WINE return hr; } - D3DCREATEOBJECTINSTANCE(object, Query) - object->lpVtbl = vtable; - object->type = Type; - object->state = QUERY_CREATED; + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if(!object) + { + ERR("Out of memory\n"); + *ppQuery = NULL; + return WINED3DERR_OUTOFVIDEOMEMORY; + } + + object->lpVtbl = vtable; + object->type = Type; + object->state = QUERY_CREATED; + object->wineD3DDevice = This; + object->parent = parent; + object->ref = 1; + + *ppQuery = (IWineD3DQuery *)object; + /* allocated the 'extended' data based on the type of query requested */ switch(Type){ case WINED3DQUERYTYPE_OCCLUSION: @@ -1536,7 +1549,14 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateSwapChain(IWineD3DDevice* iface, FIXME("The app requests more than one back buffer, this can't be supported properly. Please configure the application to use double buffering(=1 back buffer) if possible\n"); } - D3DCREATEOBJECTINSTANCE(object, SwapChain) + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if(!object) + { + ERR("Out of memory\n"); + *ppSwapChain = NULL; + return WINED3DERR_OUTOFVIDEOMEMORY; + } + switch(surface_type) { case SURFACE_GDI: object->lpVtbl = &IWineGDISwapChain_Vtbl; @@ -1548,6 +1568,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateSwapChain(IWineD3DDevice* iface, FIXME("Caller tried to create a SURFACE_UNKNOWN swapchain\n"); return WINED3DERR_INVALIDCALL; } + object->wineD3DDevice = This; + object->parent = parent; + object->ref = 1; + + *ppSwapChain = (IWineD3DSwapChain *)object; /********************* * Lookup the window Handle and the relating X window handle @@ -1844,7 +1869,20 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexDeclaration(IWineD3DDevice* TRACE("(%p) : directXVersion %u, elements %p, element_count %d, ppDecl=%p\n", This, ((IWineD3DImpl *)This->wineD3D)->dxVersion, elements, element_count, ppVertexDeclaration); - D3DCREATEOBJECTINSTANCE(object, VertexDeclaration) + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if(!object) + { + ERR("Out of memory\n"); + *ppVertexDeclaration = NULL; + return WINED3DERR_OUTOFVIDEOMEMORY; + } + + object->lpVtbl = &IWineD3DVertexDeclaration_Vtbl; + object->wineD3DDevice = This; + object->parent = parent; + object->ref = 1; + + *ppVertexDeclaration = (IWineD3DVertexDeclaration *)object; hr = IWineD3DVertexDeclaration_SetDeclaration((IWineD3DVertexDeclaration *)object, elements, element_count); if(FAILED(hr)) {

1 0

Henri Verbeet : wined3d: Fix a memory leak in CreateSwapChain() error handling.
by Alexandre Julliard 14 Jan '09

14 Jan '09

Module: wine Branch: master Commit: 4c7e72bb963d2a460f6f0375a29d512c6412d9a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c7e72bb963d2a460f6f0375a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 14 10:01:12 2009 +0100 wined3d: Fix a memory leak in CreateSwapChain() error handling. --- dlls/wined3d/device.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index dc18b22..74645b4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1566,6 +1566,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateSwapChain(IWineD3DDevice* iface, break; case SURFACE_UNKNOWN: FIXME("Caller tried to create a SURFACE_UNKNOWN swapchain\n"); + HeapFree(GetProcessHeap(), 0, object); return WINED3DERR_INVALIDCALL; } object->wineD3DDevice = This;

1 0