June 2007 - Wine-commits - list.winehq.org

James Hawkins : msi: Set the MsiNetAssemblySupport property.
by Alexandre Julliard 13 Jun '07

13 Jun '07

Module: wine Branch: master Commit: c8a8f77abe87945c48330482c1d94a3d0c527edb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8a8f77abe87945c48330482c… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Jun 12 16:33:52 2007 -0700 msi: Set the MsiNetAssemblySupport property. --- dlls/msi/package.c | 120 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 120 insertions(+), 0 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index e93ee03..1dd661d 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -35,6 +35,7 @@ #include "wincrypt.h" #include "winuser.h" #include "wininet.h" +#include "winver.h" #include "urlmon.h" #include "shlobj.h" #include "wine/unicode.h" @@ -205,6 +206,123 @@ done: return r; } +static LPWSTR get_fusion_filename(MSIPACKAGE *package) +{ + HKEY netsetup; + LONG res; + LPWSTR file; + DWORD index = 0, size; + WCHAR ver[MAX_PATH]; + WCHAR name[MAX_PATH]; + WCHAR windir[MAX_PATH]; + + static const WCHAR backslash[] = {'\\',0}; + static const WCHAR fusion[] = {'f','u','s','i','o','n','.','d','l','l',0}; + static const WCHAR sub[] = { + 'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'N','E','T',' ','F','r','a','m','e','w','o','r','k',' ','S','e','t','u','p','\\', + 'N','D','P',0 + }; + static const WCHAR subdir[] = { + 'M','i','c','r','o','s','o','f','t','.','N','E','T','\\', + 'F','r','a','m','e','w','o','r','k','\\',0 + }; + + res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, sub, 0, KEY_ENUMERATE_SUB_KEYS, &netsetup); + if (res != ERROR_SUCCESS) + return NULL; + + ver[0] = '\0'; + size = MAX_PATH; + while (RegEnumKeyExW(netsetup, index, name, &size, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + { + index++; + if (lstrcmpW(ver, name) < 0) + lstrcpyW(ver, name); + } + + RegCloseKey(netsetup); + + if (!index) + return NULL; + + GetWindowsDirectoryW(windir, MAX_PATH); + + size = lstrlenW(windir) + lstrlenW(subdir) + lstrlenW(ver) +lstrlenW(fusion) + 3; + file = msi_alloc(size * sizeof(WCHAR)); + if (!file) + return NULL; + + lstrcpyW(file, windir); + lstrcatW(file, backslash); + lstrcatW(file, subdir); + lstrcatW(file, ver); + lstrcatW(file, backslash); + lstrcatW(file, fusion); + + return file; +} + +typedef struct tagLANGANDCODEPAGE +{ + WORD wLanguage; + WORD wCodePage; +} LANGANDCODEPAGE; + +static void set_msi_assembly_prop(MSIPACKAGE *package) +{ + UINT val_len; + DWORD size, handle; + LPVOID version = NULL; + WCHAR buf[MAX_PATH]; + LPWSTR fusion, verstr; + LANGANDCODEPAGE *translate; + + static const WCHAR netasm[] = { + 'M','s','i','N','e','t','A','s','s','e','m','b','l','y','S','u','p','p','o','r','t',0 + }; + static const WCHAR translation[] = { + '\\','V','a','r','F','i','l','e','I','n','f','o', + '\\','T','r','a','n','s','l','a','t','i','o','n',0 + }; + static const WCHAR verfmt[] = { + '\\','S','t','r','i','n','g','F','i','l','e','I','n','f','o', + '\\','%','0','4','x','%','0','4','x', + '\\','P','r','o','d','u','c','t','V','e','r','s','i','o','n',0 + }; + + fusion = get_fusion_filename(package); + if (!fusion) + return; + + size = GetFileVersionInfoSizeW(fusion, &handle); + if (!size) return; + + version = msi_alloc(size); + if (!version) return; + + if (!GetFileVersionInfoW(fusion, handle, size, version)) + goto done; + + if (!VerQueryValueW(version, translation, (LPVOID *)&translate, &val_len)) + goto done; + + sprintfW(buf, verfmt, translate[0].wLanguage, translate[0].wCodePage); + + if (!VerQueryValueW(version, buf, (LPVOID *)&verstr, &val_len)) + goto done; + + if (!val_len || !verstr) + goto done; + + MSI_SetPropertyW(package, netasm, verstr); + +done: + msi_free(fusion); + msi_free(version); +} + /* * There are a whole slew of these we need to set * @@ -499,6 +617,8 @@ static VOID set_installer_properties(MSIPACKAGE *package) else ERR("Couldn't set Time property: GetTimeFormat failed with error %d\n", GetLastError()); + set_msi_assembly_prop( package ); + msi_free( check ); CloseHandle( hkey ); }

1 0

Francois Gouget : wined3d: Pass the D3DCB_CreateAdditionalSwapChain() error code to the upper layers (needed for d3d9).
by Alexandre Julliard 13 Jun '07

13 Jun '07

Module: wine Branch: master Commit: 6f24b198f3ad1be91580625ac7c72febacface6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f24b198f3ad1be91580625ac… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 12 17:49:58 2007 +0200 wined3d: Pass the D3DCB_CreateAdditionalSwapChain() error code to the upper layers (needed for d3d9). --- dlls/wined3d/device.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d81ea0b..d4a9f77 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1803,6 +1803,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreatePalette(IWineD3DDevice *iface, DW static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, WINED3DPRESENT_PARAMETERS* pPresentationParameters, D3DCB_CREATEADDITIONALSWAPCHAIN D3DCB_CreateAdditionalSwapChain) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; IWineD3DSwapChainImpl *swapchain; + HRESULT hr; DWORD state; TRACE("(%p)->(%p,%p)\n", This, pPresentationParameters, D3DCB_CreateAdditionalSwapChain); @@ -1818,9 +1819,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, WINED3DPR /* Setup the implicit swapchain */ TRACE("Creating implicit swapchain\n"); - if (FAILED(D3DCB_CreateAdditionalSwapChain((IUnknown *) This->parent, pPresentationParameters, (IWineD3DSwapChain **)&swapchain)) || !swapchain) { + hr=D3DCB_CreateAdditionalSwapChain((IUnknown *) This->parent, pPresentationParameters, (IWineD3DSwapChain **)&swapchain); + if (FAILED(hr) || !swapchain) { WARN("Failed to create implicit swapchain\n"); - return WINED3DERR_INVALIDCALL; + return hr; } This->NumberOfSwapChains = 1;

1 0

Francois Gouget : gdiplus: Add missing '\n' in Wine trace.
by Alexandre Julliard 13 Jun '07

13 Jun '07

Module: wine Branch: master Commit: 3aebd595a8d51ec90f16181e85c19a65c3257b81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3aebd595a8d51ec90f16181e8… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 12 17:50:06 2007 +0200 gdiplus: Add missing '\n' in Wine trace. --- dlls/gdiplus/gdiplus.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index 6b2683a..7ebd848 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -55,10 +55,10 @@ Status WINAPI GdiplusStartup(ULONG_PTR *token, const struct GdiplusStartupInput return UnsupportedGdiplusVersion; } else if ((input->DebugEventCallback) || (input->SuppressBackgroundThread) || (input->SuppressExternalCodecs)){ - FIXME("Unimplemented for non-default GdiplusStartupInput"); + FIXME("Unimplemented for non-default GdiplusStartupInput\n"); return NotImplemented; } else if(output) { - FIXME("Unimplemented for non-null GdiplusStartupOutput"); + FIXME("Unimplemented for non-null GdiplusStartupOutput\n"); return NotImplemented; }

1 0

Francois Gouget : winapi_check: .exe and .ocx files can also export APIs.
by Alexandre Julliard 13 Jun '07

13 Jun '07

Module: wine Branch: master Commit: 8f3187bdf160dcad643d2962ad008f18e191a890 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f3187bdf160dcad643d2962a… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 12 17:50:20 2007 +0200 winapi_check: .exe and .ocx files can also export APIs. --- tools/winapi/winapi_documentation.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winapi/winapi_documentation.pm b/tools/winapi/winapi_documentation.pm index f41cd49..a168cfa 100644 --- a/tools/winapi/winapi_documentation.pm +++ b/tools/winapi/winapi_documentation.pm @@ -125,7 +125,7 @@ sub check_documentation($) { if(!$documentation_error && $options->documentation_wrong) { foreach (split(/\n/, $documentation)) { - if (/^\s*\*\s*(\S+)\s*[$\[]\s*(\w+(?:\.(?:DRV|VXD))?)\s*\.\s*([^\s$\]]*)\s*[\)\]].*?$/) { + if (/^\s*\*\s*(\S+)\s*[$\[]\s*(\w+(?:\.(?:DRV|EXE|OCX|VXD))?)\s*\.\s*([^\s$\]]*)\s*[\)\]].*?$/) { my $external_name = $1; my $module = $2; my $ordinal = $3;

1 0

Francois Gouget : hhctrl.ocx: winapi_check expects the module name to be all uppercase in the documentation .
by Alexandre Julliard 13 Jun '07

13 Jun '07

Module: wine Branch: master Commit: 6455295e40762f29b749aad01a1b5fd66d8da376 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6455295e40762f29b749aad01… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 12 17:50:32 2007 +0200 hhctrl.ocx: winapi_check expects the module name to be all uppercase in the documentation. --- dlls/hhctrl.ocx/hhctrl.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index b687a83..44a1eb3 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -87,7 +87,7 @@ static const char *command_to_string(UINT command) } /****************************************************************** - * HtmlHelpW (hhctrl.ocx.15) + * HtmlHelpW (HHCTRL.OCX.15) */ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR data) { @@ -159,7 +159,7 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat } /****************************************************************** - * HtmlHelpA (hhctrl.ocx.14) + * HtmlHelpA (HHCTRL.OCX.14) */ HWND WINAPI HtmlHelpA(HWND caller, LPCSTR filename, UINT command, DWORD_PTR data) { @@ -223,7 +223,7 @@ HWND WINAPI HtmlHelpA(HWND caller, LPCSTR filename, UINT command, DWORD_PTR data } /****************************************************************** - * doWinMain (hhctrl.ocx.13) + * doWinMain (HHCTRL.OCX.13) */ int WINAPI doWinMain(HINSTANCE hInstance, LPSTR szCmdLine) { @@ -244,7 +244,7 @@ int WINAPI doWinMain(HINSTANCE hInstance, LPSTR szCmdLine) } /****************************************************************** - * DllGetClassObject (hhctrl.ocx.@) + * DllGetClassObject (HHCTRL.OCX.@) */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) {

1 0

Francois Gouget : msdmo: dmoreg.h should include mediaobj.h.
by Alexandre Julliard 13 Jun '07

13 Jun '07

Module: wine Branch: master Commit: 12042c040fea34069ce25c5a81b06cee845f4298 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12042c040fea34069ce25c5a8… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 12 17:50:49 2007 +0200 msdmo: dmoreg.h should include mediaobj.h. --- include/dmoreg.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/dmoreg.h b/include/dmoreg.h index 592cbd3..0852346 100644 --- a/include/dmoreg.h +++ b/include/dmoreg.h @@ -19,6 +19,8 @@ #ifndef __DMOREG_H__ #define __DMOREG_H__ +#include "mediaobj.h" + typedef struct _DMO_PARTIAL_MEDIATYPE { GUID type;

1 0

Alexandre Julliard : winex11.drv: Glyph width is rounded to 32 bits, make sure to provide enough null data.
by Alexandre Julliard 13 Jun '07

13 Jun '07

Module: wine Branch: master Commit: 1d9874a09eb99d723203ddeec334722c17fd938c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d9874a09eb99d723203ddeec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 12 16:51:31 2007 +0200 winex11.drv: Glyph width is rounded to 32 bits, make sure to provide enough null data. --- dlls/winex11.drv/xrender.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 74a7e2b..1e196a7 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -633,7 +633,7 @@ static BOOL UploadGlyph(X11DRV_PDEVICE *physDev, int glyph, AA_Type format) gsCacheEntryFormat *formatEntry; UINT ggo_format = GGO_GLYPH_INDEX; XRenderPictFormat pf; - const char zero = 0; + static const char zero[4]; switch(format) { case AA_Grey: @@ -822,7 +822,7 @@ static BOOL UploadGlyph(X11DRV_PDEVICE *physDev, int glyph, AA_Type format) wine_tsx11_lock(); pXRenderAddGlyphs(gdi_display, formatEntry->glyphset, &gid, &gi, 1, - buflen ? buf : &zero, buflen ? buflen : 1); + buflen ? buf : zero, buflen ? buflen : sizeof(zero)); wine_tsx11_unlock(); HeapFree(GetProcessHeap(), 0, buf); } else {

1 0

Stefan Dösinger : d3d8: Hold the lock in swapchain methods.
by Alexandre Julliard 13 Jun '07

13 Jun '07

Module: wine Branch: master Commit: 1bf30c037cd093312fe55d781ba46ad684294a77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bf30c037cd093312fe55d781… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat May 26 22:57:43 2007 +0200 d3d8: Hold the lock in swapchain methods. --- dlls/d3d8/swapchain.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index 5156710..25d2a0e 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -56,7 +56,9 @@ static ULONG WINAPI IDirect3DSwapChain8Impl_Release(LPDIRECT3DSWAPCHAIN8 iface) TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { + EnterCriticalSection(&d3d8_cs); IWineD3DSwapChain_Destroy(This->wineD3DSwapChain, D3D8CB_DestroyRenderTarget); + LeaveCriticalSection(&d3d8_cs); if (This->parentDevice) IUnknown_Release(This->parentDevice); HeapFree(GetProcessHeap(), 0, This); } @@ -66,8 +68,13 @@ static ULONG WINAPI IDirect3DSwapChain8Impl_Release(LPDIRECT3DSWAPCHAIN8 iface) /* IDirect3DSwapChain8 parts follow: */ static HRESULT WINAPI IDirect3DSwapChain8Impl_Present(LPDIRECT3DSWAPCHAIN8 iface, CONST RECT *pSourceRect, CONST RECT *pDestRect, HWND hDestWindowOverride, CONST RGNDATA *pDirtyRegion) { IDirect3DSwapChain8Impl *This = (IDirect3DSwapChain8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DSwapChain_Present(This->wineD3DSwapChain, pSourceRect, pDestRect, hDestWindowOverride, pDirtyRegion, 0); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DSwapChain_Present(This->wineD3DSwapChain, pSourceRect, pDestRect, hDestWindowOverride, pDirtyRegion, 0); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DSwapChain8Impl_GetBackBuffer(LPDIRECT3DSWAPCHAIN8 iface, UINT iBackBuffer, D3DBACKBUFFER_TYPE Type, IDirect3DSurface8** ppBackBuffer) { @@ -77,11 +84,13 @@ static HRESULT WINAPI IDirect3DSwapChain8Impl_GetBackBuffer(LPDIRECT3DSWAPCHAIN8 TRACE("(%p) Relay\n", This); + EnterCriticalSection(&d3d8_cs); hrc = IWineD3DSwapChain_GetBackBuffer(This->wineD3DSwapChain, iBackBuffer, (WINED3DBACKBUFFER_TYPE )Type, &mySurface); if (hrc == D3D_OK && NULL != mySurface) { IWineD3DSurface_GetParent(mySurface, (IUnknown **)ppBackBuffer); IWineD3DSurface_Release(mySurface); } + LeaveCriticalSection(&d3d8_cs); return hrc; }

1 0

Stefan Dösinger : d3d8: Hold the lock in IDirect3DVertexBuffer methods.
by Alexandre Julliard 13 Jun '07

13 Jun '07

Module: wine Branch: master Commit: 68d4fbeab3f55dbb1585ba009ae40fcbf4d1add7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68d4fbeab3f55dbb1585ba009… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun May 27 02:31:22 2007 +0200 d3d8: Hold the lock in IDirect3DVertexBuffer methods. --- dlls/d3d8/vertexbuffer.c | 67 +++++++++++++++++++++++++++++++++++++-------- 1 files changed, 55 insertions(+), 12 deletions(-) diff --git a/dlls/d3d8/vertexbuffer.c b/dlls/d3d8/vertexbuffer.c index 410659e..5dda94f 100644 --- a/dlls/d3d8/vertexbuffer.c +++ b/dlls/d3d8/vertexbuffer.c @@ -57,7 +57,9 @@ static ULONG WINAPI IDirect3DVertexBuffer8Impl_Release(LPDIRECT3DVERTEXBUFFER8 i TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { + EnterCriticalSection(&d3d8_cs); IWineD3DVertexBuffer_Release(This->wineD3DVertexBuffer); + LeaveCriticalSection(&d3d8_cs); IUnknown_Release(This->parentDevice); HeapFree(GetProcessHeap(), 0, This); } @@ -68,81 +70,122 @@ static ULONG WINAPI IDirect3DVertexBuffer8Impl_Release(LPDIRECT3DVERTEXBUFFER8 i /* IDirect3DVertexBuffer8 IDirect3DResource8 Interface follow: */ static HRESULT WINAPI IDirect3DVertexBuffer8Impl_GetDevice(LPDIRECT3DVERTEXBUFFER8 iface, IDirect3DDevice8 **ppDevice) { IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IDirect3DResource8Impl_GetDevice((LPDIRECT3DRESOURCE8) This, ppDevice); + EnterCriticalSection(&d3d8_cs); + hr = IDirect3DResource8Impl_GetDevice((LPDIRECT3DRESOURCE8) This, ppDevice); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DVertexBuffer8Impl_SetPrivateData(LPDIRECT3DVERTEXBUFFER8 iface, REFGUID refguid, CONST void *pData, DWORD SizeOfData, DWORD Flags) { IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DVertexBuffer_SetPrivateData(This->wineD3DVertexBuffer, refguid, pData, SizeOfData, Flags); + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DVertexBuffer_SetPrivateData(This->wineD3DVertexBuffer, refguid, pData, SizeOfData, Flags); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DVertexBuffer8Impl_GetPrivateData(LPDIRECT3DVERTEXBUFFER8 iface, REFGUID refguid, void *pData, DWORD *pSizeOfData) { IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DVertexBuffer_GetPrivateData(This->wineD3DVertexBuffer, refguid, pData, pSizeOfData); + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DVertexBuffer_GetPrivateData(This->wineD3DVertexBuffer, refguid, pData, pSizeOfData); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DVertexBuffer8Impl_FreePrivateData(LPDIRECT3DVERTEXBUFFER8 iface, REFGUID refguid) { IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DVertexBuffer_FreePrivateData(This->wineD3DVertexBuffer, refguid); + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DVertexBuffer_FreePrivateData(This->wineD3DVertexBuffer, refguid); + LeaveCriticalSection(&d3d8_cs); + return hr; } static DWORD WINAPI IDirect3DVertexBuffer8Impl_SetPriority(LPDIRECT3DVERTEXBUFFER8 iface, DWORD PriorityNew) { IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)iface; + DWORD ret; TRACE("(%p) Relay\n", This); - return IWineD3DVertexBuffer_SetPriority(This->wineD3DVertexBuffer, PriorityNew); + EnterCriticalSection(&d3d8_cs); + ret = IWineD3DVertexBuffer_SetPriority(This->wineD3DVertexBuffer, PriorityNew); + LeaveCriticalSection(&d3d8_cs); + return ret; } static DWORD WINAPI IDirect3DVertexBuffer8Impl_GetPriority(LPDIRECT3DVERTEXBUFFER8 iface) { IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)iface; + DWORD ret; TRACE("(%p) Relay\n", This); - return IWineD3DVertexBuffer_GetPriority(This->wineD3DVertexBuffer); + EnterCriticalSection(&d3d8_cs); + ret = IWineD3DVertexBuffer_GetPriority(This->wineD3DVertexBuffer); + LeaveCriticalSection(&d3d8_cs); + return ret; } static void WINAPI IDirect3DVertexBuffer8Impl_PreLoad(LPDIRECT3DVERTEXBUFFER8 iface) { IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)iface; TRACE("(%p) Relay\n", This); - IWineD3DVertexBuffer_PreLoad(This->wineD3DVertexBuffer); - return; + EnterCriticalSection(&d3d8_cs); + IWineD3DVertexBuffer_PreLoad(This->wineD3DVertexBuffer); + LeaveCriticalSection(&d3d8_cs); } static D3DRESOURCETYPE WINAPI IDirect3DVertexBuffer8Impl_GetType(LPDIRECT3DVERTEXBUFFER8 iface) { IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)iface; + D3DRESOURCETYPE type; TRACE("(%p) Relay\n", This); - return IWineD3DVertexBuffer_GetType(This->wineD3DVertexBuffer); + EnterCriticalSection(&d3d8_cs); + type = IWineD3DVertexBuffer_GetType(This->wineD3DVertexBuffer); + LeaveCriticalSection(&d3d8_cs); + return type; } /* IDirect3DVertexBuffer8 Interface follow: */ static HRESULT WINAPI IDirect3DVertexBuffer8Impl_Lock(LPDIRECT3DVERTEXBUFFER8 iface, UINT OffsetToLock, UINT SizeToLock, BYTE **ppbData, DWORD Flags) { IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DVertexBuffer_Lock(This->wineD3DVertexBuffer, OffsetToLock, SizeToLock, ppbData, Flags); + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DVertexBuffer_Lock(This->wineD3DVertexBuffer, OffsetToLock, SizeToLock, ppbData, Flags); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DVertexBuffer8Impl_Unlock(LPDIRECT3DVERTEXBUFFER8 iface) { IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DVertexBuffer_Unlock(This->wineD3DVertexBuffer); + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DVertexBuffer_Unlock(This->wineD3DVertexBuffer); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DVertexBuffer8Impl_GetDesc(LPDIRECT3DVERTEXBUFFER8 iface, D3DVERTEXBUFFER_DESC *pDesc) { IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DVertexBuffer_GetDesc(This->wineD3DVertexBuffer, (WINED3DVERTEXBUFFER_DESC *) pDesc); + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DVertexBuffer_GetDesc(This->wineD3DVertexBuffer, (WINED3DVERTEXBUFFER_DESC *) pDesc); + LeaveCriticalSection(&d3d8_cs); + return hr; } const IDirect3DVertexBuffer8Vtbl Direct3DVertexBuffer8_Vtbl =

1 0

Stefan Dösinger : d3d8: Hold the lock in volume methods.
by Alexandre Julliard 13 Jun '07

13 Jun '07

Module: wine Branch: master Commit: 3e8948c173de36435a5bdd05a7bc0d6b888a600f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e8948c173de36435a5bdd05a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun May 27 02:41:41 2007 +0200 d3d8: Hold the lock in volume methods. --- dlls/d3d8/volume.c | 45 +++++++++++++++++++++++++++++++++++++++------ 1 files changed, 39 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index 205c66a..bea2ea9 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -72,7 +72,9 @@ static ULONG WINAPI IDirect3DVolume8Impl_Release(LPDIRECT3DVOLUME8 iface) { TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { + EnterCriticalSection(&d3d8_cs); IWineD3DVolume_Release(This->wineD3DVolume); + LeaveCriticalSection(&d3d8_cs); HeapFree(GetProcessHeap(), 0, This); } @@ -85,28 +87,45 @@ static HRESULT WINAPI IDirect3DVolume8Impl_GetDevice(LPDIRECT3DVOLUME8 iface, ID IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; IWineD3DDevice *myDevice = NULL; + EnterCriticalSection(&d3d8_cs); IWineD3DVolume_GetDevice(This->wineD3DVolume, &myDevice); IWineD3DDevice_GetParent(myDevice, (IUnknown **)ppDevice); IWineD3DDevice_Release(myDevice); + LeaveCriticalSection(&d3d8_cs); return D3D_OK; } static HRESULT WINAPI IDirect3DVolume8Impl_SetPrivateData(LPDIRECT3DVOLUME8 iface, REFGUID refguid, CONST void *pData, DWORD SizeOfData, DWORD Flags) { IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DVolume_SetPrivateData(This->wineD3DVolume, refguid, pData, SizeOfData, Flags); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DVolume_SetPrivateData(This->wineD3DVolume, refguid, pData, SizeOfData, Flags); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DVolume8Impl_GetPrivateData(LPDIRECT3DVOLUME8 iface, REFGUID refguid, void *pData, DWORD* pSizeOfData) { IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DVolume_GetPrivateData(This->wineD3DVolume, refguid, pData, pSizeOfData); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DVolume_GetPrivateData(This->wineD3DVolume, refguid, pData, pSizeOfData); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DVolume8Impl_FreePrivateData(LPDIRECT3DVOLUME8 iface, REFGUID refguid) { IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DVolume_FreePrivateData(This->wineD3DVolume, refguid); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DVolume_FreePrivateData(This->wineD3DVolume, refguid); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DVolume8Impl_GetContainer(LPDIRECT3DVOLUME8 iface, REFIID riid, void **ppContainer) { @@ -130,6 +149,7 @@ static HRESULT WINAPI IDirect3DVolume8Impl_GetContainer(LPDIRECT3DVOLUME8 iface, static HRESULT WINAPI IDirect3DVolume8Impl_GetDesc(LPDIRECT3DVOLUME8 iface, D3DVOLUME_DESC *pDesc) { IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; + HRESULT hr; WINED3DVOLUME_DESC wined3ddesc; TRACE("(%p) Relay\n", This); @@ -144,19 +164,32 @@ static HRESULT WINAPI IDirect3DVolume8Impl_GetDesc(LPDIRECT3DVOLUME8 iface, D3DV wined3ddesc.Height = &pDesc->Height; wined3ddesc.Depth = &pDesc->Depth; - return IWineD3DVolume_GetDesc(This->wineD3DVolume, &wined3ddesc); + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DVolume_GetDesc(This->wineD3DVolume, &wined3ddesc); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DVolume8Impl_LockBox(LPDIRECT3DVOLUME8 iface, D3DLOCKED_BOX *pLockedVolume, CONST D3DBOX *pBox, DWORD Flags) { IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; + HRESULT hr; TRACE("(%p) relay %p %p %p %d\n", This, This->wineD3DVolume, pLockedVolume, pBox, Flags); - return IWineD3DVolume_LockBox(This->wineD3DVolume, (WINED3DLOCKED_BOX *) pLockedVolume, (CONST WINED3DBOX *) pBox, Flags); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DVolume_LockBox(This->wineD3DVolume, (WINED3DLOCKED_BOX *) pLockedVolume, (CONST WINED3DBOX *) pBox, Flags); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DVolume8Impl_UnlockBox(LPDIRECT3DVOLUME8 iface) { IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; + HRESULT hr; TRACE("(%p) relay %p\n", This, This->wineD3DVolume); - return IWineD3DVolume_UnlockBox(This->wineD3DVolume); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DVolume_UnlockBox(This->wineD3DVolume); + LeaveCriticalSection(&d3d8_cs); + return hr; } static const IDirect3DVolume8Vtbl Direct3DVolume8_Vtbl =

1 0