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

Stefan Dösinger : d3d9: Hold the lock in indexbuffer methods.
by Alexandre Julliard 18 Jun '07

18 Jun '07

Module: wine Branch: master Commit: 896568f209813b30c4f80c561357f7ff63881f25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=896568f209813b30c4f80c561… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jun 12 00:59:16 2007 +0200 d3d9: Hold the lock in indexbuffer methods. --- dlls/d3d9/indexbuffer.c | 75 ++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 65 insertions(+), 10 deletions(-) diff --git a/dlls/d3d9/indexbuffer.c b/dlls/d3d9/indexbuffer.c index 6c18867..d886bd7 100644 --- a/dlls/d3d9/indexbuffer.c +++ b/dlls/d3d9/indexbuffer.c @@ -57,7 +57,9 @@ static ULONG WINAPI IDirect3DIndexBuffer9Impl_Release(LPDIRECT3DINDEXBUFFER9 ifa TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { + EnterCriticalSection(&d3d9_cs); IWineD3DIndexBuffer_Release(This->wineD3DIndexBuffer); + LeaveCriticalSection(&d3d9_cs); IUnknown_Release(This->parentDevice); HeapFree(GetProcessHeap(), 0, This); } @@ -67,69 +69,122 @@ static ULONG WINAPI IDirect3DIndexBuffer9Impl_Release(LPDIRECT3DINDEXBUFFER9 ifa /* IDirect3DIndexBuffer9 IDirect3DResource9 Interface follow: */ static HRESULT WINAPI IDirect3DIndexBuffer9Impl_GetDevice(LPDIRECT3DINDEXBUFFER9 iface, IDirect3DDevice9** ppDevice) { IDirect3DIndexBuffer9Impl *This = (IDirect3DIndexBuffer9Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IDirect3DResource9Impl_GetDevice((LPDIRECT3DRESOURCE9) This, ppDevice); + + EnterCriticalSection(&d3d9_cs); + hr = IDirect3DResource9Impl_GetDevice((LPDIRECT3DRESOURCE9) This, ppDevice); + LeaveCriticalSection(&d3d9_cs); + return hr; } static HRESULT WINAPI IDirect3DIndexBuffer9Impl_SetPrivateData(LPDIRECT3DINDEXBUFFER9 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) { IDirect3DIndexBuffer9Impl *This = (IDirect3DIndexBuffer9Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DIndexBuffer_SetPrivateData(This->wineD3DIndexBuffer, refguid, pData, SizeOfData, Flags); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3DIndexBuffer_SetPrivateData(This->wineD3DIndexBuffer, refguid, pData, SizeOfData, Flags); + LeaveCriticalSection(&d3d9_cs); + return hr; } static HRESULT WINAPI IDirect3DIndexBuffer9Impl_GetPrivateData(LPDIRECT3DINDEXBUFFER9 iface, REFGUID refguid, void* pData, DWORD* pSizeOfData) { IDirect3DIndexBuffer9Impl *This = (IDirect3DIndexBuffer9Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DIndexBuffer_GetPrivateData(This->wineD3DIndexBuffer, refguid, pData, pSizeOfData); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3DIndexBuffer_GetPrivateData(This->wineD3DIndexBuffer, refguid, pData, pSizeOfData); + LeaveCriticalSection(&d3d9_cs); + return hr; } static HRESULT WINAPI IDirect3DIndexBuffer9Impl_FreePrivateData(LPDIRECT3DINDEXBUFFER9 iface, REFGUID refguid) { IDirect3DIndexBuffer9Impl *This = (IDirect3DIndexBuffer9Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DIndexBuffer_FreePrivateData(This->wineD3DIndexBuffer, refguid); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3DIndexBuffer_FreePrivateData(This->wineD3DIndexBuffer, refguid); + LeaveCriticalSection(&d3d9_cs); + return hr; } static DWORD WINAPI IDirect3DIndexBuffer9Impl_SetPriority(LPDIRECT3DINDEXBUFFER9 iface, DWORD PriorityNew) { IDirect3DIndexBuffer9Impl *This = (IDirect3DIndexBuffer9Impl *)iface; + DWORD ret; TRACE("(%p) Relay\n", This); - return IWineD3DIndexBuffer_SetPriority(This->wineD3DIndexBuffer, PriorityNew); + + EnterCriticalSection(&d3d9_cs); + ret = IWineD3DIndexBuffer_SetPriority(This->wineD3DIndexBuffer, PriorityNew); + LeaveCriticalSection(&d3d9_cs); + return ret; } static DWORD WINAPI IDirect3DIndexBuffer9Impl_GetPriority(LPDIRECT3DINDEXBUFFER9 iface) { IDirect3DIndexBuffer9Impl *This = (IDirect3DIndexBuffer9Impl *)iface; + DWORD ret; TRACE("(%p) Relay\n", This); - return IWineD3DIndexBuffer_GetPriority(This->wineD3DIndexBuffer); + + EnterCriticalSection(&d3d9_cs); + ret = IWineD3DIndexBuffer_GetPriority(This->wineD3DIndexBuffer); + LeaveCriticalSection(&d3d9_cs); + return ret; } static void WINAPI IDirect3DIndexBuffer9Impl_PreLoad(LPDIRECT3DINDEXBUFFER9 iface) { IDirect3DIndexBuffer9Impl *This = (IDirect3DIndexBuffer9Impl *)iface; TRACE("(%p) Relay\n", This); + + EnterCriticalSection(&d3d9_cs); IWineD3DIndexBuffer_PreLoad(This->wineD3DIndexBuffer); + LeaveCriticalSection(&d3d9_cs); } static D3DRESOURCETYPE WINAPI IDirect3DIndexBuffer9Impl_GetType(LPDIRECT3DINDEXBUFFER9 iface) { IDirect3DIndexBuffer9Impl *This = (IDirect3DIndexBuffer9Impl *)iface; + D3DRESOURCETYPE ret; TRACE("(%p) Relay\n", This); - return IWineD3DIndexBuffer_GetType(This->wineD3DIndexBuffer); + + EnterCriticalSection(&d3d9_cs); + ret = IWineD3DIndexBuffer_GetType(This->wineD3DIndexBuffer); + LeaveCriticalSection(&d3d9_cs); + return ret; } /* IDirect3DIndexBuffer9 Interface follow: */ static HRESULT WINAPI IDirect3DIndexBuffer9Impl_Lock(LPDIRECT3DINDEXBUFFER9 iface, UINT OffsetToLock, UINT SizeToLock, void** ppbData, DWORD Flags) { IDirect3DIndexBuffer9Impl *This = (IDirect3DIndexBuffer9Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DIndexBuffer_Lock(This->wineD3DIndexBuffer, OffsetToLock, SizeToLock, (BYTE **)ppbData, Flags); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3DIndexBuffer_Lock(This->wineD3DIndexBuffer, OffsetToLock, SizeToLock, (BYTE **)ppbData, Flags); + LeaveCriticalSection(&d3d9_cs); + return hr; } static HRESULT WINAPI IDirect3DIndexBuffer9Impl_Unlock(LPDIRECT3DINDEXBUFFER9 iface) { IDirect3DIndexBuffer9Impl *This = (IDirect3DIndexBuffer9Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DIndexBuffer_Unlock(This->wineD3DIndexBuffer); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3DIndexBuffer_Unlock(This->wineD3DIndexBuffer); + LeaveCriticalSection(&d3d9_cs); + return hr; } static HRESULT WINAPI IDirect3DIndexBuffer9Impl_GetDesc(LPDIRECT3DINDEXBUFFER9 iface, D3DINDEXBUFFER_DESC *pDesc) { IDirect3DIndexBuffer9Impl *This = (IDirect3DIndexBuffer9Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DIndexBuffer_GetDesc(This->wineD3DIndexBuffer, (WINED3DINDEXBUFFER_DESC *) pDesc); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3DIndexBuffer_GetDesc(This->wineD3DIndexBuffer, (WINED3DINDEXBUFFER_DESC *) pDesc); + LeaveCriticalSection(&d3d9_cs); + return hr; }

1 0

Stefan Dösinger : d3d9: Hold the lock in Pixelshader functions.
by Alexandre Julliard 18 Jun '07

18 Jun '07

Module: wine Branch: master Commit: 5194ce19727f0409f1c0f0ccdca194c770c9f215 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5194ce19727f0409f1c0f0ccd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jun 12 10:11:21 2007 +0200 d3d9: Hold the lock in Pixelshader functions. --- dlls/d3d9/pixelshader.c | 53 +++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 47 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/pixelshader.c b/dlls/d3d9/pixelshader.c index a6a635e..8eeb3d6 100644 --- a/dlls/d3d9/pixelshader.c +++ b/dlls/d3d9/pixelshader.c @@ -56,7 +56,9 @@ static ULONG WINAPI IDirect3DPixelShader9Impl_Release(LPDIRECT3DPIXELSHADER9 ifa TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { + EnterCriticalSection(&d3d9_cs); IWineD3DPixelShader_Release(This->wineD3DPixelShader); + LeaveCriticalSection(&d3d9_cs); IUnknown_Release(This->parentDevice); HeapFree(GetProcessHeap(), 0, This); } @@ -70,17 +72,24 @@ static HRESULT WINAPI IDirect3DPixelShader9Impl_GetDevice(LPDIRECT3DPIXELSHADER9 TRACE("(%p) : Relay\n", This); + EnterCriticalSection(&d3d9_cs); IWineD3DPixelShader_GetDevice(This->wineD3DPixelShader, &myDevice); IWineD3DDevice_GetParent(myDevice, (IUnknown **)ppDevice); IWineD3DDevice_Release(myDevice); + LeaveCriticalSection(&d3d9_cs); TRACE("(%p) returning (%p)\n", This, *ppDevice); return D3D_OK; } static HRESULT WINAPI IDirect3DPixelShader9Impl_GetFunction(LPDIRECT3DPIXELSHADER9 iface, VOID* pData, UINT* pSizeOfData) { IDirect3DPixelShader9Impl *This = (IDirect3DPixelShader9Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DPixelShader_GetFunction(This->wineD3DPixelShader, pData, pSizeOfData); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3DPixelShader_GetFunction(This->wineD3DPixelShader, pData, pSizeOfData); + LeaveCriticalSection(&d3d9_cs); + return hr; } @@ -118,7 +127,9 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreatePixelShader(LPDIRECT3DDEVICE9 iface, C object->ref = 1; object->lpVtbl = &Direct3DPixelShader9_Vtbl; + EnterCriticalSection(&d3d9_cs); hrc = IWineD3DDevice_CreatePixelShader(This->WineD3DDevice, pFunction, &object->wineD3DPixelShader , (IUnknown *)object); + LeaveCriticalSection(&d3d9_cs); if (hrc != D3D_OK) { /* free up object */ @@ -139,7 +150,10 @@ HRESULT WINAPI IDirect3DDevice9Impl_SetPixelShader(LPDIRECT3DDEVICE9 iface, IDir IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; IDirect3DPixelShader9Impl *shader = (IDirect3DPixelShader9Impl *)pShader; TRACE("(%p) Relay\n", This); + + EnterCriticalSection(&d3d9_cs); IWineD3DDevice_SetPixelShader(This->WineD3DDevice, shader == NULL ? NULL :shader->wineD3DPixelShader); + LeaveCriticalSection(&d3d9_cs); return D3D_OK; } @@ -154,6 +168,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetPixelShader(LPDIRECT3DDEVICE9 iface, IDir return D3DERR_INVALIDCALL; } + EnterCriticalSection(&d3d9_cs); hrc = IWineD3DDevice_GetPixelShader(This->WineD3DDevice, &object); if (hrc == D3D_OK && object != NULL) { hrc = IWineD3DPixelShader_GetParent(object, (IUnknown **)ppShader); @@ -161,6 +176,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetPixelShader(LPDIRECT3DDEVICE9 iface, IDir } else { *ppShader = NULL; } + LeaveCriticalSection(&d3d9_cs); TRACE("(%p) : returning %p\n", This, *ppShader); return hrc; @@ -168,8 +184,13 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetPixelShader(LPDIRECT3DDEVICE9 iface, IDir HRESULT WINAPI IDirect3DDevice9Impl_SetPixelShaderConstantF(LPDIRECT3DDEVICE9 iface, UINT Register, CONST float* pConstantData, UINT Vector4fCount) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DDevice_SetPixelShaderConstantF(This->WineD3DDevice, Register, pConstantData, Vector4fCount); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3DDevice_SetPixelShaderConstantF(This->WineD3DDevice, Register, pConstantData, Vector4fCount); + LeaveCriticalSection(&d3d9_cs); + return hr; } HRESULT WINAPI IDirect3DDevice9Impl_GetPixelShaderConstantF(LPDIRECT3DDEVICE9 iface, UINT Register, float* pConstantData, UINT Vector4fCount) { @@ -180,24 +201,44 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetPixelShaderConstantF(LPDIRECT3DDEVICE9 if HRESULT WINAPI IDirect3DDevice9Impl_SetPixelShaderConstantI(LPDIRECT3DDEVICE9 iface, UINT Register, CONST int* pConstantData, UINT Vector4iCount) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DDevice_SetPixelShaderConstantI(This->WineD3DDevice, Register, pConstantData, Vector4iCount); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3DDevice_SetPixelShaderConstantI(This->WineD3DDevice, Register, pConstantData, Vector4iCount); + LeaveCriticalSection(&d3d9_cs); + return hr; } HRESULT WINAPI IDirect3DDevice9Impl_GetPixelShaderConstantI(LPDIRECT3DDEVICE9 iface, UINT Register, int* pConstantData, UINT Vector4iCount) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DDevice_GetPixelShaderConstantI(This->WineD3DDevice, Register, pConstantData, Vector4iCount); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3DDevice_GetPixelShaderConstantI(This->WineD3DDevice, Register, pConstantData, Vector4iCount); + LeaveCriticalSection(&d3d9_cs); + return hr; } HRESULT WINAPI IDirect3DDevice9Impl_SetPixelShaderConstantB(LPDIRECT3DDEVICE9 iface, UINT Register, CONST BOOL* pConstantData, UINT BoolCount) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DDevice_SetPixelShaderConstantB(This->WineD3DDevice, Register, pConstantData, BoolCount); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3DDevice_SetPixelShaderConstantB(This->WineD3DDevice, Register, pConstantData, BoolCount); + LeaveCriticalSection(&d3d9_cs); + return hr; } HRESULT WINAPI IDirect3DDevice9Impl_GetPixelShaderConstantB(LPDIRECT3DDEVICE9 iface, UINT Register, BOOL* pConstantData, UINT BoolCount) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DDevice_GetPixelShaderConstantB(This->WineD3DDevice, Register, pConstantData, BoolCount); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3DDevice_GetPixelShaderConstantB(This->WineD3DDevice, Register, pConstantData, BoolCount); + LeaveCriticalSection(&d3d9_cs); + return hr; }

1 0

Misha Koshelev : wine.inf: Quote %1 for Msi. Package shell actions per native.
by Alexandre Julliard 18 Jun '07

18 Jun '07

Module: wine Branch: master Commit: 1a65db6076b121e23bcef802e876a1061e8ce46f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a65db6076b121e23bcef802e… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Sat Jun 16 16:00:40 2007 -0500 wine.inf: Quote %1 for Msi.Package shell actions per native. --- tools/wine.inf | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 2440c59..01bf848 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -129,9 +129,9 @@ HKCR,lnkfile\CLSID,,2,"{00021401-0000-0000-C000-000000000046}" HKCR,lnkfile\shellex\IconHandler,,2,"{00021401-0000-0000-C000-000000000046}" HKCR,lnkfile\shellex\ContextMenuHandlers\{00021401-0000-0000-C000-000000000046},,0x10, HKCR,Msi.Package\DefaultIcon,,2,"msiexec.exe" -HKCR,Msi.Package\shell\Open\command,,2,"msiexec /i %1" -HKCR,Msi.Package\shell\Repair\command,,2,"msiexec /f %1" -HKCR,Msi.Package\shell\Uninstall\command,,2,"msiexec /x %1" +HKCR,Msi.Package\shell\Open\command,,2,"msiexec /i ""%1""" +HKCR,Msi.Package\shell\Repair\command,,2,"msiexec /f ""%1""" +HKCR,Msi.Package\shell\Uninstall\command,,2,"msiexec /x ""%1""" HKCR,rtffile\shell\open\command,,2,"%11%\wordpad.exe %1" HKCR,rtffile\shell\print\command,,2,"%11%\wordpad.exe /p %1" HKCR,txtfile\shell\open\command,,2,"%11%\notepad.exe %1"

1 0

James Hawkins : msi: Implement MsiApplyPatchW.
by Alexandre Julliard 18 Jun '07

18 Jun '07

Module: wine Branch: master Commit: d8860d34e4008299320a0cbd0aea033b608a1395 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8860d34e4008299320a0cbd0… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Jun 15 14:08:37 2007 -0700 msi: Implement MsiApplyPatchW. --- dlls/msi/msi.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- include/msi.h | 3 +- 2 files changed, 85 insertions(+), 3 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index ad9c5b4..59a6f67 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -30,6 +30,7 @@ #include "shlwapi.h" #include "wine/debug.h" #include "msi.h" +#include "msidefs.h" #include "msiquery.h" #include "msipriv.h" #include "wincrypt.h" @@ -256,9 +257,89 @@ done: UINT WINAPI MsiApplyPatchW(LPCWSTR szPatchPackage, LPCWSTR szInstallPackage, INSTALLTYPE eInstallType, LPCWSTR szCommandLine) { - FIXME("%s %s %d %s\n", debugstr_w(szPatchPackage), debugstr_w(szInstallPackage), + MSIHANDLE patch, info; + UINT r, type; + DWORD size = 0; + LPCWSTR cmd_ptr = szCommandLine; + LPWSTR beg, end; + LPWSTR cmd = NULL, codes = NULL; + + static const WCHAR space[] = {' ',0}; + static const WCHAR patcheq[] = {'P','A','T','C','H','=',0}; + static WCHAR empty[] = {0}; + + TRACE("%s %s %d %s\n", debugstr_w(szPatchPackage), debugstr_w(szInstallPackage), eInstallType, debugstr_w(szCommandLine)); - return ERROR_CALL_NOT_IMPLEMENTED; + + if (szInstallPackage || eInstallType == INSTALLTYPE_NETWORK_IMAGE || + eInstallType == INSTALLTYPE_SINGLE_INSTANCE) + { + FIXME("Only reading target products from patch\n"); + return ERROR_CALL_NOT_IMPLEMENTED; + } + + r = MsiOpenDatabaseW(szPatchPackage, MSIDBOPEN_READONLY, &patch); + if (r != ERROR_SUCCESS) + return r; + + r = MsiGetSummaryInformationW(patch, NULL, 0, &info); + if (r != ERROR_SUCCESS) + goto done; + + r = MsiSummaryInfoGetPropertyW(info, PID_TEMPLATE, &type, NULL, NULL, empty, &size); + if (r != ERROR_MORE_DATA || !size || type != VT_LPSTR) + { + ERR("Failed to read product codes from patch\n"); + goto done; + } + + codes = msi_alloc(++size * sizeof(WCHAR)); + if (!codes) + { + r = ERROR_OUTOFMEMORY; + goto done; + } + + r = MsiSummaryInfoGetPropertyW(info, PID_TEMPLATE, &type, NULL, NULL, codes, &size); + if (r != ERROR_SUCCESS) + goto done; + + if (!szCommandLine) + cmd_ptr = empty; + + size = lstrlenW(cmd_ptr) + lstrlenW(patcheq) + lstrlenW(szPatchPackage) + 1; + cmd = msi_alloc(size * sizeof(WCHAR)); + if (!cmd) + { + r = ERROR_OUTOFMEMORY; + goto done; + } + + lstrcpyW(cmd, cmd_ptr); + if (szCommandLine) lstrcatW(cmd, space); + lstrcatW(cmd, patcheq); + lstrcatW(cmd, szPatchPackage); + + beg = codes; + while ((end = strchrW(beg, '}'))) + { + *(end + 1) = '\0'; + + r = MsiConfigureProductExW(beg, INSTALLLEVEL_DEFAULT, INSTALLSTATE_DEFAULT, cmd); + if (r != ERROR_SUCCESS) + goto done; + + beg = end + 2; + } + +done: + msi_free(cmd); + msi_free(codes); + + MsiCloseHandle(info); + MsiCloseHandle(patch); + + return r; } UINT WINAPI MsiConfigureProductExW(LPCWSTR szProduct, int iInstallLevel, diff --git a/include/msi.h b/include/msi.h index 28b9c51..3fb214b 100644 --- a/include/msi.h +++ b/include/msi.h @@ -167,7 +167,8 @@ typedef enum tagSCRIPTFLAGS typedef enum tagINSTALLTYPE { INSTALLTYPE_DEFAULT = 0, - INSTALLTYPE_NETWORK_IMAGE = 1 + INSTALLTYPE_NETWORK_IMAGE = 1, + INSTALLTYPE_SINGLE_INSTANCE = 2, } INSTALLTYPE; typedef enum tagMSIINSTALLCONTEXT

1 0

James Hawkins : msi: Patches are applied based on ProductCode, not ProductID.
by Alexandre Julliard 18 Jun '07

18 Jun '07

Module: wine Branch: master Commit: 261e1179bb2903590794473668dc93ffd3785ff7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=261e1179bb290359079447366… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Jun 15 14:12:13 2007 -0700 msi: Patches are applied based on ProductCode, not ProductID. --- dlls/msi/action.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index d09ddd0..ab3c914 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -454,15 +454,15 @@ static UINT msi_apply_substorage_transform( MSIPACKAGE *package, static UINT msi_check_patch_applicable( MSIPACKAGE *package, MSISUMMARYINFO *si ) { - static const WCHAR szProdID[] = { 'P','r','o','d','u','c','t','I','D',0 }; - LPWSTR guid_list, *guids, product_id; + static const WCHAR szProdCode[] = { 'P','r','o','d','u','c','t','C','o','d','e',0 }; + LPWSTR guid_list, *guids, product_code; UINT i, ret = ERROR_FUNCTION_FAILED; - product_id = msi_dup_property( package, szProdID ); - if (!product_id) + product_code = msi_dup_property( package, szProdCode ); + if (!product_code) { - /* FIXME: the property ProductID should be written into the DB somewhere */ - ERR("no product ID to check\n"); + /* FIXME: the property ProductCode should be written into the DB somewhere */ + ERR("no product code to check\n"); return ERROR_SUCCESS; } @@ -470,12 +470,12 @@ static UINT msi_check_patch_applicable( MSIPACKAGE *package, MSISUMMARYINFO *si guids = msi_split_string( guid_list, ';' ); for ( i = 0; guids[i] && ret != ERROR_SUCCESS; i++ ) { - if (!lstrcmpW( guids[i], product_id )) + if (!lstrcmpW( guids[i], product_code )) ret = ERROR_SUCCESS; } msi_free( guids ); msi_free( guid_list ); - msi_free( product_id ); + msi_free( product_code ); return ret; }

1 0

Vitaly Budovski : winealsa: Fix incorrect callback private value.
by Alexandre Julliard 18 Jun '07

18 Jun '07

Module: wine Branch: master Commit: e0940226cdcc65985a07a5ad923f977c076ec8a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0940226cdcc65985a07a5ad9… Author: Vitaly Budovski <vbudovski(a)gmail.com> Date: Sun Jun 17 02:11:02 2007 +1000 winealsa: Fix incorrect callback private value. --- dlls/winealsa.drv/mixer.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winealsa.drv/mixer.c b/dlls/winealsa.drv/mixer.c index 83c82b7..062b2ea 100644 --- a/dlls/winealsa.drv/mixer.c +++ b/dlls/winealsa.drv/mixer.c @@ -342,7 +342,7 @@ static void filllines(mixer *mmixer, snd_mixer_elem_t *mastelem, snd_mixer_elem_ mline->chans = chans(mmixer, mastelem, 0); snd_mixer_elem_set_callback(mastelem, &elem_callback); - snd_mixer_elem_set_callback_private(mastelem, &mmixer); + snd_mixer_elem_set_callback_private(mastelem, mmixer); /* Capture control * Note: since mmixer->dests = 1, it means only playback control is visible @@ -361,7 +361,7 @@ static void filllines(mixer *mmixer, snd_mixer_elem_t *mastelem, snd_mixer_elem_ mline->chans = chans(mmixer, captelem, 1); snd_mixer_elem_set_callback(captelem, &elem_callback); - snd_mixer_elem_set_callback_private(captelem, &mmixer); + snd_mixer_elem_set_callback_private(captelem, mmixer); } for (elem = snd_mixer_first_elem(mmixer->mix); elem; elem = snd_mixer_elem_next(elem)) @@ -391,7 +391,7 @@ static void filllines(mixer *mmixer, snd_mixer_elem_t *mastelem, snd_mixer_elem_ } snd_mixer_elem_set_callback(elem, &elem_callback); - snd_mixer_elem_set_callback_private(elem, &mmixer); + snd_mixer_elem_set_callback_private(elem, mmixer); } }

1 0

Misha Koshelev : shell32: Conform to native in SHELL_ArgifyW for unquoted %1 in registry keys.
by Alexandre Julliard 18 Jun '07

18 Jun '07

Module: wine Branch: master Commit: 9be151c2e9d9301c128c387cdb2d47a464012864 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9be151c2e9d9301c128c387cd… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Sat Jun 16 16:00:08 2007 -0500 shell32: Conform to native in SHELL_ArgifyW for unquoted %1 in registry keys. --- dlls/shell32/shlexec.c | 29 ++++------------------------- dlls/shell32/tests/shlexec.c | 2 +- 2 files changed, 5 insertions(+), 26 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index edb65ea..45f7621 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -156,32 +156,11 @@ static BOOL SHELL_ArgifyW(WCHAR* out, int len, const WCHAR* fmt, const WCHAR* lp else cmd = lpFile; - /* Add double quotation marks unless we already have them - (e.g.: "file://%1" %* for exefile) or unless the arg is already - enclosed in double quotation marks */ - if ((res == out || *(fmt + 1) != '"') && *cmd != '"') + used += strlenW(cmd); + if (used < len) { - used++; - if (used < len) - *res++ = '"'; - used += strlenW(cmd); - if (used < len) - { - strcpyW(res, cmd); - res += strlenW(cmd); - } - used++; - if (used < len) - *res++ = '"'; - } - else - { - used += strlenW(cmd); - if (used < len) - { - strcpyW(res, cmd); - res += strlenW(cmd); - } + strcpyW(res, cmd); + res += strlenW(cmd); } } found_p1 = TRUE; diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 7fc34fb..66b9406 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1064,7 +1064,7 @@ static dde_tests_t dde_tests[] = /* Test unquoted %1 in command and ddeexec * (test filename has space) */ - {"%1", "[open(%1)]", "shlexec", "dde", NULL, 2, "[open(%s)]", 0xa, 33}, + {"%1", "[open(%1)]", "shlexec", "dde", NULL, 2, "[open(%s)]", 0x0, 33}, /* Test ifexec precedence over ddeexec */ {"", "[open(\"%1\")]", "shlexec", "dde", "[ifexec(\"%1\")]", FALSE, "[ifexec(\"%s\")]", 0x0, 33},

1 0

Francois Gouget : regedit: Add missing '\n' to an error message.
by Alexandre Julliard 18 Jun '07

18 Jun '07

Module: wine Branch: master Commit: 8585fb3112b5ae204f0e2dd9844aa97dd2d9d560 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8585fb3112b5ae204f0e2dd98… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 15 18:57:57 2007 +0200 regedit: Add missing '\n' to an error message. --- programs/regedit/regproc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index d1d757d..ee7e195 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -62,7 +62,7 @@ static HKEY reg_class_keys[REG_CLASS_NUMBER] = { #define CHECK_ENOUGH_MEMORY(p) \ if (!(p)) \ { \ - fprintf(stderr,"%s: file %s, line %d: Not enough memory", \ + fprintf(stderr,"%s: file %s, line %d: Not enough memory\n", \ getAppName(), __FILE__, __LINE__); \ exit(NOT_ENOUGH_MEMORY); \ }

1 0

Francois Gouget : regedit: Don' t allow square-bracketed registry paths on the command line ( to match native).
by Alexandre Julliard 18 Jun '07

18 Jun '07

Module: wine Branch: master Commit: f6d5738d9a1a3117e2a43c4cb2ab673db37ed59e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6d5738d9a1a3117e2a43c4cb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 15 18:58:42 2007 +0200 regedit: Don't allow square-bracketed registry paths on the command line (to match native). The only place they are allowed is in .reg files, so exclusively deal with them in processRegEntry(). Fix detection of the trailing ']' in processRegEntry(): it can be followed by some garbage. --- programs/regedit/regproc.c | 54 ++++++++++++------------------------------- 1 files changed, 15 insertions(+), 39 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index ee7e195..7fab52b 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -276,15 +276,13 @@ static LONG setValue(LPSTR val_name, LPSTR val_data) /****************************************************************************** - * Extracts from [HKEY\some\key\path] or HKEY\some\key\path types of line + * Extracts from HKEY\some\key\path types of line * the key class (what ends before the first '\') */ static BOOL getRegClass(LPSTR lpClass, HKEY* hkey) { LPSTR classNameEnd; - LPSTR classNameBeg; unsigned int i; - char lpClassCopy[KEY_MAX_LEN]; if (lpClass == NULL) @@ -293,23 +291,11 @@ static BOOL getRegClass(LPSTR lpClass, HKEY* hkey) lstrcpynA(lpClassCopy, lpClass, KEY_MAX_LEN); classNameEnd = strchr(lpClassCopy, '\\'); /* The class name ends by '\' */ - if (!classNameEnd) /* or the whole string */ - { - classNameEnd = lpClassCopy + strlen(lpClassCopy); - if (classNameEnd[-1] == ']') - { - classNameEnd--; - } - } - *classNameEnd = '\0'; /* Isolate the class name */ - if (lpClassCopy[0] == '[') { - classNameBeg = lpClassCopy + 1; - } else { - classNameBeg = lpClassCopy; - } + if (classNameEnd) /* or the whole string */ + *classNameEnd = '\0'; /* Isolate the class name */ for (i = 0; i < REG_CLASS_NUMBER; i++) { - if (!strcmp(classNameBeg, reg_class_names[i])) { + if (!strcmp(lpClassCopy, reg_class_names[i])) { *hkey = reg_class_keys[i]; return TRUE; } @@ -318,7 +304,7 @@ static BOOL getRegClass(LPSTR lpClass, HKEY* hkey) } /****************************************************************************** - * Extracts from [HKEY\some\key\path] or HKEY\some\key\path types of line + * Extracts from HKEY\some\key\path types of line * the key name (what starts after the first '\') */ static LPSTR getRegKeyName(LPSTR lpLine) @@ -334,16 +320,6 @@ static LPSTR getRegKeyName(LPSTR lpLine) keyNameBeg = strchr(lpLineCopy, '\\'); /* The key name start by '\' */ if (keyNameBeg) { keyNameBeg++; /* is not part of the name */ - - if (lpLine[0] == '[') /* need to find matching ']' */ - { - LPSTR keyNameEnd; - - keyNameEnd = strrchr(lpLineCopy, ']'); - if (keyNameEnd) { - *keyNameEnd = '\0'; /* remove ']' from the key name */ - } - } } else { keyNameBeg = lpLineCopy + strlen(lpLineCopy); /* branch - empty string */ } @@ -489,22 +465,22 @@ static void processRegEntry(LPSTR stdInput) if ( stdInput[0] == '[') /* We are reading a new key */ { + LPSTR keyEnd; if ( bTheKeyIsOpen != FALSE ) closeKey(); /* Close the previous key before */ + /* Get rid of the square brackets */ + stdInput++; + keyEnd = strrchr(stdInput, ']'); + if (keyEnd) + *keyEnd='\0'; + /* delete the key if we encounter '-' at the start of reg key */ - if ( stdInput[1] == '-') + if ( stdInput[0] == '-') { - int last_chr = strlen(stdInput) - 1; - - /* skip leading "[-" and get rid of trailing "]" */ - if (stdInput[last_chr] == ']') - stdInput[last_chr] = '\0'; - delete_registry_key(stdInput+2); - return; + delete_registry_key(stdInput+1); } - - if ( openKey(stdInput) != ERROR_SUCCESS ) + else if ( openKey(stdInput) != ERROR_SUCCESS ) fprintf(stderr,"%s: setValue failed to open key %s\n", getAppName(), stdInput); } else if( ( bTheKeyIsOpen ) &&

1 0

Francois Gouget : regedit: Merge getRegClass() and getRegKeyName() to form parseKeyName().
by Alexandre Julliard 18 Jun '07

18 Jun '07

Module: wine Branch: master Commit: afa9d0a60da48a7efdca7114185b5e069b7b7c9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=afa9d0a60da48a7efdca71141… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 15 18:59:55 2007 +0200 regedit: Merge getRegClass() and getRegKeyName() to form parseKeyName(). Keep track of the full registry path (including the root key) in currentKeyName. This makes the error messages more informative. Reduce the number of global variables used by openKey() & co. Only use one variable, currentKeyHandle, to indicate whether a key is currently open or not. --- programs/regedit/regproc.c | 209 ++++++++++++++++++++----------------------- 1 files changed, 97 insertions(+), 112 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=afa9d0a60da48a7efdca7…

1 0