April 2008 - wine-commits

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

28 Apr '08

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 28 Apr '08

28 Apr '08

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 28 Apr '08

28 Apr '08

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 28 Apr '08

28 Apr '08

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 28 Apr '08

28 Apr '08

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 28 Apr '08

28 Apr '08

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 28 Apr '08

28 Apr '08

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

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

28 Apr '08

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: Also use WineD3D_ChoosePixelFormat for pbuffers.
by Alexandre Julliard 28 Apr '08

28 Apr '08

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

Roderick Colenbrander : wined3d: Let WineD3D_ChoosePixelFormat operate on the pixel format database we store at WineD3D startup .
by Alexandre Julliard 28 Apr '08

28 Apr '08

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

Roderick Colenbrander : wined3d: Store more information about pixel formats . This is needed for some WineD3D_ChoosePixelFormat restructuring.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 31dc00a073856762299901569a03200349fd2600 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31dc00a073856762299901569… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Apr 27 17:36:34 2008 +0000 wined3d: Store more information about pixel formats. This is needed for some WineD3D_ChoosePixelFormat restructuring. --- dlls/wined3d/directx.c | 10 +++++++--- dlls/wined3d/wined3d_private.h | 2 ++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b585a55..29f451c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3783,8 +3783,8 @@ BOOL InitAdapters(void) { /* For now only one default adapter */ { int iPixelFormat; - int attribs[8]; - int values[8]; + int attribs[10]; + int values[10]; int nAttribs = 0; int res; WineD3D_PixelFormat *cfgs; @@ -3853,6 +3853,8 @@ BOOL InitAdapters(void) { PUSH1(WGL_STENCIL_BITS_ARB) PUSH1(WGL_DRAW_TO_WINDOW_ARB) PUSH1(WGL_PIXEL_TYPE_ARB) + PUSH1(WGL_DOUBLE_BUFFER_ARB) + PUSH1(WGL_AUX_BUFFERS_ARB) for(iPixelFormat=1; iPixelFormat<=Adapters[0].nCfgs; iPixelFormat++) { res = GL_EXTCALL(wglGetPixelFormatAttribivARB(hdc, iPixelFormat, 0, nAttribs, attribs, values)); @@ -3870,6 +3872,8 @@ BOOL InitAdapters(void) { cfgs->stencilSize = values[5]; cfgs->windowDrawable = values[6]; cfgs->iPixelType = values[7]; + cfgs->doubleBuffer = values[8]; + cfgs->auxBuffers = values[9]; cfgs->pbufferDrawable = FALSE; /* Check for pbuffer support when it is around as wglGetPixelFormatAttribiv fails for unknown @@ -3881,7 +3885,7 @@ attributes. */ cfgs->pbufferDrawable = value; } - TRACE("iPixelFormat=%d, iPixelType=%#x, RGBA=%d/%d/%d/%d, depth=%d, stencil=%d, windowDrawable=%d, pbufferDrawable=%d\n", cfgs->iPixelFormat, cfgs->iPixelType, cfgs->redSize, cfgs->greenSize, cfgs->blueSize, cfgs->alphaSize, cfgs->depthSize, cfgs->stencilSize, cfgs->windowDrawable, cfgs->pbufferDrawable); + TRACE("iPixelFormat=%d, iPixelType=%#x, RGBA=%d/%d/%d/%d, doubleBuffer=%d, depth=%d, stencil=%d, windowDrawable=%d, pbufferDrawable=%d\n", cfgs->iPixelFormat, cfgs->iPixelType, cfgs->doubleBuffer, cfgs->redSize, cfgs->greenSize, cfgs->blueSize, cfgs->alphaSize, cfgs->depthSize, cfgs->stencilSize, cfgs->windowDrawable, cfgs->pbufferDrawable); cfgs++; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b0d4892..73570fa 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -684,6 +684,8 @@ typedef struct WineD3D_PixelFormat int depthSize, stencilSize; BOOL windowDrawable; BOOL pbufferDrawable; + BOOL doubleBuffer; + int auxBuffers; } WineD3D_PixelFormat; /* The adapter structure */

1 0

Roderick Colenbrander : wined3d: Split WGL pixel format selection code off from CreateContext.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: ec5400b4f815da9215e11f11a43857f44ef0f313 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec5400b4f815da9215e11f11a… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Apr 27 17:35:27 2008 +0000 wined3d: Split WGL pixel format selection code off from CreateContext. --- dlls/wined3d/context.c | 162 +++++++++++++++++++++++++++++++----------------- 1 files changed, 106 insertions(+), 56 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 1fb65ae..79ea74c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -110,6 +110,91 @@ static WineD3DContext *AddContextToArray(IWineD3DDeviceImpl *This, HWND win_hand return This->contexts[This->numContexts - 1]; } +/* 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; + 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); + + 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 { + 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); + } + + 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); + + 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); + } + + PUSH1(0); /* end the list */ + +#undef PUSH1 +#undef PUSH2 + + result = GL_EXTCALL(wglChoosePixelFormatARB(hdc, (const int*)&attribs, NULL, 1, &iPixelFormat, &nFormats)); + if(!result && !findCompatible) { + ERR("Can't find a suitable iPixelFormat\n"); + return FALSE; + } else { + PIXELFORMATDESCRIPTOR pfd; + + TRACE("Falling back to ChoosePixelFormat as wglChoosePixelFormatARB failed\n"); + /* PixelFormat selection */ + ZeroMemory(&pfd, sizeof(pfd)); + pfd.nSize = sizeof(pfd); + pfd.nVersion = 1; + pfd.dwFlags = PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER | PFD_DRAW_TO_WINDOW;/*PFD_GENERIC_ACCELERATED*/ + pfd.iPixelType = PFD_TYPE_RGBA; + pfd.cAlphaBits = alphaBits; + pfd.cColorBits = colorBits; + pfd.cDepthBits = depthBits; + pfd.cStencilBits = stencilBits; + pfd.iLayerType = PFD_MAIN_PLANE; + + iPixelFormat = ChoosePixelFormat(hdc, &pfd); + if(!iPixelFormat) { + /* If this happens something is very wrong as ChoosePixelFormat barely fails */ + ERR("Can't find a suitable iPixelFormat\n"); + return FALSE; + } + } + + return iPixelFormat; +} + /***************************************************************************** * CreateContext * @@ -205,13 +290,10 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar } else { PIXELFORMATDESCRIPTOR pfd; int iPixelFormat; - short redBits, greenBits, blueBits, alphaBits, colorBits; - short depthBits=0, stencilBits=0; int res; - int attribs[256]; - int nAttribs = 0; - unsigned int nFormats; - WINED3DFORMAT fmt = target->resource.format; + WINED3DFORMAT ColorFormat = target->resource.format; + WINED3DFORMAT DepthStencilFormat = 0; + BOOL auxBuffers = FALSE; hdc = GetDC(win_handle); if(hdc == NULL) { @@ -219,76 +301,44 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar goto out; } - /* PixelFormat selection */ - PUSH2(WGL_DRAW_TO_WINDOW_ARB, GL_TRUE); /* We want to draw to a window */ - PUSH2(WGL_DOUBLE_BUFFER_ARB, GL_TRUE); - 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 */ - /* In case of ORM_BACKBUFFER, make sure to request an alpha component for X4R4G4B4/X8R8G8B8 as we might need it for the backbuffer. */ if(wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER) { + auxBuffers = TRUE; + if(target->resource.format == WINED3DFMT_X4R4G4B4) - fmt = WINED3DFMT_A4R4G4B4; + ColorFormat = WINED3DFMT_A4R4G4B4; else if(target->resource.format == WINED3DFMT_X8R8G8B8) - fmt = WINED3DFMT_A8R8G8B8; - - /* We like to have two aux buffers in backbuffer mode */ - PUSH2(WGL_AUX_BUFFERS_ARB, 2); + ColorFormat = WINED3DFMT_A8R8G8B8; } /* DirectDraw supports 8bit paletted render targets and these are used by old games like Starcraft and C&C. * Most modern hardware doesn't support 8bit natively so we perform some form of 8bit -> 32bit conversion. * The conversion (ab)uses the alpha component for storing the palette index. For this reason we require * a format with 8bit alpha, so request A8R8G8B8. */ - if(fmt == WINED3DFMT_P8) - fmt = WINED3DFMT_A8R8G8B8; - - if(!getColorBits(fmt, &redBits, &greenBits, &blueBits, &alphaBits, &colorBits)) { - ERR("Unable to get color bits for format %#x!\n", target->resource.format); - return FALSE; - } - 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); + if(ColorFormat == WINED3DFMT_P8) + ColorFormat = WINED3DFMT_A8R8G8B8; /* Retrieve the depth stencil format from the present parameters. * The choice of the proper format can give a nice performance boost * in case of GPU limited programs. */ if(pPresentParms->EnableAutoDepthStencil) { TRACE("pPresentParms->EnableAutoDepthStencil=enabled; using AutoDepthStencilFormat=%s\n", debug_d3dformat(pPresentParms->AutoDepthStencilFormat)); - if(!getDepthStencilBits(pPresentParms->AutoDepthStencilFormat, &depthBits, &stencilBits)) { - ERR("Unable to get depth / stencil bits for AutoDepthStencilFormat %#x!\n", pPresentParms->AutoDepthStencilFormat); - return FALSE; - } - PUSH2(WGL_DEPTH_BITS_ARB, depthBits); - PUSH2(WGL_STENCIL_BITS_ARB, stencilBits); + DepthStencilFormat = pPresentParms->AutoDepthStencilFormat; } - PUSH1(0); /* end the list */ + /* Try to find a pixel format which matches our requirements */ + iPixelFormat = WineD3D_ChoosePixelFormat(This, hdc, ColorFormat, DepthStencilFormat, auxBuffers, FALSE /* PBUFFER */, FALSE /* findCompatible */); - /* In case of failure hope that standard ChoosePixelFormat will find something suitable */ - if(!GL_EXTCALL(wglChoosePixelFormatARB(hdc, (const int*)&attribs, NULL, 1, &iPixelFormat, &nFormats))) - { - /* PixelFormat selection */ - ZeroMemory(&pfd, sizeof(pfd)); - pfd.nSize = sizeof(pfd); - pfd.nVersion = 1; - pfd.dwFlags = PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER | PFD_DRAW_TO_WINDOW;/*PFD_GENERIC_ACCELERATED*/ - pfd.iPixelType = PFD_TYPE_RGBA; - pfd.cAlphaBits = alphaBits; - pfd.cColorBits = colorBits; - pfd.cDepthBits = depthBits; - pfd.cStencilBits = stencilBits; - pfd.iLayerType = PFD_MAIN_PLANE; + /* Try to locate a compatible format if we weren't able to find anything */ + if(!iPixelFormat) { + TRACE("Trying to locate a compatible pixel format because an exact match failed.\n"); + iPixelFormat = WineD3D_ChoosePixelFormat(This, hdc, ColorFormat, DepthStencilFormat, auxBuffers, FALSE /* PBUFFER */, TRUE /* findCompatible */ ); + } - iPixelFormat = ChoosePixelFormat(hdc, &pfd); - if(!iPixelFormat) { - /* If this happens something is very wrong as ChoosePixelFormat barely fails */ - ERR("Can't find a suitable iPixelFormat\n"); - } + /* If we still don't have a pixel format, something is very wrong as ChoosePixelFormat barely fails */ + if(!iPixelFormat) { + ERR("Can't find a suitable iPixelFormat\n"); + return FALSE; } DescribePixelFormat(hdc, iPixelFormat, sizeof(pfd), &pfd);

1 0

James Hawkins : schannel: Fix a test that fails in win2k3.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 31ba40fc92d3ab21fb078be611fee4912dc7ef51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31ba40fc92d3ab21fb078be61… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sat Apr 26 01:00:50 2008 -0500 schannel: Fix a test that fails in win2k3. --- dlls/schannel/tests/main.c | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/schannel/tests/main.c b/dlls/schannel/tests/main.c index af245d8..814b60a 100644 --- a/dlls/schannel/tests/main.c +++ b/dlls/schannel/tests/main.c @@ -156,13 +156,19 @@ static void testGetInfo(void) if (!pTables) return; status = pTables->GetInfo(&PackageInfo); - ok(status == STATUS_SUCCESS, "status: 0x%x\n", status); - ok(PackageInfo.fCapabilities == 0x107b3, "fCapabilities: 0x%lx\n", - PackageInfo.fCapabilities); - ok(PackageInfo.wVersion == 1, "wVersion: %d\n", PackageInfo.wVersion); - ok(PackageInfo.wRPCID == 14, "wRPCID: %d\n", PackageInfo.wRPCID); - ok(PackageInfo.cbMaxToken == 0x4000, "cbMaxToken: 0x%lx\n", - PackageInfo.cbMaxToken); + ok(status == STATUS_SUCCESS || + status == SEC_E_UNSUPPORTED_FUNCTION, /* win2k3 */ + "status: 0x%x\n", status); + + if (status == STATUS_SUCCESS) + { + ok(PackageInfo.fCapabilities == 0x107b3, "fCapabilities: 0x%lx\n", + PackageInfo.fCapabilities); + ok(PackageInfo.wVersion == 1, "wVersion: %d\n", PackageInfo.wVersion); + ok(PackageInfo.wRPCID == 14, "wRPCID: %d\n", PackageInfo.wRPCID); + ok(PackageInfo.cbMaxToken == 0x4000, "cbMaxToken: 0x%lx\n", + PackageInfo.cbMaxToken); + } } START_TEST(main)

1 0

James Hawkins : ddraw: Remove a test that fails in VMs.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 404afbaa3c4d6b5a760b7878d64f64d97cb7c1f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=404afbaa3c4d6b5a760b7878d… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Fri Apr 25 23:27:45 2008 -0500 ddraw: Remove a test that fails in VMs. --- dlls/ddraw/tests/visual.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 4353f51..8bbd14c 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -103,7 +103,6 @@ static BOOL createObjects(void) hr = IDirect3D7_CreateDevice(Direct3D, &IID_IDirect3DRefDevice, Surface, &Direct3DDevice); } } - ok(hr == D3D_OK, "IDirect3D7_CreateDevice failed with %08x\n", hr); if(!Direct3DDevice) goto err; return TRUE;

1 0

James Hawkins : d3d9: Fix a few test failures in win2k3.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 7b385fb60c1333de6054c4af30bc8cadd6880a34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b385fb60c1333de6054c4af3… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Fri Apr 25 22:56:46 2008 -0500 d3d9: Fix a few test failures in win2k3. --- dlls/d3d9/tests/device.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 8f4542a..5b51c40 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -166,7 +166,8 @@ static void test_swapchain(void) hr = IDirect3D9_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); - ok(SUCCEEDED(hr), "Failed to create IDirect3D9Device (%s)\n", DXGetErrorString9(hr)); + ok(hr == S_OK || hr == D3DERR_NOTAVAILABLE, + "Failed to create IDirect3D9Device (%s)\n", DXGetErrorString9(hr)); if (FAILED(hr)) goto cleanup; /* Check if the back buffer count was modified */ @@ -347,7 +348,8 @@ static void test_refcount(void) hr = IDirect3D9_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); - ok(SUCCEEDED(hr), "Failed to create IDirect3D9Device (%s)\n", DXGetErrorString9(hr)); + ok(hr == S_OK || hr == D3DERR_NOTAVAILABLE, + "Failed to create IDirect3D9Device (%s)\n", DXGetErrorString9(hr)); if (FAILED(hr)) goto cleanup; refcount = get_refcount( (IUnknown *)pDevice ); @@ -657,7 +659,8 @@ static void test_cursor(void) hr = IDirect3D9_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); - ok(SUCCEEDED(hr), "Failed to create IDirect3D9Device (%s)\n", DXGetErrorString9(hr)); + ok(hr == S_OK || hr == D3DERR_NOTAVAILABLE, + "Failed to create IDirect3D9Device (%s)\n", DXGetErrorString9(hr)); if (FAILED(hr)) goto cleanup; IDirect3DDevice9_CreateOffscreenPlainSurface(pDevice, 32, 32, D3DFMT_A8R8G8B8, D3DPOOL_SCRATCH, &cursor, 0); @@ -1753,7 +1756,8 @@ static void test_lights(void) hr = IDirect3D9_CreateDevice( d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd, D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_PUREDEVICE, &present_parameters, &device ); - ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "IDirect3D9_CreateDevice failed with %s\n", DXGetErrorString9(hr)); + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE || hr == D3DERR_INVALIDCALL, + "IDirect3D9_CreateDevice failed with %s\n", DXGetErrorString9(hr)); if(!device) { skip("Failed to create a d3d device\n"); @@ -1813,7 +1817,8 @@ static void test_set_stream_source(void) hr = IDirect3D9_CreateDevice( d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device ); - ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "IDirect3D9_CreateDevice failed with %s\n", DXGetErrorString9(hr)); + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE || hr == D3DERR_INVALIDCALL, + "IDirect3D9_CreateDevice failed with %s\n", DXGetErrorString9(hr)); if(!device) { hr = IDirect3D9_CreateDevice( d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_REF, hwnd,

1 0

James Hawkins : msi: Remove a debugging call.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: f2189d17b0e7895a1b5595214678e1241c4592c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2189d17b0e7895a1b5595214… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Fri Apr 25 22:06:50 2008 -0500 msi: Remove a debugging call. --- dlls/msi/tests/install.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index fac57c3..c957530 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -4048,7 +4048,6 @@ static void test_movefiles(void) create_database(msifile, mov_tables, sizeof(mov_tables) / sizeof(msi_table)); MsiSetInternalUI(INSTALLUILEVEL_FULL, NULL); - MsiEnableLog(INSTALLLOGMODE_VERBOSE | INSTALLLOGMODE_EXTRADEBUG, "log.txt", 0); /* if the source or dest property is not a full path, * windows tries to access it as a network resource

1 0

James Hawkins : cabinet: Revert "cabinet: Fix for FDICopy with an empty cabinet file.".
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: fe8c3f9059ee56f39ccfd63544016819ec6d13ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe8c3f9059ee56f39ccfd6354… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Fri Apr 25 22:49:59 2008 -0500 cabinet: Revert "cabinet: Fix for FDICopy with an empty cabinet file.". This reverts commit 33e561f53cc510c6b5be3b4f1f3d2fbf8aa7486c. Fixed the test that fails on all platforms. --- dlls/cabinet/fdi.c | 25 +++++++++---------------- dlls/cabinet/tests/fdi.c | 11 +++++++++-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 7e5edcd..468a68d 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -562,14 +562,9 @@ static BOOL FDI_read_entries( /* get the number of folders */ num_folders = EndGetI16(buf+cfhead_NumFolders); - /* if num_folders is 0, it's correct cab, but empty */ - /* if num_folders is 1, there is no folders in this cab */ - - /* get the number of files */ - num_files = EndGetI16(buf+cfhead_NumFiles); - if (num_files && !num_folders) { - /* If there at least one file in the cabinet. num_folders is always >= 1 */ - WARN("weird cabinet detect failure: cabinet is not empty, but num_folders = 0\n"); + if (num_folders == 0) { + /* PONDERME: is this really invalid? */ + WARN("weird cabinet detect failure: no folders in cabinet\n"); if (pmii) { PFDI_INT(hfdi)->perf->erfOper = FDIERROR_NOT_A_CABINET; PFDI_INT(hfdi)->perf->erfType = 0; @@ -577,9 +572,12 @@ static BOOL FDI_read_entries( } return FALSE; } - if (!num_files && num_folders) { - /* If cabinet consist of 0 files, num_folders must be 0 */ - WARN("weird cabinet detect failure: no files in cabinet, but there are folders\n"); + + /* get the number of files */ + num_files = EndGetI16(buf+cfhead_NumFiles); + if (num_files == 0) { + /* PONDERME: is this really invalid? */ + WARN("weird cabinet detect failure: no files in cabinet\n"); if (pmii) { PFDI_INT(hfdi)->perf->erfOper = FDIERROR_NOT_A_CABINET; PFDI_INT(hfdi)->perf->erfType = 0; @@ -2836,11 +2834,6 @@ BOOL __cdecl FDICopy( } /* free decompression temps */ - if (!fol) { - /* Empty cabinet */ - PFDI_CLOSE(hfdi, cabhf); - return TRUE; /* empty, but correct */ - } switch (fol->comp_type & cffoldCOMPTYPE_MASK) { case cffoldCOMPTYPE_LZX: if (LZX(window)) { diff --git a/dlls/cabinet/tests/fdi.c b/dlls/cabinet/tests/fdi.c index fc36c78..f90b6f0 100644 --- a/dlls/cabinet/tests/fdi.c +++ b/dlls/cabinet/tests/fdi.c @@ -626,8 +626,15 @@ static void test_FDICopy(void) fdi_write, fdi_close, fdi_seek, cpuUNKNOWN, &erf); - ret=FDICopy(hfdi, name, path, 0, CopyProgress, NULL, 0); - ok(ret, "Expected FDICopy to succeed\n"); + /* cabinet with no files or folders */ + SetLastError(0xdeadbeef); + ret = FDICopy(hfdi, name, path, 0, CopyProgress, NULL, 0); + ok(ret == FALSE, "Expected FALSE, got %d\n", ret); + todo_wine + { + ok(GetLastError() == ERROR_INVALID_HANDLE, + "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + } FDIDestroy(hfdi); DeleteFileA(name);

1 0

Kusanagi Kouichi : winex11: Remove unnecessary #include.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 78cb36d607c05b4dc656fbcb28fc3011bc0d8427 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78cb36d607c05b4dc656fbcb2… Author: Kusanagi Kouichi <slash(a)ma.neweb.ne.jp> Date: Sat Apr 26 06:57:10 2008 +0900 winex11: Remove unnecessary #include. --- dlls/winex11.drv/xim.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index 265f9c8..c44a869 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -30,7 +30,6 @@ #include "winnls.h" #include "x11drv.h" #include "imm.h" -#include "ddk/imm.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(x11drv);

1 0

Kusanagi Kouichi : winex11: hCompStr should never be NULL because Wine expects it is not NULL.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 9fa27034a0c2056134182b4ffe7dee7aee5cceac URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fa27034a0c2056134182b4ff… Author: Kusanagi Kouichi <slash(a)ma.neweb.ne.jp> Date: Sat Apr 26 06:48:15 2008 +0900 winex11: hCompStr should never be NULL because Wine expects it is not NULL. --- dlls/winex11.drv/ime.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index f50549f..5d36612 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -776,10 +776,8 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) X11DRV_ForceXIMReset(lpIMC->hWnd); if (lpIMC->hCompStr) - { ImmDestroyIMCC(lpIMC->hCompStr); - lpIMC->hCompStr = NULL; - } + lpIMC->hCompStr = ImeCreateBlankCompStr(); myPrivate = (LPIMEPRIVATE)ImmLockIMCC(lpIMC->hPrivate); if (myPrivate->bInComposition)

1 0

Nikolay Sivov : gdiplus: Implemented GdipCreateLineBrushFromRect.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 5873bac95d4181adb10a2164530feb0b2a63371e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5873bac95d4181adb10a21645… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Apr 25 23:17:46 2008 +0400 gdiplus: Implemented GdipCreateLineBrushFromRect. --- dlls/gdiplus/brush.c | 24 +++++++++++++++++++----- dlls/gdiplus/gdiplus.spec | 2 +- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 8129c10..5d0a1de 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -149,7 +149,7 @@ GpStatus WINGDIPAPI GdipCreateLineBrushI(GDIPCONST GpPoint* startpoint, return GdipCreateLineBrush(&stF, &endF, startcolor, endcolor, wrap, line); } -GpStatus WINGDIPAPI GdipCreateLineBrushFromRectI(GDIPCONST GpRect* rect, +GpStatus WINGDIPAPI GdipCreateLineBrushFromRect(GDIPCONST GpRectF* rect, ARGB startcolor, ARGB endcolor, LinearGradientMode mode, GpWrapMode wrap, GpLineGradient **line) { @@ -158,14 +158,28 @@ GpStatus WINGDIPAPI GdipCreateLineBrushFromRectI(GDIPCONST GpRect* rect, if(!line || !rect) return InvalidParameter; - start.X = (REAL) rect->X; - start.Y = (REAL) rect->Y; - end.X = (REAL) (rect->X + rect->Width); - end.Y = (REAL) (rect->Y + rect->Height); + start.X = rect->X; + start.Y = rect->Y; + end.X = rect->X + rect->Width; + end.Y = rect->Y + rect->Height; return GdipCreateLineBrush(&start, &end, startcolor, endcolor, wrap, line); } +GpStatus WINGDIPAPI GdipCreateLineBrushFromRectI(GDIPCONST GpRect* rect, + ARGB startcolor, ARGB endcolor, LinearGradientMode mode, GpWrapMode wrap, + GpLineGradient **line) +{ + GpRectF rectF; + + rectF.X = (REAL) rect->X; + rectF.Y = (REAL) rect->Y; + rectF.Width = (REAL) rect->Width; + rectF.Height = (REAL) rect->Height; + + return GdipCreateLineBrushFromRect(&rectF, startcolor, endcolor, mode, wrap, line); +} + GpStatus WINGDIPAPI GdipCreatePathGradient(GDIPCONST GpPointF* points, INT count, GpWrapMode wrap, GpPathGradient **grad) { diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 512947e..2c70823 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -99,7 +99,7 @@ @ stub GdipCreateHatchBrush @ stdcall GdipCreateImageAttributes(ptr) @ stdcall GdipCreateLineBrush(ptr ptr long long long ptr) -@ stub GdipCreateLineBrushFromRect +@ stdcall GdipCreateLineBrushFromRect(ptr long long long long ptr) @ stdcall GdipCreateLineBrushFromRectI(ptr long long long long ptr) @ stub GdipCreateLineBrushFromRectWithAngle @ stub GdipCreateLineBrushFromRectWithAngleI

1 0

Nikolay Sivov : gdiplus: Implemented GdipCreatePathGradientI.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 836b4183b9c2a6a8b7b2765bfee1122e774ee00c URL: http://source.winehq.org/git/wine.git/?a=commit;h=836b4183b9c2a6a8b7b2765bf… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Apr 25 23:17:41 2008 +0400 gdiplus: Implemented GdipCreatePathGradientI. --- dlls/gdiplus/brush.c | 28 ++++++++++++++++++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- 2 files changed, 29 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 727d12d..8129c10 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -211,6 +211,34 @@ GpStatus WINGDIPAPI GdipCreatePathGradient(GDIPCONST GpPointF* points, return Ok; } +GpStatus WINGDIPAPI GdipCreatePathGradientI(GDIPCONST GpPoint* points, + INT count, GpWrapMode wrap, GpPathGradient **grad) +{ + GpPointF *pointsF; + GpStatus ret; + INT i; + + if(!points || !grad) + return InvalidParameter; + + if(count <= 0) + return OutOfMemory; + + pointsF = GdipAlloc(sizeof(GpPointF) * count); + if(!pointsF) + return OutOfMemory; + + for(i = 0; i < count; i++){ + pointsF[i].X = (REAL)points[i].X; + pointsF[i].Y = (REAL)points[i].Y; + } + + ret = GdipCreatePathGradient(pointsF, count, wrap, grad); + GdipFree(pointsF); + + return ret; +} + /* FIXME: path gradient brushes not truly supported (drawn as solid brushes) */ GpStatus WINGDIPAPI GdipCreatePathGradientFromPath(GDIPCONST GpPath* path, GpPathGradient **grad) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 9774600..512947e 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -118,7 +118,7 @@ @ stdcall GdipCreatePath(long ptr) @ stdcall GdipCreatePathGradient(ptr long long ptr) @ stdcall GdipCreatePathGradientFromPath(ptr ptr) -@ stub GdipCreatePathGradientI +@ stdcall GdipCreatePathGradientI(ptr long long ptr) @ stdcall GdipCreatePathIter(ptr ptr) @ stdcall GdipCreatePen1(long long long ptr) @ stdcall GdipCreatePen2(ptr long long ptr)

1 0

Nikolay Sivov : gdiplus: Implemented GdipAddPathEllipseI.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: da76020e5d3d30714e5b5cb9d2d4f0b2824933d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da76020e5d3d30714e5b5cb9d… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Apr 25 23:17:36 2008 +0400 gdiplus: Implemented GdipAddPathEllipseI. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphicspath.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 107af12..9774600 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -15,7 +15,7 @@ @ stub GdipAddPathCurve @ stub GdipAddPathCurveI @ stdcall GdipAddPathEllipse(ptr long long long long) -@ stub GdipAddPathEllipseI +@ stdcall GdipAddPathEllipseI(ptr long long long long) @ stdcall GdipAddPathLine2(ptr ptr long) @ stdcall GdipAddPathLine2I(ptr ptr long) @ stdcall GdipAddPathLine(ptr long long long long) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 681b785..59b018d 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -226,6 +226,12 @@ GpStatus WINGDIPAPI GdipAddPathEllipse(GpPath *path, REAL x, REAL y, REAL width, return Ok; } +GpStatus WINGDIPAPI GdipAddPathEllipseI(GpPath *path, INT x, INT y, INT width, + INT height) +{ + return GdipAddPathEllipse(path,(REAL)x,(REAL)y,(REAL)width,(REAL)height); +} + GpStatus WINGDIPAPI GdipAddPathLine2(GpPath *path, GDIPCONST GpPointF *points, INT count) {

1 0

Nikolay Sivov : gdiplus: Implemented GdipAddPathBeziersI.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: c282f248fa2f1461db329fc2279648f957db2844 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c282f248fa2f1461db329fc22… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Apr 25 22:16:36 2008 +0400 gdiplus: Implemented GdipAddPathBeziersI. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphicspath.c | 25 +++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 27 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index bdead36..107af12 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -3,7 +3,7 @@ @ stdcall GdipAddPathBezier(ptr long long long long long long long long) @ stdcall GdipAddPathBezierI(ptr long long long long long long long long) @ stdcall GdipAddPathBeziers(ptr ptr long) -@ stub GdipAddPathBeziersI +@ stdcall GdipAddPathBeziersI(ptr ptr long) @ stub GdipAddPathClosedCurve2 @ stub GdipAddPathClosedCurve2I @ stub GdipAddPathClosedCurve diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 3f83bea..681b785 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -171,6 +171,31 @@ GpStatus WINGDIPAPI GdipAddPathBeziers(GpPath *path, GDIPCONST GpPointF *points, return Ok; } +GpStatus WINGDIPAPI GdipAddPathBeziersI(GpPath *path, GDIPCONST GpPoint *points, + INT count) +{ + GpPointF *ptsF; + GpStatus ret; + INT i; + + if(!points || ((count - 1) % 3)) + return InvalidParameter; + + ptsF = GdipAlloc(sizeof(GpPointF) * count); + if(!ptsF) + return OutOfMemory; + + for(i = 0; i < count; i++){ + ptsF[i].X = (REAL)points[i].X; + ptsF[i].Y = (REAL)points[i].Y; + } + + ret = GdipAddPathBeziers(path, ptsF, count); + GdipFree(ptsF); + + return ret; +} + GpStatus WINGDIPAPI GdipAddPathEllipse(GpPath *path, REAL x, REAL y, REAL width, REAL height) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 8df6c5b..de1125e 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -194,6 +194,7 @@ GpStatus WINGDIPAPI GdipAddPathArcI(GpPath*,INT,INT,INT,INT,REAL,REAL); GpStatus WINGDIPAPI GdipAddPathBezier(GpPath*,REAL,REAL,REAL,REAL,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipAddPathBezierI(GpPath*,INT,INT,INT,INT,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipAddPathBeziers(GpPath*,GDIPCONST GpPointF*,INT); +GpStatus WINGDIPAPI GdipAddPathBeziersI(GpPath*,GDIPCONST GpPoint*,INT); GpStatus WINGDIPAPI GdipAddPathEllipse(GpPath*,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipAddPathEllipseI(GpPath*,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipAddPathLine(GpPath*,REAL,REAL,REAL,REAL);

1 0

Matthias Derer : winejack: Re-added line which has been accidently deleted.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: a41bf52bb8fa29758dd73e0b80db3565e35bf3cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a41bf52bb8fa29758dd73e0b8… Author: Matthias Derer <webmaster(a)tonstube.de> Date: Mon Apr 21 20:47:05 2008 +0200 winejack: Re-added line which has been accidently deleted. --- dlls/winejack.drv/audio.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winejack.drv/audio.c b/dlls/winejack.drv/audio.c index 0e742f4..b196e4a 100644 --- a/dlls/winejack.drv/audio.c +++ b/dlls/winejack.drv/audio.c @@ -1307,6 +1307,7 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) dwFlags &= ~WAVE_DIRECTSOUND; /* direct sound not supported, ignore the flag */ + wwo->wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK); wwo->waveDesc = *lpDesc; memcpy(&wwo->format, lpDesc->lpFormat, sizeof(PCMWAVEFORMAT));

1 0

Alexander Morozov : ntoskrnl.exe: Change calling conventions for Interlocked* functions.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 7f3b1daaf2d21a553aadc37a04968defcaaed916 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f3b1daaf2d21a553aadc37a0… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Fri Apr 25 18:22:24 2008 +0400 ntoskrnl.exe: Change calling conventions for Interlocked* functions. --- dlls/ntoskrnl.exe/ntoskrnl.c | 70 +++++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 10 ++-- 2 files changed, 75 insertions(+), 5 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index cf1603a..cda3476 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -427,6 +427,76 @@ void WINAPI IofCompleteRequest( IRP *irp, UCHAR priority_boost ) /*********************************************************************** + * InterlockedCompareExchange (NTOSKRNL.EXE.@) + */ +#ifdef DEFINE_FASTCALL2_ENTRYPOINT +DEFINE_FASTCALL2_ENTRYPOINT( NTOSKRNL_InterlockedCompareExchange ) +LONG WINAPI __regs_NTOSKRNL_InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare ) +#else +LONG WINAPI NTOSKRNL_InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare ) +#endif +{ + return InterlockedCompareExchange( dest, xchg, compare ); +} + + +/*********************************************************************** + * InterlockedDecrement (NTOSKRNL.EXE.@) + */ +#ifdef DEFINE_FASTCALL1_ENTRYPOINT +DEFINE_FASTCALL1_ENTRYPOINT( NTOSKRNL_InterlockedDecrement ) +LONG WINAPI __regs_NTOSKRNL_InterlockedDecrement( LONG volatile *dest ) +#else +LONG WINAPI NTOSKRNL_InterlockedDecrement( LONG volatile *dest ) +#endif +{ + return InterlockedDecrement( dest ); +} + + +/*********************************************************************** + * InterlockedExchange (NTOSKRNL.EXE.@) + */ +#ifdef DEFINE_FASTCALL2_ENTRYPOINT +DEFINE_FASTCALL2_ENTRYPOINT( NTOSKRNL_InterlockedExchange ) +LONG WINAPI __regs_NTOSKRNL_InterlockedExchange( LONG volatile *dest, LONG val ) +#else +LONG WINAPI NTOSKRNL_InterlockedExchange( LONG volatile *dest, LONG val ) +#endif +{ + return InterlockedExchange( dest, val ); +} + + +/*********************************************************************** + * InterlockedExchangeAdd (NTOSKRNL.EXE.@) + */ +#ifdef DEFINE_FASTCALL2_ENTRYPOINT +DEFINE_FASTCALL2_ENTRYPOINT( NTOSKRNL_InterlockedExchangeAdd ) +LONG WINAPI __regs_NTOSKRNL_InterlockedExchangeAdd( LONG volatile *dest, LONG incr ) +#else +LONG WINAPI NTOSKRNL_InterlockedExchangeAdd( LONG volatile *dest, LONG incr ) +#endif +{ + return InterlockedExchangeAdd( dest, incr ); +} + + +/*********************************************************************** + * InterlockedIncrement (NTOSKRNL.EXE.@) + */ +#ifdef DEFINE_FASTCALL1_ENTRYPOINT +DEFINE_FASTCALL1_ENTRYPOINT( NTOSKRNL_InterlockedIncrement ) +LONG WINAPI __regs_NTOSKRNL_InterlockedIncrement( LONG volatile *dest ) +#else +LONG WINAPI NTOSKRNL_InterlockedIncrement( LONG volatile *dest ) +#endif +{ + return InterlockedIncrement( dest ); +} + + +/*********************************************************************** * ExAllocatePool (NTOSKRNL.EXE.@) */ PVOID WINAPI ExAllocatePool( POOL_TYPE type, SIZE_T size ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 3aef928..0e7b8e8 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -28,11 +28,11 @@ @ stub Exfi386InterlockedExchangeUlong @ stub Exfi386InterlockedIncrementLong @ stub HalExamineMBR -@ stdcall InterlockedCompareExchange(ptr long long) kernel32.InterlockedCompareExchange -@ stdcall InterlockedDecrement(ptr) kernel32.InterlockedDecrement -@ stdcall InterlockedExchange(ptr long) kernel32.InterlockedExchange -@ stdcall InterlockedExchangeAdd(ptr long ) kernel32.InterlockedExchangeAdd -@ stdcall InterlockedIncrement(ptr) kernel32.InterlockedIncrement +@ stdcall -norelay InterlockedCompareExchange(ptr long long) NTOSKRNL_InterlockedCompareExchange +@ stdcall -norelay InterlockedDecrement(ptr) NTOSKRNL_InterlockedDecrement +@ stdcall -norelay InterlockedExchange(ptr long) NTOSKRNL_InterlockedExchange +@ stdcall -norelay InterlockedExchangeAdd(ptr long) NTOSKRNL_InterlockedExchangeAdd +@ stdcall -norelay InterlockedIncrement(ptr) NTOSKRNL_InterlockedIncrement @ stdcall InterlockedPopEntrySList(ptr) kernel32.InterlockedPopEntrySList @ stdcall InterlockedPushEntrySList(ptr ptr) kernel32.InterlockedPushEntrySList @ stub IoAssignDriveLetters

1 0

Dmitry Timoshkov : fonts: Change encoding of tahomabd.sfd to unicode.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 02df8a3ab732a316bcb33172738e58c5725ba5e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02df8a3ab732a316bcb331727… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Apr 25 23:13:44 2008 +0900 fonts: Change encoding of tahomabd.sfd to unicode. --- fonts/tahomabd.sfd | 946 ++++++++++++++++++++++++++-------------------------- fonts/tahomabd.ttf | Bin 62316 -> 62804 bytes 2 files changed, 473 insertions(+), 473 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=02df8a3ab732a316bcb33…

1 0

Alexandre Julliard : shell32: Avoid traces that use size_t.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 93e775a8b70f1295e260ead88d1840cca579bb4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=93e775a8b70f1295e260ead88… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 25 17:01:50 2008 +0200 shell32: Avoid traces that use size_t. --- dlls/shell32/shellpath.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index abbaf19..6e66d1f 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -1699,7 +1699,6 @@ HRESULT WINAPI SHGetFolderPathAndSubDirA( pszPathW = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); if(!pszPathW) { hr = HRESULT_FROM_WIN32(ERROR_NOT_ENOUGH_MEMORY); - WARN("Failed to allocate %u bytes of memory\n", MAX_PATH * sizeof(WCHAR)); goto cleanup; } } @@ -1714,7 +1713,6 @@ HRESULT WINAPI SHGetFolderPathAndSubDirA( pszSubPathW = HeapAlloc(GetProcessHeap(), 0, length * sizeof(WCHAR)); if(!pszSubPathW) { hr = HRESULT_FROM_WIN32(ERROR_NOT_ENOUGH_MEMORY); - WARN("Failed to allocate %u bytes of memory\n", length * sizeof(WCHAR)); goto cleanup; } MultiByteToWideChar(CP_ACP, 0, pszSubPath, -1, pszSubPathW, length);

1 0

Austin English : download.template: Update Mandriva download info (try 2)
by Jeremy Newman 26 Apr '08

26 Apr '08

Module: website Branch: master Commit: 8f7a007c4c4fba1e03c5ca19904507b9e97bcb2f URL: http://source.winehq.org/git/website.git/?a=commit;h=8f7a007c4c4fba1e03c5ca… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Apr 23 18:33:09 2008 -0500 download.template: Update Mandriva download info (try 2) ------=_Part_5172_25697671.1208993589752 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Content-Disposition: inline First one had a typo. See bug 12661. First one had a typo. See bug 12661.<br> >From f7421b7fc6dcb726879080dc8adf28ccde625ef8 Mon Sep 17 00:00:00 2001 From: Austin English <austinenglish(a)gmail.com> Date: Sun, 20 Apr 2008 22:21:53 -0500 Subject: [PATCH] download.template: update Mandriva download info --- templates/en/download.template | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/en/download.template b/templates/en/download.template index d0bbd9a..4fdcb9d 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -50,8 +50,8 @@ for post-installation instructions.</b></p> <img src="{$root}/images/distro/mandriva.png" width="50" height="50" alt="Mandriva Linux" border="0"></a> </td> <td> <b><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=8…">Mandriva</a></b> - binary .rpms for Mandriva Linux 2006 and 2007. Download the 2007.1 package if your Mandriva is a 2007.1 - release, eg. 2007 Spring. Download the 2007.0 package if your Mandriva is the first 2007 release.</td> + binary .rpms for Mandriva Linux 2006, 2007, and 2008. Download the 2008.1 package if your Mandriva is a 2008.1 + release, eg. 2008 Spring. Download the 2008.0 package if your Mandriva is the first 2008 release.</td> <td><a href="mailto:marco@mandrivaclub.nl">Marco Meijer</a></td> </tr>

1 0

Alexandre Julliard : winex11: Check if IsXExtensionPointer is defined before using it.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: 405575168faaa80cc66ccfa9d9adefa0fbbc8a65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=405575168faaa80cc66ccfa9d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 25 16:46:17 2008 +0200 winex11: Check if IsXExtensionPointer is defined before using it. --- dlls/winex11.drv/wintab.c | 35 ++++++++++++++--------------------- 1 files changed, 14 insertions(+), 21 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index b086e44..4e3e9de 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -523,21 +523,18 @@ void X11DRV_LoadTabletInfo(HWND hwnddefault) { int class_loop; char *device_type = devices[loop].type ? XGetAtomName(data->display, devices[loop].type) : NULL; + LPWTI_CURSORS_INFO cursor; - TRACE("Device %i: [id %d|name %s|type %s|num_classes %d|use %s]\n", + TRACE("Device %i: [id %d|name %s|type %s|num_classes %d|use %d]\n", loop, (int) devices[loop].id, devices[loop].name, device_type ? device_type : "", - devices[loop].num_classes, - devices[loop].use == IsXKeyboard ? "IsXKeyboard" : - devices[loop].use == IsXPointer ? "IsXPointer" : - devices[loop].use == IsXExtensionDevice ? "IsXExtensionDevice" : - devices[loop].use == IsXExtensionPointer ? "IsXExtensionPointer" : - "Unknown" - ); - - if ((devices[loop].use == IsXExtensionDevice) || (devices[loop].use == IsXExtensionPointer)) - { - LPWTI_CURSORS_INFO cursor; + devices[loop].num_classes, devices[loop].use ); + switch (devices[loop].use) + { + case IsXExtensionDevice: +#ifdef IsXExtensionPointer + case IsXExtensionPointer: +#endif TRACE("Is XExtension%s\n", (devices[loop].use == IsXExtensionDevice)? "Device":"Pointer"); cursor_target++; target = &devices[loop]; @@ -547,8 +544,7 @@ void X11DRV_LoadTabletInfo(HWND hwnddefault) { ERR("Input device '%s' name too long - skipping\n", wine_dbgstr_a(target->name)); cursor_target--; - XFree(device_type); - continue; + break; } X11DRV_expect_error(data->display, Tablet_ErrorHandler, NULL); @@ -566,8 +562,7 @@ void X11DRV_LoadTabletInfo(HWND hwnddefault) TRACE("No buttons, Non Tablet Device\n"); pXCloseDevice(data->display, opendevice); cursor_target --; - XFree(device_type); - continue; + break; } for (i=0; i< cursor->BUTTONS; i++,shft++) @@ -581,8 +576,7 @@ void X11DRV_LoadTabletInfo(HWND hwnddefault) { WARN("Unable to open device %s\n",target->name); cursor_target --; - XFree(device_type); - continue; + break; } MultiByteToWideChar(CP_UNIXCP, 0, target->name, -1, cursor->NAME, WT_MAX_NAME_LEN); @@ -590,9 +584,8 @@ void X11DRV_LoadTabletInfo(HWND hwnddefault) { WARN("Skipping device %d [name %s|type %s]; not apparently a tablet cursor type device. If this is wrong, please report it to wine-devel(a)winehq.org\n", loop, devices[loop].name, device_type ? device_type : ""); - XFree(device_type); cursor_target --; - continue; + break; } cursor->ACTIVE = 1; @@ -727,10 +720,10 @@ void X11DRV_LoadTabletInfo(HWND hwnddefault) } any = (XAnyClassPtr) ((char*) any + any->length); } + break; } XFree(device_type); - } pXFreeDeviceList(devices);

1 0

Vitaliy Margolen : dinput: Limit number of supported axis and buttons.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: f51e0e2d26eb7909137c7c4b20a71a1993a81138 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f51e0e2d26eb7909137c7c4b2… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Thu Apr 24 09:04:11 2008 -0600 dinput: Limit number of supported axis and buttons. --- dlls/dinput/joystick_linux.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 5e87a02..46ce4ce 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -422,6 +422,19 @@ static HRESULT alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *di } #endif + if (newDevice->axes > 16) + { + /* There are 24 more axes for velocity that we can use */ + FIXME("Can't support %d axes. Clamping down to 16\n", newDevice->axes); + newDevice->axes = 16; + } + + if (newDevice->buttons > 128) + { + WARN("Can't support %d buttons. Clamping down to 128\n", newDevice->buttons); + newDevice->buttons = 128; + } + newDevice->base.lpVtbl = jvt; newDevice->base.ref = 1; newDevice->base.dinput = dinput;

1 0

Vitaly Perov : cabinet: Added a test for FDICopy with an empty cabinet file .
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: 1077238143911d10650eb6ee9f0fa3e269ae7eb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1077238143911d10650eb6ee9… Author: Vitaly Perov <vitperov(a)etersoft.ru> Date: Thu Apr 24 18:13:32 2008 +0400 cabinet: Added a test for FDICopy with an empty cabinet file. --- dlls/cabinet/tests/fdi.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/cabinet/tests/fdi.c b/dlls/cabinet/tests/fdi.c index 18745f2..bedcfa6 100644 --- a/dlls/cabinet/tests/fdi.c +++ b/dlls/cabinet/tests/fdi.c @@ -593,9 +593,54 @@ static void test_FDIIsCabinet(void) delete_test_files(); } + +INT_PTR __cdecl CopyProgress (FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin) +{ + return 0; +} + +static void test_FDICopy(void) +{ + CCAB cabParams; + HFDI hfdi; + HFCI hfci; + ERF erf; + BOOL ret; + char name[] = "extract.cab"; + char path[MAX_PATH + 1]; + + GetCurrentDirectoryA(MAX_PATH, path); + + set_cab_parameters(&cabParams); + + hfci = FCICreate(&erf, file_placed, mem_alloc, mem_free, fci_open, + fci_read, fci_write, fci_close, fci_seek, + fci_delete, get_temp_file, &cabParams, NULL); + + ret = FCIFlushCabinet(hfci, FALSE, get_next_cabinet, progress); + ok(ret, "Failed to flush the cabinet\n"); + + FCIDestroy(hfci); + + hfdi = FDICreate(fdi_alloc, fdi_free, fdi_open, fdi_read, + fdi_write, fdi_close, fdi_seek, + cpuUNKNOWN, &erf); + + ret=FDICopy(hfdi, name, path, 0, CopyProgress, NULL, 0); + todo_wine + { + ok(ret, "Expected FDICopy to succeed\n"); + } + + FDIDestroy(hfdi); + DeleteFileA(name); +} + + START_TEST(fdi) { test_FDICreate(); test_FDIDestroy(); test_FDIIsCabinet(); + test_FDICopy(); }

1 0

Vitaly Perov : cabinet: Fix for FDICopy with an empty cabinet file.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: 33e561f53cc510c6b5be3b4f1f3d2fbf8aa7486c URL: http://source.winehq.org/git/wine.git/?a=commit;h=33e561f53cc510c6b5be3b4f1… Author: Vitaly Perov <vitperov(a)etersoft.ru> Date: Thu Apr 24 18:13:46 2008 +0400 cabinet: Fix for FDICopy with an empty cabinet file. --- dlls/cabinet/fdi.c | 25 ++++++++++++++++--------- dlls/cabinet/tests/fdi.c | 5 +---- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 468a68d..7e5edcd 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -562,9 +562,14 @@ static BOOL FDI_read_entries( /* get the number of folders */ num_folders = EndGetI16(buf+cfhead_NumFolders); - if (num_folders == 0) { - /* PONDERME: is this really invalid? */ - WARN("weird cabinet detect failure: no folders in cabinet\n"); + /* if num_folders is 0, it's correct cab, but empty */ + /* if num_folders is 1, there is no folders in this cab */ + + /* get the number of files */ + num_files = EndGetI16(buf+cfhead_NumFiles); + if (num_files && !num_folders) { + /* If there at least one file in the cabinet. num_folders is always >= 1 */ + WARN("weird cabinet detect failure: cabinet is not empty, but num_folders = 0\n"); if (pmii) { PFDI_INT(hfdi)->perf->erfOper = FDIERROR_NOT_A_CABINET; PFDI_INT(hfdi)->perf->erfType = 0; @@ -572,12 +577,9 @@ static BOOL FDI_read_entries( } return FALSE; } - - /* get the number of files */ - num_files = EndGetI16(buf+cfhead_NumFiles); - if (num_files == 0) { - /* PONDERME: is this really invalid? */ - WARN("weird cabinet detect failure: no files in cabinet\n"); + if (!num_files && num_folders) { + /* If cabinet consist of 0 files, num_folders must be 0 */ + WARN("weird cabinet detect failure: no files in cabinet, but there are folders\n"); if (pmii) { PFDI_INT(hfdi)->perf->erfOper = FDIERROR_NOT_A_CABINET; PFDI_INT(hfdi)->perf->erfType = 0; @@ -2834,6 +2836,11 @@ BOOL __cdecl FDICopy( } /* free decompression temps */ + if (!fol) { + /* Empty cabinet */ + PFDI_CLOSE(hfdi, cabhf); + return TRUE; /* empty, but correct */ + } switch (fol->comp_type & cffoldCOMPTYPE_MASK) { case cffoldCOMPTYPE_LZX: if (LZX(window)) { diff --git a/dlls/cabinet/tests/fdi.c b/dlls/cabinet/tests/fdi.c index bedcfa6..fc36c78 100644 --- a/dlls/cabinet/tests/fdi.c +++ b/dlls/cabinet/tests/fdi.c @@ -627,10 +627,7 @@ static void test_FDICopy(void) cpuUNKNOWN, &erf); ret=FDICopy(hfdi, name, path, 0, CopyProgress, NULL, 0); - todo_wine - { - ok(ret, "Expected FDICopy to succeed\n"); - } + ok(ret, "Expected FDICopy to succeed\n"); FDIDestroy(hfdi); DeleteFileA(name);

1 0

Kusanagi Kouichi : imm32: Fix typos.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: 9b560b5de8c28d63df5814e6716747e4146cc8ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b560b5de8c28d63df5814e67… Author: Kusanagi Kouichi <slash(a)ma.neweb.ne.jp> Date: Fri Apr 25 16:14:59 2008 +0900 imm32: Fix typos. --- dlls/imm32/imm.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 1f20e42..f89dd2a 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -818,7 +818,7 @@ LONG WINAPI ImmGetCompositionStringA( { LPWSTR ResultStr = (LPWSTR)(compdata + compstr->dwResultStrOffset); - TRACE("GSC_RESULTSTR %p %i\n",ResultStr, + TRACE("GCS_RESULTSTR %p %i\n",ResultStr, compstr->dwResultStrLen); buf = HeapAlloc( GetProcessHeap(), 0, compstr->dwResultStrLen * 3 ); @@ -835,7 +835,7 @@ LONG WINAPI ImmGetCompositionStringA( { LPWSTR CompString = (LPWSTR)(compdata + compstr->dwCompStrOffset); - TRACE("GSC_COMPSTR %p %i\n", CompString, compstr->dwCompStrLen); + TRACE("GCS_COMPSTR %p %i\n", CompString, compstr->dwCompStrLen); buf = HeapAlloc( GetProcessHeap(), 0, compstr->dwCompStrLen * 3 ); rc = WideCharToMultiByte(CP_ACP, 0, CompString, @@ -849,7 +849,7 @@ LONG WINAPI ImmGetCompositionStringA( compstr->dwCompAttrOffset > 0) { LPWSTR Compattr = (LPWSTR)(compdata + compstr->dwCompAttrOffset); - TRACE("GSC_COMPATTR %p %i\n", Compattr , compstr->dwCompAttrLen); + TRACE("GCS_COMPATTR %p %i\n", Compattr , compstr->dwCompAttrLen); rc = compstr->dwCompAttrLen; if (dwBufLen >= rc) @@ -859,7 +859,7 @@ LONG WINAPI ImmGetCompositionStringA( compstr->dwCompClauseOffset > 0) { LPWSTR Compclause = (LPWSTR)(compdata + compstr->dwCompClauseOffset); - TRACE("GSC_COMPCLAUSE %p %i\n", Compclause, compstr->dwCompClauseLen); + TRACE("GCS_COMPCLAUSE %p %i\n", Compclause, compstr->dwCompClauseLen); rc = compstr->dwCompClauseLen; if (dwBufLen >= compstr->dwCompClauseLen) @@ -869,7 +869,7 @@ LONG WINAPI ImmGetCompositionStringA( compstr->dwResultClauseOffset > 0) { LPWSTR Resultclause = (LPWSTR)(compdata + compstr->dwResultClauseOffset); - TRACE("GSC_RESULTCLAUSE %p %i\n", Resultclause, compstr->dwResultClauseLen); + TRACE("GCS_RESULTCLAUSE %p %i\n", Resultclause, compstr->dwResultClauseLen); rc = compstr->dwResultClauseLen; if (dwBufLen >= compstr->dwResultClauseLen) @@ -877,7 +877,7 @@ LONG WINAPI ImmGetCompositionStringA( } else if (dwIndex == GCS_CURSORPOS) { - TRACE("GSC_CURSORPOS\n"); + TRACE("GCS_CURSORPOS\n"); rc = compstr->dwCursorPos; } else if (dwIndex == GCS_DELTASTART) @@ -975,7 +975,7 @@ LONG WINAPI ImmGetCompositionStringW( } else if (dwIndex == GCS_CURSORPOS) { - TRACE("GSC_CURSORPOS\n"); + TRACE("GCS_CURSORPOS\n"); rc = compstr->dwCursorPos; } else if (dwIndex == GCS_DELTASTART)

1 0

Kusanagi Kouichi : winex11: Destroy the handle to the composition string after it is cancelled.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: 4f2330ac0c951ec5fb05e2fb152c59723c3af336 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f2330ac0c951ec5fb05e2fb1… Author: Kusanagi Kouichi <slash(a)ma.neweb.ne.jp> Date: Fri Apr 25 12:08:24 2008 +0900 winex11: Destroy the handle to the composition string after it is cancelled. --- dlls/winex11.drv/ime.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index 6614213..f50549f 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -775,6 +775,12 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) X11DRV_ForceXIMReset(lpIMC->hWnd); + if (lpIMC->hCompStr) + { + ImmDestroyIMCC(lpIMC->hCompStr); + lpIMC->hCompStr = NULL; + } + myPrivate = (LPIMEPRIVATE)ImmLockIMCC(lpIMC->hPrivate); if (myPrivate->bInComposition) {

1 0

Lei Zhang : user32: Edit controls should ignore WM_KEYDOWN on control + enter.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: ae1b735547857fd8473b7d01c6be1ee586807e6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae1b735547857fd8473b7d01c… Author: Lei Zhang <thestig(a)google.com> Date: Thu Apr 24 22:17:38 2008 -0700 user32: Edit controls should ignore WM_KEYDOWN on control + enter. --- dlls/user32/edit.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 4c0342b..b58dc96 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -4606,6 +4606,7 @@ static LRESULT EDIT_WM_KeyDown(EDITSTATE *es, INT key) DWORD dw; if (!EDIT_IsInsideDialog(es)) return 1; + if (control) break; hwndParent = GetParent(es->hwndSelf); dw = SendMessageW( hwndParent, DM_GETDEFID, 0, 0 ); if (HIWORD(dw) == DC_HASDEFID)

1 0

James Hawkins : ddraw: Fix tests that fail with the reference rasterizer.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: 2f97a71e36cb62f035415a44da7f5311a6903bfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f97a71e36cb62f035415a44d… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Apr 24 22:38:40 2008 -0500 ddraw: Fix tests that fail with the reference rasterizer. --- dlls/ddraw/tests/dsurface.c | 29 +++++++++++++++++++++++++---- 1 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index dded991..42c23a4 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -1218,6 +1218,7 @@ static void AttachmentTest(void) IDirectDrawSurface *surface1, *surface2, *surface3, *surface4; DDSURFACEDESC ddsd; DDSCAPS caps = {DDSCAPS_TEXTURE}; + BOOL refrast = FALSE; HWND window = CreateWindow( "static", "ddraw_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); memset(&ddsd, 0, sizeof(ddsd)); @@ -1269,21 +1270,41 @@ static void AttachmentTest(void) hr = IDirectDraw7_CreateSurface(lpDD, &ddsd, &surface4, NULL); ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); + if (SUCCEEDED(IDirectDrawSurface7_AddAttachedSurface(surface1, surface4))) + refrast = TRUE; + hr = IDirectDrawSurface7_AddAttachedSurface(surface1, surface4); /* Succeeds on refrast */ - ok(hr == DDERR_CANNOTATTACHSURFACE, "Attaching a 16x16 offscreen plain surface to a 128x128 texture root returned %08x\n", hr); + if (refrast) + ok(hr == S_OK, "Attaching a 16x16 offscreen plain surface to a 128x128 texture root returned %08x\n", hr); + else + ok(hr == DDERR_CANNOTATTACHSURFACE, "Attaching a 16x16 offscreen plain surface to a 128x128 texture root returned %08x\n", hr); if(SUCCEEDED(hr)) IDirectDrawSurface7_DeleteAttachedSurface(surface1, 0, surface4); + hr = IDirectDrawSurface7_AddAttachedSurface(surface4, surface1); /* Succeeds on refrast */ - ok(hr == DDERR_CANNOTATTACHSURFACE, "Attaching a 128x128 texture root to a 16x16 offscreen plain surface returned %08x\n", hr); + if (refrast) + ok(hr == S_OK, "Attaching a 128x128 texture root to a 16x16 offscreen plain surface returned %08x\n", hr); + else + ok(hr == DDERR_CANNOTATTACHSURFACE, "Attaching a 128x128 texture root to a 16x16 offscreen plain surface returned %08x\n", hr); if(SUCCEEDED(hr)) IDirectDrawSurface7_DeleteAttachedSurface(surface1, 0, surface1); + hr = IDirectDrawSurface7_AddAttachedSurface(surface3, surface4); /* Succeeds on refrast */ - ok(hr == DDERR_CANNOTATTACHSURFACE, "Attaching a 16x16 offscreen plain surface to a 32x32 texture mip level returned %08x\n", hr); + if (refrast) + ok(hr == S_OK, "Attaching a 16x16 offscreen plain surface to a 32x32 texture mip level returned %08x\n", hr); + else + ok(hr == DDERR_CANNOTATTACHSURFACE, "Attaching a 16x16 offscreen plain surface to a 32x32 texture mip level returned %08x\n", hr); if(SUCCEEDED(hr)) IDirectDrawSurface7_DeleteAttachedSurface(surface3, 0, surface4); + hr = IDirectDrawSurface7_AddAttachedSurface(surface4, surface3); ok(hr == DDERR_CANNOTATTACHSURFACE, "Attaching a 32x32 texture mip level to a 16x16 offscreen plain surface returned %08x\n", hr); if(SUCCEEDED(hr)) IDirectDrawSurface7_DeleteAttachedSurface(surface4, 0, surface3); + hr = IDirectDrawSurface7_AddAttachedSurface(surface2, surface4); /* Succeeds on refrast */ - ok(hr == DDERR_CANNOTATTACHSURFACE, "Attaching a 16x16 offscreen plain surface to a 64x64 texture sublevel returned %08x\n", hr); + if (refrast) + ok(hr == S_OK, "Attaching a 16x16 offscreen plain surface to a 64x64 texture sublevel returned %08x\n", hr); + else + ok(hr == DDERR_CANNOTATTACHSURFACE, "Attaching a 16x16 offscreen plain surface to a 64x64 texture sublevel returned %08x\n", hr); if(SUCCEEDED(hr)) IDirectDrawSurface7_DeleteAttachedSurface(surface2, 0, surface4); + hr = IDirectDrawSurface7_AddAttachedSurface(surface4, surface2); ok(hr == DDERR_CANNOTATTACHSURFACE, "Attaching a 64x64 texture sublevel to a 16x16 offscreen plain surface returned %08x\n", hr); if(SUCCEEDED(hr)) IDirectDrawSurface7_DeleteAttachedSurface(surface4, 0, surface2);

1 0

James Hawkins : kernel32: Fix a test that fails in win2k3.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: ed714d09b70f3945386e3cb3118add0874fe2b5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed714d09b70f3945386e3cb31… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Apr 24 22:50:45 2008 -0500 kernel32: Fix a test that fails in win2k3. --- dlls/kernel32/tests/sync.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 61b8521..b5778fc 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -370,11 +370,17 @@ static void test_iocp_callback(void) ret = DeleteFileA(filename); ok( ret, "DeleteFileA: error %d\n", GetLastError()); + /* win2k3 requires the Flags parameter to be zero */ + SetLastError(0xdeadbeef); hFile = CreateFileA(filename, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_FLAG_RANDOM_ACCESS | FILE_FLAG_OVERLAPPED, 0); ok(hFile != INVALID_HANDLE_VALUE, "CreateFileA: error %d\n", GetLastError()); retb = p_BindIoCompletionCallback(hFile, iocp_callback, 12345); - ok(retb == TRUE, "BindIoCompletionCallback failed with Flags != 0\n"); + if (!retb) + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + else + ok(retb == TRUE, "BindIoCompletionCallback failed with Flags != 0\n"); ret = CloseHandle(hFile); ok( ret, "CloseHandle: error %d\n", GetLastError()); ret = DeleteFileA(filename);

1 0

Alistair Leslie-Hughes : msxml3: Corrected transformNode.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: 42db8b439fcd75d53fbd06f170e460dae92e1461 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42db8b439fcd75d53fbd06f17… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Apr 24 22:22:14 2008 +1000 msxml3: Corrected transformNode. --- dlls/msxml3/node.c | 44 +++++++++++++++++++++++++++++++++----------- dlls/msxml3/tests/domdoc.c | 22 +++++++++++++++++----- 2 files changed, 50 insertions(+), 16 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 246598d..f67a9f9 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -44,6 +44,10 @@ # include <libxslt/xsltInternals.h> #endif +#ifdef HAVE_LIBXML2 +# include <libxml/HTMLtree.h> +#endif + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msxml); @@ -1065,21 +1069,39 @@ static HRESULT WINAPI xmlnode_transformNode( result = xsltApplyStylesheet(xsltSS, This->node->doc, NULL); if(result) { - xmlBufferPtr pXmlBuf; - int nSize; + const xmlChar *pContent; - pXmlBuf = xmlBufferCreate(); - if(pXmlBuf) + if(result->type == XML_HTML_DOCUMENT_NODE) { - nSize = xmlNodeDump(pXmlBuf, NULL, (xmlNodePtr)result, 0, 0); - if(nSize > 0) + xmlOutputBufferPtr pOutput = xmlAllocOutputBuffer(NULL); + if(pOutput) { - const xmlChar *pContent; - - pContent = xmlBufferContent(pXmlBuf); - *xmlString = bstr_from_xmlChar(pContent); + htmlDocContentDumpOutput(pOutput, result->doc, NULL); + if(pOutput) + { + pContent = xmlBufferContent(pOutput->buffer); + *xmlString = bstr_from_xmlChar(pContent); + } + + xmlOutputBufferClose(pOutput); + } + } + else + { + xmlBufferPtr pXmlBuf; + int nSize; - xmlBufferFree(pXmlBuf); + pXmlBuf = xmlBufferCreate(); + if(pXmlBuf) + { + nSize = xmlNodeDump(pXmlBuf, NULL, (xmlNodePtr)result, 0, 0); + if(nSize > 0) + { + pContent = xmlBufferContent(pXmlBuf); + *xmlString = bstr_from_xmlChar(pContent); + + xmlBufferFree(pXmlBuf); + } } } } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 9d84435..072ed2f 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -143,10 +143,9 @@ static const CHAR szTransformSSXML[] = "</xsl:stylesheet>"; static const CHAR szTransformOutput[] = -"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n" -"<html><body><h1>\n" -"Hello World\n" -"</h1></body></html>\n"; +"<html><body><h1>" +"Hello World" +"</h1></body></html>"; static const WCHAR szNonExistentFile[] = { 'c', ':', '\\', 'N', 'o', 'n', 'e', 'x', 'i', 's', 't', 'e', 'n', 't', '.', 'x', 'm', 'l', 0 @@ -242,6 +241,19 @@ static VARIANT _variantbstr_(const char *str) return v; } +static BOOL compareIgnoreReturns(BSTR sLeft, BSTR sRight) +{ + for (;;) + { + while (*sLeft == '\r' || *sLeft == '\n') sLeft++; + while (*sRight == '\r' || *sRight == '\n') sRight++; + if (*sLeft != *sRight) return FALSE; + if (!*sLeft) return TRUE; + sLeft++; + sRight++; + } +} + static void get_str_for_type(DOMNodeType type, char *buf) { switch (type) @@ -3193,7 +3205,7 @@ static void test_testTransforms(void) hr = IXMLDOMDocument_transformNode(doc, pNode, &bOut); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( bOut, _bstr_(szTransformOutput) ), "Stylesheet output not correct\n"); + ok( compareIgnoreReturns( bOut, _bstr_(szTransformOutput)), "Stylesheet output not correct\n"); IXMLDOMNode_Release(pNode); }

1 0

Jeff Zaroyko : msadp32.acm: Use the same szShortName value as windows.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: 9c8c33006e53ecd3e7bfb1932313a1f7c9f13999 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c8c33006e53ecd3e7bfb1932… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Fri Apr 25 15:22:17 2008 +1000 msadp32.acm: Use the same szShortName value as windows. --- dlls/msadp32.acm/msadp32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msadp32.acm/msadp32.c b/dlls/msadp32.acm/msadp32.c index 4918836..5a0a964 100644 --- a/dlls/msadp32.acm/msadp32.c +++ b/dlls/msadp32.acm/msadp32.c @@ -326,7 +326,7 @@ static LRESULT ADPCM_DriverDetails(PACMDRIVERDETAILSW add) add->cFormatTags = 2; /* PCM, MS ADPCM */ add->cFilterTags = 0; add->hicon = NULL; - MultiByteToWideChar( CP_ACP, 0, "WINE-MS ADPCM", -1, + MultiByteToWideChar( CP_ACP, 0, "MS-ADPCM", -1, add->szShortName, sizeof(add->szShortName)/sizeof(WCHAR) ); MultiByteToWideChar( CP_ACP, 0, "Wine MS ADPCM converter", -1, add->szLongName, sizeof(add->szLongName)/sizeof(WCHAR) );

1 0

Alexandre Julliard : winecfg: Allow to configure the desktop separately for each application.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: f0bd1ee70b3affcc822f1d508f5c602040b63f32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0bd1ee70b3affcc822f1d508… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 25 14:36:45 2008 +0200 winecfg: Allow to configure the desktop separately for each application. --- programs/winecfg/x11drvdlg.c | 119 ++++++++++++++++++++++------------------- 1 files changed, 64 insertions(+), 55 deletions(-) diff --git a/programs/winecfg/x11drvdlg.c b/programs/winecfg/x11drvdlg.c index c0ec058..ce54924 100644 --- a/programs/winecfg/x11drvdlg.c +++ b/programs/winecfg/x11drvdlg.c @@ -28,6 +28,7 @@ #include <stdio.h> #include <windows.h> +#include <wine/unicode.h> #include <wine/debug.h> #include "resource.h" @@ -45,6 +46,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(winecfg); static const WCHAR logpixels_reg[] = {'S','y','s','t','e','m','\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\','H','a','r','d','w','a','r','e',' ','P','r','o','f','i','l','e','s','\\','C','u','r','r','e','n','t','\\','S','o','f','t','w','a','r','e','\\','F','o','n','t','s',0}; static const WCHAR logpixels[] = {'L','o','g','P','i','x','e','l','s',0}; +static const WCHAR desktopW[] = {'D','e','s','k','t','o','p',0}; +static const WCHAR defaultW[] = {'D','e','f','a','u','l','t',0}; +static const WCHAR explorerW[] = {'E','x','p','l','o','r','e','r',0}; +static const WCHAR explorer_desktopsW[] = {'E','x','p','l','o','r','e','r','\\', + 'D','e','s','k','t','o','p','s',0}; +static const WCHAR x11_driverW[] = {'X','1','1',' ','D','r','i','v','e','r',0}; +static const WCHAR default_resW[] = {'8','0','0','x','6','0','0',0}; + + static struct SHADERMODE { UINT displayStrID; @@ -58,64 +68,55 @@ static struct SHADERMODE int updating_ui; -static void update_gui_for_desktop_mode(HWND dialog) { - int desktopenabled = FALSE; +/* convert the x11 desktop key to the new explorer config */ +static void convert_x11_desktop_key(void) +{ + char *buf; + + if (!(buf = get_reg_key(config_key, "X11 Driver", "Desktop", NULL))) return; + set_reg_key(config_key, "Explorer\\Desktops", "Default", buf); + set_reg_key(config_key, "Explorer", "Desktop", "Default"); + set_reg_key(config_key, "X11 Driver", "Desktop", NULL); + HeapFree(GetProcessHeap(), 0, buf); +} + +static void update_gui_for_desktop_mode(HWND dialog) +{ + WCHAR *buf, *bufindex; + const WCHAR *desktop_name = current_app ? current_app : defaultW; WINE_TRACE("\n"); updating_ui = TRUE; - if (current_app) + buf = get_reg_keyW(config_key, explorer_desktopsW, desktop_name, NULL); + if (buf && (bufindex = strchrW(buf, 'x'))) { - disable(IDC_ENABLE_DESKTOP); - disable(IDC_DESKTOP_WIDTH); - disable(IDC_DESKTOP_HEIGHT); - disable(IDC_DESKTOP_SIZE); - disable(IDC_DESKTOP_BY); - return; + *bufindex = 0; + ++bufindex; + SetWindowTextW(GetDlgItem(dialog, IDC_DESKTOP_WIDTH), buf); + SetWindowTextW(GetDlgItem(dialog, IDC_DESKTOP_HEIGHT), bufindex); + } else { + SetWindowText(GetDlgItem(dialog, IDC_DESKTOP_WIDTH), "800"); + SetWindowText(GetDlgItem(dialog, IDC_DESKTOP_HEIGHT), "600"); } - enable(IDC_ENABLE_DESKTOP); + HeapFree(GetProcessHeap(), 0, buf); /* do we have desktop mode enabled? */ - if (reg_key_exists(config_key, keypath("X11 Driver"), "Desktop")) + if (reg_key_exists(config_key, keypath("Explorer"), "Desktop")) { - char* buf, *bufindex; CheckDlgButton(dialog, IDC_ENABLE_DESKTOP, BST_CHECKED); - - buf = get_reg_key(config_key, keypath("X11 Driver"), "Desktop", "800x600"); - /* note: this test must match the one in x11drv */ - if( buf[0] != 'n' && buf[0] != 'N' && buf[0] != 'F' && buf[0] != 'f' - && buf[0] != '0') { - desktopenabled = TRUE; - enable(IDC_DESKTOP_WIDTH); - enable(IDC_DESKTOP_HEIGHT); - enable(IDC_DESKTOP_SIZE); - enable(IDC_DESKTOP_BY); - - bufindex = strchr(buf, 'x'); - if (bufindex) { - *bufindex = 0; - ++bufindex; - SetWindowText(GetDlgItem(dialog, IDC_DESKTOP_WIDTH), buf); - SetWindowText(GetDlgItem(dialog, IDC_DESKTOP_HEIGHT), bufindex); - } else { - WINE_TRACE("Desktop registry entry is malformed\n"); - SetWindowText(GetDlgItem(dialog, IDC_DESKTOP_WIDTH), "800"); - SetWindowText(GetDlgItem(dialog, IDC_DESKTOP_HEIGHT), "600"); - } - } - HeapFree(GetProcessHeap(), 0, buf); + enable(IDC_DESKTOP_WIDTH); + enable(IDC_DESKTOP_HEIGHT); + enable(IDC_DESKTOP_SIZE); + enable(IDC_DESKTOP_BY); } - if (!desktopenabled) + else { CheckDlgButton(dialog, IDC_ENABLE_DESKTOP, BST_UNCHECKED); - disable(IDC_DESKTOP_WIDTH); disable(IDC_DESKTOP_HEIGHT); disable(IDC_DESKTOP_SIZE); disable(IDC_DESKTOP_BY); - - SetWindowText(GetDlgItem(dialog, IDC_DESKTOP_WIDTH), ""); - SetWindowText(GetDlgItem(dialog, IDC_DESKTOP_HEIGHT), ""); } updating_ui = FALSE; @@ -126,6 +127,7 @@ static void init_dialog(HWND dialog) unsigned int it; char* buf; + convert_x11_desktop_key(); update_gui_for_desktop_mode(dialog); updating_ui = TRUE; @@ -182,30 +184,37 @@ static void init_dialog(HWND dialog) updating_ui = FALSE; } -static void set_from_desktop_edits(HWND dialog) { - char *width, *height, *new; +static void set_from_desktop_edits(HWND dialog) +{ + static const WCHAR x[] = {'x',0}; + static const WCHAR def_width[] = {'8','0','0',0}; + static const WCHAR def_height[] = {'6','0','0',0}; + WCHAR *width, *height, *new; + const WCHAR *desktop_name = current_app ? current_app : defaultW; if (updating_ui) return; WINE_TRACE("\n"); - width = get_text(dialog, IDC_DESKTOP_WIDTH); - height = get_text(dialog, IDC_DESKTOP_HEIGHT); + width = get_textW(dialog, IDC_DESKTOP_WIDTH); + height = get_textW(dialog, IDC_DESKTOP_HEIGHT); - if (width == NULL || strcmp(width, "") == 0) { + if (!width || !width[0]) { HeapFree(GetProcessHeap(), 0, width); - width = strdupA("800"); + width = strdupW(def_width); } - - if (height == NULL || strcmp(height, "") == 0) { + if (!height || !height[0]) { HeapFree(GetProcessHeap(), 0, height); - height = strdupA("600"); + height = strdupW(def_height); } - new = HeapAlloc(GetProcessHeap(), 0, strlen(width) + strlen(height) + 2 /* x + terminator */); - sprintf(new, "%sx%s", width, height); - set_reg_key(config_key, keypath("X11 Driver"), "Desktop", new); - + new = HeapAlloc(GetProcessHeap(), 0, (strlenW(width) + strlenW(height) + 2) * sizeof(WCHAR)); + strcpyW( new, width ); + strcatW( new, x ); + strcatW( new, height ); + set_reg_keyW(config_key, explorer_desktopsW, desktop_name, new); + set_reg_keyW(config_key, keypathW(explorerW), desktopW, desktop_name); + HeapFree(GetProcessHeap(), 0, width); HeapFree(GetProcessHeap(), 0, height); HeapFree(GetProcessHeap(), 0, new); @@ -217,7 +226,7 @@ static void on_enable_desktop_clicked(HWND dialog) { if (IsDlgButtonChecked(dialog, IDC_ENABLE_DESKTOP) == BST_CHECKED) { set_from_desktop_edits(dialog); } else { - set_reg_key(config_key, keypath("X11 Driver"), "Desktop", NULL); + set_reg_key(config_key, keypath("Explorer"), "Desktop", NULL); } update_gui_for_desktop_mode(dialog);

1 0

Alexandre Julliard : winecfg: Add a couple of Unicode helper functions.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: ad5876734d69c8ac57e2d6ec01ec4074b47b1635 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad5876734d69c8ac57e2d6ec0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 25 14:36:25 2008 +0200 winecfg: Add a couple of Unicode helper functions. --- programs/winecfg/winecfg.c | 33 +++++++++++++++++++++++++++++++++ programs/winecfg/winecfg.h | 3 ++- 2 files changed, 35 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/winecfg.c b/programs/winecfg/winecfg.c index b21599d..3fdc796 100644 --- a/programs/winecfg/winecfg.c +++ b/programs/winecfg/winecfg.c @@ -461,6 +461,11 @@ void set_reg_key_dword(HKEY root, const char *path, const char *name, DWORD valu HeapFree(GetProcessHeap(), 0, wname); } +void set_reg_keyW(HKEY root, const WCHAR *path, const WCHAR *name, const WCHAR *value) +{ + set_reg_key_ex(root, path, name, value, REG_SZ); +} + void set_reg_key_dwordW(HKEY root, const WCHAR *path, const WCHAR *name, DWORD value) { set_reg_key_ex(root, path, name, &value, REG_DWORD); @@ -684,6 +689,34 @@ char *keypath(const char *section) return result; } +WCHAR *keypathW(const WCHAR *section) +{ + static const WCHAR appdefaultsW[] = {'A','p','p','D','e','f','a','u','l','t','s','\\',0}; + static WCHAR *result = NULL; + + HeapFree(GetProcessHeap(), 0, result); + + if (current_app) + { + DWORD len = sizeof(appdefaultsW) + (lstrlenW(current_app) + lstrlenW(section) + 1) * sizeof(WCHAR); + result = HeapAlloc(GetProcessHeap(), 0, len ); + lstrcpyW( result, appdefaultsW ); + lstrcatW( result, current_app ); + if (section[0]) + { + len = lstrlenW(result); + result[len++] = '\\'; + lstrcpyW( result + len, section ); + } + } + else + { + result = strdupW(section); + } + + return result; +} + void PRINTERROR(void) { LPSTR msg; diff --git a/programs/winecfg/winecfg.h b/programs/winecfg/winecfg.h index b0e2d39..7b0006a 100644 --- a/programs/winecfg/winecfg.h +++ b/programs/winecfg/winecfg.h @@ -71,7 +71,8 @@ WCHAR* load_string (UINT id); no explicit free is needed of the string returned by this function */ -char *keypath(const char *section); +char *keypath(const char *section); +WCHAR *keypathW(const WCHAR *section); int initialize(HINSTANCE hInstance); extern HKEY config_key;

1 0

ByeongSik Jeon : imm32: Fix a typo.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: 86b0d5ecc93a19d8fdaaed77f4e7c6b4ca2e8984 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86b0d5ecc93a19d8fdaaed77f… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Fri Apr 25 11:37:32 2008 +0900 imm32: Fix a typo. --- dlls/imm32/imm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 5cdd721..1f20e42 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1843,7 +1843,7 @@ BOOL WINAPI ImmSetOpenStatus(HIMC hIMC, BOOL fOpen) { data->IMC.fOpen = fOpen; ImmNotifyIME( hIMC, NI_CONTEXTUPDATED, 0, IMC_SETOPENSTATUS); - ImmInternalSendIMENotify(data, IMN_SETSENTENCEMODE, 0); + ImmInternalSendIMENotify(data, IMN_SETOPENSTATUS, 0); } return TRUE;

1 0

ByeongSik Jeon : imm32: ImmGetVirtualKey return orignal virtual key value.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: fab832df68e27884ba0245205065a58a4b15ebff URL: http://source.winehq.org/git/wine.git/?a=commit;h=fab832df68e27884ba0245205… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Fri Apr 25 11:37:27 2008 +0900 imm32: ImmGetVirtualKey return orignal virtual key value. --- dlls/imm32/imm.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 33f39cc..5cdd721 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1385,7 +1385,12 @@ BOOL WINAPI ImmGetStatusWindowPos(HIMC hIMC, LPPOINT lpptPos) UINT WINAPI ImmGetVirtualKey(HWND hWnd) { OSVERSIONINFOA version; - FIXME("(%p): stub\n", hWnd); + InputContextData *data = (InputContextData *)ImmGetContext( hWnd ); + TRACE("%p\n", hWnd); + + if ( data ) + return data->lastVK; + GetVersionExA( &version ); switch(version.dwPlatformId) {

1 0

ByeongSik Jeon : imm32: Reconstruct the ImmProcessKey, ImmTranslateMessage for the VK_PROCESSKEY.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: 7e341002d228237bd00b4c7feabdbaa3d3389f2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e341002d228237bd00b4c7fe… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Fri Apr 25 11:37:07 2008 +0900 imm32: Reconstruct the ImmProcessKey, ImmTranslateMessage for the VK_PROCESSKEY. --- dlls/imm32/imm.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 04b0d77..33f39cc 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -2239,7 +2239,7 @@ BOOL WINAPI ImmTranslateMessage(HWND hwnd, UINT msg, WCHAR chr, LPARAM lKeyData) UINT uVirtKey; static const int list_count = 10; - TRACE("%p %x '%c' %x\n",hwnd, msg, chr, (UINT)lKeyData); + TRACE("%p %x %x %x\n",hwnd, msg, chr, (UINT)lKeyData); if (imc) data = (InputContextData*)imc; @@ -2259,6 +2259,8 @@ BOOL WINAPI ImmTranslateMessage(HWND hwnd, UINT msg, WCHAR chr, LPARAM lKeyData) { if (!is_himc_ime_unicode(data)) ToAscii(data->lastVK, scancode, state, &chr, 0); + else + ToUnicodeEx(data->lastVK, scancode, state, &chr, 1, 0, GetKeyboardLayout(0)); uVirtKey = MAKELONG(data->lastVK,chr); } else @@ -2279,6 +2281,8 @@ BOOL WINAPI ImmTranslateMessage(HWND hwnd, UINT msg, WCHAR chr, LPARAM lKeyData) HeapFree(GetProcessHeap(),0,list); + data->lastVK = VK_PROCESSKEY; + return (msg_count > 0); } @@ -2303,17 +2307,12 @@ BOOL WINAPI ImmProcessKey(HWND hwnd, HKL hKL, UINT vKey, LPARAM lKeyData, DWORD return FALSE; GetKeyboardState(state); - data->lastVK = vKey; - if (data->immKbd->pImeProcessKey(imc, vKey, lKeyData, state)) { - WCHAR key; - UINT scancode; - - scancode = lKeyData >> 0x10 & 0xff; - ToUnicodeEx(vKey, scancode, state, &key, 1, 0, hKL); - return ImmTranslateMessage(hwnd, WM_KEYDOWN, key, lKeyData ); + data->lastVK = vKey; + return TRUE; } + data->lastVK = VK_PROCESSKEY; return FALSE; }

1 0

Alexandre Julliard : winex11: Don't force tool windows to unmanaged mode.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: 1f99d80c06994aeb8b2fa959c477a77c79184980 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f99d80c06994aeb8b2fa959c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 25 14:26:52 2008 +0200 winex11: Don't force tool windows to unmanaged mode. The detection algorithm should be good enough for that case now. --- dlls/winex11.drv/window.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 3658c71..0f84ae2 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -101,13 +101,8 @@ static BOOL is_window_managed( HWND hwnd, UINT swp_flags, const RECT *window_rec if (hwnd == GetActiveWindow()) return TRUE; /* windows with caption are managed */ if ((style & WS_CAPTION) == WS_CAPTION) return TRUE; - /* tool windows are not managed */ - ex_style = GetWindowLongW( hwnd, GWL_EXSTYLE ); - if (ex_style & WS_EX_TOOLWINDOW) return FALSE; /* windows with thick frame are managed */ if (style & WS_THICKFRAME) return TRUE; - /* application windows are managed */ - if (ex_style & WS_EX_APPWINDOW) return TRUE; if (style & WS_POPUP) { /* popup with sysmenu == caption are managed */ @@ -117,6 +112,9 @@ static BOOL is_window_managed( HWND hwnd, UINT swp_flags, const RECT *window_rec window_rect->top <= 0 && window_rect->bottom >= screen_height) return TRUE; } + /* application windows are managed */ + ex_style = GetWindowLongW( hwnd, GWL_EXSTYLE ); + if (ex_style & WS_EX_APPWINDOW) return TRUE; /* default: not managed */ return FALSE; }

1 0

Rob Shearman : widl: Move the func_declarator rule entirely into direct_declarator.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: 242a8a02f565dc3c568ceaa921949b4fd662f01a URL: http://source.winehq.org/git/wine.git/?a=commit;h=242a8a02f565dc3c568ceaa92… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Apr 25 11:00:20 2008 +0100 widl: Move the func_declarator rule entirely into direct_declarator. --- tools/widl/parser.y | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index d57d286..8e0ff86 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -300,7 +300,7 @@ static statement_list_t *append_statement(statement_list_t *list, statement_t *s %type <var> arg ne_union_field union_field s_field case enum constdef externdef %type <var_list> m_args no_args args fields ne_union_fields cases enums enum_list dispint_props field %type <var> m_ident t_ident ident -%type <declarator> declarator func_declarator direct_declarator +%type <declarator> declarator direct_declarator %type <declarator_list> declarator_list %type <func> funcdef %type <func_list> int_statements dispint_meths @@ -970,18 +970,12 @@ declarator: | direct_declarator ; -func_declarator: direct_declarator '(' m_args ')' - { $$ = $1; - $$->type = append_ptrchain_type($$->type, make_func_type($3)); - } - ; - direct_declarator: ident { $$ = make_declarator($1); } | '(' declarator ')' { $$ = $2; } | direct_declarator array { $$ = $1; $$->array = append_array($$->array, $2); } - | func_declarator { $$ = $1; - $$->func_type = $$->type; + | direct_declarator '(' m_args ')' { $$ = $1; + $$->func_type = append_ptrchain_type($$->type, make_func_type($3)); $$->type = NULL; } ;

1 0

Rob Shearman : widl: Create a statement object for import statements.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: 66fa9a714e95633deb7ef06ebda27fdea6b8f536 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66fa9a714e95633deb7ef06eb… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Apr 25 10:59:40 2008 +0100 widl: Create a statement object for import statements. Move the writing of include directives into the generated header into header.c. --- tools/widl/header.c | 12 ++++++++++++ tools/widl/header.h | 1 + tools/widl/parser.l | 11 +---------- tools/widl/parser.y | 36 ++++++++++++++++++++++++++++-------- 4 files changed, 42 insertions(+), 18 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 0d7e0b2..ae70454 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -1039,3 +1039,15 @@ void write_coclass_forward(type_t *cocl) fprintf(header, "typedef struct %s %s;\n", cocl->name, cocl->name); fprintf(header, "#endif /* defined __%s_FWD_DEFINED__ */\n\n", cocl->name ); } + +void write_import(const char *fname) +{ + char *hname, *p; + + hname = dup_basename(fname, ".idl"); + p = hname + strlen(hname) - 2; + if (p <= hname || strcmp( p, ".h" )) strcat(hname, ".h"); + + fprintf(header, "#include <%s>\n", hname); + free(hname); +} diff --git a/tools/widl/header.h b/tools/widl/header.h index c663c70..c2cecd5 100644 --- a/tools/widl/header.h +++ b/tools/widl/header.h @@ -49,6 +49,7 @@ extern int need_proxy_file(const statement_list_t *stmts); extern const var_t *is_callas(const attr_list_t *list); extern void write_args(FILE *h, const var_list_t *arg, const char *name, int obj, int do_indent); extern void write_array(FILE *h, array_dims_t *v, int field); +extern void write_import(const char *fname); extern void write_forward(type_t *iface); extern void write_interface(type_t *iface); extern void write_dispinterface(type_t *iface); diff --git a/tools/widl/parser.l b/tools/widl/parser.l index d40c9d0..1e8460b 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -411,20 +411,11 @@ struct imports { int do_import(char *fname) { FILE *f; - char *hname, *path, *p; + char *path; struct imports *import; int ptr = import_stack_ptr; int ret; - if (!parse_only && do_header) { - hname = dup_basename(fname, ".idl"); - p = hname + strlen(hname) - 2; - if (p <= hname || strcmp( p, ".h" )) strcat(hname, ".h"); - - fprintf(header, "#include <%s>\n", hname); - free(hname); - } - import = first_import; while (import && strcmp(import->name, fname)) import = import->next; diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 43c4af2..d57d286 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -78,6 +78,12 @@ struct typenode { struct list entry; }; +struct _import_t +{ + char *name; + int import_performed; +}; + typelist_t incomplete_types = LIST_INIT(incomplete_types); static void add_incomplete(type_t *t); @@ -150,6 +156,7 @@ static statement_t *make_statement_library(typelib_t *typelib); static statement_t *make_statement_cppquote(const char *str); static statement_t *make_statement_importlib(const char *str); static statement_t *make_statement_module(type_t *type); +static statement_t *make_statement_import(const char *str); static statement_list_t *append_statement(statement_list_t *list, statement_t *stmt); #define tsENUM 1 @@ -180,7 +187,8 @@ static statement_list_t *append_statement(statement_list_t *list, statement_t *s unsigned int num; double dbl; interface_info_t ifinfo; - typelib_t *typelib; + typelib_t *typelib; + struct _import_t *import; } %token <str> aIDENTIFIER @@ -298,9 +306,9 @@ static statement_list_t *append_statement(statement_list_t *list, statement_t *s %type <func_list> int_statements dispint_meths %type <type> coclass coclasshdr coclassdef %type <num> pointer_type version -%type <str> libraryhdr callconv cppquote importlib +%type <str> libraryhdr callconv cppquote importlib import %type <uuid> uuid_string -%type <num> import_start +%type <import> import_start %type <typelib> library_start librarydef %type <statement> statement typedef %type <stmt_list> gbl_statements imp_statements @@ -387,7 +395,7 @@ statement: constdef ';' { $$ = make_statement_init_decl($1); | externdef ';' { $$ = make_statement_extern($1); if (!parse_only && do_header) write_externdef($1); } - | import { $$ = NULL; } + | import { $$ = make_statement_import($1); } | structdef ';' { $$ = make_statement_type_decl($1); if (!parse_only && do_header) { write_type_def_or_decl(header, $1, FALSE, NULL); @@ -406,13 +414,18 @@ statement: constdef ';' { $$ = make_statement_init_decl($1); cppquote: tCPPQUOTE '(' aSTRING ')' { $$ = $3; if (!parse_only && do_header) fprintf(header, "%s\n", $3); } ; import_start: tIMPORT aSTRING ';' { assert(yychar == YYEMPTY); - $$ = do_import($2); - if (!$$) yychar = aEOF; + $$ = xmalloc(sizeof(struct _import_t)); + $$->name = $2; + $$->import_performed = do_import($2); + if (!$$->import_performed) yychar = aEOF; } ; -import: import_start imp_statements aEOF - { if ($1) pop_import(); } +import: import_start imp_statements aEOF { $$ = $1->name; + if ($1->import_performed) pop_import(); + free($1); + if (!parse_only && do_header) write_import($$); + } ; importlib: tIMPORTLIB '(' aSTRING ')' @@ -2607,6 +2620,13 @@ static statement_t *make_statement_importlib(const char *str) return stmt; } +static statement_t *make_statement_import(const char *str) +{ + statement_t *stmt = make_statement(STMT_IMPORT); + stmt->u.str = str; + return stmt; +} + static statement_t *make_statement_module(type_t *type) { statement_t *stmt = make_statement(STMT_MODULE);

1 0

Rob Shearman : widl: Add support for declaring multiple fields of a structure in one statement.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: 957dd4b160d5943a0a9f096b841d6a4aa5ba0684 URL: http://source.winehq.org/git/wine.git/?a=commit;h=957dd4b160d5943a0a9f096b8… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Apr 25 10:59:00 2008 +0100 widl: Add support for declaring multiple fields of a structure in one statement. --- tools/widl/parser.y | 46 +++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 41 insertions(+), 5 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 1732eae..36f5789 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -91,9 +91,11 @@ static attr_t *make_attrp(enum attr_type type, void *val); static expr_list_t *append_expr(expr_list_t *list, expr_t *expr); static array_dims_t *append_array(array_dims_t *list, expr_t *expr); static void set_type(var_t *v, type_t *type, const declarator_t *decl, int top); +static var_list_t *set_var_types(attr_list_t *attrs, type_t *type, declarator_list_t *decls); static ifref_list_t *append_ifref(ifref_list_t *list, ifref_t *iface); static ifref_t *make_ifref(type_t *iface); static var_list_t *append_var(var_list_t *list, var_t *var); +static var_list_t *append_var_list(var_list_t *list, var_list_t *vars); static var_t *make_var(char *name); static declarator_list_t *append_declarator(declarator_list_t *list, declarator_t *p); static declarator_t *make_declarator(var_t *var); @@ -287,8 +289,8 @@ static statement_list_t *append_statement(statement_list_t *list, statement_t *s %type <type> type %type <ifref> coclass_int %type <ifref_list> coclass_ints -%type <var> arg field ne_union_field union_field s_field case enum constdef externdef -%type <var_list> m_args no_args args fields ne_union_fields cases enums enum_list dispint_props +%type <var> arg ne_union_field union_field s_field case enum constdef externdef +%type <var_list> m_args no_args args fields ne_union_fields cases enums enum_list dispint_props field %type <var> m_ident t_ident ident %type <declarator> declarator func_declarator direct_declarator %type <declarator_list> declarator_list @@ -702,11 +704,16 @@ externdef: tEXTERN tCONST type ident { $$ = $4; ; fields: { $$ = NULL; } - | fields field { $$ = append_var( $1, $2 ); } + | fields field { $$ = append_var_list($1, $2); } ; -field: s_field ';' { $$ = $1; } - | m_attributes uniondef ';' { $$ = make_var(NULL); $$->type = $2; $$->attrs = $1; } +field: m_attributes type declarator_list ';' { const char *first = LIST_ENTRY(list_head($3), declarator_t, entry)->var->name; + check_field_attrs(first, $1); + $$ = set_var_types($1, $2, $3); } + | m_attributes uniondef ';' { var_t *v = make_var(NULL); + v->type = $2; v->attrs = $1; + $$ = append_var(NULL, v); + } ; ne_union_field: @@ -1413,6 +1420,23 @@ static void set_type(var_t *v, type_t *type, const declarator_t *decl, } } +static var_list_t *set_var_types(attr_list_t *attrs, type_t *type, declarator_list_t *decls) +{ + declarator_t *decl, *next; + var_list_t *var_list = NULL; + + LIST_FOR_EACH_ENTRY_SAFE( decl, next, decls, declarator_t, entry ) + { + var_t *var = decl->var; + + var->attrs = attrs; + set_type(var, type, decl, 0); + var_list = append_var(var_list, var); + free(decl); + } + return var_list; +} + static ifref_list_t *append_ifref(ifref_list_t *list, ifref_t *iface) { if (!iface) return list; @@ -1445,6 +1469,18 @@ static var_list_t *append_var(var_list_t *list, var_t *var) return list; } +static var_list_t *append_var_list(var_list_t *list, var_list_t *vars) +{ + if (!vars) return list; + if (!list) + { + list = xmalloc( sizeof(*list) ); + list_init( list ); + } + list_move_tail( list, vars ); + return list; +} + static var_t *make_var(char *name) { var_t *v = xmalloc(sizeof(var_t));

1 0

Rob Shearman : widl: Add support for string literals and wide-string literals in expressions.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: 33c891e6943497f88aa7ebab9cb21a5e4203c837 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33c891e6943497f88aa7ebab9… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Apr 25 10:59:21 2008 +0100 widl: Add support for string literals and wide-string literals in expressions. --- tools/widl/expr.c | 18 ++++++++++++++++ tools/widl/parser.l | 15 +++++++++--- tools/widl/parser.y | 53 +++++++++++++++++++++++++--------------------- tools/widl/widltypes.h | 8 +++--- tools/widl/write_msft.c | 48 +++++++++++++++++++----------------------- 5 files changed, 84 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=33c891e6943497f88aa7e…

1 0

Rob Shearman : widl: Rename pident to declarator and parse the array declarations as part of declarators .
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: 21cd6865c839c85b5a7d0813373426eff6f18384 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21cd6865c839c85b5a7d08133… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Apr 25 10:58:24 2008 +0100 widl: Rename pident to declarator and parse the array declarations as part of declarators. This allows arrays to be used in typedefs and const statements. --- tools/widl/parser.y | 129 ++++++++++++++++++++++++------------------------ tools/widl/widltypes.h | 7 ++- 2 files changed, 68 insertions(+), 68 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=21cd6865c839c85b5a7d0…

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2008