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

Dmitry Timoshkov : gdi32: Save/ restore internal EMF playing state on EMR_SAVEDC/EMR_RESTOREDC, add a test for this.
by Alexandre Julliard April 28, 2008

April 28, 2008

Module: wine Branch: master Commit: c871d9a81d266ec08404136fc901631cc7c61f13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c871d9a81d266ec08404136fc… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Apr 28 16:02:31 2008 +0900 gdi32: Save/restore internal EMF playing state on EMR_SAVEDC/EMR_RESTOREDC, add a test for this. --- dlls/gdi32/enhmetafile.c | 244 ++++++++++++++++++++++++++----------------- dlls/gdi32/tests/metafile.c | 210 ++++++++++++++++++++++++++++++++++++- 2 files changed, 355 insertions(+), 99 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c871d9a81d266ec084041…

1 0

Dmitry Timoshkov : gdi32: Do not reselect objects while recording a metafile, that' s done at the playing time.
by Alexandre Julliard April 28, 2008

April 28, 2008

Module: wine Branch: master Commit: d01438bd538ef7a69ea7ad773579523c876fe1d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d01438bd538ef7a69ea7ad773… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Apr 28 16:01:40 2008 +0900 gdi32: Do not reselect objects while recording a metafile, that's done at the playing time. --- dlls/gdi32/dc.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index cb4de19..9baa7e4 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -315,8 +315,9 @@ void DC_UpdateXforms( DC *dc ) /* Reselect the font and pen back into the dc so that the size gets updated. */ - if (oldworld2vport.eM11 != dc->xformWorld2Vport.eM11 || - oldworld2vport.eM22 != dc->xformWorld2Vport.eM22) + if ((oldworld2vport.eM11 != dc->xformWorld2Vport.eM11 || + oldworld2vport.eM22 != dc->xformWorld2Vport.eM22) && + !GdiIsMetaFileDC(dc->hSelf)) { SelectObject(dc->hSelf, GetCurrentObject(dc->hSelf, OBJ_FONT)); SelectObject(dc->hSelf, GetCurrentObject(dc->hSelf, OBJ_PEN));

1 0

Eric Pouech : wordpad: Open the filename passed on command line if any.
by Alexandre Julliard April 28, 2008

April 28, 2008

Module: wine Branch: master Commit: 2cf1925eb46624eb8d025aa16a6d4d049b25aea9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cf1925eb46624eb8d025aa16… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Apr 26 13:33:24 2008 +0200 wordpad: Open the filename passed on command line if any. --- programs/wordpad/wordpad.c | 29 ++++++++++++++++------------- 1 files changed, 16 insertions(+), 13 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index b03ae2e..cec080c 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -1041,23 +1041,26 @@ static void HandleCommandLine(LPWSTR cmdline) while (*cmdline && *cmdline != delimiter) cmdline++; if (*cmdline == delimiter) cmdline++; - while (*cmdline == ' ' || *cmdline == '-' || *cmdline == '/') + while (*cmdline) { - WCHAR option; + while (isspace(*cmdline)) cmdline++; - if (*cmdline++ == ' ') continue; - - option = *cmdline; - if (option) cmdline++; - while (*cmdline == ' ') cmdline++; - - switch (option) + if (*cmdline == '-' || *cmdline == '/') { - case 'p': - case 'P': - opt_print = 1; - break; + if (!cmdline[2] || isspace(cmdline[2])) + { + switch (cmdline[1]) + { + case 'P': + case 'p': + opt_print = 1; + cmdline += 2; + continue; + } + } + /* a filename starting by / */ } + break; } if (*cmdline)

1 0

Vitaliy Margolen : winex11: Fix MapVirtualKeyEx to properly map left-right modifier keys.
by Alexandre Julliard April 28, 2008

April 28, 2008

Module: wine Branch: master Commit: 09c6bf415ff2f0927cc186c5d8a89a6d62d6f224 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09c6bf415ff2f0927cc186c5d… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Apr 26 17:35:50 2008 -0600 winex11: Fix MapVirtualKeyEx to properly map left-right modifier keys. --- dlls/user32/tests/input.c | 22 +++++++++++ dlls/winex11.drv/keyboard.c | 83 ++++++++++++++++++++++++++++++------------- 2 files changed, 80 insertions(+), 25 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index a4e09a3..dd597d8 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1111,6 +1111,27 @@ static void test_GetMouseMovePointsEx(void) #undef MYERROR } +static void test_key_map(void) +{ + HKL kl = GetKeyboardLayout(0); + UINT kL, kR, s, sL; + + s = MapVirtualKeyEx(VK_SHIFT, MAPVK_VK_TO_VSC, kl); + ok(s != 0, "MapVirtualKeyEx(VK_SHIFT) should return non-zero\n"); + sL = MapVirtualKeyEx(VK_LSHIFT, MAPVK_VK_TO_VSC, kl); + ok(s == sL, "%x != %x\n", s, sL); + + kL = MapVirtualKeyEx(0x2a, MAPVK_VSC_TO_VK, kl); + ok(kL == VK_SHIFT, "Scan code -> vKey = %x (not VK_SHIFT)\n", kL); + kR = MapVirtualKeyEx(0x36, MAPVK_VSC_TO_VK, kl); + ok(kR == VK_SHIFT, "Scan code -> vKey = %x (not VK_SHIFT)\n", kR); + + kL = MapVirtualKeyEx(0x2a, MAPVK_VSC_TO_VK_EX, kl); + ok(kL == VK_LSHIFT, "Scan code -> vKey = %x (not VK_LSHIFT)\n", kL); + kR = MapVirtualKeyEx(0x36, MAPVK_VSC_TO_VK_EX, kl); + ok(kR == VK_RSHIFT, "Scan code -> vKey = %x (not VK_RSHIFT)\n", kR); +} + START_TEST(input) { init_function_pointers(); @@ -1123,6 +1144,7 @@ START_TEST(input) test_Input_blackbox(); test_keynames(); test_mouse_ll_hook(); + test_key_map(); if(pGetMouseMovePointsEx) test_GetMouseMovePointsEx(); diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 917cc2e..981e4df 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -2053,31 +2053,64 @@ UINT X11DRV_MapVirtualKeyEx(UINT wCode, UINT wMapType, HKL hkl) if (hkl != X11DRV_GetKeyboardLayout(0)) FIXME("keyboard layout %p is not supported\n", hkl); - switch(wMapType) { - case MAPVK_VK_TO_VSC: /* vkey-code to scan-code */ - case MAPVK_VK_TO_VSC_EX: /* FIXME: should differentiate between - left and right keys */ - { - /* let's do vkey -> keycode -> scan */ - int keyc; - for (keyc=min_keycode; keyc<=max_keycode; keyc++) - if ((keyc2vkey[keyc] & 0xFF) == wCode) - returnMVK (keyc2scan[keyc] & 0xFF); - TRACE("returning no scan-code.\n"); - return 0; - } - case MAPVK_VSC_TO_VK: /* scan-code to vkey-code */ - case MAPVK_VSC_TO_VK_EX: /* FIXME: should differentiate between - left and right keys */ - { - /* let's do scan -> keycode -> vkey */ - int keyc; - for (keyc=min_keycode; keyc<=max_keycode; keyc++) - if ((keyc2scan[keyc] & 0xFF) == (wCode & 0xFF)) - returnMVK (keyc2vkey[keyc] & 0xFF); - TRACE("returning no vkey-code.\n"); - return 0; - } + switch(wMapType) + { + case MAPVK_VK_TO_VSC: /* vkey-code to scan-code */ + case MAPVK_VK_TO_VSC_EX: + { + int keyc; + + switch (wCode) + { + case VK_SHIFT: wCode = VK_LSHIFT; break; + case VK_CONTROL: wCode = VK_LCONTROL; break; + case VK_MENU: wCode = VK_LMENU; break; + } + + /* let's do vkey -> keycode -> scan */ + for (keyc = min_keycode; keyc <= max_keycode; keyc++) + if ((keyc2vkey[keyc] & 0xFF) == wCode) break; + + if (keyc > max_keycode) + { + TRACE("returning no scan-code.\n"); + return 0; + } + returnMVK (keyc2scan[keyc] & 0xFF); + } + case MAPVK_VSC_TO_VK: /* scan-code to vkey-code */ + case MAPVK_VSC_TO_VK_EX: + { + int keyc; + UINT vkey; + + /* let's do scan -> keycode -> vkey */ + for (keyc = min_keycode; keyc <= max_keycode; keyc++) + if ((keyc2scan[keyc] & 0xFF) == (wCode & 0xFF)) break; + + if (keyc > max_keycode) + { + TRACE("returning no vkey-code.\n"); + return 0; + } + + vkey = keyc2vkey[keyc] & 0xFF; + if (wMapType == MAPVK_VSC_TO_VK) + switch (vkey) + { + case VK_LSHIFT: + case VK_RSHIFT: + vkey = VK_SHIFT; break; + case VK_LCONTROL: + case VK_RCONTROL: + vkey = VK_CONTROL; break; + case VK_LMENU: + case VK_RMENU: + vkey = VK_MENU; break; + } + + returnMVK (vkey); + } case MAPVK_VK_TO_CHAR: /* vkey-code to unshifted ANSI code */ { /* we still don't know what "unshifted" means. in windows VK_W (0x57)

1 0

Vitaliy Margolen : winex11: Use constants instead of magic numbers in GetKeyNameText.
by Alexandre Julliard April 28, 2008

April 28, 2008

Module: wine Branch: master Commit: 56989b6ed030f37162623e45f0a65612929968e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56989b6ed030f37162623e45f… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Apr 26 17:35:47 2008 -0600 winex11: Use constants instead of magic numbers in GetKeyNameText. --- dlls/winex11.drv/keyboard.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index b2f2522..917cc2e 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -2158,8 +2158,7 @@ INT X11DRV_GetKeyNameText(LONG lParam, LPWSTR lpBuffer, INT nSize) scanCode = lParam >> 16; scanCode &= 0x1ff; /* keep "extended-key" flag with code */ - /* FIXME: should use MVK type 3 (NT version that distinguishes right and left */ - vkey = X11DRV_MapVirtualKeyEx(scanCode, 1, X11DRV_GetKeyboardLayout(0)); + vkey = X11DRV_MapVirtualKeyEx(scanCode, MAPVK_VSC_TO_VK_EX, X11DRV_GetKeyboardLayout(0)); /* handle "don't care" bit (0x02000000) */ if (!(lParam & 0x02000000)) { @@ -2181,7 +2180,7 @@ INT X11DRV_GetKeyNameText(LONG lParam, LPWSTR lpBuffer, INT nSize) } } - ansi = X11DRV_MapVirtualKeyEx(vkey, 2, X11DRV_GetKeyboardLayout(0)); + ansi = X11DRV_MapVirtualKeyEx(vkey, MAPVK_VK_TO_CHAR, X11DRV_GetKeyboardLayout(0)); TRACE("scan 0x%04x, vkey 0x%04x, ANSI 0x%04x\n", scanCode, vkey, ansi); /* first get the name of the "regular" keys which is the Upper case

1 0

Vitaliy Margolen : winex11: Fix GetKeyNameText for Right Shift.
by Alexandre Julliard April 28, 2008

April 28, 2008

Module: wine Branch: master Commit: 964687d7c347acfbde412a4f9c47078f50dc84ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=964687d7c347acfbde412a4f9… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Apr 26 17:35:45 2008 -0600 winex11: Fix GetKeyNameText for Right Shift. --- dlls/winex11.drv/keyboard.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 40c3e55..b2f2522 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -2164,8 +2164,10 @@ INT X11DRV_GetKeyNameText(LONG lParam, LPWSTR lpBuffer, INT nSize) /* handle "don't care" bit (0x02000000) */ if (!(lParam & 0x02000000)) { switch (vkey) { - case VK_LSHIFT: case VK_RSHIFT: + /* R-Shift is "special" - it is an extended key with separate scan code */ + scanCode |= 0x100; + case VK_LSHIFT: vkey = VK_SHIFT; break; case VK_LCONTROL: @@ -2176,8 +2178,6 @@ INT X11DRV_GetKeyNameText(LONG lParam, LPWSTR lpBuffer, INT nSize) case VK_RMENU: vkey = VK_MENU; break; - default: - break; } }

1 0

Vitaliy Margolen : dinput: Explicitly set extended key flag for Right Shift .
by Alexandre Julliard April 28, 2008

April 28, 2008

Module: wine Branch: master Commit: 4a2f7497ab496acb1e735e8b2426787719eef3a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a2f7497ab496acb1e735e8b2… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Apr 26 17:35:43 2008 -0600 dinput: Explicitly set extended key flag for Right Shift. --- dlls/dinput/keyboard.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 87837ff..84d9f60 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -64,7 +64,9 @@ static void KeyboardCallback( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM TRACE("(%p) %ld,%ld\n", iface, wparam, lparam); dik_code = hook->scanCode & 0xff; - if (hook->flags & LLKHF_EXTENDED) dik_code |= 0x80; + /* R-Shift is special - it is an extended key with separate scan code */ + if (hook->flags & LLKHF_EXTENDED && dik_code != 0x36) + dik_code |= 0x80; new_diks = hook->flags & LLKHF_UP ? 0 : 0x80;

1 0

Roderick Colenbrander : wined3d: Also use WineD3D_ChoosePixelFormat for pbuffers.
by Alexandre Julliard April 28, 2008

April 28, 2008

Module: wine Branch: master Commit: 34d06a5e96d1372c1254540025e56228a0e8e8b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34d06a5e96d1372c125454002… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Apr 27 18:40:33 2008 +0000 wined3d: Also use WineD3D_ChoosePixelFormat for pbuffers. --- dlls/wined3d/context.c | 57 ++++++++++++----------------------------------- 1 files changed, 15 insertions(+), 42 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 901a36c..f185c33 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -249,52 +249,25 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar if(create_pbuffer) { HDC hdc_parent = GetDC(win_handle); int iPixelFormat = 0; - short redBits, greenBits, blueBits, alphaBits, colorBits; - short depthBits, stencilBits; IWineD3DSurface *StencilSurface = This->stencilBufferTarget; WINED3DFORMAT StencilBufferFormat = (NULL != StencilSurface) ? ((IWineD3DSurfaceImpl *) StencilSurface)->resource.format : 0; - int attribs[256]; - int nAttribs = 0; - unsigned int nFormats; - - /* Retrieve the specifications for the pixelformat from the backbuffer / stencilbuffer */ - getColorBits(target->resource.format, &redBits, &greenBits, &blueBits, &alphaBits, &colorBits); - getDepthStencilBits(StencilBufferFormat, &depthBits, &stencilBits); - PUSH2(WGL_DRAW_TO_PBUFFER_ARB, 1); /* We need pbuffer support; doublebuffering isn't needed */ - PUSH2(WGL_PIXEL_TYPE_ARB, WGL_TYPE_RGBA_ARB); /* Make sure we don't get a float or color index format */ - PUSH2(WGL_COLOR_BITS_ARB, colorBits); - PUSH2(WGL_RED_BITS_ARB, redBits); - PUSH2(WGL_GREEN_BITS_ARB, greenBits); - PUSH2(WGL_BLUE_BITS_ARB, blueBits); - PUSH2(WGL_ALPHA_BITS_ARB, alphaBits); - PUSH2(WGL_DEPTH_BITS_ARB, depthBits); - PUSH2(WGL_STENCIL_BITS_ARB, stencilBits); - PUSH1(0); /* end the list */ - - /* Try to find a pixelformat that matches exactly. If that fails let ChoosePixelFormat try to find a close match */ - if(!GL_EXTCALL(wglChoosePixelFormatARB(hdc_parent, (const int*)&attribs, NULL, 1, &iPixelFormat, &nFormats))) - { - PIXELFORMATDESCRIPTOR pfd; - - TRACE("Falling back to ChoosePixelFormat as wglChoosePixelFormatARB failed\n"); - - ZeroMemory(&pfd, sizeof(pfd)); - pfd.nSize = sizeof(pfd); - pfd.nVersion = 1; - pfd.dwFlags = PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER_DONTCARE | PFD_DRAW_TO_WINDOW; - pfd.iPixelType = PFD_TYPE_RGBA; - pfd.cColorBits = colorBits; - pfd.cDepthBits = depthBits; - pfd.cStencilBits = stencilBits; - pfd.iLayerType = PFD_MAIN_PLANE; - - iPixelFormat = ChoosePixelFormat(hdc_parent, &pfd); - if(!iPixelFormat) { - /* If this happens something is very wrong as ChoosePixelFormat barely fails */ - ERR("Can't find a suitable iPixelFormat for the pbuffer\n"); - } + /* Try to find a pixel format with pbuffer support. */ + iPixelFormat = WineD3D_ChoosePixelFormat(This, hdc_parent, target->resource.format, StencilBufferFormat, FALSE /* auxBuffers */, TRUE /* PBUFFER */, FALSE /* findCompatible */); + if(!iPixelFormat) { + TRACE("Trying to locate a compatible pixel format because an exact match failed.\n"); + + /* For some reason we weren't able to find a format, try to find something instead of crashing. + * A reason for failure could have been wglChoosePixelFormatARB strictness. */ + iPixelFormat = WineD3D_ChoosePixelFormat(This, hdc_parent, target->resource.format, StencilBufferFormat, FALSE /* auxBuffer */, TRUE /* PBUFFER */, TRUE /* findCompatible */); + } + + /* This shouldn't happen as ChoosePixelFormat always returns something */ + if(!iPixelFormat) { + ERR("Unable to locate a pixel format for a pbuffer\n"); + ReleaseDC(win_handle, hdc_parent); + goto out; } TRACE("Creating a pBuffer drawable for the new context\n");

1 0

Lionel Debroux : dinput: joystick test: Improve reporting when enumerated axes/buttons/POVs don' t match capabilities.
by Alexandre Julliard April 28, 2008

April 28, 2008

Module: wine Branch: master Commit: 27c2b56c5e19291281488636469777ecd828f21c URL: http://source.winehq.org/git/wine.git/?a=commit;h=27c2b56c5e192912814886364… Author: Lionel Debroux <lionel_debroux(a)yahoo.fr> Date: Sat Apr 26 13:56:34 2008 +0200 dinput: joystick test: Improve reporting when enumerated axes/buttons/POVs don't match capabilities. --- dlls/dinput/tests/joystick.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index 61d1426..d8c05f0 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -274,9 +274,9 @@ static BOOL CALLBACK EnumJoysticks( ok(hr==DI_OK,"IDirectInputDevice_EnumObjects() failed: %s\n", DXGetErrorString8(hr)); - ok(caps.dwAxes == info.axis, "Number of enumerated axes doesn't match capabilities\n"); - ok(caps.dwButtons == info.button, "Number of enumerated buttons doesn't match capabilities\n"); - ok(caps.dwPOVs == info.pov, "Number of enumerated POVs doesn't match capabilities\n"); + ok(caps.dwAxes == info.axis, "Number of enumerated axes (%d) doesn't match capabilities (%d)\n", info.axis, caps.dwAxes); + ok(caps.dwButtons == info.button, "Number of enumerated buttons (%d) doesn't match capabilities (%d)\n", info.button, caps.dwButtons); + ok(caps.dwPOVs == info.pov, "Number of enumerated POVs (%d) doesn't match capabilities (%d)\n", info.pov, caps.dwPOVs); /* Set format and check limits again */ hr = IDirectInputDevice_SetDataFormat(pJoystick, &c_dfDIJoystick2);

1 0

Roderick Colenbrander : wined3d: Let WineD3D_ChoosePixelFormat operate on the pixel format database we store at WineD3D startup .
by Alexandre Julliard April 28, 2008

April 28, 2008

Module: wine Branch: master Commit: a38e5a95efb28757de812b68359c23a9125d1310 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a38e5a95efb28757de812b683… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Apr 27 17:42:48 2008 +0000 wined3d: Let WineD3D_ChoosePixelFormat operate on the pixel format database we store at WineD3D startup. --- dlls/wined3d/context.c | 111 ++++++++++++++++++++++++++++++------------------ 1 files changed, 69 insertions(+), 42 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 79ea74c..901a36c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -113,65 +113,91 @@ static WineD3DContext *AddContextToArray(IWineD3DDeviceImpl *This, HWND win_hand /* This function takes care of WineD3D pixel format selection. */ static int WineD3D_ChoosePixelFormat(IWineD3DDeviceImpl *This, HDC hdc, WINED3DFORMAT ColorFormat, WINED3DFORMAT DepthStencilFormat, BOOL auxBuffers, BOOL pbuffer, BOOL findCompatible) { - int iPixelFormat = 0; - int attribs[256]; - int nAttribs = 0; - unsigned int nFormats; + int iPixelFormat=0; short redBits, greenBits, blueBits, alphaBits, colorBits; short depthBits=0, stencilBits=0; - BOOL result = FALSE; -#define PUSH1(att) attribs[nAttribs++] = (att); -#define PUSH2(att,value) attribs[nAttribs++] = (att); attribs[nAttribs++] = (value); + int i = 0; + int nCfgs = This->adapter->nCfgs; + WineD3D_PixelFormat *cfgs = This->adapter->cfgs; - if(getColorBits(ColorFormat, &redBits, &greenBits, &blueBits, &alphaBits, &colorBits)) { - PUSH2(WGL_COLOR_BITS_ARB, colorBits); - PUSH2(WGL_RED_BITS_ARB, redBits); - PUSH2(WGL_GREEN_BITS_ARB, greenBits); - PUSH2(WGL_BLUE_BITS_ARB, blueBits); - PUSH2(WGL_ALPHA_BITS_ARB, alphaBits); - } else { + if(!getColorBits(ColorFormat, &redBits, &greenBits, &blueBits, &alphaBits, &colorBits)) { ERR("Unable to get color bits for format %s (%#x)!\n", debug_d3dformat(ColorFormat), ColorFormat); return 0; } - /* Request depth/stencil when we need it */ - if(DepthStencilFormat && getDepthStencilBits(DepthStencilFormat, &depthBits, &stencilBits)) { - PUSH2(WGL_DEPTH_BITS_ARB, depthBits); - PUSH2(WGL_STENCIL_BITS_ARB, stencilBits); + if(DepthStencilFormat) { + getDepthStencilBits(DepthStencilFormat, &depthBits, &stencilBits); } - PUSH2(WGL_PIXEL_TYPE_ARB, WGL_TYPE_RGBA_ARB); /* Make sure we don't get a float or color index format */ - PUSH2(WGL_SUPPORT_OPENGL_ARB, GL_TRUE); - PUSH2(WGL_ACCELERATION_ARB, WGL_FULL_ACCELERATION_ARB); /* Make sure we receive an accelerated format. On windows (at least on ATI) this is not always the case */ - - if(auxBuffers) { - TRACE("Requesting 2 aux buffers\n"); - /* We like to have two aux buffers in backbuffer mode */ - PUSH2(WGL_AUX_BUFFERS_ARB, 2); + /* Find a pixel format which EXACTLY matches our requirements (except for depth) */ + for(i=0; i<nCfgs; i++) { + BOOL exactDepthMatch = TRUE; + + /* For now only accept RGBA formats. Perhaps some day we will + * allow floating point formats for pbuffers. */ + if(cfgs->iPixelType != WGL_TYPE_RGBA_ARB) + continue; + + /* In all cases except when we are in pbuffer-mode we need a window drawable format with double buffering. */ + if(!pbuffer && !cfgs->windowDrawable && !cfgs->doubleBuffer) + continue; + + /* We like to have aux buffers in backbuffer mode */ + if(auxBuffers && !cfgs->auxBuffers) + continue; + + /* In pbuffer-mode we need a pbuffer-capable format */ + if(pbuffer && !cfgs->pbufferDrawable) + continue; + + if(cfgs->redSize != redBits) + continue; + if(cfgs->greenSize != greenBits) + continue; + if(cfgs->blueSize != blueBits) + continue; + if(cfgs->alphaSize != alphaBits) + continue; + + /* We try to locate a format which matches our requirements exactly. In case of + * depth it is no problem to emulate 16-bit using e.g. 24-bit, so accept that. */ + if(cfgs->depthSize < depthBits) + continue; + else if(cfgs->depthSize > depthBits) + exactDepthMatch = FALSE; + + /* In all cases make sure the number of stencil bits matches our requirements + * even when we don't need stencil because it could affect performance */ + if(!(cfgs->stencilSize == stencilBits)) + continue; + + /* When we have passed all the checks then we have found a format which matches our + * requirements. Note that we only check for a limit number of capabilities right now, + * so there can easily be a dozen of pixel formats which appear to be the 'same' but + * can still differ in things like multisampling, stereo, SRGB and other flags. + */ - PUSH2(WGL_DRAW_TO_WINDOW_ARB, GL_TRUE); /* We want to draw to a window */ - PUSH2(WGL_DOUBLE_BUFFER_ARB, GL_TRUE); - } else if(pbuffer) { - PUSH2(WGL_DRAW_TO_PBUFFER_ARB, GL_TRUE); /* We need pbuffer support; doublebuffering isn't needed */ - } else { - PUSH2(WGL_DRAW_TO_WINDOW_ARB, GL_TRUE); /* We want to draw to a window */ - PUSH2(WGL_DOUBLE_BUFFER_ARB, GL_TRUE); + /* Exit the loop as we have found a format :) */ + if(exactDepthMatch) { + iPixelFormat = cfgs->iPixelFormat; + break; + } else if(!iPixelFormat) { + /* In the end we might end up with a format which doesn't exactly match our depth + * requirements. Accept the first format we found because formats with higher iPixelFormat + * values tend to have more extended capabilities (e.g. multisampling) which we don't need. */ + iPixelFormat = cfgs->iPixelFormat; + } } - PUSH1(0); /* end the list */ - -#undef PUSH1 -#undef PUSH2 - - result = GL_EXTCALL(wglChoosePixelFormatARB(hdc, (const int*)&attribs, NULL, 1, &iPixelFormat, &nFormats)); - if(!result && !findCompatible) { + /* When findCompatible is set and no suitable format was found, let ChoosePixelFormat choose a pixel format in order not to crash. */ + if(!iPixelFormat && !findCompatible) { ERR("Can't find a suitable iPixelFormat\n"); return FALSE; } else { PIXELFORMATDESCRIPTOR pfd; - TRACE("Falling back to ChoosePixelFormat as wglChoosePixelFormatARB failed\n"); + TRACE("Falling back to ChoosePixelFormat as we weren't able to find an exactly matching pixel format\n"); /* PixelFormat selection */ ZeroMemory(&pfd, sizeof(pfd)); pfd.nSize = sizeof(pfd); @@ -192,6 +218,7 @@ static int WineD3D_ChoosePixelFormat(IWineD3DDeviceImpl *This, HDC hdc, WINED3DF } } + TRACE("Found iPixelFormat=%d for ColorFormat=%s, DepthStencilFormat=%s\n", cfgs->iPixelFormat, debug_d3dformat(ColorFormat), debug_d3dformat(DepthStencilFormat)); return iPixelFormat; }

1 0