March 2008 - Wine-commits - list.winehq.org

Roderick Colenbrander : wined3d: Put vertex texture capability checking in its own function.
by Alexandre Julliard 18 Mar '08

18 Mar '08

Module: wine Branch: master Commit: 2f1e01bbe3ee6f76d6860517c68ea170a813adbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f1e01bbe3ee6f76d6860517c… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Mon Mar 17 18:37:15 2008 +0100 wined3d: Put vertex texture capability checking in its own function. --- dlls/wined3d/directx.c | 74 ++++++++++++++++++++++++++++++++++------------- 1 files changed, 53 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ab60722..9a281ea 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2167,6 +2167,29 @@ MAKEFOURCC('I','N','S','T') once return FALSE; } +static BOOL CheckVertexTextureCapability(UINT Adapter, WINED3DFORMAT CheckFormat) +{ + if (!GL_LIMITS(vertex_samplers)) { + TRACE_(d3d_caps)("[FAILED]\n"); + return FALSE; + } + + switch (CheckFormat) { + case WINED3DFMT_A32B32G32R32F: + if (!GL_SUPPORT(ARB_TEXTURE_FLOAT)) { + TRACE_(d3d_caps)("[FAILED]\n"); + return FALSE; + } + TRACE_(d3d_caps)("[OK]\n"); + return TRUE; + + default: + TRACE_(d3d_caps)("[FAILED]\n"); + return FALSE; + } + return FALSE; +} + static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapter, WINED3DDEVTYPE DeviceType, WINED3DFORMAT AdapterFormat, DWORD Usage, WINED3DRESOURCETYPE RType, WINED3DFORMAT CheckFormat) { IWineD3DImpl *This = (IWineD3DImpl *)iface; @@ -2238,6 +2261,16 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt return WINED3DERR_NOTAVAILABLE; } } + + /* Check QUERY_VERTEXTEXTURE support */ + if(Usage & WINED3DUSAGE_QUERY_VERTEXTEXTURE) { + if(CheckVertexTextureCapability(Adapter, CheckFormat)) { + UsageCaps |= WINED3DUSAGE_QUERY_VERTEXTEXTURE; + } else { + TRACE_(d3d_caps)("[FAILED] - No query vertextexture support\n"); + return WINED3DERR_NOTAVAILABLE; + } + } } } } else if(RType == WINED3DRTYPE_SURFACE) { @@ -2310,6 +2343,16 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt return WINED3DERR_NOTAVAILABLE; } } + + /* Check QUERY_VERTEXTEXTURE support */ + if(Usage & WINED3DUSAGE_QUERY_VERTEXTEXTURE) { + if(CheckVertexTextureCapability(Adapter, CheckFormat)) { + UsageCaps |= WINED3DUSAGE_QUERY_VERTEXTEXTURE; + } else { + TRACE_(d3d_caps)("[FAILED] - No query vertextexture support\n"); + return WINED3DERR_NOTAVAILABLE; + } + } } else if(CheckDepthStencilCapability(Adapter, AdapterFormat, CheckFormat)) { if(Usage & WINED3DUSAGE_DEPTHSTENCIL) UsageCaps |= WINED3DUSAGE_DEPTHSTENCIL; @@ -2331,6 +2374,16 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt return WINED3DERR_NOTAVAILABLE; } } + + /* Check QUERY_VERTEXTEXTURE support */ + if(Usage & WINED3DUSAGE_QUERY_VERTEXTEXTURE) { + if(CheckVertexTextureCapability(Adapter, CheckFormat)) { + UsageCaps |= WINED3DUSAGE_QUERY_VERTEXTEXTURE; + } else { + TRACE_(d3d_caps)("[FAILED] - No query vertextexture support\n"); + return WINED3DERR_NOTAVAILABLE; + } + } } /* Filter formats that need conversion; For one part, this conversion is unimplemented, @@ -2383,27 +2436,6 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt break; } } - /* TODO: Check support against more of the WINED3DUSAGE_QUERY_* constants */ - if (Usage & WINED3DUSAGE_QUERY_VERTEXTEXTURE) { - if (!GL_LIMITS(vertex_samplers)) { - TRACE_(d3d_caps)("[FAILED]\n"); - return WINED3DERR_NOTAVAILABLE; - } - - switch (CheckFormat) { - case WINED3DFMT_A32B32G32R32F: - if (!GL_SUPPORT(ARB_TEXTURE_FLOAT)) { - TRACE_(d3d_caps)("[FAILED]\n"); - return WINED3DERR_NOTAVAILABLE; - } - TRACE_(d3d_caps)("[OK]\n"); - return WINED3D_OK; - - default: - TRACE_(d3d_caps)("[FAILED]\n"); - return WINED3DERR_NOTAVAILABLE; - } - } /* This format is nothing special and it is supported perfectly. * However, ati and nvidia driver on windows do not mark this format as

1 0

Roderick Colenbrander : wined3d: Put the SRG read capability check in its own function.
by Alexandre Julliard 18 Mar '08

18 Mar '08

Module: wine Branch: master Commit: 32a32d82c417b7af86b00fe86492cfea850c4417 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32a32d82c417b7af86b00fe86… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Mon Mar 17 18:32:53 2008 +0100 wined3d: Put the SRG read capability check in its own function. --- dlls/wined3d/directx.c | 85 +++++++++++++++++++++++++++++++++-------------- 1 files changed, 59 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f7f0adc..ab60722 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1940,6 +1940,35 @@ static BOOL CheckRenderTargetCapability(WINED3DFORMAT AdapterFormat, WINED3DFORM return FALSE; } +static BOOL CheckSrgbReadCapability(UINT Adapter, WINED3DFORMAT CheckFormat) +{ + /* Check for supported sRGB formats (Texture loading and framebuffer) */ + if(!GL_SUPPORT(EXT_TEXTURE_SRGB)) { + TRACE_(d3d_caps)("[FAILED] GL_EXT_texture_sRGB not supported\n"); + return FALSE; + } + + switch (CheckFormat) { + case WINED3DFMT_A8R8G8B8: + case WINED3DFMT_X8R8G8B8: + case WINED3DFMT_A4R4G4B4: + case WINED3DFMT_L8: + case WINED3DFMT_A8L8: + case WINED3DFMT_DXT1: + case WINED3DFMT_DXT2: + case WINED3DFMT_DXT3: + case WINED3DFMT_DXT4: + case WINED3DFMT_DXT5: + TRACE_(d3d_caps)("[OK]\n"); + return TRUE; + + default: + TRACE_(d3d_caps)("[FAILED] Gamma texture format %s not supported.\n", debug_d3dformat(CheckFormat)); + return FALSE; + } + return FALSE; +} + /* Check if a texture format is supported on the given adapter */ static BOOL CheckTextureCapability(UINT Adapter, WINED3DFORMAT CheckFormat) { @@ -2199,6 +2228,16 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt return WINED3DERR_NOTAVAILABLE; } } + + /* Check QUERY_SRGBREAD support */ + if(Usage & WINED3DUSAGE_QUERY_SRGBREAD) { + if(CheckSrgbReadCapability(Adapter, CheckFormat)) { + UsageCaps |= WINED3DUSAGE_QUERY_SRGBREAD; + } else { + TRACE_(d3d_caps)("[FAILED] - No query srgbread support\n"); + return WINED3DERR_NOTAVAILABLE; + } + } } } } else if(RType == WINED3DRTYPE_SURFACE) { @@ -2261,6 +2300,16 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt return WINED3DERR_NOTAVAILABLE; } } + + /* Check QUERY_SRGBREAD support */ + if(Usage & WINED3DUSAGE_QUERY_SRGBREAD) { + if(CheckSrgbReadCapability(Adapter, CheckFormat)) { + UsageCaps |= WINED3DUSAGE_QUERY_SRGBREAD; + } else { + TRACE_(d3d_caps)("[FAILED] - No query srgbread support\n"); + return WINED3DERR_NOTAVAILABLE; + } + } } else if(CheckDepthStencilCapability(Adapter, AdapterFormat, CheckFormat)) { if(Usage & WINED3DUSAGE_DEPTHSTENCIL) UsageCaps |= WINED3DUSAGE_DEPTHSTENCIL; @@ -2272,6 +2321,16 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt TRACE_(d3d_caps)("[FAILED] - Format not supported\n"); return WINED3DERR_NOTAVAILABLE; } + + /* Check QUERY_SRGBREAD support */ + if(Usage & WINED3DUSAGE_QUERY_SRGBREAD) { + if(CheckSrgbReadCapability(Adapter, CheckFormat)) { + UsageCaps |= WINED3DUSAGE_QUERY_SRGBREAD; + } else { + TRACE_(d3d_caps)("[FAILED] - No query srgbread support\n"); + return WINED3DERR_NOTAVAILABLE; + } + } } /* Filter formats that need conversion; For one part, this conversion is unimplemented, @@ -2346,32 +2405,6 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt } } - /* Check for supported sRGB formats (Texture loading and framebuffer) */ - if (Usage & WINED3DUSAGE_QUERY_SRGBREAD) { - if(!GL_SUPPORT(EXT_TEXTURE_SRGB)) { - TRACE_(d3d_caps)("[FAILED] GL_EXT_texture_sRGB not supported\n"); - } - - switch (CheckFormat) { - case WINED3DFMT_A8R8G8B8: - case WINED3DFMT_X8R8G8B8: - case WINED3DFMT_A4R4G4B4: - case WINED3DFMT_L8: - case WINED3DFMT_A8L8: - case WINED3DFMT_DXT1: - case WINED3DFMT_DXT2: - case WINED3DFMT_DXT3: - case WINED3DFMT_DXT4: - case WINED3DFMT_DXT5: - TRACE_(d3d_caps)("[OK]\n"); - break; /* Continue with checking other flags */ - - default: - TRACE_(d3d_caps)("[FAILED] Gamma texture format %s not supported.\n", debug_d3dformat(CheckFormat)); - return WINED3DERR_NOTAVAILABLE; - } - } - /* This format is nothing special and it is supported perfectly. * However, ati and nvidia driver on windows do not mark this format as * supported (tested with the dxCapsViewer) and pretending to

1 0

Roderick Colenbrander : wined3d: Add a function which checks the filtering capabilities for a format.
by Alexandre Julliard 18 Mar '08

18 Mar '08

Module: wine Branch: master Commit: aa46edd60cd6c66bc093cab7c3064856d7271bac URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa46edd60cd6c66bc093cab7c… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Mon Mar 17 19:27:24 2008 +0100 wined3d: Add a function which checks the filtering capabilities for a format. --- dlls/wined3d/directx.c | 57 +++++++++++++++++++++++++++++++++++++---------- 1 files changed, 45 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9a281ea..7b90177 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1873,6 +1873,21 @@ WINED3DFORMAT DepthStencilFormat) return FALSE; } +static BOOL CheckFilterCapability(WINED3DFORMAT CheckFormat) +{ + switch (CheckFormat) { + /* Filtering not supported */ + case WINED3DFMT_R32F: + case WINED3DFMT_A32B32G32R32F: + TRACE_(d3d_caps)("[FAILED]\n"); + return FALSE; + default: + break; + } + + return TRUE; +} + /* Check the render target capabilities of a format */ static BOOL CheckRenderTargetCapability(WINED3DFORMAT AdapterFormat, WINED3DFORMAT CheckFormat) { @@ -2208,18 +2223,6 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt return WINED3DERR_INVALIDCALL; } - if (Usage & WINED3DUSAGE_QUERY_FILTER) { - switch (CheckFormat) { - /* Filtering not supported */ - case WINED3DFMT_R32F: - case WINED3DFMT_A32B32G32R32F: - TRACE_(d3d_caps)("[FAILED]\n"); - return WINED3DERR_NOTAVAILABLE; - default: - break; - } - } - if (Usage & WINED3DUSAGE_AUTOGENMIPMAP) { if(!GL_SUPPORT(SGIS_GENERATE_MIPMAP)) { TRACE_(d3d_caps)("[FAILED] - No mipmap generation support\n"); @@ -2252,6 +2255,16 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt } } + /* Check QUERY_FILTER support */ + if(Usage & WINED3DUSAGE_QUERY_FILTER) { + if(CheckFilterCapability(CheckFormat)) { + UsageCaps |= WINED3DUSAGE_QUERY_FILTER; + } else { + TRACE_(d3d_caps)("[FAILED] - No query filter support\n"); + return WINED3DERR_NOTAVAILABLE; + } + } + /* Check QUERY_SRGBREAD support */ if(Usage & WINED3DUSAGE_QUERY_SRGBREAD) { if(CheckSrgbReadCapability(Adapter, CheckFormat)) { @@ -2324,6 +2337,16 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt } } + /* Check QUERY_FILTER support */ + if(Usage & WINED3DUSAGE_QUERY_FILTER) { + if(CheckFilterCapability(CheckFormat)) { + UsageCaps |= WINED3DUSAGE_QUERY_FILTER; + } else { + TRACE_(d3d_caps)("[FAILED] - No query filter support\n"); + return WINED3DERR_NOTAVAILABLE; + } + } + /* Check QUERY_LEGACYBUMPMAP support */ if(Usage & WINED3DUSAGE_QUERY_LEGACYBUMPMAP) { if(CheckBumpMapCapability(Adapter, CheckFormat)) { @@ -2365,6 +2388,16 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt return WINED3DERR_NOTAVAILABLE; } + /* Check QUERY_FILTER support */ + if(Usage & WINED3DUSAGE_QUERY_FILTER) { + if(CheckFilterCapability(CheckFormat)) { + UsageCaps |= WINED3DUSAGE_QUERY_FILTER; + } else { + TRACE_(d3d_caps)("[FAILED] - No query filter support\n"); + return WINED3DERR_NOTAVAILABLE; + } + } + /* Check QUERY_SRGBREAD support */ if(Usage & WINED3DUSAGE_QUERY_SRGBREAD) { if(CheckSrgbReadCapability(Adapter, CheckFormat)) {

1 0

Roderick Colenbrander : wined3d: Add a function which checks the legacy bump mapping capabilities.
by Alexandre Julliard 18 Mar '08

18 Mar '08

Module: wine Branch: master Commit: 4e66c9c9906e163dcdc3427dfb70882072612c78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e66c9c9906e163dcdc3427df… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Mon Mar 17 18:29:29 2008 +0100 wined3d: Add a function which checks the legacy bump mapping capabilities. --- dlls/wined3d/directx.c | 64 ++++++++++++++++++++++++++++------------------- 1 files changed, 38 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 97989ba..f7f0adc 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1808,6 +1808,34 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceType(IWineD3D *iface, UINT Adapter #define GLINFO_LOCATION Adapters[Adapter].gl_info +/* Check if we support bumpmapping for a format */ +static BOOL CheckBumpMapCapability(UINT Adapter, WINED3DFORMAT CheckFormat) +{ + if(GL_SUPPORT(NV_REGISTER_COMBINERS) && GL_SUPPORT(NV_TEXTURE_SHADER2)) { + switch (CheckFormat) { + case WINED3DFMT_V8U8: + TRACE_(d3d_caps)("[OK]\n"); + return TRUE; + /* TODO: Other bump map formats */ + default: + TRACE_(d3d_caps)("[FAILED]\n"); + return FALSE; + } + } + if(GL_SUPPORT(ATI_ENVMAP_BUMPMAP)) { + switch (CheckFormat) { + case WINED3DFMT_V8U8: + TRACE_(d3d_caps)("[OK]\n"); + return TRUE; + default: + TRACE_(d3d_caps)("[FAILED]\n"); + return FALSE; + } + } + TRACE_(d3d_caps)("[FAILED]\n"); + return FALSE; +} + /* Check if the given DisplayFormat + DepthStencilFormat combination is valid for the Adapter */ static BOOL CheckDepthStencilCapability(UINT Adapter, WINED3DFORMAT DisplayFormat, WINED3DFORMAT DepthStencilFormat) @@ -2223,6 +2251,16 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt return WINED3DERR_NOTAVAILABLE; } } + + /* Check QUERY_LEGACYBUMPMAP support */ + if(Usage & WINED3DUSAGE_QUERY_LEGACYBUMPMAP) { + if(CheckBumpMapCapability(Adapter, CheckFormat)) { + UsageCaps |= WINED3DUSAGE_QUERY_LEGACYBUMPMAP; + } else { + TRACE_(d3d_caps)("[FAILED] - No legacy bumpmap support\n"); + return WINED3DERR_NOTAVAILABLE; + } + } } else if(CheckDepthStencilCapability(Adapter, AdapterFormat, CheckFormat)) { if(Usage & WINED3DUSAGE_DEPTHSTENCIL) UsageCaps |= WINED3DUSAGE_DEPTHSTENCIL; @@ -2308,32 +2346,6 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt } } - if(Usage & WINED3DUSAGE_QUERY_LEGACYBUMPMAP) { - if(GL_SUPPORT(NV_REGISTER_COMBINERS) && GL_SUPPORT(NV_TEXTURE_SHADER2)) { - switch (CheckFormat) { - case WINED3DFMT_V8U8: - TRACE_(d3d_caps)("[OK]\n"); - return WINED3D_OK; - /* TODO: Other bump map formats */ - default: - TRACE_(d3d_caps)("[FAILED]\n"); - return WINED3DERR_NOTAVAILABLE; - } - } - if(GL_SUPPORT(ATI_ENVMAP_BUMPMAP)) { - switch (CheckFormat) { - case WINED3DFMT_V8U8: - TRACE_(d3d_caps)("[OK]\n"); - return WINED3D_OK; - default: - TRACE_(d3d_caps)("[FAILED]\n"); - return WINED3DERR_NOTAVAILABLE; - } - } - TRACE_(d3d_caps)("[FAILED]\n"); - return WINED3DERR_NOTAVAILABLE; - } - /* Check for supported sRGB formats (Texture loading and framebuffer) */ if (Usage & WINED3DUSAGE_QUERY_SRGBREAD) { if(!GL_SUPPORT(EXT_TEXTURE_SRGB)) {

1 0

James Hawkins : msi: Fix a few test failures on win9x.
by Alexandre Julliard 18 Mar '08

18 Mar '08

Module: wine Branch: master Commit: ecc948ab4873cabfe4fca9a9d9dcb37193064b76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecc948ab4873cabfe4fca9a9d… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Mar 17 15:40:53 2008 -0700 msi: Fix a few test failures on win9x. --- dlls/msi/tests/suminfo.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/suminfo.c b/dlls/msi/tests/suminfo.c index 6ef98f7..3afd0d5 100644 --- a/dlls/msi/tests/suminfo.c +++ b/dlls/msi/tests/suminfo.c @@ -391,10 +391,11 @@ static void test_summary_binary(void) type = 0; r = MsiSummaryInfoGetProperty(hsuminfo, PID_LASTPRINTED, &type, NULL, NULL, sval, &sz); ok(r == ERROR_SUCCESS, "MsiSummaryInfoGetProperty failed\n"); - ok(!strcmp(sval, ""), "Expected empty string, got %s\n", sval); + ok(!lstrcmpA(sval, "") || !lstrcmpA(sval, "7"), + "Expected empty string or \"7\", got \"%s\"\n", sval); todo_wine { ok(type == VT_LPSTR, "Expected VT_LPSTR, got %d\n", type); - ok(sz == 0, "Expected 0, got %d\n", sz); + ok(sz == 0 || sz == 1, "Expected 0 or 1, got %d\n", sz); } ival = -1;

1 0

James Hawkins : msi: Fix a few test failures on win9x.
by Alexandre Julliard 18 Mar '08

18 Mar '08

Module: wine Branch: master Commit: afb575d59979a1fe7e6fa92f4c70ff8d2306b81a URL: http://source.winehq.org/git/wine.git/?a=commit;h=afb575d59979a1fe7e6fa92f4… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Mar 17 15:39:53 2008 -0700 msi: Fix a few test failures on win9x. --- dlls/msi/tests/install.c | 60 ++++++++++++++++++++++++++++++++------------- 1 files changed, 42 insertions(+), 18 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index c6f22c5..a0c5af2 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1676,14 +1676,25 @@ static void test_continuouscabs(void) MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); r = MsiInstallProductA(msifile, NULL); - ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); - todo_wine + if (r == ERROR_SUCCESS) /* win9x has a problem with this */ { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); - ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); + todo_wine + { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); + } + ok(delete_pf("msitest", FALSE), "File not installed\n"); + } + else + { + /* FIXME: remove when we pass with ERROR_SUCCESS */ + delete_pf("msitest\\maximus", TRUE); + delete_pf("msitest\\augustus", TRUE); + delete_pf("msitest\\caesar", TRUE); + delete_pf("msitest", FALSE); } - ok(delete_pf("msitest", FALSE), "File not installed\n"); delete_cab_files(); DeleteFile(msifile); @@ -1829,14 +1840,17 @@ static void test_samesequence(void) MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); r = MsiInstallProductA(msifile, NULL); - todo_wine + if (r == ERROR_SUCCESS) /* win9x has a problem with this */ { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); - ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); + todo_wine + { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); + } + ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "File not installed\n"); } - ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); - ok(delete_pf("msitest", FALSE), "File not installed\n"); delete_cab_files(); DeleteFile(msifile); @@ -1852,14 +1866,24 @@ static void test_uiLevelFlags(void) MsiSetInternalUI(INSTALLUILEVEL_NONE | INSTALLUILEVEL_SOURCERESONLY, NULL); r = MsiInstallProductA(msifile, NULL); - ok(!delete_pf("msitest\\maximus", TRUE), "UI install occurred, but execute-only was requested.\n"); - todo_wine + if (r == ERROR_SUCCESS) /* win9x has a problem with this */ { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); + ok(!delete_pf("msitest\\maximus", TRUE), "UI install occurred, but execute-only was requested.\n"); + todo_wine + { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); + } + ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "File not installed\n"); + } + else + { + /* FIXME: remove when we pass with ERROR_SUCCESS */ + delete_pf("msitest\\caesar", TRUE); + delete_pf("msitest\\augustus", TRUE); + delete_pf("msitest", FALSE); } - ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); - ok(delete_pf("msitest", FALSE), "File not installed\n"); delete_cab_files(); DeleteFile(msifile);

1 0

James Hawkins : msi: Fix a few test failures on win9x.
by Alexandre Julliard 18 Mar '08

18 Mar '08

Module: wine Branch: master Commit: 669122fdfe4485ba0e663638177e90c6c2178276 URL: http://source.winehq.org/git/wine.git/?a=commit;h=669122fdfe4485ba0e6636381… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Mar 17 16:59:30 2008 -0500 msi: Fix a few test failures on win9x. --- dlls/msi/tests/package.c | 31 +++++++++++++++++++++---------- 1 files changed, 21 insertions(+), 10 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 540de8b..0857d1b 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -922,10 +922,12 @@ static void test_settargetpath(void) sprintf( tempdir, "%s\\subdir", buffer ); r = MsiSetTargetPath( hpkg, "TARGETDIR", buffer ); - ok( r == ERROR_SUCCESS, "MsiSetTargetPath on file returned %d\n", r ); + ok( r == ERROR_SUCCESS || r == ERROR_DIRECTORY, + "MsiSetTargetPath on file returned %d\n", r ); r = MsiSetTargetPath( hpkg, "TARGETDIR", tempdir ); - ok( r == ERROR_SUCCESS, "MsiSetTargetPath on 'subdir' of file returned %d\n", r ); + ok( r == ERROR_SUCCESS || r == ERROR_DIRECTORY, + "MsiSetTargetPath on 'subdir' of file returned %d\n", r ); DeleteFile( buffer ); @@ -4731,6 +4733,7 @@ static void test_installprops(void) size = MAX_PATH; type = REG_SZ; + *path = '\0'; if (RegQueryValueEx(hkey1, "DefName", NULL, &type, (LPBYTE)path, &size) != ERROR_SUCCESS) { size = MAX_PATH; @@ -4738,13 +4741,18 @@ static void test_installprops(void) RegQueryValueEx(hkey2, "RegisteredOwner", NULL, &type, (LPBYTE)path, &size); } - size = MAX_PATH; - r = MsiGetProperty(hpkg, "USERNAME", buf, &size); - ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); - ok( !lstrcmp(buf, path), "Expected %s, got %s\n", path, buf); + /* win9x doesn't set this */ + if (*path) + { + size = MAX_PATH; + r = MsiGetProperty(hpkg, "USERNAME", buf, &size); + ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); + ok( !lstrcmp(buf, path), "Expected %s, got %s\n", path, buf); + } size = MAX_PATH; type = REG_SZ; + *path = '\0'; if (RegQueryValueEx(hkey1, "DefCompany", NULL, &type, (LPBYTE)path, &size) != ERROR_SUCCESS) { size = MAX_PATH; @@ -4752,10 +4760,13 @@ static void test_installprops(void) RegQueryValueEx(hkey2, "RegisteredOrganization", NULL, &type, (LPBYTE)path, &size); } - size = MAX_PATH; - r = MsiGetProperty(hpkg, "COMPANYNAME", buf, &size); - ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); - ok( !lstrcmp(buf, path), "Expected %s, got %s\n", path, buf); + if (*path) + { + size = MAX_PATH; + r = MsiGetProperty(hpkg, "COMPANYNAME", buf, &size); + ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); + ok( !lstrcmp(buf, path), "Expected %s, got %s\n", path, buf); + } size = MAX_PATH; r = MsiGetProperty(hpkg, "VersionDatabase", buf, &size);

1 0

James Hawkins : msi: Skip the Installer object tests on win9x.
by Alexandre Julliard 18 Mar '08

18 Mar '08

Module: wine Branch: master Commit: c1e3f831ec993b7220e6ac59669997bf98f4575e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1e3f831ec993b7220e6ac596… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Mar 17 16:58:16 2008 -0500 msi: Skip the Installer object tests on win9x. --- dlls/msi/tests/automation.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index abdd2e4..a44a3aa 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -2168,6 +2168,12 @@ static void test_Installer_InstallProduct(void) /* Installer::InstallProduct */ hr = Installer_InstallProduct(szMsifile, NULL); + if (hr == DISP_E_EXCEPTION) + { + skip("Installer object not supported.\n"); + delete_test_files(); + return; + } ok(hr == S_OK, "Installer_InstallProduct failed, hresult 0x%08x\n", hr); /* Installer::ProductState for our product code, which has been installed */

1 0

James Hawkins : msi: Fix a few tests of display IDs that don' t exist on win9x.
by Alexandre Julliard 18 Mar '08

18 Mar '08

Module: wine Branch: master Commit: 55365b77d7ca6ec13617a27e6e25befafc9accdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=55365b77d7ca6ec13617a27e6… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Mar 17 16:57:42 2008 -0500 msi: Fix a few tests of display IDs that don't exist on win9x. --- dlls/msi/tests/automation.c | 195 +++++++++++++++++++++++++++--------------- 1 files changed, 125 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=55365b77d7ca6ec13617a…

1 0

James Hawkins : msi: Skip the endlines test if the table fails on import.
by Alexandre Julliard 18 Mar '08

18 Mar '08

Module: wine Branch: master Commit: 97f1afbd3b5ee94adcb736d43c55ad468d6c1dd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97f1afbd3b5ee94adcb736d43… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Mar 17 12:16:03 2008 -0500 msi: Skip the endlines test if the table fails on import. --- dlls/msi/tests/db.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index ebcdc77..5bb049d 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1643,7 +1643,12 @@ static void test_msiimport(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); r = add_table_to_db(hdb, endlines1); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + if (r == ERROR_FUNCTION_FAILED) + { + /* win9x doesn't handle this case */ + skip("endlines not handled correctly.\n"); + return; + } r = add_table_to_db(hdb, endlines2); ok(r == ERROR_FUNCTION_FAILED,

1 0