December 2008 - Wine-commits

Stefan Dösinger : wined3d: Make pixelshaders disable fog properly.
by Alexandre Julliard 19 Dec '08

19 Dec '08

Module: wine Branch: master Commit: 690cbe76ac4f84b67cebe7779a14e23332e271d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=690cbe76ac4f84b67cebe7779… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Dec 15 19:35:40 2008 +0100 wined3d: Make pixelshaders disable fog properly. This is a first step towards cleaning up the fog mess. The fog parameter is added to the pixelshader compile args structure. That way multiple pshaders are compiled for different fog settings, and the pixel shader can remove the fog line if fog is not enabled. That way we don't need special fog start and end settings, and this allows us to implement EXP and EXP2 fog in the future too. --- dlls/wined3d/arb_program_shader.c | 42 +++++++++++++++++++++++++----------- dlls/wined3d/glsl_shader.c | 18 ++++++++++++--- dlls/wined3d/pixelshader.c | 26 ++++++++++++++++++++++- dlls/wined3d/state.c | 22 ------------------- dlls/wined3d/wined3d_private.h | 15 ++++++++----- 5 files changed, 77 insertions(+), 46 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 4f7f955..b31590a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1905,27 +1905,43 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShader *iface, SHADER_BUF shader_generate_arb_declarations( (IWineD3DBaseShader*) This, reg_maps, buffer, &GLINFO_LOCATION); /* We need two variables for fog blending */ - shader_addline(buffer, "TEMP TMP_FOG;\n"); + if(args->fog != FOG_OFF) shader_addline(buffer, "TEMP TMP_FOG;\n"); if (shader_version >= WINED3DPS_VERSION(2,0)) shader_addline(buffer, "TEMP TMP_COLOR;\n"); /* Base Shader Body */ shader_generate_main( (IWineD3DBaseShader*) This, buffer, reg_maps, function); - /* calculate fog and blend it - * NOTE: state.fog.params.y and state.fog.params.z don't hold fog start s and end e but - * -1/(e-s) and e/(e-s) respectively. - */ - shader_addline(buffer, "MAD_SAT TMP_FOG, fragment.fogcoord, state.fog.params.y, state.fog.params.z;\n"); - - fragcolor = (shader_version < WINED3DPS_VERSION(2,0)) ? "R0" : "TMP_COLOR"; - + if (shader_version < WINED3DPS_VERSION(2,0)) { + fragcolor = "R0"; + } else { + fragcolor = "TMP_COLOR"; + } if(args->srgb_correction) { arbfp_add_sRGB_correction(buffer, fragcolor, "TMP", "TMP2", "TA", "TB"); } - if (shader_version < WINED3DPS_VERSION(3,0)) - { - shader_addline(buffer, "LRP result.color.rgb, TMP_FOG.x, %s, state.fog.color;\n", fragcolor); - shader_addline(buffer, "MOV result.color.a, %s.a;\n", fragcolor); + if (shader_version < WINED3DPS_VERSION(3,0)) { + /* calculate fog and blend it + * NOTE: state.fog.params.y and state.fog.params.z don't hold fog start s and end e but + * -1/(e-s) and e/(e-s) respectively. + */ + switch(args->fog) { + case FOG_OFF: + shader_addline(buffer, "MOV result.color, %s;\n", fragcolor); + break; + case FOG_LINEAR: + shader_addline(buffer, "MAD_SAT TMP_FOG, fragment.fogcoord, state.fog.params.y, state.fog.params.z;\n"); + shader_addline(buffer, "LRP result.color.rgb, TMP_FOG.x, %s, state.fog.color;\n", fragcolor); + shader_addline(buffer, "MOV result.color.a, %s.a;\n", fragcolor); + break; + case FOG_EXP: + FIXME("Implement EXP fog in ARB\n"); + shader_addline(buffer, "MOV result.color, %s;\n", fragcolor); + break; + case FOG_EXP2: + FIXME("Implement EXP2 fog in ARB\n"); + shader_addline(buffer, "MOV result.color, %s;\n", fragcolor); + break; + } } shader_addline(buffer, "END\n"); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 59e3427..b9a0e2e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3675,10 +3675,20 @@ static GLuint shader_glsl_generate_pshader(IWineD3DPixelShader *iface, SHADER_BU * NOTE: gl_Fog.start and gl_Fog.end don't hold fog start s and end e but * -1/(e-s) and e/(e-s) respectively. */ - if (reg_maps->shader_version < WINED3DPS_VERSION(3,0)) - { - shader_addline(buffer, "float Fog = clamp(gl_FogFragCoord * gl_Fog.start + gl_Fog.end, 0.0, 1.0);\n"); - shader_addline(buffer, "%s.xyz = mix(gl_Fog.color.xyz, %s.xyz, Fog);\n", fragcolor, fragcolor); + if(reg_maps->shader_version < WINED3DPS_VERSION(3,0)) { + switch(args->fog) { + case FOG_OFF: break; + case FOG_LINEAR: + shader_addline(buffer, "float Fog = clamp(gl_FogFragCoord * gl_Fog.start + gl_Fog.end, 0.0, 1.0);\n"); + shader_addline(buffer, "%s.xyz = mix(gl_Fog.color.xyz, %s.xyz, Fog);\n", fragcolor, fragcolor); + break; + case FOG_EXP: + FIXME("Implement EXP fog in glsl\n"); + break; + case FOG_EXP2: + FIXME("Implement EXP2 fog in glsl\n"); + break; + } } shader_addline(buffer, "}\n"); diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 94a45cf..15392d8 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -463,9 +463,9 @@ void find_ps_compile_args(IWineD3DPixelShaderImpl *shader, IWineD3DStateBlockImp UINT i, sampler; IWineD3DBaseTextureImpl *tex; + memset(args, 0, sizeof(*args)); /* FIXME: Make sure all bits are set */ args->srgb_correction = stateblock->renderState[WINED3DRS_SRGBWRITEENABLE] ? 1 : 0; - memset(args->color_fixup, 0, sizeof(args->color_fixup)); for(i = 0; i < shader->baseShader.num_sampled_samplers; i++) { sampler = shader->baseShader.sampled_samplers[i]; tex = (IWineD3DBaseTextureImpl *) stateblock->textures[sampler]; @@ -484,8 +484,32 @@ void find_ps_compile_args(IWineD3DPixelShaderImpl *shader, IWineD3DStateBlockImp } else { args->vp_mode = fixedfunction; } + args->fog = FOG_OFF; } else { args->vp_mode = vertexshader; + if(stateblock->renderState[WINED3DRS_FOGENABLE]) { + switch(stateblock->renderState[WINED3DRS_FOGTABLEMODE]) { + case WINED3DFOG_NONE: + if(((IWineD3DDeviceImpl *) shader->baseShader.device)->strided_streams.u.s.position_transformed || + use_vs((IWineD3DDeviceImpl *) shader->baseShader.device)) { + args->fog = FOG_LINEAR; + break; + } + switch(stateblock->renderState[WINED3DRS_FOGVERTEXMODE]) { + case WINED3DFOG_NONE: /* Drop through */ + case WINED3DFOG_LINEAR: args->fog = FOG_LINEAR; break; + case WINED3DFOG_EXP: args->fog = FOG_EXP; break; + case WINED3DFOG_EXP2: args->fog = FOG_EXP2; break; + } + break; + + case WINED3DFOG_LINEAR: args->fog = FOG_LINEAR; break; + case WINED3DFOG_EXP: args->fog = FOG_EXP; break; + case WINED3DFOG_EXP2: args->fog = FOG_EXP2; break; + } + } else { + args->fog = FOG_OFF; + } } } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 0bf357d..e4c819d 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -911,18 +911,6 @@ static void state_fog(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCo /* No fog? Disable it, and we're done :-) */ glDisable(GL_FOG); checkGLcall("glDisable GL_FOG"); - if (use_ps(stateblock->wineD3DDevice) - && ps_impl->baseShader.reg_maps.shader_version < WINED3DPS_VERSION(3,0)) - { - /* disable fog in the pixel shader - * NOTE: For pixel shader, GL_FOG_START and GL_FOG_END don't hold fog start s and end e but - * -1/(e-s) and e/(e-s) respectively. - */ - glFogf(GL_FOG_START, 0.0f); - checkGLcall("glFogf(GL_FOG_START, fogstart)"); - glFogf(GL_FOG_END, 1.0f); - checkGLcall("glFogf(GL_FOG_END, fogend)"); - } return; } @@ -1168,16 +1156,6 @@ static void state_fog(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCo } else { glDisable(GL_FOG); checkGLcall("glDisable GL_FOG"); - if( use_ps(stateblock->wineD3DDevice) ) { - /* disable fog in the pixel shader - * NOTE: For pixel shader, GL_FOG_START and GL_FOG_END don't hold fog start s and end e but - * -1/(e-s) and e/(e-s) respectively. - */ - glFogf(GL_FOG_START, 0.0f); - checkGLcall("glFogf(GL_FOG_START, fogstart)"); - glFogf(GL_FOG_END, 1.0f); - checkGLcall("glFogf(GL_FOG_END, fogend)"); - } } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f308c40..d433b53 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -438,6 +438,13 @@ struct stb_const_desc { UINT const_num; }; +enum fogmode { + FOG_OFF, + FOG_LINEAR, + FOG_EXP, + FOG_EXP2 +}; + /* Stateblock dependent parameters which have to be hardcoded * into the shader code */ @@ -445,6 +452,7 @@ struct ps_compile_args { struct color_fixup_desc color_fixup[MAX_FRAGMENT_SAMPLERS]; BOOL srgb_correction; enum vertexprocessing_mode vp_mode; + enum fogmode fog; /* Projected textures(ps 1.0-1.3) */ /* Texture types(2D, Cube, 3D) in ps 1.x */ }; @@ -974,12 +982,7 @@ struct texture_stage_op struct ffp_frag_settings { struct texture_stage_op op[MAX_TEXTURES]; - enum { - FOG_OFF, - FOG_LINEAR, - FOG_EXP, - FOG_EXP2 - } fog; + enum fogmode fog; /* Use an int instead of a char to get dword alignment */ unsigned int sRGB_write; };

1 0

Stefan Dösinger : wined3d: Make use of ps_compile_args in arb shader.
by Alexandre Julliard 19 Dec '08

19 Dec '08

Module: wine Branch: master Commit: 20189eb4f8ce4f12f2bb9683e3089d3c9f233a02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20189eb4f8ce4f12f2bb9683e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Dec 14 15:42:42 2008 +0100 wined3d: Make use of ps_compile_args in arb shader. --- dlls/wined3d/arb_program_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 4f37c9b..4f7f955 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1919,7 +1919,7 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShader *iface, SHADER_BUF fragcolor = (shader_version < WINED3DPS_VERSION(2,0)) ? "R0" : "TMP_COLOR"; - if(((IWineD3DDeviceImpl *)This->baseShader.device)->stateBlock->renderState[WINED3DRS_SRGBWRITEENABLE]) { + if(args->srgb_correction) { arbfp_add_sRGB_correction(buffer, fragcolor, "TMP", "TMP2", "TA", "TB"); } if (shader_version < WINED3DPS_VERSION(3,0))

1 0

Paul Vriens : riched20/tests: Fix tests on Win9x by using A-calls.
by Alexandre Julliard 19 Dec '08

19 Dec '08

Module: wine Branch: master Commit: 5e66808ad35f2a0029c1188867642fae1cdda81d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e66808ad35f2a0029c118886… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Dec 18 16:38:01 2008 +0100 riched20/tests: Fix tests on Win9x by using A-calls. --- dlls/riched20/tests/editor.c | 44 +++++++++++++++++++++--------------------- 1 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index d6b3ba7..9e2f5e4 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5853,7 +5853,7 @@ static void test_format_rect(void) expected = clientRect; expected.left += 1; expected.right -= 1; - SendMessageW(hwnd, EM_GETRECT, 0, (LPARAM)&rc); + SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); ok(rc.top == expected.top && rc.left == expected.left && rc.bottom == expected.bottom && rc.right == expected.right, "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", @@ -5867,14 +5867,14 @@ static void test_format_rect(void) rc.left += n; rc.bottom -= n; rc.right -= n; - SendMessageW(hwnd, EM_SETRECT, 0, (LPARAM)&rc); + SendMessageA(hwnd, EM_SETRECT, 0, (LPARAM)&rc); expected = rc; expected.top = max(0, rc.top); expected.left = max(0, rc.left); expected.bottom = min(clientRect.bottom, rc.bottom); expected.right = min(clientRect.right, rc.right); - SendMessageW(hwnd, EM_GETRECT, 0, (LPARAM)&rc); + SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); ok(rc.top == expected.top && rc.left == expected.left && rc.bottom == expected.bottom && rc.right == expected.right, "[n=%d] rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", @@ -5883,9 +5883,9 @@ static void test_format_rect(void) } rc = clientRect; - SendMessageW(hwnd, EM_SETRECT, 0, (LPARAM)&rc); + SendMessageA(hwnd, EM_SETRECT, 0, (LPARAM)&rc); expected = clientRect; - SendMessageW(hwnd, EM_GETRECT, 0, (LPARAM)&rc); + SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); ok(rc.top == expected.top && rc.left == expected.left && rc.bottom == expected.bottom && rc.right == expected.right, "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", @@ -5893,11 +5893,11 @@ static void test_format_rect(void) expected.top, expected.left, expected.bottom, expected.right); /* Adding the selectionbar adds the selectionbar width to the left side. */ - SendMessageW(hwnd, EM_SETOPTIONS, ECOOP_OR, ECO_SELECTIONBAR); - options = SendMessageW(hwnd, EM_GETOPTIONS, 0, 0); + SendMessageA(hwnd, EM_SETOPTIONS, ECOOP_OR, ECO_SELECTIONBAR); + options = SendMessageA(hwnd, EM_GETOPTIONS, 0, 0); ok(options & ECO_SELECTIONBAR, "EM_SETOPTIONS failed to add selectionbar.\n"); expected.left += 8; /* selection bar width */ - SendMessageW(hwnd, EM_GETRECT, 0, (LPARAM)&rc); + SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); ok(rc.top == expected.top && rc.left == expected.left && rc.bottom == expected.bottom && rc.right == expected.right, "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", @@ -5905,9 +5905,9 @@ static void test_format_rect(void) expected.top, expected.left, expected.bottom, expected.right); rc = clientRect; - SendMessageW(hwnd, EM_SETRECT, 0, (LPARAM)&rc); + SendMessageA(hwnd, EM_SETRECT, 0, (LPARAM)&rc); expected = clientRect; - SendMessageW(hwnd, EM_GETRECT, 0, (LPARAM)&rc); + SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); ok(rc.top == expected.top && rc.left == expected.left && rc.bottom == expected.bottom && rc.right == expected.right, "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", @@ -5916,11 +5916,11 @@ static void test_format_rect(void) /* Removing the selectionbar subtracts the selectionbar width from the left side, * even if the left side is already 0. */ - SendMessageW(hwnd, EM_SETOPTIONS, ECOOP_AND, ~ECO_SELECTIONBAR); - options = SendMessageW(hwnd, EM_GETOPTIONS, 0, 0); + SendMessageA(hwnd, EM_SETOPTIONS, ECOOP_AND, ~ECO_SELECTIONBAR); + options = SendMessageA(hwnd, EM_GETOPTIONS, 0, 0); ok(!(options & ECO_SELECTIONBAR), "EM_SETOPTIONS failed to remove selectionbar.\n"); expected.left -= 8; /* selection bar width */ - SendMessageW(hwnd, EM_GETRECT, 0, (LPARAM)&rc); + SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); ok(rc.top == expected.top && rc.left == expected.left && rc.bottom == expected.bottom && rc.right == expected.right, "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", @@ -5929,9 +5929,9 @@ static void test_format_rect(void) /* Set the absolute value of the formatting rectangle. */ rc = clientRect; - SendMessageW(hwnd, EM_SETRECT, 0, (LPARAM)&rc); + SendMessageA(hwnd, EM_SETRECT, 0, (LPARAM)&rc); expected = clientRect; - SendMessageW(hwnd, EM_GETRECT, 0, (LPARAM)&rc); + SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); ok(rc.top == expected.top && rc.left == expected.left && rc.bottom == expected.bottom && rc.right == expected.right, "[n=%d] rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", @@ -5946,8 +5946,8 @@ static void test_format_rect(void) rc.bottom = clientRect.bottom - 15; rc.right = clientRect.right - 15; expected = rc; - SendMessageW(hwnd, EM_SETRECT, 1, (LPARAM)&rc); - SendMessageW(hwnd, EM_GETRECT, 0, (LPARAM)&rc); + SendMessageA(hwnd, EM_SETRECT, 1, (LPARAM)&rc); + SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); ok(rc.top == expected.top && rc.left == expected.left && rc.bottom == expected.bottom && rc.right == expected.right, "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", @@ -5961,8 +5961,8 @@ static void test_format_rect(void) rc.bottom = clientRect.bottom + 15; rc.right = clientRect.right + 15; expected = rc; - SendMessageW(hwnd, EM_SETRECT, 1, (LPARAM)&rc); - SendMessageW(hwnd, EM_GETRECT, 0, (LPARAM)&rc); + SendMessageA(hwnd, EM_SETRECT, 1, (LPARAM)&rc); + SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); ok(rc.top == expected.top && rc.left == expected.left && rc.bottom == expected.bottom && rc.right == expected.right, "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", @@ -5983,7 +5983,7 @@ static void test_format_rect(void) expected.left += 1; expected.top += 1; expected.right -= 1; - SendMessageW(hwnd, EM_GETRECT, 0, (LPARAM)&rc); + SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); ok(rc.top == expected.top && rc.left == expected.left && rc.bottom == expected.bottom && rc.right == expected.right, "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", @@ -5999,8 +5999,8 @@ static void test_format_rect(void) expected.top -= 1; expected.left -= 1; expected.right += 1; - SendMessageW(hwnd, EM_SETRECT, 0, (LPARAM)&rc); - SendMessageW(hwnd, EM_GETRECT, 0, (LPARAM)&rc); + SendMessageA(hwnd, EM_SETRECT, 0, (LPARAM)&rc); + SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); ok(rc.top == expected.top && rc.left == expected.left && rc.bottom == expected.bottom && rc.right == expected.right, "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n",

1 0

Paul Vriens : wintrust/tests: Fix test crash on Win9x.
by Alexandre Julliard 19 Dec '08

19 Dec '08

Module: wine Branch: master Commit: ff833ee255db9222a94b1e4805608337cbb82fa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff833ee255db9222a94b1e480… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Dec 18 17:06:54 2008 +0100 wintrust/tests: Fix test crash on Win9x. --- dlls/wintrust/tests/crypt.c | 18 ++++++------------ 1 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index 0b7f825..397daff 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -116,12 +116,6 @@ static void test_context(void) CHAR windir[MAX_PATH], catroot[MAX_PATH], catroot2[MAX_PATH], dummydir[MAX_PATH]; DWORD attrs; - if (!pCryptCATAdminAcquireContext || !pCryptCATAdminReleaseContext) - { - skip("CryptCATAdminAcquireContext and/or CryptCATAdminReleaseContext are not available\n"); - return; - } - /* When CryptCATAdminAcquireContext is successful it will create * several directories if they don't exist: * @@ -262,12 +256,6 @@ static void test_calchash(void) CHAR temp[MAX_PATH]; DWORD written; - if (!pCryptCATAdminCalcHashFromFileHandle) - { - skip("CryptCATAdminCalcHashFromFileHandle is not available\n"); - return; - } - /* All NULL */ SetLastError(0xdeadbeef); ret = pCryptCATAdminCalcHashFromFileHandle(NULL, NULL, NULL, 0); @@ -438,6 +426,12 @@ START_TEST(crypt) InitFunctionPtrs(); + if (!pCryptCATAdminAcquireContext) + { + win_skip("CryptCATAdmin functions are not available\n"); + return; + } + myARGC = winetest_get_mainargs(&myARGV); strcpy(selfname, myARGV[0]);

1 0

Paul Vriens : wintrust/tests: Don't crash on NT4 and W2K.
by Alexandre Julliard 19 Dec '08

19 Dec '08

Module: wine Branch: master Commit: 936bec69cfaad868a49a6b70a9838e47255faec5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=936bec69cfaad868a49a6b70a… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Dec 18 17:10:17 2008 +0100 wintrust/tests: Don't crash on NT4 and W2K. --- dlls/wintrust/tests/crypt.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index 397daff..99f3066 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -352,6 +352,13 @@ static void test_CryptCATAdminAddRemoveCatalog(void) DWORD error, written; BOOL ret; + if (!pCryptCATAdminRemoveCatalog) + { + /* NT4 and W2K do have CryptCATAdminAddCatalog !! */ + win_skip("CryptCATAdminRemoveCatalog is not available\n"); + return; + } + if (!GetTempFileNameA(CURR_DIR, "cat", 0, tmpfile)) return; DeleteFileA(tmpfile); file = CreateFileA(tmpfile, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, NULL);

1 0

Stefan Dösinger : wined3d: Pass the ps_compile_args structures to the shader generation code.
by Alexandre Julliard 19 Dec '08

19 Dec '08

Module: wine Branch: master Commit: 61e581abb46b2d464961ace093fdb6ad7e5345f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61e581abb46b2d464961ace09… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Dec 14 15:40:07 2008 +0100 wined3d: Pass the ps_compile_args structures to the shader generation code. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/baseshader.c | 2 +- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/pixelshader.c | 3 +- dlls/wined3d/wined3d_private.h | 47 ++++++++++++++++++------------------- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index dbffcb8..4f37c9b 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1879,7 +1879,7 @@ static void arbfp_add_sRGB_correction(SHADER_BUFFER *buffer, const char *fragcol /* [0.0;1.0] clamping. Not needed, this is done implicitly */ } -static GLuint shader_arb_generate_pshader(IWineD3DPixelShader *iface, SHADER_BUFFER *buffer) { +static GLuint shader_arb_generate_pshader(IWineD3DPixelShader *iface, SHADER_BUFFER *buffer, const struct ps_compile_args *args) { IWineD3DPixelShaderImpl *This = (IWineD3DPixelShaderImpl *)iface; const shader_reg_maps* reg_maps = &This->baseShader.reg_maps; CONST DWORD *function = This->baseShader.function; diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 2289746..93f86b2 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -1130,7 +1130,7 @@ static void shader_none_destroy(IWineD3DBaseShader *iface) {} static HRESULT shader_none_alloc(IWineD3DDevice *iface) {return WINED3D_OK;} static void shader_none_free(IWineD3DDevice *iface) {} static BOOL shader_none_dirty_const(IWineD3DDevice *iface) {return FALSE;} -static GLuint shader_none_generate_pshader(IWineD3DPixelShader *iface, SHADER_BUFFER *buffer) { +static GLuint shader_none_generate_pshader(IWineD3DPixelShader *iface, SHADER_BUFFER *buffer, const struct ps_compile_args *args) { FIXME("NONE shader backend asked to generate a pixel shader\n"); return 0; } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 205f111..c16e56a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3610,7 +3610,7 @@ static BOOL shader_glsl_dirty_const(IWineD3DDevice *iface) { return FALSE; } -static GLuint shader_glsl_generate_pshader(IWineD3DPixelShader *iface, SHADER_BUFFER *buffer) { +static GLuint shader_glsl_generate_pshader(IWineD3DPixelShader *iface, SHADER_BUFFER *buffer, const struct ps_compile_args *args) { IWineD3DPixelShaderImpl *This = (IWineD3DPixelShaderImpl *)iface; const struct shader_reg_maps *reg_maps = &This->baseShader.reg_maps; CONST DWORD *function = This->baseShader.function; diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index b6b84b0..94a45cf 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -423,6 +423,7 @@ static GLuint pixelshader_compile(IWineD3DPixelShaderImpl *This, const struct ps CONST DWORD *function = This->baseShader.function; GLuint retval; SHADER_BUFFER buffer; + IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) This->baseShader.device; TRACE("(%p) : function %p\n", This, function); @@ -435,7 +436,7 @@ static GLuint pixelshader_compile(IWineD3DPixelShaderImpl *This, const struct ps /* Generate the HW shader */ TRACE("(%p) : Generating hardware program\n", This); shader_buffer_init(&buffer); - retval = ((IWineD3DDeviceImpl *)This->baseShader.device)->shader_backend->shader_generate_pshader((IWineD3DPixelShader *)This, &buffer); + retval = device->shader_backend->shader_generate_pshader((IWineD3DPixelShader *)This, &buffer, args); shader_buffer_free(&buffer); This->baseShader.is_compiled = TRUE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 195af9f..f308c40 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -427,6 +427,28 @@ enum tex_types tex_type_count = 5, }; +enum vertexprocessing_mode { + fixedfunction, + vertexshader, + pretransformed +}; + +struct stb_const_desc { + char texunit; + UINT const_num; +}; + +/* Stateblock dependent parameters which have to be hardcoded + * into the shader code + */ +struct ps_compile_args { + struct color_fixup_desc color_fixup[MAX_FRAGMENT_SAMPLERS]; + BOOL srgb_correction; + enum vertexprocessing_mode vp_mode; + /* Projected textures(ps 1.0-1.3) */ + /* Texture types(2D, Cube, 3D) in ps 1.x */ +}; + typedef struct { const SHADER_HANDLER *shader_instruction_handler_table; void (*shader_select)(IWineD3DDevice *iface, BOOL usePS, BOOL useVS); @@ -440,7 +462,7 @@ typedef struct { HRESULT (*shader_alloc_private)(IWineD3DDevice *iface); void (*shader_free_private)(IWineD3DDevice *iface); BOOL (*shader_dirtifyable_constants)(IWineD3DDevice *iface); - GLuint (*shader_generate_pshader)(IWineD3DPixelShader *iface, SHADER_BUFFER *buffer); + GLuint (*shader_generate_pshader)(IWineD3DPixelShader *iface, SHADER_BUFFER *buffer, const struct ps_compile_args *args); void (*shader_generate_vshader)(IWineD3DVertexShader *iface, SHADER_BUFFER *buffer); void (*shader_get_caps)(WINED3DDEVTYPE devtype, const WineD3D_GL_Info *gl_info, struct shader_caps *caps); BOOL (*shader_color_fixup_supported)(struct color_fixup_desc fixup); @@ -2347,29 +2369,6 @@ HRESULT IWineD3DVertexShaderImpl_CompileShader(IWineD3DVertexShader *iface); /***************************************************************************** * IDirect3DPixelShader implementation structure */ - -enum vertexprocessing_mode { - fixedfunction, - vertexshader, - pretransformed -}; - -struct stb_const_desc { - char texunit; - UINT const_num; -}; - -/* Stateblock dependent parameters which have to be hardcoded - * into the shader code - */ -struct ps_compile_args { - struct color_fixup_desc color_fixup[MAX_FRAGMENT_SAMPLERS]; - BOOL srgb_correction; - enum vertexprocessing_mode vp_mode; - /* Projected textures(ps 1.0-1.3) */ - /* Texture types(2D, Cube, 3D) in ps 1.x */ -}; - struct ps_compiled_shader { struct ps_compile_args args; GLuint prgId;

1 0

Stefan Dösinger : wined3d: Make use of the ps_compile_args structure in glsl_shader.
by Alexandre Julliard 19 Dec '08

19 Dec '08

Module: wine Branch: master Commit: 30d542c3dd155fc2fd4f31d16a2df594d96f1984 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30d542c3dd155fc2fd4f31d16… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Dec 14 15:42:04 2008 +0100 wined3d: Make use of the ps_compile_args structure in glsl_shader. Only a first step, many more occasions need fixing. This is an easy one though. --- dlls/wined3d/glsl_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c16e56a..968acbb 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3663,7 +3663,7 @@ static GLuint shader_glsl_generate_pshader(IWineD3DPixelShader *iface, SHADER_BU } else { fragcolor = "gl_FragColor"; } - if(((IWineD3DDeviceImpl *)This->baseShader.device)->stateBlock->renderState[WINED3DRS_SRGBWRITEENABLE]) { + if(args->srgb_correction) { shader_addline(buffer, "tmp0.xyz = pow(%s.xyz, vec3(%f, %f, %f)) * vec3(%f, %f, %f) - vec3(%f, %f, %f);\n", fragcolor, srgb_pow, srgb_pow, srgb_pow, srgb_mul_high, srgb_mul_high, srgb_mul_high, srgb_sub_high, srgb_sub_high, srgb_sub_high);

1 0

Hans Leidekker : wintrust: Implement CryptCATAdminCalcHashFromFileHandle.
by Alexandre Julliard 19 Dec '08

19 Dec '08

Module: wine Branch: master Commit: 50d76df1ea0a411ce5e1a529d4fab9d3e7f3e048 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50d76df1ea0a411ce5e1a529d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 18 15:53:42 2008 +0100 wintrust: Implement CryptCATAdminCalcHashFromFileHandle. Based on work done by Maarten Lankhorst. --- dlls/wintrust/crypt.c | 55 ++++++++++++++++++++++++++++++++++++++++-- dlls/wintrust/tests/crypt.c | 21 ---------------- 2 files changed, 52 insertions(+), 24 deletions(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index b03740c..6337a85 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -176,10 +176,59 @@ HCATINFO WINAPI CryptCATAdminAddCatalog(HCATADMIN catAdmin, PWSTR catalogFile, BOOL WINAPI CryptCATAdminCalcHashFromFileHandle(HANDLE hFile, DWORD* pcbHash, BYTE* pbHash, DWORD dwFlags ) { - FIXME("%p %p %p %x\n", hFile, pcbHash, pbHash, dwFlags); + BOOL ret = FALSE; - if (pbHash && pcbHash) memset(pbHash, 0, *pcbHash); - return TRUE; + TRACE("%p %p %p %x\n", hFile, pcbHash, pbHash, dwFlags); + + if (!hFile || !pcbHash || dwFlags) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (*pcbHash < 20) + { + *pcbHash = 20; + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return TRUE; + } + + *pcbHash = 20; + if (pbHash) + { + HCRYPTPROV prov; + HCRYPTHASH hash; + DWORD bytes_read; + BYTE *buffer; + + if (!(buffer = HeapAlloc(GetProcessHeap(), 0, 4096))) + { + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + ret = CryptAcquireContextW(&prov, NULL, MS_DEF_PROV_W, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); + if (!ret) + { + HeapFree(GetProcessHeap(), 0, buffer); + return FALSE; + } + ret = CryptCreateHash(prov, CALG_SHA1, 0, 0, &hash); + if (!ret) + { + HeapFree(GetProcessHeap(), 0, buffer); + CryptReleaseContext(prov, 0); + return FALSE; + } + while ((ret = ReadFile(hFile, buffer, 4096, &bytes_read, NULL)) && bytes_read) + { + CryptHashData(hash, buffer, bytes_read, 0); + } + if (ret) ret = CryptGetHashParam(hash, HP_HASHVAL, pbHash, pcbHash, 0); + + HeapFree(GetProcessHeap(), 0, buffer); + CryptDestroyHash(hash); + CryptReleaseContext(prov, 0); + } + return ret; } /*********************************************************************** diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index dc748c9..0b7f825 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -271,45 +271,33 @@ static void test_calchash(void) /* All NULL */ SetLastError(0xdeadbeef); ret = pCryptCATAdminCalcHashFromFileHandle(NULL, NULL, NULL, 0); - todo_wine - { ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - } /* NULL filehandle, rest is legal */ SetLastError(0xdeadbeef); ret = pCryptCATAdminCalcHashFromFileHandle(NULL, &hashsize, NULL, 0); - todo_wine - { ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - } /* Correct filehandle, rest is NULL */ file = CreateFileA(selfname, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); SetLastError(0xdeadbeef); ret = pCryptCATAdminCalcHashFromFileHandle(file, NULL, NULL, 0); - todo_wine - { ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - } CloseHandle(file); /* All OK, but dwFlags set to 1 */ file = CreateFileA(selfname, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); SetLastError(0xdeadbeef); ret = pCryptCATAdminCalcHashFromFileHandle(file, &hashsize, NULL, 1); - todo_wine - { ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - } CloseHandle(file); /* All OK, requesting the size of the hash */ @@ -318,12 +306,9 @@ static void test_calchash(void) SetLastError(0xdeadbeef); ret = pCryptCATAdminCalcHashFromFileHandle(file, &hashsize, NULL, 0); ok(ret, "Expected success %u\n", GetLastError()); - todo_wine - { ok(hashsize == 20," Expected a hash size of 20, got %d\n", hashsize); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); - } CloseHandle(file); /* All OK, retrieve the hash @@ -335,12 +320,9 @@ static void test_calchash(void) SetLastError(0xdeadbeef); ret = pCryptCATAdminCalcHashFromFileHandle(file, &hashsize, hash, 0); ok(ret, "Expected success %u\n", GetLastError()); - todo_wine - { ok(hashsize == 20," Expected a hash size of 20, got %d\n", hashsize); ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); - } CloseHandle(file); HeapFree(GetProcessHeap(), 0, hash); @@ -360,14 +342,11 @@ static void test_calchash(void) SetLastError(0xdeadbeef); ret = pCryptCATAdminCalcHashFromFileHandle(file, &hashsize, hash, 0); ok(ret, "Expected success\n"); - todo_wine - { ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); ok(hashsize == sizeof(expectedhash) && !memcmp(hash, expectedhash, sizeof(expectedhash)), "Hashes didn't match\n"); - } CloseHandle(file); HeapFree(GetProcessHeap(), 0, hash);

1 0

Maik Schulz : more german translations
by Jeremy Newman 18 Dec '08

18 Dec '08

Module: website Branch: master Commit: c4f8bae011395d3b557c2c21cf26f0f59b92846b URL: http://source.winehq.org/git/website.git/?a=commit;h=c4f8bae011395d3b557c2c… Author: Maik Schulz <maik.schulz(a)gmail.com> Date: Thu Dec 18 17:43:39 2008 +0100 more german translations the next batch... Cheers, -Maik >From 309eb07fd4620346529cc6b8a417416c33649293 Mon Sep 17 00:00:00 2001 From: Maik Schulz <maik.schulz(a)gmail.com> Date: Thu, 18 Dec 2008 15:54:49 +0100 Subject: german translation --- templates/de/contributing.template | 447 ++++++++++++++++++++++++++++++++++++ templates/de/download.template | 219 ++++++++++++++++++ 2 files changed, 666 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=c4f8bae011395d3b55…

1 0

Jörg Höhle : winecfg: Prevent crash when clearing volume serial number input.
by Alexandre Julliard 18 Dec '08

18 Dec '08

Module: wine Branch: master Commit: cda8e4410ace2616fdabde7cebaad3bdeacbbf1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cda8e4410ace2616fdabde7ce… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Dec 16 10:29:35 2008 +0100 winecfg: Prevent crash when clearing volume serial number input. --- programs/winecfg/drive.c | 2 +- programs/winecfg/driveui.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/programs/winecfg/drive.c b/programs/winecfg/drive.c index 1a3671c..9e6077c 100644 --- a/programs/winecfg/drive.c +++ b/programs/winecfg/drive.c @@ -187,7 +187,7 @@ static void set_drive_serial( char letter, DWORD serial ) HANDLE hFile; filename[0] = letter; - WINE_TRACE("Putting serial number of %08x into file '%s'\n", serial, filename); + WINE_TRACE("Putting serial number of %08X into file '%s'\n", serial, filename); hFile = CreateFile(filename, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); if (hFile != INVALID_HANDLE_VALUE) diff --git a/programs/winecfg/driveui.c b/programs/winecfg/driveui.c index 375eccb..b9bcd2d 100644 --- a/programs/winecfg/driveui.c +++ b/programs/winecfg/driveui.c @@ -520,10 +520,11 @@ static void on_edit_changed(HWND dialog, WORD id) char *serial; serial = get_text(dialog, id); - current_drive->serial = strtoul( serial, NULL, 16 ); + current_drive->serial = serial ? strtoul( serial, NULL, 16 ) : 0; + HeapFree(GetProcessHeap(), 0, serial); current_drive->modified = TRUE; - WINE_TRACE("set serial to %08x\n", current_drive->serial); + WINE_TRACE("set serial to %08X\n", current_drive->serial); /* enable the apply button */ SendMessage(GetParent(dialog), PSM_CHANGED, (WPARAM) dialog, 0); @@ -775,7 +776,8 @@ DriveDlgProc (HWND dialog, UINT msg, WPARAM wParam, LPARAM lParam) current_drive->label = str; str = get_textW(dialog, IDC_EDIT_SERIAL); - current_drive->serial = strtoulW( str, NULL, 16 ); + current_drive->serial = str ? strtoulW( str, NULL, 16 ) : 0; + HeapFree(GetProcessHeap(), 0, str); current_drive->modified = TRUE; /* TODO: we don't have a device at this point */

1 0