December 2007 - Wine-Commits

Gerald Pfeifer : winex11.drv: Simplify condition in create_xcursor_cursor() based on the unsignedness of types.
by Alexandre Julliard Dec. 31, 2007

Dec. 31, 2007

Module: wine Branch: master Commit: fcdca0e809536aa72af5c8a550ef3eb541fb1947 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcdca0e809536aa72af5c8a55… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Dec 29 23:55:58 2007 +0100 winex11.drv: Simplify condition in create_xcursor_cursor() based on the unsignedness of types. --- dlls/winex11.drv/mouse.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 97e097b..4440c85 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -566,8 +566,8 @@ static Cursor create_xcursor_cursor( Display *display, CURSORICONINFO *ptr ) /* Make sure hotspot is valid */ image->xhot = ptr->ptHotSpot.x; image->yhot = ptr->ptHotSpot.y; - if (image->xhot < 0 || image->xhot >= image->width || - image->yhot < 0 || image->yhot >= image->height) + if (image->xhot >= image->width || + image->yhot >= image->height) { image->xhot = image->width / 2; image->yhot = image->height / 2;

1 0

Michael Stefaniuc : janitorial: Remove superfluous backslashes at end of lines.
by Alexandre Julliard Dec. 31, 2007

Dec. 31, 2007

Module: wine Branch: master Commit: 1f26b146d19dc3ad317e47035e053fe75c8198f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f26b146d19dc3ad317e47035… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 31 17:29:57 2007 +0100 janitorial: Remove superfluous backslashes at end of lines. --- dlls/comctl32/datetime.c | 2 +- dlls/gdiplus/graphics.c | 2 +- dlls/msi/tests/install.c | 2 +- dlls/msi/tests/msi.c | 2 +- dlls/oleaut32/tests/varformat.c | 2 +- dlls/quartz/tests/misc.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 02b6685..100cd74 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -1072,7 +1072,7 @@ DATETIME_SetFocus (DATETIME_INFO *infoPtr, HWND lostFocus) TRACE("got focus from %p\n", lostFocus); /* if monthcal is open and it loses focus, close monthcal */ - if (infoPtr->hMonthCal && (lostFocus == infoPtr->hMonthCal) && \ + if (infoPtr->hMonthCal && (lostFocus == infoPtr->hMonthCal) && IsWindowVisible(infoPtr->hMonthCal)) { ShowWindow(infoPtr->hMonthCal, SW_HIDE); diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 65e7151..684a3b4 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -500,7 +500,7 @@ static GpStatus draw_polyline(GpGraphics *graphics, GpPen *pen, draw_cap(graphics, pen->brush->lb.lbColor, pen->endcap, pen->width, pen->customend, pt[count - 2].X, pt[count - 2].Y, pt[count - 1].X, pt[count - 1].Y); draw_cap(graphics, pen->brush->lb.lbColor, pen->startcap, pen->width, pen->customstart, - pt[1].X, pt[1].Y, pt[0].X, pt[0].Y);\ + pt[1].X, pt[1].Y, pt[0].X, pt[0].Y); } transform_and_round_points(graphics, pti, ptcopy, count); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index fd8184b..2c674bb 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -2447,7 +2447,7 @@ static void test_publish(void) state = MsiQueryProductState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); - state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "feature");\ + state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "feature"); ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "montecristo"); diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index b31d88f..d400360 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -736,7 +736,7 @@ static void test_MsiQueryComponentState(void) /* empty szProductCode */ state = MAGIC_ERROR; - r = pMsiQueryComponentStateA("", NULL, MSIINSTALLCONTEXT_MACHINE, component, &state);\ + r = pMsiQueryComponentStateA("", NULL, MSIINSTALLCONTEXT_MACHINE, component, &state); ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); ok(state == MAGIC_ERROR, "Expected 0xdeadbeef, got %d\n", state); diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index 5a13e67..399aeb7 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -393,7 +393,7 @@ static void test_VarFormat(void) VARFMT(VT_BOOL,V_BOOL,VARIANT_TRUE,"",E_INVALIDARG,""); } -static const char *szVarWdnFail = \ +static const char *szVarWdnFail = "VarWeekdayName (%d, %d, %d, %d, %x): returned %8x, expected %8x\n"; #define VARWDN(iWeekday, fAbbrev, iFirstDay, dwFlags, ret, buff, out, freeOut) \ do { \ diff --git a/dlls/quartz/tests/misc.c b/dlls/quartz/tests/misc.c index fbe81bf..3be5757 100644 --- a/dlls/quartz/tests/misc.c +++ b/dlls/quartz/tests/misc.c @@ -97,7 +97,7 @@ static void test_aggregation(const CLSID clsidOuter, const CLSID clsidInner, QI_SUCCEED(pUnkInner, iidInner, pUnkAggregatee); QI_SUCCEED(pUnkInner, IID_IUnknown, pUnkInnerTest); - if (!pUnkAggregator || !pUnkOuterTest || !pUnkAggregatee \ + if (!pUnkAggregator || !pUnkOuterTest || !pUnkAggregatee || !pUnkInnerTest) { skip("One of the required interfaces is NULL\n");

1 0

Gerald Pfeifer : kernel32/tests: Remove extraneous check.
by Alexandre Julliard Dec. 31, 2007

Dec. 31, 2007

Module: wine Branch: master Commit: f41d0cb530d44f7e8716b55b3db7f10ef559a707 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f41d0cb530d44f7e8716b55b3… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Dec 29 21:09:43 2007 +0100 kernel32/tests: Remove extraneous check. --- dlls/kernel32/tests/alloc.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/alloc.c b/dlls/kernel32/tests/alloc.c index c46fa8d..fed6247 100644 --- a/dlls/kernel32/tests/alloc.c +++ b/dlls/kernel32/tests/alloc.c @@ -150,8 +150,7 @@ static void test_Heap(void) dwSize = HeapSize(heap, 0, mem1); /* should work with 0-length buffer */ - ok((dwSize >= 0) && (dwSize < 0xFFFFFFFF), - "The size of the 0-length buffer\n"); + ok(dwSize < 0xFFFFFFFF, "The size of the 0-length buffer\n"); ok(HeapFree(heap, 0, mem1), "Freed the 0-length buffer\n"); /* Check that HeapDestry works */

1 0

Gerald Pfeifer : taskmgr: Remove redundant out-of-domain checking which is already handled by PerfDataGetProcessorUsage () and PerfDataGetProcessorSystemUsage().
by Alexandre Julliard Dec. 31, 2007

Dec. 31, 2007

Module: wine Branch: master Commit: f35b93c655ba947eb55d8dd10c66391e7e297692 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f35b93c655ba947eb55d8dd10… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Dec 29 21:06:17 2007 +0100 taskmgr: Remove redundant out-of-domain checking which is already handled by PerfDataGetProcessorUsage() and PerfDataGetProcessorSystemUsage(). --- programs/taskmgr/graph.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/programs/taskmgr/graph.c b/programs/taskmgr/graph.c index 1797010..7fcfe3d 100644 --- a/programs/taskmgr/graph.c +++ b/programs/taskmgr/graph.c @@ -72,10 +72,6 @@ static void Graph_DrawCpuUsageGraph(HDC hDC, HWND hWnd) */ CpuUsage = PerfDataGetProcessorUsage(); CpuKernelUsage = PerfDataGetProcessorSystemUsage(); - if (CpuUsage < 0) CpuUsage = 0; - if (CpuUsage > 100) CpuUsage = 100; - if (CpuKernelUsage < 0) CpuKernelUsage = 0; - if (CpuKernelUsage > 100) CpuKernelUsage = 100; /* * Check and see how many digits it will take

1 0

Gerald Pfeifer : winhelp: Remove a dead condition.
by Alexandre Julliard Dec. 31, 2007

Dec. 31, 2007

Module: wine Branch: master Commit: fde4e4b6081647671e857909759907927ede31a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fde4e4b6081647671e8579097… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Dec 29 20:57:03 2007 +0100 winhelp: Remove a dead condition. --- programs/winhelp/winhelp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index f92a12c..ab516e8 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -1219,7 +1219,7 @@ static LRESULT CALLBACK WINHELP_TextWndProc(HWND hWnd, UINT msg, WPARAM wParam, hlpfile = WINHELP_LookupHelpFile(part->link->lpszString); if (part->link->window == -1) wi = win->info; - else if ((part->link->window >= 0) && (part->link->window < hlpfile->numWindows)) + else if (part->link->window < hlpfile->numWindows) wi = &hlpfile->windows[part->link->window]; else {

1 0

Alexander Dorofeyev : wined3d: Fix regression of colorfill and texture to swapchain codepaths in BltOverride .
by Alexandre Julliard Dec. 31, 2007

Dec. 31, 2007

Module: wine Branch: master Commit: 7165d7268b021d620c7ce47c476332d7d943aa86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7165d7268b021d620c7ce47c4… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sun Dec 30 18:04:27 2007 -0800 wined3d: Fix regression of colorfill and texture to swapchain codepaths in BltOverride. --- dlls/wined3d/surface.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 24cc14d..489f72e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2972,12 +2972,10 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * FIXME("Implement hardware blit between two different swapchains\n"); return WINED3DERR_INVALIDCALL; } else if(dstSwapchain) { - if(SrcSurface != myDevice->render_targets[0]) { - ERR("Unexpected render target -> render target blit\n"); - return 0; + if(SrcSurface == myDevice->render_targets[0]) { + TRACE("Blit from active render target to a swapchain\n"); + /* Handled with regular texture -> swapchain blit */ } - TRACE("Blit from active render target to a swapchain\n"); - /* Handled with regular texture -> swapchain blit */ } else if(srcSwapchain && This == (IWineD3DSurfaceImpl *) myDevice->render_targets[0]) { FIXME("Implement blit from a swapchain to the active render target\n"); return WINED3DERR_INVALIDCALL;

1 0

Alexander Dorofeyev : ddraw: Remove redundant iface<-> impl casts in IDirect3DTextureImpl_Load.
by Alexandre Julliard Dec. 31, 2007

Dec. 31, 2007

Module: wine Branch: master Commit: 18143f693b897df4c440f5d6b2cc360ef9bcfc7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=18143f693b897df4c440f5d6b… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sun Dec 30 18:03:48 2007 -0800 ddraw: Remove redundant iface<->impl casts in IDirect3DTextureImpl_Load. The implementation pointer retrieved from interface ptr wasn't being used for anything except retrieving same interface ptr back. --- dlls/ddraw/texture.c | 28 ++++++---------------------- 1 files changed, 6 insertions(+), 22 deletions(-) diff --git a/dlls/ddraw/texture.c b/dlls/ddraw/texture.c index 3f0ccc9..7542ef2 100644 --- a/dlls/ddraw/texture.c +++ b/dlls/ddraw/texture.c @@ -302,7 +302,6 @@ IDirect3DTextureImpl_Load(IDirect3DTexture2 *iface, IDirectDrawSurfaceImpl *src_ptr = ICOM_OBJECT(IDirectDrawSurfaceImpl, IDirect3DTexture2, D3DTexture2); IWineD3DPalette *wine_pal, *wine_pal_src; IDirectDrawPalette *pal = NULL, *pal_src = NULL; - IDirectDrawPaletteImpl *pal_impl, *pal_impl_src; HRESULT ret_value = D3D_OK; TRACE("(%p)->(%p)\n", This, src_ptr); @@ -346,11 +345,6 @@ IDirect3DTextureImpl_Load(IDirect3DTexture2 *iface, LeaveCriticalSection(&ddraw_cs); return D3DERR_TEXTURE_LOAD_FAILED; } - pal_impl = ICOM_OBJECT(IDirectDrawPaletteImpl, IDirectDrawPalette, pal); - } - else - { - pal_impl = NULL; } ret_value = IWineD3DSurface_GetPalette(src_ptr->WineD3DSurface, &wine_pal_src); @@ -369,29 +363,19 @@ IDirect3DTextureImpl_Load(IDirect3DTexture2 *iface, LeaveCriticalSection(&ddraw_cs); return D3DERR_TEXTURE_LOAD_FAILED; } - pal_impl_src = ICOM_OBJECT(IDirectDrawPaletteImpl, IDirectDrawPalette, pal_src); - } - else - { - pal_impl_src = NULL; } /* After seeing some logs, not sure at all about this... */ - if (pal_impl == NULL) + if (pal == NULL) { IWineD3DSurface_SetPalette(This->WineD3DSurface, wine_pal); - if (pal_impl_src != NULL) IDirectDrawPalette_AddRef(ICOM_INTERFACE(pal_impl_src, IDirectDrawPalette)); + if (pal_src != NULL) IDirectDrawPalette_AddRef(pal_src); } - else + else if (pal_src != NULL) { - if (pal_impl_src != NULL) - { - PALETTEENTRY palent[256]; - IDirectDrawPalette_GetEntries(ICOM_INTERFACE(pal_impl_src, IDirectDrawPalette), - 0, 0, 256, palent); - IDirectDrawPalette_SetEntries(ICOM_INTERFACE(pal_impl, IDirectDrawPalette), - 0, 0, 256, palent); - } + PALETTEENTRY palent[256]; + IDirectDrawPalette_GetEntries(pal_src, 0, 0, 256, palent); + IDirectDrawPalette_SetEntries(pal, 0, 0, 256, palent); } if (pal) IDirectDrawPalette_Release(pal);

1 0

Alexander Dorofeyev : ddraw: Release palette interfaces.
by Alexandre Julliard Dec. 31, 2007

Dec. 31, 2007

Module: wine Branch: master Commit: 9dbdacbd824189fafe6d88075761c5309a3f551b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dbdacbd824189fafe6d88075… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sun Dec 30 18:03:42 2007 -0800 ddraw: Release palette interfaces. --- dlls/ddraw/texture.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/texture.c b/dlls/ddraw/texture.c index 0880154..3f0ccc9 100644 --- a/dlls/ddraw/texture.c +++ b/dlls/ddraw/texture.c @@ -394,6 +394,9 @@ IDirect3DTextureImpl_Load(IDirect3DTexture2 *iface, } } + if (pal) IDirectDrawPalette_Release(pal); + if (pal_src) IDirectDrawPalette_Release(pal_src); + /* Copy one surface on the other */ dst_d = (DDSURFACEDESC *)&(This->surface_desc); src_d = (DDSURFACEDESC *)&(src_ptr->surface_desc);

1 0

Jeremy White : wintab32: If we could not find a stylus sort of device, we haven't found a tablet.
by Alexandre Julliard Dec. 31, 2007

Dec. 31, 2007

Module: wine Branch: master Commit: 659494660e77c4fbe0186f92fab3724d02d1619e URL: http://source.winehq.org/git/wine.git/?a=commit;h=659494660e77c4fbe0186f92f… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Mon Dec 31 10:00:13 2007 -0600 wintab32: If we could not find a stylus sort of device, we haven't found a tablet. --- dlls/winex11.drv/wintab.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 335d7f5..3f6abb1 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -724,9 +724,16 @@ void X11DRV_LoadTabletInfo(HWND hwnddefault) } pXFreeDeviceList(devices); - gSysDevice.NCSRTYPES = cursor_target+1; - gNumCursors = cursor_target+1; - Tablet_FixupCursors(); + + if (axis_read_complete) + { + gSysDevice.NCSRTYPES = cursor_target+1; + gNumCursors = cursor_target+1; + Tablet_FixupCursors(); + } + else + WARN("Did not find a valid stylus cursor with >= 5 axes, returning 0 valid devices.\n"); + wine_tsx11_unlock(); }

1 0

Alexander Dorofeyev : wined3d: Free palette handle when destroying IWineD3DPaletteImpl.
by Alexandre Julliard Dec. 31, 2007

Dec. 31, 2007

Module: wine Branch: master Commit: 83fe4e77f5bfda822688906c0cf0484b7b042ea2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83fe4e77f5bfda822688906c0… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sun Dec 30 18:03:35 2007 -0800 wined3d: Free palette handle when destroying IWineD3DPaletteImpl. --- dlls/wined3d/palette.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c index 506b4fe..d97799c 100644 --- a/dlls/wined3d/palette.c +++ b/dlls/wined3d/palette.c @@ -63,6 +63,7 @@ static ULONG WINAPI IWineD3DPaletteImpl_Release(IWineD3DPalette *iface) { TRACE("(%p)->() decrementing from %u.\n", This, ref + 1); if (!ref) { + DeleteObject(This->hpal); HeapFree(GetProcessHeap(), 0, This); return 0; }

1 0