May 2009 - Wine-commits - list.winehq.org

Andrew Nguyen : kernel32/tests: Use named constants for a drive test.
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: 94945af5566c73fa3832f7fe70ebc6dede54861d URL: http://source.winehq.org/git/wine.git/?a=commit;h=94945af5566c73fa3832f7fe7… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Mon May 18 05:07:22 2009 -0500 kernel32/tests: Use named constants for a drive test. --- dlls/kernel32/tests/drive.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/drive.c b/dlls/kernel32/tests/drive.c index 6bee4a7..af1cf7f 100644 --- a/dlls/kernel32/tests/drive.c +++ b/dlls/kernel32/tests/drive.c @@ -39,7 +39,8 @@ static void test_GetDriveTypeA(void) for (drive[0] = 'A'; drive[0] <= 'Z'; drive[0]++) { type = GetDriveTypeA(drive); - ok(type > 0 && type <= 6, "not a valid drive %c: type %u\n", drive[0], type); + ok(type > DRIVE_UNKNOWN && type <= DRIVE_RAMDISK, + "not a valid drive %c: type %u\n", drive[0], type); if (!(logical_drives & 1)) ok(type == DRIVE_NO_ROOT_DIR, @@ -67,7 +68,8 @@ static void test_GetDriveTypeW(void) win_skip("GetDriveTypeW is not available on Win9x\n"); return; } - ok(type > 0 && type <= 6, "not a valid drive %c: type %u\n", drive[0], type); + ok(type > DRIVE_UNKNOWN && type <= DRIVE_RAMDISK, + "not a valid drive %c: type %u\n", drive[0], type); if (!(logical_drives & 1)) ok(type == DRIVE_NO_ROOT_DIR,

1 0

Paul Vriens : setupapi: Fix passing a NULL parameter (Coverity).
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: 77fa32a8327b09a33080f78e2ce69123bbd3083c URL: http://source.winehq.org/git/wine.git/?a=commit;h=77fa32a8327b09a33080f78e2… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri May 15 14:48:28 2009 +0200 setupapi: Fix passing a NULL parameter (Coverity). --- dlls/setupapi/misc.c | 6 ++++++ dlls/setupapi/tests/misc.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index 36d52ba..a9efa2a 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -1139,6 +1139,12 @@ BOOL WINAPI SetupUninstallOEMInfW( PCWSTR inf_file, DWORD flags, PVOID reserved TRACE("%s, 0x%08x, %p\n", debugstr_w(inf_file), flags, reserved); + if (!inf_file) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (!GetWindowsDirectoryW( target, sizeof(target)/sizeof(WCHAR) )) return FALSE; strcatW( target, infW ); diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index e110e22..4b8bd03 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -46,6 +46,7 @@ static CHAR CURR_DIR[MAX_PATH]; static BOOL (WINAPI *pSetupGetFileCompressionInfoExA)(PCSTR, PSTR, DWORD, PDWORD, PDWORD, PDWORD, PUINT); static BOOL (WINAPI *pSetupCopyOEMInfA)(PCSTR, PCSTR, DWORD, DWORD, PSTR, DWORD, PDWORD, PSTR *); static BOOL (WINAPI *pSetupQueryInfOriginalFileInformationA)(PSP_INF_INFORMATION, UINT, PSP_ALTPLATFORM_INFO, PSP_ORIGINAL_FILE_INFO_A); +static BOOL (WINAPI *pSetupUninstallOEMInfA)(PCSTR, DWORD, PVOID); static void create_inf_file(LPCSTR filename) { @@ -581,6 +582,32 @@ static void test_SetupDecompressOrCopyFile(void) DeleteFileA(source); } +static void test_SetupUninstallOEMInf(void) +{ + BOOL ret; + + SetLastError(0xdeadbeef); + ret = pSetupUninstallOEMInfA(NULL, 0, NULL); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pSetupUninstallOEMInfA("", 0, NULL); + todo_wine + { + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %08x\n", GetLastError()); + } + + SetLastError(0xdeadbeef); + ret = pSetupUninstallOEMInfA("nonexistent.inf", 0, NULL); + todo_wine + { + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %08x\n", GetLastError()); + } +} + START_TEST(misc) { HMODULE hsetupapi = GetModuleHandle("setupapi.dll"); @@ -588,6 +615,7 @@ START_TEST(misc) pSetupGetFileCompressionInfoExA = (void*)GetProcAddress(hsetupapi, "SetupGetFileCompressionInfoExA"); pSetupCopyOEMInfA = (void*)GetProcAddress(hsetupapi, "SetupCopyOEMInfA"); pSetupQueryInfOriginalFileInformationA = (void*)GetProcAddress(hsetupapi, "SetupQueryInfOriginalFileInformationA"); + pSetupUninstallOEMInfA = (void*)GetProcAddress(hsetupapi, "SetupUninstallOEMInfA"); GetCurrentDirectoryA(MAX_PATH, CURR_DIR); @@ -604,4 +632,9 @@ START_TEST(misc) win_skip("SetupGetFileCompressionInfoExA is not available\n"); test_SetupDecompressOrCopyFile(); + + if (pSetupUninstallOEMInfA) + test_SetupUninstallOEMInf(); + else + win_skip("SetupUninstallOEMInfA is not available\n"); }

1 0

Andrew Nguyen : kernel32/tests: Correctly skip tests when the Unicode directory functions are not available .
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: 4f7f110c5e39a3aeb94a6a75bc6894a5a08b2540 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f7f110c5e39a3aeb94a6a75b… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Mon May 18 04:24:20 2009 -0500 kernel32/tests: Correctly skip tests when the Unicode directory functions are not available. --- dlls/kernel32/tests/directory.c | 22 +++++++++++++++++----- 1 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/directory.c b/dlls/kernel32/tests/directory.c index a0ccd9f..8d1c457 100644 --- a/dlls/kernel32/tests/directory.c +++ b/dlls/kernel32/tests/directory.c @@ -61,8 +61,11 @@ static void test_GetWindowsDirectoryW(void) static const WCHAR fooW[] = {'f','o','o',0}; len_with_null = GetWindowsDirectoryW(NULL, 0); - if (len_with_null==0 && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) + if (len_with_null == 0 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("GetWindowsDirectoryW is not implemented\n"); return; + } ok(len_with_null <= MAX_PATH, "should fit into MAX_PATH\n"); lstrcpyW(buf, fooW); @@ -124,8 +127,11 @@ static void test_GetSystemDirectoryW(void) static const WCHAR fooW[] = {'f','o','o',0}; len_with_null = GetSystemDirectoryW(NULL, 0); - if (len_with_null==0 && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) + if (len_with_null == 0 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("GetSystemDirectoryW is not available\n"); return; + } ok(len_with_null <= MAX_PATH, "should fit into MAX_PATH\n"); lstrcpyW(buf, fooW); @@ -337,8 +343,11 @@ static void test_CreateDirectoryW(void) static const WCHAR questionW[] = {'?',0}; ret = CreateDirectoryW(NULL, NULL); - if (!ret && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) + if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("CreateDirectoryW is not available\n"); return; + } ok(ret == FALSE && GetLastError() == ERROR_PATH_NOT_FOUND, "should not create NULL path ret %u err %u\n", ret, GetLastError()); @@ -441,8 +450,11 @@ static void test_RemoveDirectoryW(void) GetTempPathW(MAX_PATH, tmpdir); lstrcatW(tmpdir, tmp_dir_name); ret = CreateDirectoryW(tmpdir, NULL); - if (!ret && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) - return; + if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("CreateDirectoryW is not available\n"); + return; + } ok(ret == TRUE, "CreateDirectoryW should always succeed\n");

1 0

Andrew Nguyen : kernel32/tests: Correctly skip tests when the Unicode drive functions are not available.
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: a85dc859606b079dc9e4923b48141ec4c85fb743 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a85dc859606b079dc9e4923b4… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Mon May 18 04:24:26 2009 -0500 kernel32/tests: Correctly skip tests when the Unicode drive functions are not available. --- dlls/kernel32/tests/drive.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/drive.c b/dlls/kernel32/tests/drive.c index 98bc126..6bee4a7 100644 --- a/dlls/kernel32/tests/drive.c +++ b/dlls/kernel32/tests/drive.c @@ -62,9 +62,9 @@ static void test_GetDriveTypeW(void) for (drive[0] = 'A'; drive[0] <= 'Z'; drive[0]++) { type = GetDriveTypeW(drive); - if (type == DRIVE_UNKNOWN && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) + if (type == DRIVE_UNKNOWN && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { - /* Must be Win9x which doesn't support the Unicode functions */ + win_skip("GetDriveTypeW is not available on Win9x\n"); return; } ok(type > 0 && type <= 6, "not a valid drive %c: type %u\n", drive[0], type); @@ -165,9 +165,9 @@ static void test_GetDiskFreeSpaceW(void) static const WCHAR unix_style_root_pathW[] = { '/', 0 }; ret = GetDiskFreeSpaceW(NULL, &sectors_per_cluster, &bytes_per_sector, &free_clusters, &total_clusters); - if (ret == 0 && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) + if (ret == 0 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { - /* Must be Win9x which doesn't support the Unicode functions */ + win_skip("GetDiskFreeSpaceW is not available\n"); return; } ok(ret, "GetDiskFreeSpaceW error %d\n", GetLastError());

1 0

Andrew Nguyen : kernel32/tests: Correctly skip when the Unicode file functions are not available.
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: 38f7d54fe08718044e59732aa2f5f0ea79beddcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=38f7d54fe08718044e59732aa… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Mon May 18 04:24:31 2009 -0500 kernel32/tests: Correctly skip when the Unicode file functions are not available. --- dlls/kernel32/tests/file.c | 25 ++++++++++++++++++++----- 1 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 89b284d..86ad4e5 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -633,8 +633,11 @@ static void test_CopyFileW(void) DWORD ret; ret = GetTempPathW(MAX_PATH, temp_path); - if (ret==0 && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) + if (ret == 0 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("GetTempPathW is not available\n"); return; + } ok(ret != 0, "GetTempPathW error %d\n", GetLastError()); ok(ret < MAX_PATH, "temp path should fit into MAX_PATH\n"); @@ -720,8 +723,11 @@ static void test_CreateFileW(void) DWORD ret; ret = GetTempPathW(MAX_PATH, temp_path); - if (ret==0 && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) + if (ret == 0 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("GetTempPathW is not available\n"); return; + } ok(ret != 0, "GetTempPathW error %d\n", GetLastError()); ok(ret < MAX_PATH, "temp path should fit into MAX_PATH\n"); @@ -864,8 +870,11 @@ static void test_DeleteFileW( void ) static const WCHAR emptyW[]={'\0'}; ret = DeleteFileW(NULL); - if (ret==0 && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) + if (ret == 0 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("DeleteFileW is not available\n"); return; + } ok(!ret && GetLastError() == ERROR_PATH_NOT_FOUND, "DeleteFileW(NULL) returned ret=%d error=%d\n",ret,GetLastError()); @@ -984,8 +993,11 @@ static void test_MoveFileW(void) DWORD ret; ret = GetTempPathW(MAX_PATH, temp_path); - if (ret==0 && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) + if (ret == 0 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("GetTempPathW is not available\n"); return; + } ok(ret != 0, "GetTempPathW error %d\n", GetLastError()); ok(ret < MAX_PATH, "temp path should fit into MAX_PATH\n"); @@ -2352,8 +2364,11 @@ static void test_ReplaceFileW(void) } ret = GetTempPathW(MAX_PATH, temp_path); - if (ret==0 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + if (ret == 0 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("GetTempPathW is not available\n"); return; + } ok(ret != 0, "GetTempPathW error %d\n", GetLastError()); ok(ret < MAX_PATH, "temp path should fit into MAX_PATH\n");

1 0

Andrew Nguyen : kernel32/tests: Correctly skip when Unicode locale functions are not available.
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: 1e74b21f182162e03ba1e9490d3f5b5cebe309ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e74b21f182162e03ba1e9490… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Mon May 18 04:24:37 2009 -0500 kernel32/tests: Correctly skip when Unicode locale functions are not available. --- dlls/kernel32/tests/locale.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index e88e182..4f287cf 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -432,7 +432,10 @@ static void test_GetDateFormatW(void) ret = GetDateFormatW(LOCALE_SYSTEM_DEFAULT, DATE_LONGDATE, NULL, input, buffer, COUNTOF(buffer)); if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) - return; + { + win_skip("GetDateFormatW is not implemented\n"); + return; + } ok(!ret && GetLastError() == ERROR_INVALID_FLAGS, "Expected ERROR_INVALID_FLAGS, got %d\n", GetLastError()); EXPECT_EQW; @@ -1631,8 +1634,11 @@ static void test_FoldStringA(void) /* MAP_FOLDDIGITS */ SetLastError(0); ret = pFoldStringA(MAP_FOLDDIGITS, digits_src, -1, dst, 256); - if (GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) + if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("FoldStringA is not implemented\n"); return; + } ok(ret == 4, "Expected ret == 4, got %d, error %d\n", ret, GetLastError()); ok(strcmp(dst, digits_dst) == 0, "MAP_FOLDDIGITS: Expected '%s', got '%s'\n", digits_dst, dst);

1 0

Andrew Nguyen : kernel32/tests: Correctly skip when GetTempPathW is not available.
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: fda79ef2178256e9f90afed8b10476f9c119bc43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fda79ef2178256e9f90afed8b… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Mon May 18 04:24:42 2009 -0500 kernel32/tests: Correctly skip when GetTempPathW is not available. --- dlls/kernel32/tests/path.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 20ee453..de26fc9 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -878,8 +878,11 @@ static void test_GetTempPathW(char* tmp_dir) lstrcpyW(buf, fooW); len = GetTempPathW(MAX_PATH, buf); - if (len==0 && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) + if (len == 0 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("GetTempPathW is not available\n"); return; + } ok(lstrcmpiW(buf, tmp_dirW) == 0, "GetTempPathW returned an incorrect temporary path\n"); ok(len == lstrlenW(buf), "returned length should be equal to the length of string\n");

1 0

Stefan Dösinger : wined3d: Update the bump constants after a shader change.
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: 45563979bd5f6bb1a91205ba3b10564291cca9e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45563979bd5f6bb1a91205ba3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 15 13:34:12 2009 +0200 wined3d: Update the bump constants after a shader change. Since we're using local constants now, we have to update the constants after a shader change. --- dlls/wined3d/arb_program_shader.c | 50 +++++++++++++++++++++--------------- 1 files changed, 29 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 1ff7fd4..4e35983 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -186,6 +186,32 @@ static void shader_arb_load_np2fixup_constants( /* not implemented */ } +static inline void shader_arb_ps_local_constants(IWineD3DDeviceImpl* deviceImpl) +{ + IWineD3DStateBlockImpl* stateBlock = deviceImpl->stateBlock; + IWineD3DBaseShaderImpl* pshader = (IWineD3DBaseShaderImpl*) stateBlock->pixelShader; + IWineD3DPixelShaderImpl *psi = (IWineD3DPixelShaderImpl *) pshader; + const WineD3D_GL_Info *gl_info = &deviceImpl->adapter->gl_info; + unsigned char i; + + for(i = 0; i < psi->numbumpenvmatconsts; i++) + { + /* The state manager takes care that this function is always called if the bump env matrix changes */ + const float *data = (const float *)&stateBlock->textureState[(int) psi->bumpenvmatconst[i].texunit][WINED3DTSS_BUMPENVMAT00]; + GL_EXTCALL(glProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, psi->bumpenvmatconst[i].const_num, data)); + + if (psi->luminanceconst[i].const_num != WINED3D_CONST_NUM_UNUSED) + { + /* WINED3DTSS_BUMPENVLSCALE and WINED3DTSS_BUMPENVLOFFSET are next to each other. + * point gl to the scale, and load 4 floats. x = scale, y = offset, z and w are junk, we + * don't care about them. The pointers are valid for sure because the stateblock is bigger. + * (they're WINED3DTSS_TEXTURETRANSFORMFLAGS and WINED3DTSS_ADDRESSW, so most likely 0 or NaN + */ + const float *scale = (const float *)&stateBlock->textureState[(int) psi->luminanceconst[i].texunit][WINED3DTSS_BUMPENVLSCALE]; + GL_EXTCALL(glProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, psi->luminanceconst[i].const_num, scale)); + } + } +} /** * Loads the app-supplied constants into the currently set ARB_[vertex/fragment]_programs. * @@ -201,7 +227,6 @@ static void shader_arb_load_constants( IWineD3DDeviceImpl* deviceImpl = (IWineD3DDeviceImpl*) device; IWineD3DStateBlockImpl* stateBlock = deviceImpl->stateBlock; const WineD3D_GL_Info *gl_info = &deviceImpl->adapter->gl_info; - unsigned char i; if (useVertexShader) { IWineD3DBaseShaderImpl* vshader = (IWineD3DBaseShaderImpl*) stateBlock->vertexShader; @@ -218,9 +243,7 @@ static void shader_arb_load_constants( } if (usePixelShader) { - IWineD3DBaseShaderImpl* pshader = (IWineD3DBaseShaderImpl*) stateBlock->pixelShader; - IWineD3DPixelShaderImpl *psi = (IWineD3DPixelShaderImpl *) pshader; /* Load DirectX 9 float constants for pixel shader */ deviceImpl->highest_dirty_ps_const = shader_arb_load_constantsF( @@ -228,24 +251,7 @@ static void shader_arb_load_constants( deviceImpl->highest_dirty_ps_const, stateBlock->pixelShaderConstantF, deviceImpl->activeContext->pshader_const_dirty); - - for(i = 0; i < psi->numbumpenvmatconsts; i++) { - /* The state manager takes care that this function is always called if the bump env matrix changes - */ - const float *data = (const float *)&stateBlock->textureState[(int) psi->bumpenvmatconst[i].texunit][WINED3DTSS_BUMPENVMAT00]; - GL_EXTCALL(glProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, psi->bumpenvmatconst[i].const_num, data)); - - if (psi->luminanceconst[i].const_num != WINED3D_CONST_NUM_UNUSED) - { - /* WINED3DTSS_BUMPENVLSCALE and WINED3DTSS_BUMPENVLOFFSET are next to each other. - * point gl to the scale, and load 4 floats. x = scale, y = offset, z and w are junk, we - * don't care about them. The pointers are valid for sure because the stateblock is bigger. - * (they're WINED3DTSS_TEXTURETRANSFORMFLAGS and WINED3DTSS_ADDRESSW, so most likely 0 or NaN - */ - const float *scale = (const float *)&stateBlock->textureState[(int) psi->luminanceconst[i].texunit][WINED3DTSS_BUMPENVLSCALE]; - GL_EXTCALL(glProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, psi->luminanceconst[i].const_num, scale)); - } - } + shader_arb_ps_local_constants(deviceImpl); } } @@ -1687,6 +1693,8 @@ static void shader_arb_select(IWineD3DDevice *iface, BOOL usePS, BOOL useVS) { checkGLcall("glEnable(GL_FRAGMENT_PROGRAM_ARB);"); } TRACE("(%p) : Bound fragment program %u and enabled GL_FRAGMENT_PROGRAM_ARB\n", This, priv->current_fprogram_id); + + shader_arb_ps_local_constants(This); } else if(GL_SUPPORT(ARB_FRAGMENT_PROGRAM) && !priv->use_arbfp_fixed_func) { /* Disable only if we're not using arbfp fixed function fragment processing. If this is used, * keep GL_FRAGMENT_PROGRAM_ARB enabled, and the fixed function pipeline will bind the fixed function

1 0

Stefan Dösinger : wined3d: Support clipplanes with GLSL.
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: 2cb8f42168aa9b00b8dd511a6e5828b45088cbba URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cb8f42168aa9b00b8dd511a6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 8 17:24:01 2009 +0200 wined3d: Support clipplanes with GLSL. This is the Nth attemt to make clipping work with GLSL shaders. The patch now uses the GLSL quirk table to handle cards that need a custom varying for gl_ClipPos, and the code is adapted to the changed state table and shader backend system. --- dlls/wined3d/arb_program_shader.c | 2 + dlls/wined3d/directx.c | 22 ++++++++++++++++++ dlls/wined3d/glsl_shader.c | 34 ++++++++++++++++++++------- dlls/wined3d/state.c | 45 ++++++++++++++++++++++++------------ dlls/wined3d/wined3d_gl.h | 1 + dlls/wined3d/wined3d_private.h | 3 ++ 6 files changed, 83 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2cb8f42168aa9b00b8dd5…

1 0

Stefan Dösinger : wined3d: Avoid declaring helper_const in vertex programs if possible.
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: c7839112c9cb60f85b55f511e38405829cd930c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7839112c9cb60f85b55f511e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 7 19:01:49 2009 +0200 wined3d: Avoid declaring helper_const in vertex programs if possible. --- dlls/wined3d/arb_program_shader.c | 39 +++++++++++++++++++++++++++--------- 1 files changed, 29 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e7dd296..bfd2d7d 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -42,11 +42,22 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d); #define GLINFO_LOCATION (*gl_info) /* GL locking for state handlers is done by the caller. */ +static BOOL need_helper_const(const WineD3D_GL_Info *gl_info) { + if(!GL_SUPPORT(NV_VERTEX_PROGRAM) || /* Need to init colors */ + gl_info->arb_vs_offset_limit || /* Have to init texcoords */ + gl_info->set_texcoord_w) { /* Load the immval offset */ + return TRUE; + } + return FALSE; +} -/* We have to subtract any other PARAMs that we might use in our shader programs. - * ATI seems to count 2 implicit PARAMs when we use fog and NVIDIA counts 1, - * and we reference one row of the PROJECTION matrix which counts as 1 PARAM. */ -#define ARB_SHADER_RESERVED_VS_CONSTS 3 +static unsigned int reserved_vs_const(const WineD3D_GL_Info *gl_info) { + /* We use one PARAM for the pos fixup, and in some cases one to load + * some immediate values into the shader + */ + if(need_helper_const(gl_info)) return 2; + else return 1; +} /* The arb shader only loads the bump mapping environment matrix into the shader if it finds * a free constant to do that, so only reduce the number of available constants by 2 for the fog states. @@ -56,7 +67,7 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d); /* Internally used shader constants. Applications can use constants 0 to GL_LIMITS(vshader_constantsF) - 1, * so upload them above that */ -#define ARB_SHADER_PRIVCONST_BASE (GL_LIMITS(vshader_constantsF) - ARB_SHADER_RESERVED_VS_CONSTS) +#define ARB_SHADER_PRIVCONST_BASE (GL_LIMITS(vshader_constantsF) - reserved_vs_const(&GLINFO_LOCATION)) #define ARB_SHADER_PRIVCONST_POS ARB_SHADER_PRIVCONST_BASE + 0 /* ARB_program_shader private data */ @@ -307,7 +318,7 @@ static void shader_generate_arb_declarations(IWineD3DBaseShader *iface, const sh char pshader = shader_is_pshader_version(reg_maps->shader_version.type); unsigned max_constantsF = min(This->baseShader.limits.constant_float, (pshader ? GL_LIMITS(pshader_constantsF) - ARB_SHADER_RESERVED_PS_CONSTS : - GL_LIMITS(vshader_constantsF) - ARB_SHADER_RESERVED_VS_CONSTS)); + GL_LIMITS(vshader_constantsF) - reserved_vs_const(gl_info))); const local_constant *lconst; /* Temporary Output register */ @@ -1958,7 +1969,9 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShader *iface, /* Create the hw ARB shader */ shader_addline(buffer, "!!ARBvp1.0\n"); - shader_addline(buffer, "PARAM helper_const = { 2.0, -1.0, %d.0, 0.0 };\n", This->rel_offset); + if(need_helper_const(gl_info)) { + shader_addline(buffer, "PARAM helper_const = { 2.0, -1.0, %d.0, 0.0 };\n", This->rel_offset); + } /* Mesa supports only 95 constants */ if (GL_VEND(MESA) || GL_VEND(WINE)) @@ -2009,7 +2022,8 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShader *iface, if(args->fog_src == VS_FOG_Z) { shader_addline(buffer, "MOV result.fogcoord, TMP_OUT.z;\n"); } else if (!reg_maps->fog) { - shader_addline(buffer, "MOV result.fogcoord, helper_const.w;\n"); + /* posFixup.x is always 1.0, so we can savely use it */ + shader_addline(buffer, "ADD result.fogcoord, posFixup.x, -posFixup.x;\n"); } /* Write the final position. @@ -2026,7 +2040,12 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShader *iface, /* Z coord [0;1]->[-1;1] mapping, see comment in transform_projection in state.c * and the glsl equivalent */ - shader_addline(buffer, "MAD TMP_OUT.z, TMP_OUT.z, helper_const.x, -TMP_OUT.w;\n"); + if(need_helper_const(gl_info)) { + shader_addline(buffer, "MAD TMP_OUT.z, TMP_OUT.z, helper_const.x, -TMP_OUT.w;\n"); + } else { + shader_addline(buffer, "ADD TMP_OUT.z, TMP_OUT.z, TMP_OUT.z;\n"); + shader_addline(buffer, "ADD TMP_OUT.z, TMP_OUT.z, -TMP_OUT.w;\n"); + } shader_addline(buffer, "MOV result.position, TMP_OUT;\n"); @@ -2073,7 +2092,7 @@ static void shader_arb_get_caps(WINED3DDEVTYPE devtype, const WineD3D_GL_Info *g if(GL_SUPPORT(ARB_VERTEX_PROGRAM)) { pCaps->VertexShaderVersion = WINED3DVS_VERSION(1,1); TRACE_(d3d_caps)("Hardware vertex shader version 1.1 enabled (ARB_PROGRAM)\n"); - pCaps->MaxVertexShaderConst = GL_LIMITS(vshader_constantsF) - ARB_SHADER_RESERVED_VS_CONSTS; + pCaps->MaxVertexShaderConst = GL_LIMITS(vshader_constantsF) - reserved_vs_const(gl_info); } if(GL_SUPPORT(ARB_FRAGMENT_PROGRAM)) {

1 0