wine-commits March 2009

wine-commits@winehq.org

2 participants
834 discussions

Huw Davies : ole32/tests: Add broken return value for win98.
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: d28d731b615d89ad683ac3e719da5f45afb04da9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d28d731b615d89ad683ac3e71… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 31 10:18:13 2009 +0100 ole32/tests: Add broken return value for win98. --- dlls/ole32/tests/clipboard.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index 8b16a5f..f0296ac 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -517,7 +517,9 @@ static void test_enum_fmtetc(IDataObject *src) ok(hr == S_OK, "OleGetClipboard failed with error 0x%08x\n", hr); hr = IDataObject_EnumFormatEtc(data, DATADIR_SET, &enum_fmt); - ok(hr == E_NOTIMPL, "got %08x\n", hr); + ok(hr == E_NOTIMPL || + broken(hr == E_INVALIDARG), /* win98 (not win98SE) */ + "got %08x\n", hr); DataObjectImpl_EnumFormatEtc_calls = 0; hr = IDataObject_EnumFormatEtc(data, DATADIR_GET, &enum_fmt);

1 0

Huw Davies : ole32/tests: On win9x GetClipboardData returns a new handle.
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: 5492fd2b0d062586e848373238827e0f12f86c83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5492fd2b0d062586e84837323… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 31 10:11:46 2009 +0100 ole32/tests: On win9x GetClipboardData returns a new handle. --- dlls/ole32/tests/clipboard.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index 7e18549..8b16a5f 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -746,7 +746,9 @@ static void test_set_clipboard(void) h = SetClipboardData(cf_onemore, hblob); ok(h == hblob, "got %p\n", h); h = GetClipboardData(cf_onemore); - ok(h == hblob, "got %p\n", h); + ok(h == hblob || + broken(h != NULL), /* win9x */ + "got %p\n", h); CloseClipboard(); hr = OleFlushClipboard(); @@ -761,7 +763,9 @@ static void test_set_clipboard(void) /* format should survive the flush */ OpenClipboard(NULL); h = GetClipboardData(cf_onemore); - ok(h == hblob, "got %p\n", h); + ok(h == hblob || + broken(h != NULL), /* win9x */ + "got %p\n", h); CloseClipboard(); test_cf_dataobject(NULL);

1 0

Huw Davies : ole32: Simplify some of the error handling.
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: 2c6be9521b04522750f208d4db1b218d517ee306 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c6be9521b04522750f208d4d… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 30 15:33:28 2009 +0100 ole32: Simplify some of the error handling. --- dlls/ole32/clipboard.c | 62 +++++++++++++---------------------------------- 1 files changed, 17 insertions(+), 45 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 66f620a..281bafc 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -821,8 +821,6 @@ static HRESULT WINAPI OLEClipbrd_IDataObject_GetData( STGMEDIUM* pmedium) { HANDLE hData = 0; - BOOL bClipboardOpen = FALSE; - HRESULT hr = S_OK; LPVOID src; ole_clipbrd *This = impl_from_IDataObject(iface); @@ -855,8 +853,7 @@ static HRESULT WINAPI OLEClipbrd_IDataObject_GetData( /* * Otherwise, get the data from the windows clipboard using GetClipboardData */ - if ( !(bClipboardOpen = OpenClipboard(theOleClipboard->hWndClipboard)) ) - HANDLE_ERROR( CLIPBRD_E_CANT_OPEN ); + if ( !OpenClipboard(theOleClipboard->hWndClipboard)) return CLIPBRD_E_CANT_OPEN; hData = GetClipboardData(pformatetcIn->cfFormat); @@ -886,17 +883,8 @@ static HRESULT WINAPI OLEClipbrd_IDataObject_GetData( pmedium->u.hGlobal = hData; pmedium->pUnkForRelease = NULL; - hr = S_OK; + if ( !CloseClipboard() ) return CLIPBRD_E_CANT_CLOSE; -CLEANUP: - /* - * Close Windows clipboard - */ - if ( bClipboardOpen && !CloseClipboard() ) - hr = CLIPBRD_E_CANT_CLOSE; - - if ( FAILED(hr) ) - return hr; return (hData == 0) ? DV_E_FORMATETC : S_OK; } @@ -1356,7 +1344,6 @@ static HRESULT set_dataobject_format(HWND hwnd) HRESULT WINAPI OleSetClipboard(IDataObject* pDataObj) { HRESULT hr = S_OK; - BOOL bClipboardOpen = FALSE; struct oletls *info = COM_CurrentInfo(); TRACE("(%p)\n", pDataObj); @@ -1367,9 +1354,6 @@ HRESULT WINAPI OleSetClipboard(IDataObject* pDataObj) if(!info->ole_inits) return CO_E_NOTINITIALIZED; - /* - * Make sure we have a clipboard object - */ OLEClipbrd_Initialize(); /* @@ -1378,21 +1362,19 @@ HRESULT WINAPI OleSetClipboard(IDataObject* pDataObj) if ( !theOleClipboard->hWndClipboard ) theOleClipboard->hWndClipboard = OLEClipbrd_CreateWindow(); - if ( !theOleClipboard->hWndClipboard ) /* sanity check */ - HANDLE_ERROR( E_FAIL ); + if ( !theOleClipboard->hWndClipboard ) return E_FAIL; - /* - * Open the Windows clipboard, associating it with our hidden window - */ - if ( !(bClipboardOpen = OpenClipboard(theOleClipboard->hWndClipboard)) ) - HANDLE_ERROR( CLIPBRD_E_CANT_OPEN ); + if ( !OpenClipboard(theOleClipboard->hWndClipboard) ) return CLIPBRD_E_CANT_OPEN; /* * Empty the current clipboard and make our window the clipboard owner * NOTE: This will trigger a WM_DESTROYCLIPBOARD message */ if ( !EmptyClipboard() ) - HANDLE_ERROR( CLIPBRD_E_CANT_EMPTY ); + { + hr = CLIPBRD_E_CANT_EMPTY; + goto end; + } /* * If we are already holding on to an IDataObject first release that. @@ -1409,22 +1391,15 @@ HRESULT WINAPI OleSetClipboard(IDataObject* pDataObj) { IDataObject_AddRef(theOleClipboard->pIDataObjectSrc); hr = set_clipboard_formats(pDataObj); - if(FAILED(hr)) goto CLEANUP; + if(FAILED(hr)) goto end; } hr = set_dataobject_format(theOleClipboard->hWndClipboard); -CLEANUP: +end: - /* - * Close Windows clipboard (It remains associated with our window) - */ - if ( bClipboardOpen && !CloseClipboard() ) - hr = CLIPBRD_E_CANT_CLOSE; + if ( !CloseClipboard() ) hr = CLIPBRD_E_CANT_CLOSE; - /* - * Release the source IDataObject if something failed - */ if ( FAILED(hr) ) { if (theOleClipboard->pIDataObjectSrc) @@ -1477,7 +1452,6 @@ HRESULT WINAPI OleFlushClipboard(void) IEnumFORMATETC* penumFormatetc = NULL; FORMATETC rgelt; HRESULT hr = S_OK; - BOOL bClipboardOpen = FALSE; TRACE("()\n"); @@ -1489,8 +1463,8 @@ HRESULT WINAPI OleFlushClipboard(void) if (!theOleClipboard->pIDataObjectSrc) return S_OK; - if ( !(bClipboardOpen = OpenClipboard(theOleClipboard->hWndClipboard)) ) - HANDLE_ERROR( CLIPBRD_E_CANT_OPEN ); + if (!OpenClipboard(theOleClipboard->hWndClipboard)) + return CLIPBRD_E_CANT_OPEN; /* * Render all HGLOBAL formats supported by the source into @@ -1499,9 +1473,8 @@ HRESULT WINAPI OleFlushClipboard(void) if ( FAILED( hr = IDataObject_EnumFormatEtc( theOleClipboard->pIDataObjectSrc, DATADIR_GET, &penumFormatetc) )) - { - HANDLE_ERROR( hr ); - } + goto end; + while ( S_OK == IEnumFORMATETC_Next(penumFormatetc, 1, &rgelt, NULL) ) { @@ -1524,10 +1497,9 @@ HRESULT WINAPI OleFlushClipboard(void) IDataObject_Release(theOleClipboard->pIDataObjectSrc); theOleClipboard->pIDataObjectSrc = NULL; -CLEANUP: +end: - if ( bClipboardOpen && !CloseClipboard() ) - hr = CLIPBRD_E_CANT_CLOSE; + if ( !CloseClipboard() ) hr = CLIPBRD_E_CANT_CLOSE; return hr; }

1 0

Henri Verbeet : wined3d: Don' t leak the swapchain in IWineD3DDeviceImpl_Reset() if the display mode is unsupported.
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: 7f740f2a51f564be6f6ba47c66b3234811c73d4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f740f2a51f564be6f6ba47c6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 31 09:38:14 2009 +0200 wined3d: Don't leak the swapchain in IWineD3DDeviceImpl_Reset() if the display mode is unsupported. --- 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 aebcfaf..ecc00d6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -7605,6 +7605,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE WARN("Rejecting Reset() call because the requested display mode is not supported\n"); WARN("Requested mode: %d, %d\n", pPresentationParameters->BackBufferWidth, pPresentationParameters->BackBufferHeight); + IWineD3DSwapChain_Release((IWineD3DSwapChain *)swapchain); return WINED3DERR_INVALIDCALL; }

1 0

Henri Verbeet : d3d10core: Set the initial buffer data, when present.
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: 4ccbc948a16eb84180381bd9e2359484e91e2c7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ccbc948a16eb84180381bd9e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 31 09:38:14 2009 +0200 d3d10core: Set the initial buffer data, when present. --- dlls/d3d10core/device.c | 2 +- dlls/wined3d/device.c | 27 +++++++++++++++++++++++++-- include/wine/wined3d.idl | 1 + 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index bd82316..b0eae7f 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -620,7 +620,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBuffer(ID3D10Device *iface, wined3d_desc.misc_flags = desc->MiscFlags; hr = IWineD3DDevice_CreateBuffer(This->wined3d_device, &wined3d_desc, - (IUnknown *)object, &object->wined3d_buffer); + data ? data->pSysMem : NULL, (IUnknown *)object, &object->wined3d_buffer); if (FAILED(hr)) { ERR("CreateBuffer failed, returning %#x\n", hr); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0f6885f..aebcfaf 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -435,13 +435,13 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetParent(IWineD3DDevice *iface, IUnkno } static HRESULT WINAPI IWineD3DDeviceImpl_CreateBuffer(IWineD3DDevice *iface, - struct wined3d_buffer_desc *desc, IUnknown *parent, IWineD3DBuffer **buffer) + struct wined3d_buffer_desc *desc, const void *data, IUnknown *parent, IWineD3DBuffer **buffer) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; struct wined3d_buffer *object; HRESULT hr; - TRACE("iface %p, desc %p, parent %p, buffer %p\n", iface, desc, parent, buffer); + TRACE("iface %p, desc %p, data %p, parent %p, buffer %p\n", iface, desc, data, parent, buffer); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) @@ -471,6 +471,29 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateBuffer(IWineD3DDevice *iface, TRACE("size %#x, usage=%#x, format %s, memory @ %p, iface @ %p\n", object->resource.size, object->resource.usage, debug_d3dformat(object->resource.format_desc->format), object->resource.allocatedMemory, object); + if (data) + { + BYTE *ptr; + + hr = IWineD3DBuffer_Map((IWineD3DBuffer *)object, 0, desc->byte_width, &ptr, 0); + if (FAILED(hr)) + { + ERR("Failed to map buffer, hr %#x\n", hr); + IWineD3DBuffer_Release((IWineD3DBuffer *)object); + return hr; + } + + memcpy(ptr, data, desc->byte_width); + + hr = IWineD3DBuffer_Unmap((IWineD3DBuffer *)object); + if (FAILED(hr)) + { + ERR("Failed to unmap buffer, hr %#x\n", hr); + IWineD3DBuffer_Release((IWineD3DBuffer *)object); + return hr; + } + } + *buffer = (IWineD3DBuffer *)object; return WINED3D_OK; diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index ad6197f..604781b 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2909,6 +2909,7 @@ interface IWineD3DDevice : IWineD3DBase { HRESULT CreateBuffer( [in] struct wined3d_buffer_desc *desc, + [in] const void *data, [in] IUnknown *parent, [out] IWineD3DBuffer **buffer );

1 0

Henri Verbeet : wined3d: Care for things like pitch and blocksize when copying DXT surfaces.
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: 0591442469b8dfe28b05fb001d6b2338448d54aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=0591442469b8dfe28b05fb001… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 31 09:38:14 2009 +0200 wined3d: Care for things like pitch and blocksize when copying DXT surfaces. --- dlls/wined3d/surface_base.c | 37 +++++++++++++++++++++++++++++++++++-- 1 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 8d9d941..4b1629d 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -1664,6 +1664,10 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD dst /* Handle first the FOURCC surfaces... */ if (sEntry->Flags & dEntry->Flags & WINED3DFMT_FLAG_FOURCC) { + UINT block_width; + UINT block_height; + UINT block_byte_size; + TRACE("Fourcc -> Fourcc copy\n"); if (trans) FIXME("trans arg not supported when a FOURCC surface is involved\n"); @@ -1675,8 +1679,37 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD dst ret = WINED3DERR_WRONGTEXTUREFORMAT; goto error; } - /* FIXME: Watch out that the size is correct for FOURCC surfaces */ - memcpy(dbuf, sbuf, This->resource.size); + + if (This->resource.format_desc->format == WINED3DFMT_DXT1) + { + block_width = 4; + block_height = 4; + block_byte_size = 8; + } + else if (This->resource.format_desc->format == WINED3DFMT_DXT2 + || This->resource.format_desc->format == WINED3DFMT_DXT3 + || This->resource.format_desc->format == WINED3DFMT_DXT4 + || This->resource.format_desc->format == WINED3DFMT_DXT5) + { + block_width = 4; + block_height = 4; + block_byte_size = 16; + } + else + { + FIXME("Unsupported FourCC format %s.\n", debug_d3dformat(This->resource.format_desc->format)); + block_width = 1; + block_height = 1; + block_byte_size = This->resource.format_desc->byte_count; + } + + for (y = 0; y < h; y += block_height) + { + memcpy(dbuf, sbuf, (w / block_width) * block_byte_size); + dbuf += dlock.Pitch; + sbuf += slock.Pitch; + } + goto error; } if ((sEntry->Flags & WINED3DFMT_FLAG_FOURCC) && !(dEntry->Flags & WINED3DFMT_FLAG_FOURCC))

1 0

Henri Verbeet : d3d10core: Implement ID3D10Device::IASetVertexBuffers().
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: 9ef184c168f47ae0c611b288c7ca0e9f45ce3fb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ef184c168f47ae0c611b288c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 31 09:38:14 2009 +0200 d3d10core: Implement ID3D10Device::IASetVertexBuffers(). --- dlls/d3d10core/device.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 336ae85..bd82316 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -178,8 +178,17 @@ static void STDMETHODCALLTYPE d3d10_device_IASetVertexBuffers(ID3D10Device *ifac UINT start_slot, UINT buffer_count, ID3D10Buffer *const *buffers, const UINT *strides, const UINT *offsets) { - FIXME("iface %p, start_slot %u, buffer_count %u, buffers %p, strides %p, offsets %p stub!\n", + struct d3d10_device *This = (struct d3d10_device *)iface; + unsigned int i; + + TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p, strides %p, offsets %p\n", iface, start_slot, buffer_count, buffers, strides, offsets); + + for (i = 0; i < buffer_count; ++i) + { + IWineD3DDevice_SetStreamSource(This->wined3d_device, start_slot, + ((struct d3d10_buffer *)buffers[i])->wined3d_buffer, offsets[i], strides[i]); + } } static void STDMETHODCALLTYPE d3d10_device_IASetIndexBuffer(ID3D10Device *iface,

1 0

Henri Verbeet : d3d10core: Implement ID3D10Device::IASetInputLayout().
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: de7749b3fbf447399f8d1b22268e6043302a7bb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de7749b3fbf447399f8d1b222… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 31 09:38:14 2009 +0200 d3d10core: Implement ID3D10Device::IASetInputLayout(). --- dlls/d3d10core/device.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index ff31b53..336ae85 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -166,7 +166,12 @@ static void STDMETHODCALLTYPE d3d10_device_PSSetConstantBuffers(ID3D10Device *if static void STDMETHODCALLTYPE d3d10_device_IASetInputLayout(ID3D10Device *iface, ID3D10InputLayout *input_layout) { - FIXME("iface %p, input_layout %p stub!\n", iface, input_layout); + struct d3d10_device *This = (struct d3d10_device *)iface; + + TRACE("iface %p, input_layout %p\n", iface, input_layout); + + IWineD3DDevice_SetVertexDeclaration(This->wined3d_device, + ((struct d3d10_input_layout *)input_layout)->wined3d_decl); } static void STDMETHODCALLTYPE d3d10_device_IASetVertexBuffers(ID3D10Device *iface,

1 0

Hans Leidekker : msi: Build a proper source path in MsiConfigureProductExW.
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: e3b558887d353ceadd952d148d59e98ae07127d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3b558887d353ceadd952d148… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 31 11:31:28 2009 +0200 msi: Build a proper source path in MsiConfigureProductExW. We were passing uninitialized data which would ultimately end up in the registry. --- dlls/msi/msi.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 445d135..90c7ba6 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -476,7 +476,7 @@ UINT WINAPI MsiConfigureProductExW(LPCWSTR szProduct, int iInstallLevel, MSIINSTALLCONTEXT context; UINT r; DWORD sz; - WCHAR sourcepath[MAX_PATH]; + WCHAR sourcepath[MAX_PATH], filename[MAX_PATH]; LPWSTR commandline; static const WCHAR szInstalled[] = { @@ -538,6 +538,16 @@ UINT WINAPI MsiConfigureProductExW(LPCWSTR szProduct, int iInstallLevel, if (context == MSIINSTALLCONTEXT_MACHINE) lstrcatW(commandline, szMachine); + sz = sizeof(sourcepath); + MsiSourceListGetInfoW(szProduct, NULL, context, MSICODE_PRODUCT, + INSTALLPROPERTY_LASTUSEDSOURCEW, sourcepath, &sz); + + sz = sizeof(filename); + MsiSourceListGetInfoW(szProduct, NULL, context, MSICODE_PRODUCT, + INSTALLPROPERTY_PACKAGENAMEW, filename, &sz); + + strcatW(sourcepath, filename); + r = MSI_InstallPackage( package, sourcepath, commandline ); msi_free(commandline);

1 0

Hans Leidekker : msi: Don' t publish package name as part of product properties.
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: 965698cd28812178370546549edc97beb12e71e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=965698cd28812178370546549… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 31 11:31:01 2009 +0200 msi: Don't publish package name as part of product properties. This value does not exist directly under the product key on Windows. --- dlls/msi/action.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 92b95df..948cf4a 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3559,9 +3559,6 @@ static UINT msi_publish_product_properties(MSIPACKAGE *package, HKEY hkey) langid = msi_get_property_int(package, szProductLanguage, 0); msi_reg_set_val_dword(hkey, INSTALLPROPERTY_LANGUAGEW, langid); - ptr = strrchrW(package->PackagePath, '\\' ) + 1; - msi_reg_set_val_str(hkey, INSTALLPROPERTY_PACKAGENAMEW, ptr); - /* FIXME */ msi_reg_set_val_dword(hkey, INSTALLPROPERTY_AUTHORIZED_LUA_APPW, 0);

1 0

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 March 2009