April 2008 - Wine-Commits - list.winehq.org

Alex Villacís Lasso : riched20: Reject RTF that is recognized as invalid.
by Alexandre Julliard April 24, 2008

April 24, 2008

Module: wine Branch: master Commit: 4f95cf707254653a3199caff3553fd0f732f23df URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f95cf707254653a3199caff3… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Thu Apr 24 10:07:12 2008 -0500 riched20: Reject RTF that is recognized as invalid. --- dlls/riched20/editor.c | 6 +++--- dlls/riched20/tests/editor.c | 8 -------- dlls/riched32/tests/editor.c | 4 ---- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 04b0e80..e635e9f 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1029,6 +1029,7 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre int from, to, to2, nUndoMode; int nEventMask = editor->nEventMask; ME_InStream inStream; + BOOL invalidRTF = FALSE; TRACE("stream==%p hWnd==%p format==0x%X\n", stream, editor->hWnd, format); editor->nEventMask = 0; @@ -1071,13 +1072,12 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre if ((!editor->bEmulateVersion10 && strncmp(inStream.buffer, "{\\rtf", 5) && strncmp(inStream.buffer, "{\\urtf", 6)) || (editor->bEmulateVersion10 && *inStream.buffer != '{')) { - format &= ~SF_RTF; - format |= SF_TEXT; + invalidRTF = TRUE; } } } - if (!inStream.editstream->dwError) + if (!invalidRTF && !inStream.editstream->dwError) { if (format & SF_RTF) { /* setup the RTF parser */ diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 1593d09..554d7ba 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -2415,28 +2415,20 @@ static void test_EM_STREAMIN(void) (WPARAM)(SF_RTF), (LPARAM)&es); result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); - todo_wine { ok (result == 0, "EM_STREAMIN: Test 2 returned %ld, expected 0\n", result); - } - todo_wine { ok (strlen(buffer) == 0, "EM_STREAMIN: Test 2 set wrong text: Result: %s\n",buffer); - } es.dwCookie = (DWORD_PTR)&streamText3; SendMessage(hwndRichEdit, EM_STREAMIN, (WPARAM)(SF_RTF), (LPARAM)&es); result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); - todo_wine { ok (result == 0, "EM_STREAMIN: Test 3 returned %ld, expected 9\n", result); - } - todo_wine { ok (strlen(buffer) == 0, "EM_STREAMIN: Test 3 set wrong text: Result: %s\n",buffer); - } DestroyWindow(hwndRichEdit); } diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 22dac0a..c8b7181 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -276,14 +276,10 @@ static void test_EM_STREAMIN(void) (WPARAM)(SF_RTF), (LPARAM)&es); result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); - todo_wine { ok (result == 0, "EM_STREAMIN: Test 3 returned %ld, expected 0\n", result); - } - todo_wine { ok (strlen(buffer) == 0, "EM_STREAMIN: Test 3 set wrong text: Result: %s\n",buffer); - } DestroyWindow(hwndRichEdit); }

1 0

Alex Villacís Lasso : riched20: Implement ignoring of last \par for EM_STREAMIN.
by Alexandre Julliard April 24, 2008

April 24, 2008

Module: wine Branch: master Commit: 7148f92c4c2891373dc2f9512151a01180e09bbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=7148f92c4c2891373dc2f9512… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Thu Apr 24 10:00:29 2008 -0500 riched20: Implement ignoring of last \par for EM_STREAMIN. --- dlls/riched20/editor.c | 22 ++++++++++++++++++---- dlls/riched20/tests/editor.c | 12 ------------ 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index c5a7554..97fce4a 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1022,7 +1022,7 @@ ME_StreamInFill(ME_InStream *stream) stream->dwUsed = 0; } -static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stream) +static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stream, BOOL stripLastCR) { RTF_Info parser; ME_Style *style; @@ -1101,6 +1101,20 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre if (parser.lpRichEditOle) IRichEditOle_Release(parser.lpRichEditOle); + /* Remove last line break, as mandated by tests */ + if (stripLastCR) { + int newfrom, newto; + ME_GetSelection(editor, &newfrom, &newto); + if (newto > to) { + WCHAR lastchar = '\0'; + + ME_GetTextW(editor, &lastchar, newto - 1, 1, 0); + if (lastchar == '\r') { + ME_InternalDeleteText(editor, newto - 1, 1); + } + } + } + style = parser.style; } else if (format & SF_TEXT) @@ -1170,7 +1184,7 @@ ME_StreamInRTFString(ME_TextEditor *editor, BOOL selection, char *string) data.pos = 0; es.dwCookie = (DWORD)&data; es.pfnCallback = ME_ReadFromRTFString; - ME_StreamIn(editor, SF_RTF | (selection ? SFF_SELECTION : 0), &es); + ME_StreamIn(editor, SF_RTF | (selection ? SFF_SELECTION : 0), &es, FALSE); } @@ -1923,7 +1937,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, /* Messages specific to Richedit controls */ case EM_STREAMIN: - return ME_StreamIn(editor, wParam, (EDITSTREAM*)lParam); + return ME_StreamIn(editor, wParam, (EDITSTREAM*)lParam, TRUE); case EM_STREAMOUT: return ME_StreamOut(editor, wParam, (EDITSTREAM *)lParam); case WM_GETDLGCODE: @@ -2435,7 +2449,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, gds.nLength = 0; es.dwCookie = (DWORD)&gds; es.pfnCallback = dwFormat == SF_RTF ? ME_ReadFromHGLOBALRTF : ME_ReadFromHGLOBALUnicode; - ME_StreamIn(editor, dwFormat|SFF_SELECTION, &es); + ME_StreamIn(editor, dwFormat|SFF_SELECTION, &es, FALSE); CloseClipboard(); return 0; diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index b6e9176..1593d09 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -2377,15 +2377,11 @@ static void test_EM_STREAMIN(void) (WPARAM)(SF_RTF), (LPARAM)&es); result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); - todo_wine { ok (result == 12, "EM_STREAMIN: Test 0-a returned %ld, expected 12\n", result); - } result = strcmp (buffer,"TestSomeText"); - todo_wine { ok (result == 0, "EM_STREAMIN: Test 0-a set wrong text: Result: %s\n",buffer); - } /* Native richedit 2.0 ignores last \par, next-to-last \par appears */ es.dwCookie = (DWORD_PTR)&streamText0b; @@ -2395,15 +2391,11 @@ static void test_EM_STREAMIN(void) (WPARAM)(SF_RTF), (LPARAM)&es); result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); - todo_wine { ok (result == 14, "EM_STREAMIN: Test 0-b returned %ld, expected 14\n", result); - } result = strcmp (buffer,"TestSomeText\r\n"); - todo_wine { ok (result == 0, "EM_STREAMIN: Test 0-b set wrong text: Result: %s\n",buffer); - } es.dwCookie = (DWORD_PTR)&streamText1; es.dwError = 0; @@ -2412,15 +2404,11 @@ static void test_EM_STREAMIN(void) (WPARAM)(SF_RTF), (LPARAM)&es); result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); - todo_wine { ok (result == 12, "EM_STREAMIN: Test 1 returned %ld, expected 12\n", result); - } result = strcmp (buffer,"TestSomeText"); - todo_wine { ok (result == 0, "EM_STREAMIN: Test 1 set wrong text: Result: %s\n",buffer); - } es.dwCookie = (DWORD_PTR)&streamText2; SendMessage(hwndRichEdit, EM_STREAMIN,

1 0

Stefan Dösinger : wined3d: Remove an unused variable.
by Alexandre Julliard April 24, 2008

April 24, 2008

Module: wine Branch: master Commit: 663bfb773c54ea7d6c3cac8c040a494191e0f351 URL: http://source.winehq.org/git/wine.git/?a=commit;h=663bfb773c54ea7d6c3cac8c0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 24 14:47:40 2008 +0200 wined3d: Remove an unused variable. --- dlls/wined3d/ati_fragment_shader.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index c481529..e722f05 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -812,7 +812,6 @@ static void set_tex_op_atifs(DWORD state, IWineD3DStateBlockImpl *stateblock, Wi for(i = 0; i < desc->num_textures_used; i++) { mapped_stage = This->texUnitMap[i]; if(mapped_stage != -1) { - const struct StateEntry *StateTable = stateblock->wineD3DDevice->shader_backend->StateTable; GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + mapped_stage)); checkGLcall("glActiveTextureARB"); texture_activate_dimensions(i, stateblock, context);

1 0

Stefan Dösinger : d3d9: Check textures for srgb writing, not surfaces.
by Alexandre Julliard April 24, 2008

April 24, 2008

Module: wine Branch: master Commit: 97d64396ebc893f247283bfc0c3d2250c52c5c37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97d64396ebc893f247283bfc0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 24 01:00:44 2008 +0200 d3d9: Check textures for srgb writing, not surfaces. --- dlls/d3d9/tests/visual.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 2c224e8..2c3cea4 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -6552,9 +6552,15 @@ static void fog_srgbwrite_test(IDirect3DDevice9 *device) DWORD color; IDirect3DDevice9_GetDirect3D(device, &d3d); + /* Ask for srgb writing on D3DRTYPE_TEXTURE. Some Windows drivers do not report it on surfaces. + * For some not entirely understood reasons D3DUSAGE_RENDERTARGET | D3DUSAGE_QUERY_SRGBWRITE + * passes on surfaces, while asking for SRGBWRITE alone fails. Textures advertize srgb writing + * alone as well, so use that since it is not the point of this test to show how CheckDeviceFormat + * works + */ if(IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, D3DUSAGE_RENDERTARGET | D3DUSAGE_QUERY_SRGBWRITE, - D3DRTYPE_SURFACE, D3DFMT_A8R8G8B8) != D3D_OK) { + D3DRTYPE_TEXTURE, D3DFMT_A8R8G8B8) != D3D_OK) { skip("No SRGBWRITEENABLE support on D3DFMT_X8R8G8B8\n"); IDirect3D9_Release(d3d); return;

1 0

Stefan Dösinger : d3d9: Dump the device information in the visual tests.
by Alexandre Julliard April 24, 2008

April 24, 2008

Module: wine Branch: master Commit: dc684c060fcce002dc9c0922fcc781f7cd6c9b5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc684c060fcce002dc9c0922f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 24 01:09:49 2008 +0200 d3d9: Dump the device information in the visual tests. --- dlls/d3d9/tests/visual.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 2c3cea4..c954806 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -143,6 +143,7 @@ static IDirect3DDevice9 *init_d3d9(void) IDirect3DDevice9 *device_ptr = 0; D3DPRESENT_PARAMETERS present_parameters; HRESULT hr; + D3DADAPTER_IDENTIFIER9 identifier; d3d9_create = (void *)GetProcAddress(d3d9_handle, "Direct3DCreate9"); ok(d3d9_create != NULL, "Failed to get address of Direct3DCreate9\n"); @@ -162,6 +163,16 @@ static IDirect3DDevice9 *init_d3d9(void) present_parameters.EnableAutoDepthStencil = TRUE; present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; + memset(&identifier, 0, sizeof(identifier)); + hr = IDirect3D9_GetAdapterIdentifier(d3d9_ptr, 0, 0, &identifier); + ok(hr == D3D_OK, "Failed to get adapter identifier description\n"); + trace("Driver string: \"%s\"\n", identifier.Driver); + trace("Description string: \"%s\"\n", identifier.Description); + trace("Device name string: \"%s\"\n", identifier.DeviceName); + trace("Driver version %d.%d.%d.%d\n", + HIWORD(identifier.DriverVersion.HighPart), LOWORD(identifier.DriverVersion.HighPart), + HIWORD(identifier.DriverVersion.LowPart), LOWORD(identifier.DriverVersion.LowPart)); + hr = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, present_parameters.hDeviceWindow, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); if(FAILED(hr)) { present_parameters.AutoDepthStencilFormat = D3DFMT_D16;

1 0

Alex Villacís Lasso : riched20: Implement ignoring of last \par for EM_STREAMIN - 1.0 emulation.
by Alexandre Julliard April 24, 2008

April 24, 2008

Module: wine Branch: master Commit: d10256f309e2f77b7a48594e5691899586150f3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d10256f309e2f77b7a48594e5… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Thu Apr 24 10:04:23 2008 -0500 riched20: Implement ignoring of last \par for EM_STREAMIN - 1.0 emulation. --- dlls/riched20/editor.c | 11 +++++---- dlls/riched32/tests/editor.c | 52 +++++++++++++++++++++++++++++++++++++---- 2 files changed, 53 insertions(+), 10 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 97fce4a..04b0e80 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1105,12 +1105,13 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre if (stripLastCR) { int newfrom, newto; ME_GetSelection(editor, &newfrom, &newto); - if (newto > to) { - WCHAR lastchar = '\0'; + if (newto > to + (editor->bEmulateVersion10 ? 1 : 0)) { + WCHAR lastchar[3] = {'\0', '\0'}; + int linebreakSize = editor->bEmulateVersion10 ? 2 : 1; - ME_GetTextW(editor, &lastchar, newto - 1, 1, 0); - if (lastchar == '\r') { - ME_InternalDeleteText(editor, newto - 1, 1); + ME_GetTextW(editor, lastchar, newto - linebreakSize, linebreakSize, 0); + if (lastchar[0] == '\r' && (lastchar[1] == '\n' || lastchar[1] == '\0')) { + ME_InternalDeleteText(editor, newto - linebreakSize, linebreakSize); } } } diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index ac53572..22dac0a 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -179,6 +179,10 @@ static void test_EM_STREAMIN(void) EDITSTREAM es; char buffer[1024] = {0}; + const char * streamText0 = "{\\rtf1 TestSomeText}"; + const char * streamText0a = "{\\rtf1 TestSomeText\\par}"; + const char * streamText0b = "{\\rtf1 TestSomeText\\par\\par}"; + const char * streamText1 = "{\\rtf1\\ansi\\ansicpg1252\\deff0\\deflang12298{\\fonttbl{\\f0\\fswiss\\fprq2\\fcharset0 System;}}\r\n" \ "\\viewkind4\\uc1\\pard\\f0\\fs17 TestSomeText\\par\r\n" \ @@ -196,6 +200,48 @@ static void test_EM_STREAMIN(void) const char * streamText3 = "RichEdit1"; + /* Minimal test without \par at the end */ + es.dwCookie = (DWORD_PTR)&streamText0; + es.dwError = 0; + es.pfnCallback = test_EM_STREAMIN_esCallback; + SendMessage(hwndRichEdit, EM_STREAMIN, + (WPARAM)(SF_RTF), (LPARAM)&es); + + result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + ok (result == 12, + "EM_STREAMIN: Test 0 returned %ld, expected 12\n", result); + result = strcmp (buffer,"TestSomeText"); + ok (result == 0, + "EM_STREAMIN: Test 0 set wrong text: Result: %s\n",buffer); + + /* Native richedit 2.0 ignores last \par */ + es.dwCookie = (DWORD_PTR)&streamText0a; + es.dwError = 0; + es.pfnCallback = test_EM_STREAMIN_esCallback; + SendMessage(hwndRichEdit, EM_STREAMIN, + (WPARAM)(SF_RTF), (LPARAM)&es); + + result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + ok (result == 12, + "EM_STREAMIN: Test 0-a returned %ld, expected 12\n", result); + result = strcmp (buffer,"TestSomeText"); + ok (result == 0, + "EM_STREAMIN: Test 0-a set wrong text: Result: %s\n",buffer); + + /* Native richedit 2.0 ignores last \par, next-to-last \par appears */ + es.dwCookie = (DWORD_PTR)&streamText0b; + es.dwError = 0; + es.pfnCallback = test_EM_STREAMIN_esCallback; + SendMessage(hwndRichEdit, EM_STREAMIN, + (WPARAM)(SF_RTF), (LPARAM)&es); + + result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + ok (result == 14, + "EM_STREAMIN: Test 0-b returned %ld, expected 14\n", result); + result = strcmp (buffer,"TestSomeText\r\n"); + ok (result == 0, + "EM_STREAMIN: Test 0-b set wrong text: Result: %s\n",buffer); + es.dwCookie = (DWORD_PTR)&streamText1; es.dwError = 0; es.pfnCallback = test_EM_STREAMIN_esCallback; @@ -203,15 +249,11 @@ static void test_EM_STREAMIN(void) (WPARAM)(SF_RTF), (LPARAM)&es); result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); - todo_wine { ok (result == 12, "EM_STREAMIN: Test 1 returned %ld, expected 12\n", result); - } result = strcmp (buffer,"TestSomeText"); - todo_wine { ok (result == 0, "EM_STREAMIN: Test 1 set wrong text: Result: %s\n",buffer); - } es.dwCookie = (DWORD_PTR)&streamText2; @@ -236,7 +278,7 @@ static void test_EM_STREAMIN(void) result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); todo_wine { ok (result == 0, - "EM_STREAMIN: Test 3 returned %ld, expected 9\n", result); + "EM_STREAMIN: Test 3 returned %ld, expected 0\n", result); } todo_wine { ok (strlen(buffer) == 0,

1 0

Stefan Dösinger : wined3d: Fix DP2ADD in GLSL.
by Alexandre Julliard April 24, 2008

April 24, 2008

Module: wine Branch: master Commit: 9b2593575783cb73c76388e5b71046c56bd4f9df URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b2593575783cb73c76388e5b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Apr 23 22:18:32 2008 +0200 wined3d: Fix DP2ADD in GLSL. DP2ADD returns a scalar, and fglrx (correctly) complains that it can't assign that to a 3 component vector. --- dlls/wined3d/glsl_shader.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 901d461..ebf3c09 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2696,7 +2696,11 @@ void pshader_glsl_dp2add(SHADER_OPCODE_ARG* arg) { shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1, &src1_param); shader_glsl_add_src_param(arg, arg->src[2], arg->src_addr[2], WINED3DSP_WRITEMASK_0, &src2_param); - shader_addline(arg->buffer, "dot(%s, %s) + %s);\n", src0_param.param_str, src1_param.param_str, src2_param.param_str); + if (mask_size > 1) { + shader_addline(arg->buffer, "vec%d(dot(%s, %s) + %s));\n", mask_size, src0_param.param_str, src1_param.param_str, src2_param.param_str); + } else { + shader_addline(arg->buffer, "dot(%s, %s) + %s);\n", src0_param.param_str, src1_param.param_str, src2_param.param_str); + } } void pshader_glsl_input_pack(

1 0

Stefan Dösinger : wined3d: Fix the GL_ATI_separate_stencil codepath.
by Alexandre Julliard April 24, 2008

April 24, 2008

Module: wine Branch: master Commit: dc07ddb53161751e0f6068a469c97024f795de0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc07ddb53161751e0f6068a46… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Apr 23 21:53:59 2008 +0200 wined3d: Fix the GL_ATI_separate_stencil codepath. glStencilFuncSeparateATI does not take a face argument, instead it sets the front and back facing functions at once. This means the renderstate_stencil_twosided helper function is somewhat pointless for this extension. --- dlls/wined3d/state.c | 66 ++++++++++++++++++++++++------------------------- 1 files changed, 32 insertions(+), 34 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 1f6bb8e..482c293 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -772,32 +772,14 @@ static void state_texfactor(DWORD state, IWineD3DStateBlockImpl *stateblock, Win static void renderstate_stencil_twosided(IWineD3DStateBlockImpl *stateblock, GLint face, GLint func, GLint ref, GLuint mask, GLint stencilFail, GLint depthFail, GLint stencilPass ) { -#if 0 /* Don't use OpenGL 2.0 calls for now */ - if(GL_EXTCALL(glStencilFuncSeparate) && GL_EXTCALL(glStencilOpSeparate)) { - GL_EXTCALL(glStencilFuncSeparate(face, func, ref, mask)); - checkGLcall("glStencilFuncSeparate(...)"); - GL_EXTCALL(glStencilOpSeparate(face, stencilFail, depthFail, stencilPass)); - checkGLcall("glStencilOpSeparate(...)"); - } - else -#endif - if(GL_SUPPORT(EXT_STENCIL_TWO_SIDE)) { - glEnable(GL_STENCIL_TEST_TWO_SIDE_EXT); - checkGLcall("glEnable(GL_STENCIL_TEST_TWO_SIDE_EXT)"); - GL_EXTCALL(glActiveStencilFaceEXT(face)); - checkGLcall("glActiveStencilFaceEXT(...)"); - glStencilFunc(func, ref, mask); - checkGLcall("glStencilFunc(...)"); - glStencilOp(stencilFail, depthFail, stencilPass); - checkGLcall("glStencilOp(...)"); - } else if(GL_SUPPORT(ATI_SEPARATE_STENCIL)) { - GL_EXTCALL(glStencilFuncSeparateATI(face, func, ref, mask)); - checkGLcall("glStencilFuncSeparateATI(...)"); - GL_EXTCALL(glStencilOpSeparateATI(face, stencilFail, depthFail, stencilPass)); - checkGLcall("glStencilOpSeparateATI(...)"); - } else { - ERR("Separate (two sided) stencil not supported on this version of opengl. Caps weren't honored?\n"); - } + glEnable(GL_STENCIL_TEST_TWO_SIDE_EXT); + checkGLcall("glEnable(GL_STENCIL_TEST_TWO_SIDE_EXT)"); + GL_EXTCALL(glActiveStencilFaceEXT(face)); + checkGLcall("glActiveStencilFaceEXT(...)"); + glStencilFunc(func, ref, mask); + checkGLcall("glStencilFunc(...)"); + glStencilOp(stencilFail, depthFail, stencilPass); + checkGLcall("glStencilOp(...)"); } static void @@ -848,20 +830,36 @@ state_stencil(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *c glEnable(GL_STENCIL_TEST); checkGLcall("glEnable GL_STENCIL_TEST"); - /* Apply back first, then front. This function calls glActiveStencilFaceEXT, - * which has an effect on the code below too. If we apply the front face - * afterwards, we are sure that the active stencil face is set to front, - * and other stencil functions which do not use two sided stencil do not have - * to set it back - */ - renderstate_stencil_twosided(stateblock, GL_BACK, func_ccw, ref, mask, stencilFail_ccw, depthFail_ccw, stencilPass_ccw); - renderstate_stencil_twosided(stateblock, GL_FRONT, func, ref, mask, stencilFail, depthFail, stencilPass); + if(GL_SUPPORT(EXT_STENCIL_TWO_SIDE)) { + /* Apply back first, then front. This function calls glActiveStencilFaceEXT, + * which has an effect on the code below too. If we apply the front face + * afterwards, we are sure that the active stencil face is set to front, + * and other stencil functions which do not use two sided stencil do not have + * to set it back + */ + renderstate_stencil_twosided(stateblock, GL_BACK, func_ccw, ref, mask, + stencilFail_ccw, depthFail_ccw, stencilPass_ccw); + renderstate_stencil_twosided(stateblock, GL_FRONT, func, ref, mask, + stencilFail, depthFail, stencilPass); + } else if(GL_SUPPORT(ATI_SEPARATE_STENCIL)) { + GL_EXTCALL(glStencilFuncSeparateATI(func, func_ccw, ref, mask)); + checkGLcall("glStencilFuncSeparateATI(...)"); + GL_EXTCALL(glStencilOpSeparateATI(GL_FRONT, stencilFail, depthFail, stencilPass)); + checkGLcall("glStencilOpSeparateATI(GL_FRONT, ...)"); + GL_EXTCALL(glStencilOpSeparateATI(GL_BACK, stencilFail_ccw, depthFail_ccw, stencilPass_ccw)); + checkGLcall("glStencilOpSeparateATI(GL_BACK, ...)"); + } else { + ERR("Separate (two sided) stencil not supported on this version of opengl. Caps weren't honored?\n"); + } } else if(onesided_enable) { if(GL_SUPPORT(EXT_STENCIL_TWO_SIDE)) { glDisable(GL_STENCIL_TEST_TWO_SIDE_EXT); checkGLcall("glDisable(GL_STENCIL_TEST_TWO_SIDE_EXT)"); } + /* This code disables the ATI extension as well, since the standard stencil functions are equal + * to calling the ATI functions with GL_FRONT_AND_BACK as face parameter + */ glEnable(GL_STENCIL_TEST); checkGLcall("glEnable GL_STENCIL_TEST"); glStencilFunc(func, ref, mask);

1 0

Stefan Dösinger : wined3d: More fglrx spam.
by Alexandre Julliard April 24, 2008

April 24, 2008

Module: wine Branch: master Commit: bcb0f7cc2283949c4baf67c2e8a0cf764741138b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcb0f7cc2283949c4baf67c2e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Apr 23 21:36:39 2008 +0200 wined3d: More fglrx spam. --- dlls/wined3d/glsl_shader.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index cc0c2e0..901d461 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -62,12 +62,15 @@ void print_glsl_info_log(WineD3D_GL_Info *gl_info, GLhandleARB obj) { BOOL is_spam; const char *spam[] = { - "Vertex shader was successfully compiled to run on hardware.\n", /* fglrx */ - "Fragment shader was successfully compiled to run on hardware.\n", /* fglrx */ - "Fragment shader(s) linked, vertex shader(s) linked.", /* fglrx, no \n */ - "Vertex shader(s) linked, no fragment shader(s) defined.", /* fglrx, no \n */ + "Vertex shader was successfully compiled to run on hardware.\n", /* fglrx */ + "Fragment shader was successfully compiled to run on hardware.\n", /* fglrx */ + "Fragment shader(s) linked, vertex shader(s) linked. \n ", /* fglrx, with \n */ + "Fragment shader(s) linked, vertex shader(s) linked.", /* fglrx, no \n */ + "Vertex shader(s) linked, no fragment shader(s) defined. \n ", /* fglrx, with \n */ + "Vertex shader(s) linked, no fragment shader(s) defined.", /* fglrx, no \n */ "Fragment shader was successfully compiled to run on hardware.\nWARNING: 0:1: extension 'GL_ARB_draw_buffers' is not supported", - "Fragment shader(s) linked, no vertex shader(s) defined." /* fglrx, no \n */ + "Fragment shader(s) linked, no vertex shader(s) defined.", /* fglrx, no \n */ + "Fragment shader(s) linked, no vertex shader(s) defined. \n " /* fglrx, with \n */ }; GL_EXTCALL(glGetObjectParameterivARB(obj,

1 0

Alexandre Julliard : user32: Allow the default desktop name to be specified on a per-app basis.
by Alexandre Julliard April 24, 2008

April 24, 2008

Module: wine Branch: master Commit: 9359ff6fe0fc7f4e5986394069c42bc89f1190ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=9359ff6fe0fc7f4e598639406… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 24 17:22:04 2008 +0200 user32: Allow the default desktop name to be specified on a per-app basis. --- dlls/user32/user_main.c | 59 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 57 insertions(+), 2 deletions(-) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 01b396d..77913a8 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -154,6 +154,61 @@ static void palette_init(void) /*********************************************************************** + * get_default_desktop + * + * Get the name of the desktop to use for this app if not specified explicitly. + */ +static const WCHAR *get_default_desktop(void) +{ + static const WCHAR defaultW[] = {'D','e','f','a','u','l','t',0}; + static const WCHAR desktopW[] = {'D','e','s','k','t','o','p',0}; + static const WCHAR explorerW[] = {'\\','E','x','p','l','o','r','e','r',0}; + static const WCHAR app_defaultsW[] = {'S','o','f','t','w','a','r','e','\\', + 'W','i','n','e','\\', + 'A','p','p','D','e','f','a','u','l','t','s',0}; + static WCHAR buffer[MAX_PATH + sizeof(explorerW)/sizeof(WCHAR)]; + WCHAR *p, *appname = buffer; + const WCHAR *ret = defaultW; + DWORD len; + HKEY tmpkey, appkey; + + len = (GetModuleFileNameW( 0, buffer, MAX_PATH )); + if (!len || len >= MAX_PATH) return ret; + if ((p = strrchrW( appname, '/' ))) appname = p + 1; + if ((p = strrchrW( appname, '\\' ))) appname = p + 1; + p = appname + strlenW(appname); + strcpyW( p, explorerW ); + + /* @@ Wine registry key: HKCU\Software\Wine\AppDefaults\app.exe\Explorer */ + if (!RegOpenKeyW( HKEY_CURRENT_USER, app_defaultsW, &tmpkey )) + { + if (RegOpenKeyW( tmpkey, appname, &appkey )) appkey = 0; + RegCloseKey( tmpkey ); + if (appkey) + { + len = sizeof(buffer); + if (!RegQueryValueExW( appkey, desktopW, 0, NULL, (LPBYTE)buffer, &len )) ret = buffer; + RegCloseKey( appkey ); + if (ret && strcmpiW( ret, defaultW )) return ret; + ret = defaultW; + } + } + + memcpy( buffer, app_defaultsW, 13 * sizeof(WCHAR) ); /* copy only software\\wine */ + strcpyW( buffer + 13, explorerW ); + + /* @@ Wine registry key: HKCU\Software\Wine\Explorer */ + if (!RegOpenKeyW( HKEY_CURRENT_USER, buffer, &appkey )) + { + len = sizeof(buffer); + if (!RegQueryValueExW( appkey, desktopW, 0, NULL, (LPBYTE)buffer, &len )) ret = buffer; + RegCloseKey( appkey ); + } + return ret; +} + + +/*********************************************************************** * winstation_init * * Connect to the process window station and desktop. @@ -161,7 +216,6 @@ static void palette_init(void) static void winstation_init(void) { static const WCHAR WinSta0[] = {'W','i','n','S','t','a','0',0}; - static const WCHAR Default[] = {'D','e','f','a','u','l','t',0}; STARTUPINFOW info; WCHAR *winstation = NULL, *desktop = NULL, *buffer = NULL; @@ -200,7 +254,8 @@ static void winstation_init(void) } if (buffer || !GetThreadDesktop( GetCurrentThreadId() )) { - handle = CreateDesktopW( desktop ? desktop : Default, NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL ); + handle = CreateDesktopW( desktop ? desktop : get_default_desktop(), + NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL ); if (handle) SetThreadDesktop( handle ); } HeapFree( GetProcessHeap(), 0, buffer );

1 0