October 2008 - Wine-commits

Henri Verbeet : wined3d: Make sure some variables are always initialized.
by Alexandre Julliard 09 Oct '08

09 Oct '08

Module: wine Branch: master Commit: 3643d59d5bda160a605cbfb6263eb716893fb0d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3643d59d5bda160a605cbfb62… Author: Henri Verbeet <hverbeet(a)gmail.com> Date: Wed Oct 8 17:34:51 2008 +0200 wined3d: Make sure some variables are always initialized. --- dlls/wined3d/ati_fragment_shader.c | 6 +++++- dlls/wined3d/glsl_shader.c | 1 + 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 20c4ebe..7e3225b 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -163,7 +163,11 @@ static GLuint register_for_arg(DWORD arg, WineD3D_GL_Info *gl_info, unsigned int GLenum ret; if(mod) *mod = GL_NONE; - if(arg == ARG_UNUSED) return -1; /* This is the marker for unused registers */ + if(arg == ARG_UNUSED) + { + if (rep) *rep = GL_NONE; + return -1; /* This is the marker for unused registers */ + } switch(arg & WINED3DTA_SELECTMASK) { case WINED3DTA_DIFFUSE: diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 057826d..b73d894 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1219,6 +1219,7 @@ static void shader_glsl_get_sample_function(DWORD sampler_type, BOOL projected, break; default: sample_function->name = ""; + sample_function->coord_mask = 0; FIXME("Unrecognized sampler type: %#x;\n", sampler_type); break; }

1 0

Paul Vriens : shlwapi/tests: Don't crash on NT4.
by Alexandre Julliard 09 Oct '08

09 Oct '08

Module: wine Branch: master Commit: b1105d49f6c69764acd3c06e94a84d34bfbe8030 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1105d49f6c69764acd3c06e9… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Oct 8 17:28:54 2008 +0200 shlwapi/tests: Don't crash on NT4. --- dlls/shlwapi/tests/istream.c | 52 +++++++++++++++++++++++++---------------- 1 files changed, 32 insertions(+), 20 deletions(-) diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index 6aa4f54..66465b8 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -306,17 +306,23 @@ static void test_SHCreateStreamOnFileW(DWORD mode, DWORD stgm) /* invalid arguments */ - stream = NULL; - ret = (*pSHCreateStreamOnFileW)(NULL, mode | stgm, &stream); - ok(ret == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) || /* XP */ - ret == E_INVALIDARG /* Vista */, - "SHCreateStreamOnFileW: expected HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) or E_INVALIDARG, got 0x%08x\n", ret); - ok(stream == NULL, "SHCreateStreamOnFileW: expected a NULL IStream object, got %p\n", stream); + if (0) + { + /* Crashes on NT4 */ + stream = NULL; + ret = (*pSHCreateStreamOnFileW)(NULL, mode | stgm, &stream); + ok(ret == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) || /* XP */ + ret == E_INVALIDARG /* Vista */, + "SHCreateStreamOnFileW: expected HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) or E_INVALIDARG, got 0x%08x\n", ret); + ok(stream == NULL, "SHCreateStreamOnFileW: expected a NULL IStream object, got %p\n", stream); + } -#if 0 /* This test crashes on WinXP SP2 */ - ret = (*pSHCreateStreamOnFileW)(test_file, mode | stgm, NULL); - ok(ret == E_INVALIDARG, "SHCreateStreamOnFileW: expected E_INVALIDARG, got 0x%08x\n", ret); -#endif + if (0) + { + /* This test crashes on WinXP SP2 */ + ret = (*pSHCreateStreamOnFileW)(test_file, mode | stgm, NULL); + ok(ret == E_INVALIDARG, "SHCreateStreamOnFileW: expected E_INVALIDARG, got 0x%08x\n", ret); + } stream = NULL; ret = (*pSHCreateStreamOnFileW)(test_file, mode | STGM_CONVERT | stgm, &stream); @@ -405,12 +411,16 @@ static void test_SHCreateStreamOnFileEx(DWORD mode, DWORD stgm) /* invalid arguments */ - stream = NULL; - ret = (*pSHCreateStreamOnFileEx)(NULL, mode, 0, FALSE, NULL, &stream); - ok(ret == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) || /* XP */ - ret == E_INVALIDARG /* Vista */, - "SHCreateStreamOnFileEx: expected HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) or E_INVALIDARG, got 0x%08x\n", ret); - ok(stream == NULL, "SHCreateStreamOnFileEx: expected a NULL IStream object, got %p\n", stream); + if (0) + { + /* Crashes on NT4 */ + stream = NULL; + ret = (*pSHCreateStreamOnFileEx)(NULL, mode, 0, FALSE, NULL, &stream); + ok(ret == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) || /* XP */ + ret == E_INVALIDARG /* Vista */, + "SHCreateStreamOnFileEx: expected HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) or E_INVALIDARG, got 0x%08x\n", ret); + ok(stream == NULL, "SHCreateStreamOnFileEx: expected a NULL IStream object, got %p\n", stream); + } stream = NULL; ret = (*pSHCreateStreamOnFileEx)(test_file, mode, 0, FALSE, template, &stream); @@ -421,10 +431,12 @@ static void test_SHCreateStreamOnFileEx(DWORD mode, DWORD stgm) ok(stream == NULL, "SHCreateStreamOnFileEx: expected a NULL IStream object, got %p\n", stream); -#if 0 /* This test crashes on WinXP SP2 */ - ret = (*pSHCreateStreamOnFileEx)(test_file, mode, 0, FALSE, NULL, NULL); - ok(ret == E_INVALIDARG, "SHCreateStreamOnFileEx: expected E_INVALIDARG, got 0x%08x\n", ret); -#endif + if (0) + { + /* This test crashes on WinXP SP2 */ + ret = (*pSHCreateStreamOnFileEx)(test_file, mode, 0, FALSE, NULL, NULL); + ok(ret == E_INVALIDARG, "SHCreateStreamOnFileEx: expected E_INVALIDARG, got 0x%08x\n", ret); + } /* file does not exist */

1 0

Paul Vriens : wininet/tests: Don't crash on W2K and below.
by Alexandre Julliard 09 Oct '08

09 Oct '08

Module: wine Branch: master Commit: eba92bd7ee5acf472636996789411ed3ab841c7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=eba92bd7ee5acf47263699678… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Oct 8 17:39:37 2008 +0200 wininet/tests: Don't crash on W2K and below. --- dlls/wininet/tests/urlcache.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index 44852f7..d135976 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -132,10 +132,14 @@ static void test_RetrieveUrlCacheEntryA(void) ok(!ret, "RetrieveUrlCacheEntryFile should have failed\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "RetrieveUrlCacheEntryFile should have set last error to ERROR_INVALID_PARAMETER instead of %d\n", GetLastError()); - SetLastError(0xdeadbeef); - ret = RetrieveUrlCacheEntryFile(TEST_URL, NULL, NULL, 0); - ok(!ret, "RetrieveUrlCacheEntryFile should have failed\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "RetrieveUrlCacheEntryFile should have set last error to ERROR_INVALID_PARAMETER instead of %d\n", GetLastError()); + if (0) + { + /* Crashes on Win9x, NT4 and W2K */ + SetLastError(0xdeadbeef); + ret = RetrieveUrlCacheEntryFile(TEST_URL, NULL, NULL, 0); + ok(!ret, "RetrieveUrlCacheEntryFile should have failed\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "RetrieveUrlCacheEntryFile should have set last error to ERROR_INVALID_PARAMETER instead of %d\n", GetLastError()); + } SetLastError(0xdeadbeef); cbCacheEntryInfo = 100000;

1 0

Henri Verbeet : wined3d: Assign the correct "levels" variable (LLVM/Clang).
by Alexandre Julliard 09 Oct '08

09 Oct '08

Module: wine Branch: master Commit: e9daf92ae686b57e7d6095bc19af6632a113dc47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9daf92ae686b57e7d6095bc1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 8 16:00:53 2008 +0200 wined3d: Assign the correct "levels" variable (LLVM/Clang). --- dlls/wined3d/device.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 79c9f68..6ba8bc0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -962,7 +962,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVolumeTexture(IWineD3DDevice *ifa WARN("D3DUSAGE_AUTOGENMIPMAP is set, and level count > 1, returning D3DERR_INVALIDCALL\n"); return WINED3DERR_INVALIDCALL; } - Levels = 1; + object->baseTexture.levels = 1; } else if (Levels == 0) { object->baseTexture.levels++; tmpW = Width; @@ -1117,7 +1117,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateCubeTexture(IWineD3DDevice *iface return WINED3DERR_INVALIDCALL; } - Levels = 1; + object->baseTexture.levels = 1; } else if (Levels == 0) { object->baseTexture.levels++; tmpW = EdgeLength;

1 0

Henri Verbeet : wined3d: Remove a redundant initialization of cfgs in CheckDepthStencilCapability ( LLVM/Clang).
by Alexandre Julliard 09 Oct '08

09 Oct '08

Module: wine Branch: master Commit: 937ceda47f5a9ab3acd04c5b9fbee3ac740d5ad7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=937ceda47f5a9ab3acd04c5b9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 8 16:37:00 2008 +0200 wined3d: Remove a redundant initialization of cfgs in CheckDepthStencilCapability (LLVM/Clang). --- dlls/wined3d/directx.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index fd0d290..5fa091e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2005,7 +2005,6 @@ static BOOL CheckBumpMapCapability(UINT Adapter, WINED3DDEVTYPE DeviceType, WINE static BOOL CheckDepthStencilCapability(UINT Adapter, WINED3DFORMAT DisplayFormat, WINED3DFORMAT DepthStencilFormat) { int it=0; - WineD3D_PixelFormat *cfgs = Adapters[Adapter].cfgs; const GlPixelFormatDesc *glDesc; const StaticPixelFormatDesc *desc = getFormatDescEntry(DepthStencilFormat, &GLINFO_LOCATION, &glDesc); @@ -2018,10 +2017,10 @@ static BOOL CheckDepthStencilCapability(UINT Adapter, WINED3DFORMAT DisplayForma return FALSE; /* Walk through all WGL pixel formats to find a match */ - cfgs = Adapters[Adapter].cfgs; for (it = 0; it < Adapters[Adapter].nCfgs; ++it) { - if (IWineD3DImpl_IsPixelFormatCompatibleWithRenderFmt(&cfgs[it], DisplayFormat)) { - if (IWineD3DImpl_IsPixelFormatCompatibleWithDepthFmt(&cfgs[it], DepthStencilFormat)) { + WineD3D_PixelFormat *cfg = &Adapters[Adapter].cfgs[it]; + if (IWineD3DImpl_IsPixelFormatCompatibleWithRenderFmt(cfg, DisplayFormat)) { + if (IWineD3DImpl_IsPixelFormatCompatibleWithDepthFmt(cfg, DepthStencilFormat)) { return TRUE; } }

1 0

Henri Verbeet : wined3d: Get rid of some redundant assignments (LLVM/Clang) .
by Alexandre Julliard 09 Oct '08

09 Oct '08

Module: wine Branch: master Commit: 8985b7a7556fc206a63f792c68bb34555ea0d9e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8985b7a7556fc206a63f792c6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 8 16:37:08 2008 +0200 wined3d: Get rid of some redundant assignments (LLVM/Clang). --- dlls/wined3d/device.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6ba8bc0..445fbaa 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -821,8 +821,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateTexture(IWineD3DDevice *iface, U object->baseTexture.pow2Matrix[15] = 1.0; object->target = GL_TEXTURE_2D; object->cond_np2 = TRUE; - pow2Width = Width; - pow2Height = Height; object->baseTexture.minMipLookup = &minMipLookup_noFilter; } else if(GL_SUPPORT(ARB_TEXTURE_RECTANGLE) && (Width != pow2Width || Height != pow2Height) && @@ -1058,7 +1056,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateCubeTexture(IWineD3DDevice *iface unsigned int i, j; UINT tmpW; HRESULT hr; - unsigned int pow2EdgeLength = EdgeLength; + unsigned int pow2EdgeLength; const GlPixelFormatDesc *glDesc; getFormatDescEntry(Format, &GLINFO_LOCATION, &glDesc);

1 0

Henri Verbeet : wined3d: Set the correct pow2Matrix for cube textures when NPOT textures are supported .
by Alexandre Julliard 09 Oct '08

09 Oct '08

Module: wine Branch: master Commit: 3b2ac77e128e0d62e41ed67829dad2e572829d6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b2ac77e128e0d62e41ed6782… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 8 16:44:24 2008 +0200 wined3d: Set the correct pow2Matrix for cube textures when NPOT textures are supported. --- dlls/wined3d/device.c | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 445fbaa..b90ac1d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1077,19 +1077,25 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateCubeTexture(IWineD3DDevice *iface TRACE("(%p) Create Cube Texture\n", This); - /** Non-power2 support **/ - /* Find the nearest pow2 match */ pow2EdgeLength = 1; while (pow2EdgeLength < EdgeLength) pow2EdgeLength <<= 1; object->edgeLength = EdgeLength; - /* TODO: support for native non-power 2 */ - /* Precalculated scaling for 'faked' non power of two texture coords */ - object->baseTexture.pow2Matrix[ 0] = ((float)EdgeLength) / ((float)pow2EdgeLength); - object->baseTexture.pow2Matrix[ 5] = ((float)EdgeLength) / ((float)pow2EdgeLength); - object->baseTexture.pow2Matrix[10] = ((float)EdgeLength) / ((float)pow2EdgeLength); - object->baseTexture.pow2Matrix[15] = 1.0; + + if (GL_SUPPORT(ARB_TEXTURE_NON_POWER_OF_TWO)) { + /* Precalculated scaling for 'faked' non power of two texture coords */ + object->baseTexture.pow2Matrix[ 0] = 1.0; + object->baseTexture.pow2Matrix[ 5] = 1.0; + object->baseTexture.pow2Matrix[10] = 1.0; + object->baseTexture.pow2Matrix[15] = 1.0; + } else { + /* Precalculated scaling for 'faked' non power of two texture coords */ + object->baseTexture.pow2Matrix[ 0] = ((float)EdgeLength) / ((float)pow2EdgeLength); + object->baseTexture.pow2Matrix[ 5] = ((float)EdgeLength) / ((float)pow2EdgeLength); + object->baseTexture.pow2Matrix[10] = ((float)EdgeLength) / ((float)pow2EdgeLength); + object->baseTexture.pow2Matrix[15] = 1.0; + } if(glDesc->Flags & WINED3DFMT_FLAG_FILTERING) { object->baseTexture.minMipLookup = &minMipLookup;

1 0

Henri Verbeet : wined3d: Don't do GL calls without a context.
by Alexandre Julliard 09 Oct '08

09 Oct '08

Module: wine Branch: master Commit: af6636c21c47e4185cb6913331a25a59793d0ff9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af6636c21c47e4185cb691333… Author: Henri Verbeet <hverbeet(a)gmail.com> Date: Wed Oct 8 17:34:51 2008 +0200 wined3d: Don't do GL calls without a context. --- dlls/wined3d/context.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index ce432c9..bfa2ce2 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1493,12 +1493,13 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU else { TRACE("Switching gl ctx to %p, hdc=%p ctx=%p\n", context, context->hdc, context->glCtx); - This->frag_pipe->enable_extension((IWineD3DDevice *) This, FALSE); ret = pwglMakeCurrent(context->hdc, context->glCtx); if(ret == FALSE) { ERR("Failed to activate the new context\n"); } else if(!context->last_was_blit) { This->frag_pipe->enable_extension((IWineD3DDevice *) This, TRUE); + } else { + This->frag_pipe->enable_extension((IWineD3DDevice *) This, FALSE); } } if(This->activeContext->vshader_const_dirty) {

1 0

Henri Verbeet : wined3d: Correct some swizzles and write masks in arb_program_shader.
by Alexandre Julliard 09 Oct '08

09 Oct '08

Module: wine Branch: master Commit: 9aaccfe77f894d3f7ca4f5e9ac7a228957a77c6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aaccfe77f894d3f7ca4f5e9a… Author: Henri Verbeet <hverbeet(a)gmail.com> Date: Wed Oct 8 17:34:51 2008 +0200 wined3d: Correct some swizzles and write masks in arb_program_shader. --- dlls/wined3d/arb_program_shader.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 233098b..3258e3e 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -722,9 +722,9 @@ static void gen_color_correction(SHADER_BUFFER *buffer, const char *reg, const c /* Swap y and z (U and L), and do a sign conversion on x and the new y(V and U) */ shader_addline(buffer, "MOV TMP.g, %s.%c;\n", reg, writemask[2]); - shader_addline(buffer, "MAD %s.%c%c, %s.%c%c, %s, -%s;\n", - reg, writemask[1], writemask[1], - reg, writemask[1], writemask[3], + shader_addline(buffer, "MAD %s.%c%c, %s.%c%c%c%c, %s, -%s;\n", + reg, writemask[1], writemask[2], + reg, writemask[3], writemask[1], writemask[3], writemask[1], two, one); shader_addline(buffer, "MOV %s.%c, TMP.g;\n", reg, writemask[3]); @@ -2820,6 +2820,7 @@ static GLuint gen_arbfp_ffp_shader(struct ffp_settings *settings, IWineD3DStateB } shader_addline(&buffer, "PARAM const = {1, 2, 4, 0.5};\n"); + shader_addline(&buffer, "TEMP TMP;\n"); shader_addline(&buffer, "TEMP ret;\n"); if(tempreg_used || settings->sRGB_write) shader_addline(&buffer, "TEMP tempreg;\n"); shader_addline(&buffer, "TEMP arg0;\n");

1 0

Muneyuki Noguchi : shlwapi: Use "MS Shell Dlg" 9 in Japanese resources.
by Alexandre Julliard 08 Oct '08

08 Oct '08

Module: wine Branch: stable Commit: a40d09fcaf944d5647f12e715388fedbd6b85716 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a40d09fcaf944d5647f12e715… Author: Muneyuki Noguchi <nogu.dev(a)gmail.com> Date: Thu Sep 25 11:41:56 2008 +0900 shlwapi: Use "MS Shell Dlg" 9 in Japanese resources. (cherry picked from commit 7ddd48da2d1ec12b7cc0896cf0ef97481c2fc672) --- dlls/shlwapi/shlwapi_Ja.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/shlwapi_Ja.rc b/dlls/shlwapi/shlwapi_Ja.rc index dbcc441..debdcf0 100644 --- a/dlls/shlwapi/shlwapi_Ja.rc +++ b/dlls/shlwapi/shlwapi_Ja.rc @@ -23,7 +23,7 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "�G��[!" -FONT 9, "MS UI Gothic" +FONT 9, "MS Shell Dlg" { LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8

1 0