wine-commits June 2007

wine-commits@winehq.org

5 participants
856 discussions

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

18 Jun '07

Module: wine Branch: master Commit: 08207779832de3ac1aebf6251436cc1670476267 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08207779832de3ac1aebf6251… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jun 11 23:14:37 2007 +0200 d3d9: Hold the lock in methods implemented in device.c. --- dlls/d3d9/device.c | 539 +++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 450 insertions(+), 89 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=08207779832de3ac1aebf…

1 0

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

18 Jun '07

Module: wine Branch: master Commit: 66821059b4704991fbd84c59625507c7a13a53a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66821059b4704991fbd84c596… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Jun 10 17:32:37 2007 +0200 d3d9: Hold the lock in IDirect3D9 methods. --- dlls/d3d9/directx.c | 93 +++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 82 insertions(+), 11 deletions(-) diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 699daff..acc95ce 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -57,7 +57,9 @@ static ULONG WINAPI IDirect3D9Impl_Release(LPDIRECT3D9 iface) { TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { + EnterCriticalSection(&d3d9_cs); IWineD3D_Release(This->WineD3D); + LeaveCriticalSection(&d3d9_cs); HeapFree(GetProcessHeap(), 0, This); } @@ -67,17 +69,30 @@ static ULONG WINAPI IDirect3D9Impl_Release(LPDIRECT3D9 iface) { /* IDirect3D9 Interface follow: */ static HRESULT WINAPI IDirect3D9Impl_RegisterSoftwareDevice(LPDIRECT3D9 iface, void* pInitializeFunction) { IDirect3D9Impl *This = (IDirect3D9Impl *)iface; - return IWineD3D_RegisterSoftwareDevice(This->WineD3D, pInitializeFunction); + HRESULT hr; + TRACE("(%p)->(%p)\n", This, pInitializeFunction); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3D_RegisterSoftwareDevice(This->WineD3D, pInitializeFunction); + LeaveCriticalSection(&d3d9_cs); + return hr; } static UINT WINAPI IDirect3D9Impl_GetAdapterCount(LPDIRECT3D9 iface) { IDirect3D9Impl *This = (IDirect3D9Impl *)iface; - return IWineD3D_GetAdapterCount(This->WineD3D); + HRESULT hr; + TRACE("%p\n", This); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3D_GetAdapterCount(This->WineD3D); + LeaveCriticalSection(&d3d9_cs); + return hr; } static HRESULT WINAPI IDirect3D9Impl_GetAdapterIdentifier(LPDIRECT3D9 iface, UINT Adapter, DWORD Flags, D3DADAPTER_IDENTIFIER9* pIdentifier) { IDirect3D9Impl *This = (IDirect3D9Impl *)iface; WINED3DADAPTER_IDENTIFIER adapter_id; + HRESULT hr; /* dx8 and dx9 have different structures to be filled in, with incompatible layouts so pass in pointers to the places to be filled via an internal @@ -93,27 +108,41 @@ static HRESULT WINAPI IDirect3D9Impl_GetAdapterIdentifier(LPDIRECT3D9 iface, UIN adapter_id.DeviceIdentifier = &pIdentifier->DeviceIdentifier; adapter_id.WHQLLevel = &pIdentifier->WHQLLevel; - return IWineD3D_GetAdapterIdentifier(This->WineD3D, Adapter, Flags, &adapter_id); + EnterCriticalSection(&d3d9_cs); + hr = IWineD3D_GetAdapterIdentifier(This->WineD3D, Adapter, Flags, &adapter_id); + LeaveCriticalSection(&d3d9_cs); + return hr; } static UINT WINAPI IDirect3D9Impl_GetAdapterModeCount(LPDIRECT3D9 iface, UINT Adapter, D3DFORMAT Format) { IDirect3D9Impl *This = (IDirect3D9Impl *)iface; + HRESULT hr; + TRACE("(%p)->(%d, %d\n", This, Adapter, Format); /* Others than that not supported by d3d9, but reported by wined3d for ddraw. Filter them out */ if(Format != D3DFMT_X8R8G8B8 && Format != D3DFMT_R5G6B5) { return 0; } - return IWineD3D_GetAdapterModeCount(This->WineD3D, Adapter, Format); + EnterCriticalSection(&d3d9_cs); + hr = IWineD3D_GetAdapterModeCount(This->WineD3D, Adapter, Format); + LeaveCriticalSection(&d3d9_cs); + return hr; } static HRESULT WINAPI IDirect3D9Impl_EnumAdapterModes(LPDIRECT3D9 iface, UINT Adapter, D3DFORMAT Format, UINT Mode, D3DDISPLAYMODE* pMode) { IDirect3D9Impl *This = (IDirect3D9Impl *)iface; + HRESULT hr; + TRACE("(%p)->(%d, %d, %d, %p)\n", This, Adapter, Format, Mode, pMode); /* We can't pass this to WineD3D, otherwise it'll think it came from D3D8 or DDraw. It's supposed to fail anyway, so no harm returning failure. */ if(Format != WINED3DFMT_X8R8G8B8 && Format != WINED3DFMT_R5G6B5) return D3DERR_INVALIDCALL; - return IWineD3D_EnumAdapterModes(This->WineD3D, Adapter, Format, Mode, (WINED3DDISPLAYMODE *) pMode); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3D_EnumAdapterModes(This->WineD3D, Adapter, Format, Mode, (WINED3DDISPLAYMODE *) pMode); + LeaveCriticalSection(&d3d9_cs); + return hr; } static HRESULT WINAPI IDirect3D9Impl_GetAdapterDisplayMode(LPDIRECT3D9 iface, UINT Adapter, D3DDISPLAYMODE* pMode) { @@ -125,38 +154,69 @@ static HRESULT WINAPI IDirect3D9Impl_CheckDeviceType(LPDIRECT3D9 iface, UINT Adapter, D3DDEVTYPE CheckType, D3DFORMAT DisplayFormat, D3DFORMAT BackBufferFormat, BOOL Windowed) { IDirect3D9Impl *This = (IDirect3D9Impl *)iface; - return IWineD3D_CheckDeviceType(This->WineD3D, Adapter, CheckType, DisplayFormat, + HRESULT hr; + TRACE("(%p)->(%d, %d, %d, %d, %s\n", This, Adapter, CheckType, DisplayFormat, + BackBufferFormat, Windowed ? "true" : "false"); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3D_CheckDeviceType(This->WineD3D, Adapter, CheckType, DisplayFormat, BackBufferFormat, Windowed); + LeaveCriticalSection(&d3d9_cs); + return hr; } static HRESULT WINAPI IDirect3D9Impl_CheckDeviceFormat(LPDIRECT3D9 iface, UINT Adapter, D3DDEVTYPE DeviceType, D3DFORMAT AdapterFormat, DWORD Usage, D3DRESOURCETYPE RType, D3DFORMAT CheckFormat) { IDirect3D9Impl *This = (IDirect3D9Impl *)iface; - return IWineD3D_CheckDeviceFormat(This->WineD3D, Adapter, DeviceType, AdapterFormat, + HRESULT hr; + TRACE("%p\n", This); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3D_CheckDeviceFormat(This->WineD3D, Adapter, DeviceType, AdapterFormat, Usage, RType, CheckFormat); + LeaveCriticalSection(&d3d9_cs); + return hr; } static HRESULT WINAPI IDirect3D9Impl_CheckDeviceMultiSampleType(LPDIRECT3D9 iface, UINT Adapter, D3DDEVTYPE DeviceType, D3DFORMAT SurfaceFormat, BOOL Windowed, D3DMULTISAMPLE_TYPE MultiSampleType, DWORD* pQualityLevels) { IDirect3D9Impl *This = (IDirect3D9Impl *)iface; - return IWineD3D_CheckDeviceMultiSampleType(This->WineD3D, Adapter, DeviceType, SurfaceFormat, + HRESULT hr; + TRACE("%p\n", This); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3D_CheckDeviceMultiSampleType(This->WineD3D, Adapter, DeviceType, SurfaceFormat, Windowed, MultiSampleType, pQualityLevels); + LeaveCriticalSection(&d3d9_cs); + return hr; } static HRESULT WINAPI IDirect3D9Impl_CheckDepthStencilMatch(LPDIRECT3D9 iface, UINT Adapter, D3DDEVTYPE DeviceType, D3DFORMAT AdapterFormat, D3DFORMAT RenderTargetFormat, D3DFORMAT DepthStencilFormat) { IDirect3D9Impl *This = (IDirect3D9Impl *)iface; - return IWineD3D_CheckDepthStencilMatch(This->WineD3D, Adapter, DeviceType, AdapterFormat, + HRESULT hr; + TRACE("%p\n", This); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3D_CheckDepthStencilMatch(This->WineD3D, Adapter, DeviceType, AdapterFormat, RenderTargetFormat, DepthStencilFormat); + LeaveCriticalSection(&d3d9_cs); + return hr; } static HRESULT WINAPI IDirect3D9Impl_CheckDeviceFormatConversion(LPDIRECT3D9 iface, UINT Adapter, D3DDEVTYPE DeviceType, D3DFORMAT SourceFormat, D3DFORMAT TargetFormat) { IDirect3D9Impl *This = (IDirect3D9Impl *)iface; - return IWineD3D_CheckDeviceFormatConversion(This->WineD3D, Adapter, DeviceType, SourceFormat, + HRESULT hr; + TRACE("%p\n", This); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3D_CheckDeviceFormatConversion(This->WineD3D, Adapter, DeviceType, SourceFormat, TargetFormat); + LeaveCriticalSection(&d3d9_cs); + return hr; } static HRESULT WINAPI IDirect3D9Impl_GetDeviceCaps(LPDIRECT3D9 iface, UINT Adapter, D3DDEVTYPE DeviceType, D3DCAPS9* pCaps) { @@ -174,7 +234,9 @@ static HRESULT WINAPI IDirect3D9Impl_GetDeviceCaps(LPDIRECT3D9 iface, UINT Adapt return D3DERR_INVALIDCALL; /*well this is what MSDN says to return*/ } D3D9CAPSTOWINECAPS(pCaps, pWineCaps) + EnterCriticalSection(&d3d9_cs); hrc = IWineD3D_GetDeviceCaps(This->WineD3D, Adapter, DeviceType, pWineCaps); + LeaveCriticalSection(&d3d9_cs); HeapFree(GetProcessHeap(), 0, pWineCaps); /* Some functionality is implemented in d3d9.dll, not wined3d.dll. Add the needed caps */ @@ -185,7 +247,13 @@ static HRESULT WINAPI IDirect3D9Impl_GetDeviceCaps(LPDIRECT3D9 iface, UINT Adapt static HMONITOR WINAPI IDirect3D9Impl_GetAdapterMonitor(LPDIRECT3D9 iface, UINT Adapter) { IDirect3D9Impl *This = (IDirect3D9Impl *)iface; - return IWineD3D_GetAdapterMonitor(This->WineD3D, Adapter); + HMONITOR ret; + TRACE("%p\n", This); + + EnterCriticalSection(&d3d9_cs); + ret = IWineD3D_GetAdapterMonitor(This->WineD3D, Adapter); + LeaveCriticalSection(&d3d9_cs); + return ret; } /* Internal function called back during the CreateDevice to create a render target */ @@ -348,11 +416,13 @@ static HRESULT WINAPI IDirect3D9Impl_CreateDevice(LPDIRECT3D9 iface, UINT Adapte *ppReturnedDeviceInterface = (IDirect3DDevice9 *)object; /* Allocate an associated WineD3DDevice object */ + EnterCriticalSection(&d3d9_cs); hr =IWineD3D_CreateDevice(This->WineD3D, Adapter, DeviceType, hFocusWindow, BehaviourFlags, &object->WineD3DDevice, (IUnknown *)object); if (hr != D3D_OK) { HeapFree(GetProcessHeap(), 0, object); *ppReturnedDeviceInterface = NULL; + LeaveCriticalSection(&d3d9_cs); return hr; } @@ -404,6 +474,7 @@ static HRESULT WINAPI IDirect3D9Impl_CreateDevice(LPDIRECT3D9 iface, UINT Adapte * can be used without further checking */ object->convertedDecls = HeapAlloc(GetProcessHeap(), 0, 0); + 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

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

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

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

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: Forward MsiApplyPatchA to MsiApplyPatchW.
by Alexandre Julliard 18 Jun '07

18 Jun '07

Module: wine Branch: master Commit: 974e76fe79b54ba98196e637d6d4372f56e50aea URL: http://source.winehq.org/git/wine.git/?a=commit;h=974e76fe79b54ba98196e637d… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Jun 15 14:04:04 2007 -0700 msi: Forward MsiApplyPatchA to MsiApplyPatchW. --- dlls/msi/msi.c | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index a09984e..ad9c5b4 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -226,9 +226,31 @@ UINT WINAPI MsiReinstallProductW(LPCWSTR szProduct, DWORD dwReinstallMode) UINT WINAPI MsiApplyPatchA(LPCSTR szPatchPackage, LPCSTR szInstallPackage, INSTALLTYPE eInstallType, LPCSTR szCommandLine) { - FIXME("%s %s %d %s\n", debugstr_a(szPatchPackage), debugstr_a(szInstallPackage), + LPWSTR patch_package = NULL; + LPWSTR install_package = NULL; + LPWSTR command_line = NULL; + UINT r = ERROR_OUTOFMEMORY; + + TRACE("%s %s %d %s\n", debugstr_a(szPatchPackage), debugstr_a(szInstallPackage), eInstallType, debugstr_a(szCommandLine)); - return ERROR_CALL_NOT_IMPLEMENTED; + + if (szPatchPackage && !(patch_package = strdupAtoW(szPatchPackage))) + goto done; + + if (szInstallPackage && !(install_package = strdupAtoW(szInstallPackage))) + goto done; + + if (szCommandLine && !(command_line = strdupAtoW(szCommandLine))) + goto done; + + r = MsiApplyPatchW(patch_package, install_package, eInstallType, command_line); + +done: + msi_free(patch_package); + msi_free(install_package); + msi_free(command_line); + + return r; } UINT WINAPI MsiApplyPatchW(LPCWSTR szPatchPackage, LPCWSTR szInstallPackage,

1 0

Francois Gouget : shlwapi: Update win32. api to fix the winapi_check warnings.
by Alexandre Julliard 18 Jun '07

18 Jun '07

Module: wine Branch: master Commit: 56c841ced0639cf94547163fd072ee24a4da5a03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56c841ced0639cf94547163fd… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jun 15 19:00:02 2007 +0200 shlwapi: Update win32.api to fix the winapi_check warnings. --- dlls/shlwapi/ordinal.c | 2 +- tools/winapi/win32.api | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index bad167c..e8738f3 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -4393,7 +4393,7 @@ typedef struct SHELL_USER_PERMISSION { /* ...and this should be in shlwapi.h */ * NOTES * Call should free returned descriptor with LocalFree */ -SECURITY_DESCRIPTOR * WINAPI GetShellSecurityDescriptor(PSHELL_USER_PERMISSION *apUserPerm, int cUserPerm) +PSECURITY_DESCRIPTOR WINAPI GetShellSecurityDescriptor(PSHELL_USER_PERMISSION *apUserPerm, int cUserPerm) { PSID *sidlist; PSID cur_user = NULL; diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 2102951..9ce60f7 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -4193,7 +4193,6 @@ HRESULT HUSKEY HWND INT -LANGID LONG LPARAM LRESULT @@ -4214,6 +4213,7 @@ int %long --pointer INT_PTR +DWORD_PTR %longlong @@ -4224,9 +4224,11 @@ LONGLONG BOOL * BSTR * CLSID * +DISPPARAMS * DLGPROC DLLVERSIONINFO * DWORD * +DWORD_PTR * FDSA_info * HICON * HKEY * @@ -4240,7 +4242,6 @@ IDropTarget * IEnumIDList ** IFACE_INDEX_TBL * IID * -INT * IPropertyBag * IShellFolder * IStream * @@ -4285,12 +4286,11 @@ PARSEDURLA * PARSEDURLW * PHKEY PHUSKEY -PLONG PPOINTL PSECURITY_DESCRIPTOR +PSHELL_USER_PERMISSION * PVOID PVOID * -RECT * REFCLSID REFGUID REFIID @@ -4299,7 +4299,9 @@ STRRET * UINT * ULARGE_INTEGER * VARIANT * +VARIANTARG * VOID * +WAITORTIMERCALLBACK WNDCLASSA * WNDCLASSW * int *

1 0

Francois Gouget : winapi_check: ULONG_PTR is a 'long --pointer', not a ' long'.
by Alexandre Julliard 18 Jun '07

18 Jun '07

Module: wine Branch: master Commit: 8b35421bf98952e2f81c9ea864b8c55a9e66ae0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b35421bf98952e2f81c9ea86… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jun 15 19:00:10 2007 +0200 winapi_check: ULONG_PTR is a 'long --pointer', not a 'long'. --- tools/winapi/win32.api | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 74c8324..2102951 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -629,6 +629,9 @@ BOOL HWND LONG LPARAM + +%long --pointer + ULONG_PTR %ptr

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2007