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

Stefan Dösinger : wined3d: Get rid of TMP accesses in texm3x3* instructions.
by Alexandre Julliard May 19, 2009

May 19, 2009

Module: wine Branch: master Commit: ad217029b0348cacfa45ab0d6b656ed431f3d144 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad217029b0348cacfa45ab0d6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 7 19:07:34 2009 +0200 wined3d: Get rid of TMP accesses in texm3x3* instructions. --- dlls/wined3d/arb_program_shader.c | 55 +++++++++++++++++++++++------------- 1 files changed, 35 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e2b6005..229c323 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1294,9 +1294,16 @@ static void pshader_hw_texm3x3pad(const struct wined3d_shader_instruction *ins) SHADER_BUFFER *buffer = ins->ctx->buffer; SHADER_PARSE_STATE* current_state = &This->baseShader.parse_state; char src0_name[50]; + unsigned int dst; + + /* There are always 2 texm3x3pad instructions followed by one texm3x3[tex,vspec, ...] instruction, with + * incrementing ins->dst[0].register_idx numbers. So the pad instruction already knows the final destination + * register, and this register is uninitialized(otherwise the assembler complains that it is 'redeclared') + */ + dst = reg + 2 - current_state->current_row; shader_arb_get_src_param(ins, &ins->src[0], 0, src0_name); - shader_addline(buffer, "DP3 TMP.%c, fragment.texcoord[%u], %s;\n", 'x' + current_state->current_row, reg, src0_name); + shader_addline(buffer, "DP3 T%u.%c, fragment.texcoord[%u], %s;\n", dst, 'x' + current_state->current_row, reg, src0_name); current_state->texcoord_w[current_state->current_row++] = reg; } @@ -1309,15 +1316,17 @@ static void pshader_hw_texm3x3tex(const struct wined3d_shader_instruction *ins) SHADER_BUFFER *buffer = ins->ctx->buffer; SHADER_PARSE_STATE* current_state = &This->baseShader.parse_state; char dst_str[50]; + char dst_reg[8]; char src0_name[50]; + sprintf(dst_reg, "T%u", reg); shader_arb_get_src_param(ins, &ins->src[0], 0, src0_name); - shader_addline(buffer, "DP3 TMP.z, fragment.texcoord[%u], %s;\n", reg, src0_name); + shader_addline(buffer, "DP3 %s.z, fragment.texcoord[%u], %s;\n", dst_reg, reg, src0_name); /* Sample the texture using the calculated coordinates */ shader_arb_get_dst_param(ins, &ins->dst[0], dst_str); flags = reg < MAX_TEXTURES ? deviceImpl->stateBlock->textureState[reg][WINED3DTSS_TEXTURETRANSFORMFLAGS] : 0; - shader_hw_sample(ins, reg, dst_str, "TMP", flags & WINED3DTTFF_PROJECTED, FALSE); + shader_hw_sample(ins, reg, dst_str, dst_reg, flags & WINED3DTTFF_PROJECTED, FALSE); current_state->current_row = 0; } @@ -1331,10 +1340,14 @@ static void pshader_hw_texm3x3vspec(const struct wined3d_shader_instruction *ins SHADER_PARSE_STATE* current_state = &This->baseShader.parse_state; char dst_str[50]; char src0_name[50]; + char dst_reg[8]; + /* Get the dst reg without writemask strings. We know this register is uninitialized, so we can use all + * components for temporary data storage + */ + sprintf(dst_reg, "T%u", reg); shader_arb_get_src_param(ins, &ins->src[0], 0, src0_name); - /* Note: TMP.xy is input here, generated in earlier texm3x3pad instructions */ - shader_addline(buffer, "DP3 TMP.z, fragment.texcoord[%u], %s;\n", reg, src0_name); + shader_addline(buffer, "DP3 %s.z, fragment.texcoord[%u], %s;\n", dst_reg, reg, src0_name); /* Construct the eye-ray vector from w coordinates */ shader_addline(buffer, "MOV TB.x, fragment.texcoord[%u].w;\n", current_state->texcoord_w[0]); @@ -1343,18 +1356,18 @@ static void pshader_hw_texm3x3vspec(const struct wined3d_shader_instruction *ins /* Calculate reflection vector */ - shader_addline(buffer, "DP3 TMP.w, TMP, TB;\n"); + shader_addline(buffer, "DP3 %s.w, %s, TB;\n", dst_reg, dst_reg); /* The .w is ignored when sampling, so I can use TB.w to calculate dot(N, N) */ - shader_addline(buffer, "DP3 TB.w, TMP, TMP;\n"); + shader_addline(buffer, "DP3 TB.w, %s, %s;\n", dst_reg, dst_reg); shader_addline(buffer, "RCP TB.w, TB.w;\n"); - shader_addline(buffer, "MUL TMP.w, TMP.w, TB.w;\n"); - shader_addline(buffer, "MUL TMP, TMP.w, TMP;\n"); - shader_addline(buffer, "MAD TMP, coefmul.x, TMP, -TB;\n"); + shader_addline(buffer, "MUL %s.w, %s.w, TB.w;\n", dst_reg, dst_reg); + shader_addline(buffer, "MUL %s, %s.w, %s;\n", dst_reg, dst_reg, dst_reg); + shader_addline(buffer, "MAD %s, coefmul.x, %s, -TB;\n", dst_reg, dst_reg); /* Sample the texture using the calculated coordinates */ shader_arb_get_dst_param(ins, &ins->dst[0], dst_str); flags = reg < MAX_TEXTURES ? deviceImpl->stateBlock->textureState[reg][WINED3DTSS_TEXTURETRANSFORMFLAGS] : 0; - shader_hw_sample(ins, reg, dst_str, "TMP", flags & WINED3DTTFF_PROJECTED, FALSE); + shader_hw_sample(ins, reg, dst_str, dst_reg, flags & WINED3DTTFF_PROJECTED, FALSE); current_state->current_row = 0; } @@ -1369,11 +1382,13 @@ static void pshader_hw_texm3x3spec(const struct wined3d_shader_instruction *ins) char dst_str[50]; char src0_name[50]; char src1_name[50]; + char dst_reg[8]; shader_arb_get_src_param(ins, &ins->src[0], 0, src0_name); shader_arb_get_src_param(ins, &ins->src[0], 1, src1_name); /* Note: TMP.xy is input here, generated by two texm3x3pad instructions */ - shader_addline(buffer, "DP3 TMP.z, fragment.texcoord[%u], %s;\n", reg, src0_name); + sprintf(dst_reg, "T%u", reg); + shader_addline(buffer, "DP3 %s.z, fragment.texcoord[%u], %s;\n", dst_reg, reg, src0_name); /* Calculate reflection vector. * @@ -1383,17 +1398,17 @@ static void pshader_hw_texm3x3spec(const struct wined3d_shader_instruction *ins) * * Which normalizes the normal vector */ - shader_addline(buffer, "DP3 TMP.w, TMP, %s;\n", src1_name); - shader_addline(buffer, "DP3 TC.w, TMP, TMP;\n"); + shader_addline(buffer, "DP3 %s.w, %s, %s;\n", dst_reg, dst_reg, src1_name); + shader_addline(buffer, "DP3 TC.w, %s, %s;\n", dst_reg, dst_reg); shader_addline(buffer, "RCP TC.w, TC.w;\n"); - shader_addline(buffer, "MUL TMP.w, TMP.w, TC.w;\n"); - shader_addline(buffer, "MUL TMP, TMP.w, TMP;\n"); - shader_addline(buffer, "MAD TMP, coefmul.x, TMP, -%s;\n", src1_name); + shader_addline(buffer, "MUL %s.w, %s.w, TC.w;\n", dst_reg, dst_reg); + shader_addline(buffer, "MUL %s, %s.w, %s;\n", dst_reg, dst_reg, dst_reg); + shader_addline(buffer, "MAD %s, coefmul.x, %s, -%s;\n", dst_reg, dst_reg, src1_name); /* Sample the texture using the calculated coordinates */ shader_arb_get_dst_param(ins, &ins->dst[0], dst_str); flags = reg < MAX_TEXTURES ? deviceImpl->stateBlock->textureState[reg][WINED3DTSS_TEXTURETRANSFORMFLAGS] : 0; - shader_hw_sample(ins, reg, dst_str, "TMP", flags & WINED3DTTFF_PROJECTED, FALSE); + shader_hw_sample(ins, reg, dst_str, dst_reg, flags & WINED3DTTFF_PROJECTED, FALSE); current_state->current_row = 0; } @@ -1469,8 +1484,8 @@ static void pshader_hw_texm3x3(const struct wined3d_shader_instruction *ins) shader_arb_get_dst_param(ins, dst, dst_str); shader_arb_get_src_param(ins, &ins->src[0], 0, src0); - shader_addline(buffer, "DP3 TMP.z, fragment.texcoord[%u], %s;\n", dst->reg.idx, src0); - shader_addline(buffer, "MOV %s, TMP;\n", dst_str); + shader_addline(buffer, "DP3 T%u.z, fragment.texcoord[%u], %s;\n", dst->reg.idx, dst->reg.idx, src0); + shader_addline(buffer, "MOV %s, T%u;\n", dst_str, dst->reg.idx); } /** Process the WINED3DSIO_TEXM3X2DEPTH instruction in ARB:

1 0

Francois Gouget : oleaut32/tests: Replace realloc() with HeapReAlloc().
by Alexandre Julliard May 19, 2009

May 19, 2009

Module: wine Branch: master Commit: 1ef2f3844fd257e22a161fc5e354e5a0b0fbb5d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ef2f3844fd257e22a161fc5e… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 19 11:21:07 2009 +0200 oleaut32/tests: Replace realloc() with HeapReAlloc(). --- dlls/oleaut32/tests/tmarshal.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index a9392c5..b8cc57d 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -56,7 +56,11 @@ static char *get_tmp_space( int size ) int idx; idx = ++pos % (sizeof(list)/sizeof(list[0])); - if ((ret = realloc( list[idx], size ))) list[idx] = ret; + if (list[idx]) + ret = HeapReAlloc( GetProcessHeap(), 0, list[idx], size ); + else + ret = HeapAlloc( GetProcessHeap(), 0, size ); + if (ret) list[idx] = ret; return ret; }

1 0

Hans Leidekker : kernel32: Add tests for FormatMessageA/W.
by Alexandre Julliard May 19, 2009

May 19, 2009

Module: wine Branch: master Commit: 0eb5893ea6a34b00700de95c70f2c0d03fe3f648 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eb5893ea6a34b00700de95c7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 19 09:20:34 2009 +0200 kernel32: Add tests for FormatMessageA/W. --- dlls/kernel32/tests/format_msg.c | 334 +++++++++++++++++++++++++++++++++++++- 1 files changed, 329 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0eb5893ea6a34b00700de…

1 0

Hans Leidekker : kernel32: Add support for %ws and %wc format specifiers to FormatMessageA/W.
by Alexandre Julliard May 19, 2009

May 19, 2009

Module: wine Branch: master Commit: 0f1ecf2819b3de7a6f1f5667466d4100e3ea1b71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f1ecf2819b3de7a6f1f56674… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 19 09:20:06 2009 +0200 kernel32: Add support for %ws and %wc format specifiers to FormatMessageA/W. --- dlls/kernel32/format_msg.c | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c index c251514..1fca102 100644 --- a/dlls/kernel32/format_msg.c +++ b/dlls/kernel32/format_msg.c @@ -257,11 +257,20 @@ DWORD WINAPI FormatMessageA( argliststart=(*(DWORD**)args)+insertnr-1; /* FIXME: precision and width components are not handled correctly */ - if ( (strcmp(fmtstr, "%ls") == 0) || (strcmp(fmtstr,"%S") == 0) ) { - sz = WideCharToMultiByte( CP_ACP, 0, *(WCHAR**)argliststart, -1, NULL, 0, NULL, NULL); + if (strcmp(fmtstr, "%ls") == 0 || strcmp(fmtstr,"%S") == 0 || strcmp(fmtstr,"%ws") == 0) + { + sz = WideCharToMultiByte(CP_ACP, 0, *(WCHAR**)argliststart, -1, NULL, 0, NULL, NULL); b = HeapAlloc(GetProcessHeap(), 0, sz); - WideCharToMultiByte( CP_ACP, 0, *(WCHAR**)argliststart, -1, b, sz, NULL, NULL); - } else { + WideCharToMultiByte(CP_ACP, 0, *(WCHAR**)argliststart, -1, b, sz, NULL, NULL); + } + else if (strcmp(fmtstr, "%wc") == 0) + { + sz = WideCharToMultiByte(CP_ACP, 0, (WCHAR *)argliststart, 1, NULL, 0, NULL, NULL); + b = HeapAlloc(GetProcessHeap(), 0, sz); + WideCharToMultiByte(CP_ACP, 0, (WCHAR *)argliststart, 1, b, sz, NULL, NULL); + } + else + { b = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sz = 1000); /* CMF - This makes a BIG assumption about va_list */ TRACE("A BIG assumption\n"); @@ -367,6 +376,7 @@ DWORD WINAPI FormatMessageW( DWORD width = dwFlags & FORMAT_MESSAGE_MAX_WIDTH_MASK; BOOL eos = FALSE; WCHAR ch; + static const WCHAR fmt_wc[] = {'%','w','c',0}; TRACE("(0x%x,%p,%d,0x%x,%p,%d,%p)\n", dwFlags,lpSource,dwMessageId,dwLanguageId,lpBuffer,nSize,args); @@ -483,6 +493,11 @@ DWORD WINAPI FormatMessageW( /* CMF - This makes a BIG assumption about va_list */ vsprintfW(sprintfbuf, fmtstr, (va_list) xarr); + } + else if (strcmpW(fmtstr, fmt_wc) == 0) { + sprintfbuf = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * 2); + sprintfbuf[0] = *(WCHAR *)argliststart; + sprintfbuf[1] = 0; } else { sprintfbuf=HeapAlloc(GetProcessHeap(),0,100);

1 0

Andrew Nguyen : kernel32/tests: Correctly skip when the Unicode communications functions are not available .
by Alexandre Julliard May 19, 2009

May 19, 2009

Module: wine Branch: master Commit: 786158796b14bdd752734bf50cd85f00f3beab0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=786158796b14bdd752734bf50… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Tue May 19 02:11:34 2009 -0500 kernel32/tests: Correctly skip when the Unicode communications functions are not available. --- dlls/kernel32/tests/comm.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index 99fe505..8cd07ad 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -571,7 +571,10 @@ static void test_BuildCommDCBW(TEST *ptest, int initial_value, DCB *pexpected_dc result = BuildCommDCBW(wide_string, &dcb); if(GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("BuildCommDCBW is not available\n"); return; + } /* check results */ check_result("BuildCommDCBW", ptest, initial_value, result); @@ -595,7 +598,10 @@ static void test_BuildCommDCBAndTimeoutsW(TEST *ptest, int initial_value, DCB *p result = BuildCommDCBAndTimeoutsW(wide_string, &dcb, &timeouts); if(GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("BuildCommDCBAndTimeoutsW is not available\n"); return; + } /* check results */ check_result("BuildCommDCBAndTimeoutsA", ptest, initial_value, result);

1 0

Michael Stefaniuc : notepad: Fix the Romanian translation.
by Alexandre Julliard May 19, 2009

May 19, 2009

Module: wine Branch: master Commit: f6b24b5cadef9a3fea9804bdfcbd24c6ddd2dad9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6b24b5cadef9a3fea9804bdf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 19 00:00:20 2009 +0200 notepad: Fix the Romanian translation. --- programs/notepad/Ro.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/notepad/Ro.rc b/programs/notepad/Ro.rc index 1a288f7..9685de9 100644 --- a/programs/notepad/Ro.rc +++ b/programs/notepad/Ro.rc @@ -53,6 +53,7 @@ POPUP "&Editează" { POPUP "&Caută" { MENUITEM "&Caută...\tCtrl+F", CMD_SEARCH MENUITEM "Caută &următorul\tF3", CMD_SEARCH_NEXT + MENUITEM "&Înlocuiește...\tCtrl+H", CMD_REPLACE } POPUP "&Ajutor" { MENUITEM "C&onținut", CMD_HELP_CONTENTS

1 0

Jacek Caban : urlmon: Added MIME filter handling in BindProtocol tests.
by Alexandre Julliard May 19, 2009

May 19, 2009

Module: wine Branch: master Commit: 69365793b1f6144cb2a93aff08790c38903188e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69365793b1f6144cb2a93aff0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 18 18:36:24 2009 +0200 urlmon: Added MIME filter handling in BindProtocol tests. --- dlls/urlmon/tests/protocol.c | 723 +++++++++++++++++++++++++++++++++++------- 1 files changed, 608 insertions(+), 115 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=69365793b1f6144cb2a93…

1 0

Michael Stefaniuc : notepad: Use the explicit W-form of the functions.
by Alexandre Julliard May 19, 2009

May 19, 2009

Module: wine Branch: master Commit: 27c8839f66ef7b63a0a816d9bc0b6a2a34b5d616 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27c8839f66ef7b63a0a816d9b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 18 21:08:20 2009 +0200 notepad: Use the explicit W-form of the functions. --- programs/notepad/dialog.c | 106 ++++++++++++++++++++++---------------------- programs/notepad/main.c | 67 ++++++++++++++-------------- 2 files changed, 86 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=27c8839f66ef7b63a0a81…

1 0

Michael Stefaniuc : Fix typo in Romanian translation basă => bază.
by Alexandre Julliard May 19, 2009

May 19, 2009

Module: wine Branch: master Commit: 4fd3d633cb873f2f4d5f33be0438e2a300e213f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fd3d633cb873f2f4d5f33be0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 19 00:13:06 2009 +0200 Fix typo in Romanian translation basă => bază. Thanks to Dimitriu Petru for spotting this. --- dlls/comdlg32/cdlg_Ro.rc | 2 +- programs/winecfg/Ro.rc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/cdlg_Ro.rc b/dlls/comdlg32/cdlg_Ro.rc index 0c58bfc..45a6889 100644 --- a/dlls/comdlg32/cdlg_Ro.rc +++ b/dlls/comdlg32/cdlg_Ro.rc @@ -155,7 +155,7 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Culoare" FONT 8, "MS Shell Dlg" { - LTEXT "Culori de &basă:", 1088, 4, 4, 140, 10 + LTEXT "Culori de &bază:", 1088, 4, 4, 140, 10 LTEXT "&Culori personalizate:", 1089, 4, 106, 140, 10 LTEXT "Culoare | Sol&id", 1090, 150, 151, 48, 10 LTEXT "&Roșu:", 726 /*1094*/,249,126,24,10 diff --git a/programs/winecfg/Ro.rc b/programs/winecfg/Ro.rc index a4b0cad..45e2274 100644 --- a/programs/winecfg/Ro.rc +++ b/programs/winecfg/Ro.rc @@ -268,7 +268,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_ACCEL_FULL "Complet" IDS_ACCEL_STANDARD "Standard" - IDS_ACCEL_BASIC "De basă" + IDS_ACCEL_BASIC "De bază" IDS_ACCEL_EMULATION "Emulare" IDS_DRIVER_ALSA "Driver ALSA" IDS_DRIVER_ESOUND "Driver Esound"

1 0

Roderick Colenbrander : wgl: Use local pixel format data for WGL_ACCELERATION_ARB.
by Alexandre Julliard May 19, 2009

May 19, 2009

Module: wine Branch: master Commit: f83b299bd28f59e5157b484b4adb05e61bada69a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f83b299bd28f59e5157b484b4… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Tue May 19 00:23:05 2009 +0200 wgl: Use local pixel format data for WGL_ACCELERATION_ARB. --- dlls/winex11.drv/opengl.c | 35 +++++++++++++++++++++++++---------- 1 files changed, 25 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 3696072..3d7c456 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -717,6 +717,11 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, Wine_GLPBuf break; case WGL_ACCELERATION_ARB: + /* This flag is set in a WineGLPixelFormat */ + pop = iWGLAttr[++cur]; + TRACE("pAttr[%d] = WGL_ACCELERATION_ARB: %d\n", cur, pop); + break; + case WGL_SUPPORT_OPENGL_ARB: pop = iWGLAttr[++cur]; /** nothing to do, if we are here, supposing support Accelerated OpenGL */ @@ -2694,6 +2699,20 @@ static GLboolean WINAPI X11DRV_wglChoosePixelFormatARB(HDC hdc, const int *piAtt if(piAttribIList[i+1]) dwFlags |= PFD_DRAW_TO_BITMAP; break; + case WGL_ACCELERATION_ARB: + switch(piAttribIList[i+1]) + { + case WGL_NO_ACCELERATION_ARB: + dwFlags |= PFD_GENERIC_FORMAT; + break; + case WGL_GENERIC_ACCELERATION_ARB: + dwFlags |= PFD_GENERIC_ACCELERATED; + break; + case WGL_FULL_ACCELERATION_ARB: + /* Nothing to do */ + break; + } + break; case WGL_SUPPORT_GDI_ARB: if(piAttribIList[i+1]) dwFlags |= PFD_SUPPORT_GDI; @@ -2791,16 +2810,12 @@ static GLboolean WINAPI X11DRV_wglGetPixelFormatAttribivARB(HDC hdc, int iPixelF case WGL_ACCELERATION_ARB: curGLXAttr = GLX_CONFIG_CAVEAT; if (!fmt) goto pix_error; - hTest = pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, curGLXAttr, &tmp); - if (hTest) goto get_error; - switch (tmp) { - case GLX_NONE: piValues[i] = WGL_FULL_ACCELERATION_ARB; break; - case GLX_SLOW_CONFIG: piValues[i] = WGL_GENERIC_ACCELERATION_ARB; break; - case GLX_NON_CONFORMANT_CONFIG: piValues[i] = WGL_FULL_ACCELERATION_ARB; break; - default: - ERR("unexpected Config Caveat(%x)\n", tmp); - piValues[i] = WGL_NO_ACCELERATION_ARB; - } + if(fmt->dwFlags & PFD_GENERIC_FORMAT) + piValues[i] = WGL_NO_ACCELERATION_ARB; + else if(fmt->dwFlags & PFD_GENERIC_ACCELERATED) + piValues[i] = WGL_GENERIC_ACCELERATION_ARB; + else + piValues[i] = WGL_FULL_ACCELERATION_ARB; continue; case WGL_TRANSPARENT_ARB:

1 0