February 2008 - Wine-Commits

Roderick Colenbrander : wined3d: Fix lack of indent in PreLoad.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: 28464f96893612998df1099fe17cab87c5a7bcff URL: http://source.winehq.org/git/wine.git/?a=commit;h=28464f96893612998df1099fe… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Mon Feb 18 21:34:29 2008 +0100 wined3d: Fix lack of indent in PreLoad. --- dlls/wined3d/surface.c | 52 ++++++++++++++++++++++++------------------------ 1 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8736e58..ca3dea4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -474,35 +474,35 @@ void WINAPI IWineD3DSurfaceImpl_PreLoad(IWineD3DSurface *iface) { IWineD3DBaseTexture_PreLoad(baseTexture); IWineD3DBaseTexture_Release(baseTexture); } else { - TRACE("(%p) : About to load surface\n", This); + TRACE("(%p) : About to load surface\n", This); - if(!device->isInDraw) { - ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); - } + if(!device->isInDraw) { + ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + } - ENTER_GL(); - glEnable(This->glDescription.target);/* make sure texture support is enabled in this context */ - if (!This->glDescription.level) { - if (!This->glDescription.textureName) { - glGenTextures(1, &This->glDescription.textureName); - checkGLcall("glGenTextures"); - TRACE("Surface %p given name %d\n", This, This->glDescription.textureName); + ENTER_GL(); + glEnable(This->glDescription.target);/* make sure texture support is enabled in this context */ + if (!This->glDescription.level) { + if (!This->glDescription.textureName) { + glGenTextures(1, &This->glDescription.textureName); + checkGLcall("glGenTextures"); + TRACE("Surface %p given name %d\n", This, This->glDescription.textureName); + } + glBindTexture(This->glDescription.target, This->glDescription.textureName); + checkGLcall("glBindTexture"); + IWineD3DSurface_LoadTexture(iface, FALSE); + /* This is where we should be reducing the amount of GLMemoryUsed */ + } else if (This->glDescription.textureName) { /* NOTE: the level 0 surface of a mpmapped texture must be loaded first! */ + /* assume this is a coding error not a real error for now */ + FIXME("Mipmap surface has a glTexture bound to it!\n"); } - glBindTexture(This->glDescription.target, This->glDescription.textureName); - checkGLcall("glBindTexture"); - IWineD3DSurface_LoadTexture(iface, FALSE); - /* This is where we should be reducing the amount of GLMemoryUsed */ - } else if (This->glDescription.textureName) { /* NOTE: the level 0 surface of a mpmapped texture must be loaded first! */ - /* assume this is a coding error not a real error for now */ - FIXME("Mipmap surface has a glTexture bound to it!\n"); - } - if (This->resource.pool == WINED3DPOOL_DEFAULT) { - /* Tell opengl to try and keep this texture in video ram (well mostly) */ - GLclampf tmp; - tmp = 0.9f; - glPrioritizeTextures(1, &This->glDescription.textureName, &tmp); - } - LEAVE_GL(); + if (This->resource.pool == WINED3DPOOL_DEFAULT) { + /* Tell opengl to try and keep this texture in video ram (well mostly) */ + GLclampf tmp; + tmp = 0.9f; + glPrioritizeTextures(1, &This->glDescription.textureName, &tmp); + } + LEAVE_GL(); } return; }

1 0

Roderick Colenbrander : wined3d: The base RealizePalette isn' t needed anymore.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: ef21f1e85eb8111c1cab6be9b6c8e7b50dae51b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef21f1e85eb8111c1cab6be9b… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Mon Feb 18 21:13:50 2008 +0100 wined3d: The base RealizePalette isn't needed anymore. --- dlls/wined3d/surface_base.c | 40 ---------------------------------------- 1 files changed, 0 insertions(+), 40 deletions(-) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index d733852..4f189c2 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -287,46 +287,6 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetPalette(IWineD3DSurface *iface, IWineD return WINED3D_OK; } -HRESULT WINAPI IWineD3DBaseSurfaceImpl_RealizePalette(IWineD3DSurface *iface) { - IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; - RGBQUAD col[256]; - IWineD3DPaletteImpl *pal = This->palette; - unsigned int n; - TRACE("(%p)\n", This); - - if(This->resource.format == WINED3DFMT_P8 || - This->resource.format == WINED3DFMT_A8P8) - { - if(!(This->Flags & SFLAG_INSYSMEM)) { - TRACE("Palette changed with surface that does not have an up to date system memory copy\n"); - IWineD3DSurface_LoadLocation(iface, SFLAG_INSYSMEM, NULL); - } - TRACE("Dirtifying surface\n"); - IWineD3DSurface_ModifyLocation(iface, SFLAG_INSYSMEM, TRUE); - } - - if(This->Flags & SFLAG_DIBSECTION) { - TRACE("(%p): Updating the hdc's palette\n", This); - for (n=0; n<256; n++) { - if(pal) { - col[n].rgbRed = pal->palents[n].peRed; - col[n].rgbGreen = pal->palents[n].peGreen; - col[n].rgbBlue = pal->palents[n].peBlue; - } else { - IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; - /* Use the default device palette */ - col[n].rgbRed = device->palettes[device->currentPalette][n].peRed; - col[n].rgbGreen = device->palettes[device->currentPalette][n].peGreen; - col[n].rgbBlue = device->palettes[device->currentPalette][n].peBlue; - } - col[n].rgbReserved = 0; - } - SetDIBColorTable(This->hDC, 0, 256, col); - } - - return WINED3D_OK; -} - DWORD WINAPI IWineD3DBaseSurfaceImpl_GetPitch(IWineD3DSurface *iface) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; DWORD ret;

1 0

Roderick Colenbrander : wined3d: Add a GL specific RealizePalette which also updates the drawable.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: 48275308ee5ac682beed99d039a2d03a8a31fc3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=48275308ee5ac682beed99d03… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Mon Feb 18 21:13:13 2008 +0100 wined3d: Add a GL specific RealizePalette which also updates the drawable. --- dlls/wined3d/surface.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 46 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c6b8403..8736e58 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3536,6 +3536,51 @@ HRESULT WINAPI IWineD3DSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD dstx, D return IWineD3DBaseSurfaceImpl_BltFast(iface, dstx, dsty, Source, rsrc, trans); } +HRESULT WINAPI IWineD3DSurfaceImpl_RealizePalette(IWineD3DSurface *iface) { + IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; + RGBQUAD col[256]; + IWineD3DPaletteImpl *pal = This->palette; + unsigned int n; + TRACE("(%p)\n", This); + + if(This->resource.format == WINED3DFMT_P8 || + This->resource.format == WINED3DFMT_A8P8) + { + if(!(This->Flags & SFLAG_INSYSMEM)) { + TRACE("Palette changed with surface that does not have an up to date system memory copy\n"); + IWineD3DSurface_LoadLocation(iface, SFLAG_INSYSMEM, NULL); + } + TRACE("Dirtifying surface\n"); + IWineD3DSurface_ModifyLocation(iface, SFLAG_INSYSMEM, TRUE); + } + + if(This->Flags & SFLAG_DIBSECTION) { + TRACE("(%p): Updating the hdc's palette\n", This); + for (n=0; n<256; n++) { + if(pal) { + col[n].rgbRed = pal->palents[n].peRed; + col[n].rgbGreen = pal->palents[n].peGreen; + col[n].rgbBlue = pal->palents[n].peBlue; + } else { + IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; + /* Use the default device palette */ + col[n].rgbRed = device->palettes[device->currentPalette][n].peRed; + col[n].rgbGreen = device->palettes[device->currentPalette][n].peGreen; + col[n].rgbBlue = device->palettes[device->currentPalette][n].peBlue; + } + col[n].rgbReserved = 0; + } + SetDIBColorTable(This->hDC, 0, 256, col); + } + + /* Propagate the changes to the drawable. + * TODO: in case of hardware p8 palettes we should only upload the palette. */ + if(This->resource.usage & WINED3DUSAGE_RENDERTARGET) + IWineD3DSurface_LoadLocation(iface, SFLAG_INDRAWABLE, NULL); + + return WINED3D_OK; +} + static HRESULT WINAPI IWineD3DSurfaceImpl_PrivateSetup(IWineD3DSurface *iface) { /** Check against the maximum texture sizes supported by the video card **/ IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; @@ -4120,7 +4165,7 @@ const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl = IWineD3DSurfaceImpl_BltFast, IWineD3DBaseSurfaceImpl_GetPalette, IWineD3DBaseSurfaceImpl_SetPalette, - IWineD3DBaseSurfaceImpl_RealizePalette, + IWineD3DSurfaceImpl_RealizePalette, IWineD3DBaseSurfaceImpl_SetColorKey, IWineD3DBaseSurfaceImpl_GetPitch, IWineD3DSurfaceImpl_SetMem,

1 0

Alexandre Julliard : wineboot: Delete files from dllcache once they have been installed.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: 448ede1adbdac67e9493ab6789d831ab02834184 URL: http://source.winehq.org/git/wine.git/?a=commit;h=448ede1adbdac67e9493ab678… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 19 12:19:42 2008 +0100 wineboot: Delete files from dllcache once they have been installed. --- programs/wineboot/wineboot.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 23735dc..3185963 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -522,9 +522,18 @@ static int ProcessWindowsFileProtection(void) dllcache, targetpath, currentpath, tempfile, &sz); if (rc != ERROR_SUCCESS) { - WINE_ERR("WFP: %s error 0x%x\n",wine_dbgstr_w(finddata.cFileName),rc); + WINE_WARN("WFP: %s error 0x%x\n",wine_dbgstr_w(finddata.cFileName),rc); DeleteFileW(tempfile); } + + /* now delete the source file so that we don't try to install it over and over again */ + lstrcpynW( targetpath, dllcache, MAX_PATH - 1 ); + sz = strlenW( targetpath ); + targetpath[sz++] = '\\'; + lstrcpynW( targetpath + sz, finddata.cFileName, MAX_PATH - sz ); + if (!DeleteFileW( targetpath )) + WINE_WARN( "failed to delete %s: error %u\n", wine_dbgstr_w(targetpath), GetLastError() ); + find_rc = FindNextFileW(find_handle,&finddata); } FindClose(find_handle);

1 0

James Hawkins : msi: Remove invalid FIXMEs.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: 123602df78793ca64dc08868b58195142e1ff701 URL: http://source.winehq.org/git/wine.git/?a=commit;h=123602df78793ca64dc08868b… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Feb 19 02:13:08 2008 -0600 msi: Remove invalid FIXMEs. --- dlls/msi/source.c | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/msi/source.c b/dlls/msi/source.c index b43a23b..1d9a28b 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -424,12 +424,6 @@ UINT WINAPI MsiSourceListSetInfoW( LPCWSTR szProduct, LPCWSTR szUserSid, return ERROR_UNKNOWN_PATCH; } - if (szUserSid) - FIXME("Unhandled UserSid %s\n",debugstr_w(szUserSid)); - - if (dwContext == MSIINSTALLCONTEXT_USERUNMANAGED) - FIXME("Unknown context MSIINSTALLCONTEXT_USERUNMANAGED\n"); - property = szProperty; if (!lstrcmpW(szProperty, INSTALLPROPERTY_MEDIAPACKAGEPATHW)) property = media_package; @@ -493,10 +487,7 @@ UINT WINAPI MsiSourceListSetInfoW( LPCWSTR szProduct, LPCWSTR szUserSid, rc = ERROR_UNKNOWN_PROPERTY; } else - { - FIXME("Unknown property %s\n",debugstr_w(szProperty)); rc = ERROR_UNKNOWN_PROPERTY; - } RegCloseKey(sourcekey); return rc;

1 0

Roderick Colenbrander : wined3d: Add a GDI version of RealizePalette.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: 61c82f8069a34426646f304c2c9dc616c912b06e URL: http://source.winehq.org/git/wine.git/?a=commit;h=61c82f8069a34426646f304c2… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Mon Feb 18 21:10:18 2008 +0100 wined3d: Add a GDI version of RealizePalette. The base version won't suffice anymore as it is not able to upload palette changes to the drawable in an efficient way for both GDI and GL. Further the LoadLocation code in RealizePalette isn't needed for the GDI version as in all cases it works on system memory. --- dlls/wined3d/surface_gdi.c | 37 ++++++++++++++++++++++++++++++++++++- 1 files changed, 36 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index 30c922a..c0f54bc 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -631,6 +631,41 @@ HRESULT WINAPI IWineGDISurfaceImpl_ReleaseDC(IWineD3DSurface *iface, HDC hDC) { return WINED3D_OK; } +HRESULT WINAPI IWineGDISurfaceImpl_RealizePalette(IWineD3DSurface *iface) { + IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; + RGBQUAD col[256]; + IWineD3DPaletteImpl *pal = This->palette; + unsigned int n; + TRACE("(%p)\n", This); + + if(This->Flags & SFLAG_DIBSECTION) { + TRACE("(%p): Updating the hdc's palette\n", This); + for (n=0; n<256; n++) { + if(pal) { + col[n].rgbRed = pal->palents[n].peRed; + col[n].rgbGreen = pal->palents[n].peGreen; + col[n].rgbBlue = pal->palents[n].peBlue; + } else { + IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; + /* Use the default device palette */ + col[n].rgbRed = device->palettes[device->currentPalette][n].peRed; + col[n].rgbGreen = device->palettes[device->currentPalette][n].peGreen; + col[n].rgbBlue = device->palettes[device->currentPalette][n].peBlue; + } + col[n].rgbReserved = 0; + } + SetDIBColorTable(This->hDC, 0, 256, col); + } + + /* Update the image because of the palette change. Some games like e.g Red Alert + * call SetEntries a lot to implement fading. + */ + if(This->resource.usage & WINED3DUSAGE_RENDERTARGET) + x11_copy_to_screen(This, NULL); + + return WINED3D_OK; +} + /***************************************************************************** * IWineD3DSurface::PrivateSetup, GDI version * @@ -808,7 +843,7 @@ const IWineD3DSurfaceVtbl IWineGDISurface_Vtbl = IWineD3DBaseSurfaceImpl_BltFast, IWineD3DBaseSurfaceImpl_GetPalette, IWineD3DBaseSurfaceImpl_SetPalette, - IWineD3DBaseSurfaceImpl_RealizePalette, + IWineGDISurfaceImpl_RealizePalette, IWineD3DBaseSurfaceImpl_SetColorKey, IWineD3DBaseSurfaceImpl_GetPitch, IWineGDISurfaceImpl_SetMem,

1 0

James Hawkins : msi: Return ERROR_INVALID_PARAMETER if the context is machine and szUserSid is non-NULL .
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: 7cf6be8aeb1cb5563bdf70320f4f566f4a611700 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cf6be8aeb1cb5563bdf70320… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Feb 19 02:12:30 2008 -0600 msi: Return ERROR_INVALID_PARAMETER if the context is machine and szUserSid is non-NULL. --- dlls/msi/source.c | 3 +++ dlls/msi/tests/source.c | 7 ++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msi/source.c b/dlls/msi/source.c index 737c8cf..b43a23b 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -415,6 +415,9 @@ UINT WINAPI MsiSourceListSetInfoW( LPCWSTR szProduct, LPCWSTR szUserSid, if (!szValue) return ERROR_UNKNOWN_PROPERTY; + if (dwContext == MSIINSTALLCONTEXT_MACHINE && szUserSid) + return ERROR_INVALID_PARAMETER; + if (dwOptions & MSICODE_PATCH) { FIXME("Unhandled options MSICODE_PATCH\n"); diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c index b2e88ee..6f704df 100644 --- a/dlls/msi/tests/source.c +++ b/dlls/msi/tests/source.c @@ -1764,11 +1764,8 @@ static void test_MsiSourceListSetInfo(void) r = MsiSourceListSetInfoA(prodcode, usersid, MSIINSTALLCONTEXT_MACHINE, MSICODE_PRODUCT, INSTALLPROPERTY_MEDIAPACKAGEPATH, "path"); - todo_wine - { - ok(r == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - } + ok(r == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", r); RegDeleteValueA(media, "MediaPackage"); RegDeleteKeyA(media, "");

1 0

James Hawkins : msi: Validate the dwOptions parameter of MsiSourceListSetInfo.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: 4ee1745e8152c1fd9756e5e632f428d3572d3892 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ee1745e8152c1fd9756e5e63… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Feb 19 02:11:42 2008 -0600 msi: Validate the dwOptions parameter of MsiSourceListSetInfo. --- dlls/msi/source.c | 7 ++++++ dlls/msi/tests/source.c | 49 ++++++++++++++-------------------------------- 2 files changed, 22 insertions(+), 34 deletions(-) diff --git a/dlls/msi/source.c b/dlls/msi/source.c index 9702cda..737c8cf 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -435,6 +435,13 @@ UINT WINAPI MsiSourceListSetInfoW( LPCWSTR szProduct, LPCWSTR szUserSid, if (rc != ERROR_SUCCESS) return rc; + if (lstrcmpW(szProperty, INSTALLPROPERTY_LASTUSEDSOURCEW) && + dwOptions & (MSISOURCETYPE_NETWORK | MSISOURCETYPE_URL)) + { + RegCloseKey(sourcekey); + return ERROR_INVALID_PARAMETER; + } + if (!lstrcmpW(szProperty, INSTALLPROPERTY_MEDIAPACKAGEPATHW) || !lstrcmpW(szProperty, INSTALLPROPERTY_DISKPROMPTW)) { diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c index ffc2145..b2e88ee 100644 --- a/dlls/msi/tests/source.c +++ b/dlls/msi/tests/source.c @@ -1452,16 +1452,15 @@ static void test_MsiSourceListSetInfo(void) r = MsiSourceListSetInfoA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PATCH, INSTALLPROPERTY_MEDIAPACKAGEPATH, "path"); - ok(r == ERROR_UNKNOWN_PATCH, - "Expected ERROR_UNKNOWN_PATCH, got %d\n", r); + ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCH, got %d\n", r); /* dwOptions is both MSICODE_PRODUCT and MSICODE_PATCH */ r = MsiSourceListSetInfoA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT | MSICODE_PATCH | MSISOURCETYPE_URL, INSTALLPROPERTY_MEDIAPACKAGEPATH, "path"); - ok(r == ERROR_UNKNOWN_PATCH, - "Expected ERROR_SUCCESS, got %d\n", r); + ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCH, got %d\n", r); + /* dwOptions has both MSISOURCETYPE_NETWORK and MSISOURCETYPE_URL */ r = MsiSourceListSetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, @@ -1556,22 +1555,16 @@ static void test_MsiSourceListSetInfo(void) MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT | MSISOURCETYPE_NETWORK, INSTALLPROPERTY_MEDIAPACKAGEPATH, "path"); - todo_wine - { - ok(r == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - } + ok(r == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", r); /* INSTALLPROPERTY_MEDIAPACKAGEPATH, MSISOURCETYPE_URL */ r = MsiSourceListSetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT | MSISOURCETYPE_URL, INSTALLPROPERTY_MEDIAPACKAGEPATH, "path"); - todo_wine - { - ok(r == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - } + ok(r == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", r); /* INSTALLPROPERTY_DISKPROMPT */ r = MsiSourceListSetInfoA(prodcode, NULL, @@ -1585,22 +1578,16 @@ static void test_MsiSourceListSetInfo(void) MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT | MSISOURCETYPE_NETWORK, INSTALLPROPERTY_DISKPROMPT, "prompt"); - todo_wine - { - ok(r == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - } + ok(r == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", r); /* INSTALLPROPERTY_DISKPROMPT, MSISOURCETYPE_URL */ r = MsiSourceListSetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT | MSISOURCETYPE_URL, INSTALLPROPERTY_DISKPROMPT, "prompt"); - todo_wine - { - ok(r == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - } + ok(r == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", r); /* INSTALLPROPERTY_LASTUSEDSOURCE */ r = MsiSourceListSetInfoA(prodcode, NULL, @@ -1664,22 +1651,16 @@ static void test_MsiSourceListSetInfo(void) MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT | MSISOURCETYPE_NETWORK, INSTALLPROPERTY_PACKAGENAME, "name"); - todo_wine - { - ok(r == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - } + ok(r == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", r); /* INSTALLPROPERTY_PACKAGENAME, MSISOURCETYPE_URL */ r = MsiSourceListSetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT | MSISOURCETYPE_URL, INSTALLPROPERTY_PACKAGENAME, "name"); - todo_wine - { - ok(r == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - } + ok(r == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", r); /* INSTALLPROPERTY_LASTUSEDTYPE */ r = MsiSourceListSetInfoA(prodcode, NULL,

1 0

James Hawkins : msi: Simplify the MEDIAPACKAGEPATH and DISKPROMPT cases.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: 95ef6a1fbc4ffc8964dc384b7f8d197ceb94f24f URL: http://source.winehq.org/git/wine.git/?a=commit;h=95ef6a1fbc4ffc8964dc384b7… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Feb 19 01:49:04 2008 -0600 msi: Simplify the MEDIAPACKAGEPATH and DISKPROMPT cases. --- dlls/msi/source.c | 41 ++++++++++++++------------------- dlls/msi/tests/source.c | 57 ++++++++++++---------------------------------- 2 files changed, 33 insertions(+), 65 deletions(-) diff --git a/dlls/msi/source.c b/dlls/msi/source.c index 710383c..9702cda 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -395,9 +395,14 @@ UINT WINAPI MsiSourceListSetInfoW( LPCWSTR szProduct, LPCWSTR szUserSid, LPCWSTR szProperty, LPCWSTR szValue) { WCHAR squished_pc[GUID_SIZE]; - HKEY sourcekey; + HKEY sourcekey, media; + LPCWSTR property; UINT rc; + static const WCHAR media_package[] = { + 'M','e','d','i','a','P','a','c','k','a','g','e',0 + }; + TRACE("%s %s %x %x %s %s\n", debugstr_w(szProduct), debugstr_w(szUserSid), dwContext, dwOptions, debugstr_w(szProperty), debugstr_w(szValue)); @@ -415,40 +420,30 @@ UINT WINAPI MsiSourceListSetInfoW( LPCWSTR szProduct, LPCWSTR szUserSid, FIXME("Unhandled options MSICODE_PATCH\n"); return ERROR_UNKNOWN_PATCH; } - + if (szUserSid) FIXME("Unhandled UserSid %s\n",debugstr_w(szUserSid)); if (dwContext == MSIINSTALLCONTEXT_USERUNMANAGED) FIXME("Unknown context MSIINSTALLCONTEXT_USERUNMANAGED\n"); + property = szProperty; + if (!lstrcmpW(szProperty, INSTALLPROPERTY_MEDIAPACKAGEPATHW)) + property = media_package; + rc = OpenSourceKey(szProduct, &sourcekey, MSICODE_PRODUCT, dwContext, FALSE); if (rc != ERROR_SUCCESS) return rc; - if (strcmpW(szProperty, INSTALLPROPERTY_MEDIAPACKAGEPATHW) == 0) + if (!lstrcmpW(szProperty, INSTALLPROPERTY_MEDIAPACKAGEPATHW) || + !lstrcmpW(szProperty, INSTALLPROPERTY_DISKPROMPTW)) { - HKEY key; - DWORD size = lstrlenW(szValue)*sizeof(WCHAR); - rc = OpenMediaSubkey(sourcekey, &key, FALSE); + rc = OpenMediaSubkey(sourcekey, &media, TRUE); if (rc == ERROR_SUCCESS) - rc = RegSetValueExW(key, INSTALLPROPERTY_MEDIAPACKAGEPATHW, 0, - REG_SZ, (const BYTE *)szValue, size); - if (rc != ERROR_SUCCESS) - rc = ERROR_UNKNOWN_PROPERTY; - RegCloseKey(key); - } - else if (strcmpW(szProperty, INSTALLPROPERTY_DISKPROMPTW) == 0) - { - HKEY key; - DWORD size = lstrlenW(szValue)*sizeof(WCHAR); - rc = OpenMediaSubkey(sourcekey, &key, FALSE); - if (rc == ERROR_SUCCESS) - rc = RegSetValueExW(key, INSTALLPROPERTY_DISKPROMPTW, 0, - REG_SZ, (const BYTE *)szValue, size); - if (rc != ERROR_SUCCESS) - rc = ERROR_UNKNOWN_PROPERTY; - RegCloseKey(key); + { + rc = msi_reg_set_val_str(media, property, szValue); + RegCloseKey(media); + } } else if (strcmpW(szProperty, INSTALLPROPERTY_LASTUSEDSOURCEW)==0) { diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c index 013e7e9..ffc2145 100644 --- a/dlls/msi/tests/source.c +++ b/dlls/msi/tests/source.c @@ -1509,28 +1509,19 @@ static void test_MsiSourceListSetInfo(void) r = MsiSourceListSetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_MEDIAPACKAGEPATH, "path"); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); /* Media key is created by MsiSourceListSetInfo */ res = RegOpenKeyA(source, "Media", &media); - todo_wine - { - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - CHECK_REG_STR(media, "MediaPackage", "path"); - } + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + CHECK_REG_STR(media, "MediaPackage", "path"); /* set the info again */ r = MsiSourceListSetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_MEDIAPACKAGEPATH, "path2"); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - CHECK_REG_STR(media, "MediaPackage", "path2"); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + CHECK_REG_STR(media, "MediaPackage", "path2"); /* NULL szProperty */ r = MsiSourceListSetInfoA(prodcode, NULL, @@ -1557,11 +1548,8 @@ static void test_MsiSourceListSetInfo(void) r = MsiSourceListSetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_MEDIAPACKAGEPATH, ""); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - CHECK_REG_STR(media, "MediaPackage", ""); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + CHECK_REG_STR(media, "MediaPackage", ""); /* INSTALLPROPERTY_MEDIAPACKAGEPATH, MSISOURCETYPE_NETWORK */ r = MsiSourceListSetInfoA(prodcode, NULL, @@ -1589,11 +1577,8 @@ static void test_MsiSourceListSetInfo(void) r = MsiSourceListSetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_DISKPROMPT, "prompt"); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - CHECK_REG_STR(media, "DiskPrompt", "prompt"); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + CHECK_REG_STR(media, "DiskPrompt", "prompt"); /* INSTALLPROPERTY_DISKPROMPT, MSISOURCETYPE_NETWORK */ r = MsiSourceListSetInfoA(prodcode, NULL, @@ -1750,18 +1735,12 @@ static void test_MsiSourceListSetInfo(void) r = MsiSourceListSetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_MEDIAPACKAGEPATH, "path"); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); /* Media key is created by MsiSourceListSetInfo */ res = RegOpenKeyA(source, "Media", &media); - todo_wine - { - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - CHECK_REG_STR(media, "MediaPackage", "path"); - } + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + CHECK_REG_STR(media, "MediaPackage", "path"); RegDeleteValueA(media, "MediaPackage"); RegDeleteKeyA(media, ""); @@ -1793,18 +1772,12 @@ static void test_MsiSourceListSetInfo(void) r = MsiSourceListSetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_MACHINE, MSICODE_PRODUCT, INSTALLPROPERTY_MEDIAPACKAGEPATH, "path"); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); /* Media key is created by MsiSourceListSetInfo */ res = RegOpenKeyA(source, "Media", &media); - todo_wine - { - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - CHECK_REG_STR(media, "MediaPackage", "path"); - } + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + CHECK_REG_STR(media, "MediaPackage", "path"); /* szUserSid is non-NULL */ r = MsiSourceListSetInfoA(prodcode, usersid,

1 0

James Hawkins : msi: Return the results from OpenSourceKey.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: fe987103fb9bf1e119544d813cc93b7c2a44b952 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe987103fb9bf1e119544d813… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Feb 19 02:09:33 2008 -0600 msi: Return the results from OpenSourceKey. --- dlls/msi/source.c | 5 ++--- dlls/msi/tests/source.c | 21 ++++++--------------- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/dlls/msi/source.c b/dlls/msi/source.c index f129c5f..710383c 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -81,7 +81,7 @@ static UINT OpenSourceKey(LPCWSTR szProduct, HKEY* key, DWORD dwOptions, rc = MSIREG_OpenLocalClassesProductKey(szProduct, &rootkey, create); } - if (rc) + if (rc != ERROR_SUCCESS) { if (dwOptions == MSICODE_PATCH) return ERROR_UNKNOWN_PATCH; @@ -424,8 +424,7 @@ UINT WINAPI MsiSourceListSetInfoW( LPCWSTR szProduct, LPCWSTR szUserSid, rc = OpenSourceKey(szProduct, &sourcekey, MSICODE_PRODUCT, dwContext, FALSE); if (rc != ERROR_SUCCESS) - return ERROR_UNKNOWN_PRODUCT; - + return rc; if (strcmpW(szProperty, INSTALLPROPERTY_MEDIAPACKAGEPATHW) == 0) { diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c index f25b476..013e7e9 100644 --- a/dlls/msi/tests/source.c +++ b/dlls/msi/tests/source.c @@ -1499,11 +1499,8 @@ static void test_MsiSourceListSetInfo(void) r = MsiSourceListSetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_MEDIAPACKAGEPATH, "path"); - todo_wine - { - ok(r == ERROR_BAD_CONFIGURATION, - "Expected ERROR_BAD_CONFIGURATION, got %d\n", r); - } + ok(r == ERROR_BAD_CONFIGURATION, + "Expected ERROR_BAD_CONFIGURATION, got %d\n", r); res = RegCreateKeyA(userkey, "SourceList", &source); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -1743,11 +1740,8 @@ static void test_MsiSourceListSetInfo(void) r = MsiSourceListSetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_MEDIAPACKAGEPATH, "path"); - todo_wine - { - ok(r == ERROR_BAD_CONFIGURATION, - "Expected ERROR_BAD_CONFIGURATION, got %d\n", r); - } + ok(r == ERROR_BAD_CONFIGURATION, + "Expected ERROR_BAD_CONFIGURATION, got %d\n", r); res = RegCreateKeyA(userkey, "SourceList", &source); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -1789,11 +1783,8 @@ static void test_MsiSourceListSetInfo(void) r = MsiSourceListSetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_MACHINE, MSICODE_PRODUCT, INSTALLPROPERTY_MEDIAPACKAGEPATH, "path"); - todo_wine - { - ok(r == ERROR_BAD_CONFIGURATION, - "Expected ERROR_BAD_CONFIGURATION, got %d\n", r); - } + ok(r == ERROR_BAD_CONFIGURATION, + "Expected ERROR_BAD_CONFIGURATION, got %d\n", r); res = RegCreateKeyA(prodkey, "SourceList", &source); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);

1 0