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

Roderick Colenbrander : wined3d: Store more information about pixel formats . This is needed for some WineD3D_ChoosePixelFormat restructuring.
by Alexandre Julliard April 28, 2008

April 28, 2008

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 April 28, 2008

April 28, 2008

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 : d3d9: Fix a few test failures in win2k3.
by Alexandre Julliard April 28, 2008

April 28, 2008

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 : ddraw: Remove a test that fails in VMs.
by Alexandre Julliard April 28, 2008

April 28, 2008

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 : schannel: Fix a test that fails in win2k3.
by Alexandre Julliard April 28, 2008

April 28, 2008

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

Kusanagi Kouichi : winex11: Remove unnecessary #include.
by Alexandre Julliard April 28, 2008

April 28, 2008

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

James Hawkins : msi: Remove a debugging call.
by Alexandre Julliard April 28, 2008

April 28, 2008

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

Kusanagi Kouichi : winex11: hCompStr should never be NULL because Wine expects it is not NULL.
by Alexandre Julliard April 28, 2008

April 28, 2008

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 April 28, 2008

April 28, 2008

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

James Hawkins : cabinet: Revert "cabinet: Fix for FDICopy with an empty cabinet file.".
by Alexandre Julliard April 28, 2008

April 28, 2008

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