December 2006 - Wine-commits

Stefan Dösinger : wined3d: Clean up SetRenderState.
by Alexandre Julliard 15 Dec '06

15 Dec '06

Module: wine Branch: master Commit: 17eabc42b3707d36ad39b47a03c924d91bda81cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=17eabc42b3707d36ad39b47a0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 14 20:48:49 2006 +0100 wined3d: Clean up SetRenderState. --- dlls/wined3d/device.c | 124 +------------------------------------------------ 1 files changed, 2 insertions(+), 122 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 939af52..a78b005 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3328,128 +3328,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl } ENTER_GL(); - - switch (State) { - case WINED3DRS_FILLMODE : - case WINED3DRS_LIGHTING : - case WINED3DRS_ZENABLE : - case WINED3DRS_CULLMODE : - case WINED3DRS_SHADEMODE : - case WINED3DRS_DITHERENABLE : - case WINED3DRS_ZWRITEENABLE : - case WINED3DRS_ZFUNC : - case WINED3DRS_AMBIENT : - case WINED3DRS_ALPHABLENDENABLE : - case WINED3DRS_SRCBLEND : - case WINED3DRS_DESTBLEND : - case WINED3DRS_ANTIALIASEDLINEENABLE : - case WINED3DRS_BLENDFACTOR : - case WINED3DRS_ALPHATESTENABLE : - case WINED3DRS_ALPHAFUNC : - case WINED3DRS_ALPHAREF : - case WINED3DRS_COLORKEYENABLE : - case WINED3DRS_CLIPPLANEENABLE : - case WINED3DRS_CLIPPING : - case WINED3DRS_BLENDOP : - case WINED3DRS_TEXTUREFACTOR : - case WINED3DRS_SPECULARENABLE : - case WINED3DRS_STENCILENABLE : - case WINED3DRS_TWOSIDEDSTENCILMODE : - case WINED3DRS_STENCILFUNC : - case WINED3DRS_CCW_STENCILFUNC : - case WINED3DRS_STENCILREF : - case WINED3DRS_STENCILMASK : - case WINED3DRS_STENCILFAIL : - case WINED3DRS_STENCILZFAIL : - case WINED3DRS_STENCILPASS : - case WINED3DRS_CCW_STENCILFAIL : - case WINED3DRS_CCW_STENCILZFAIL : - case WINED3DRS_CCW_STENCILPASS : - case WINED3DRS_EDGEANTIALIAS : - case WINED3DRS_STENCILWRITEMASK : - case WINED3DRS_FOGENABLE : - case WINED3DRS_FOGTABLEMODE : - case WINED3DRS_FOGVERTEXMODE : - case WINED3DRS_FOGSTART : - case WINED3DRS_FOGEND : - case WINED3DRS_RANGEFOGENABLE : - case WINED3DRS_FOGCOLOR : - case WINED3DRS_FOGDENSITY : - case WINED3DRS_VERTEXBLEND : - case WINED3DRS_TWEENFACTOR : - case WINED3DRS_INDEXEDVERTEXBLENDENABLE : - case WINED3DRS_COLORVERTEX : - case WINED3DRS_DIFFUSEMATERIALSOURCE : - case WINED3DRS_SPECULARMATERIALSOURCE : - case WINED3DRS_AMBIENTMATERIALSOURCE : - case WINED3DRS_EMISSIVEMATERIALSOURCE : - case WINED3DRS_LINEPATTERN : - case WINED3DRS_ZBIAS : /* D3D8 only */ - case WINED3DRS_NORMALIZENORMALS : - case WINED3DRS_POINTSIZE : - case WINED3DRS_POINTSIZE_MIN : - case WINED3DRS_POINTSIZE_MAX : - case WINED3DRS_POINTSCALE_A : - case WINED3DRS_POINTSCALE_B : - case WINED3DRS_POINTSCALE_C : - case WINED3DRS_POINTSCALEENABLE : - case WINED3DRS_COLORWRITEENABLE : - case WINED3DRS_COLORWRITEENABLE1 : - case WINED3DRS_COLORWRITEENABLE2 : - case WINED3DRS_COLORWRITEENABLE3 : - case WINED3DRS_LOCALVIEWER : - case WINED3DRS_LASTPIXEL : - case WINED3DRS_SOFTWAREVERTEXPROCESSING : - case WINED3DRS_POINTSPRITEENABLE : - case WINED3DRS_WRAP0 : - case WINED3DRS_WRAP1 : - case WINED3DRS_WRAP2 : - case WINED3DRS_WRAP3 : - case WINED3DRS_WRAP4 : - case WINED3DRS_WRAP5 : - case WINED3DRS_WRAP6 : - case WINED3DRS_WRAP7 : - case WINED3DRS_WRAP8 : - case WINED3DRS_WRAP9 : - case WINED3DRS_WRAP10 : - case WINED3DRS_WRAP11 : - case WINED3DRS_WRAP12 : - case WINED3DRS_WRAP13 : - case WINED3DRS_WRAP14 : - case WINED3DRS_WRAP15 : - case WINED3DRS_MULTISAMPLEANTIALIAS : - case WINED3DRS_SCISSORTESTENABLE : - case WINED3DRS_SLOPESCALEDEPTHBIAS : - case WINED3DRS_DEPTHBIAS : - case WINED3DRS_TEXTUREPERSPECTIVE : - case WINED3DRS_STIPPLEDALPHA : - case WINED3DRS_ANTIALIAS : - case WINED3DRS_MULTISAMPLEMASK : - case WINED3DRS_PATCHEDGESTYLE : - case WINED3DRS_PATCHSEGMENTS : - case WINED3DRS_DEBUGMONITORTOKEN : - case WINED3DRS_POSITIONDEGREE : - case WINED3DRS_NORMALDEGREE : - case WINED3DRS_MINTESSELLATIONLEVEL : - case WINED3DRS_MAXTESSELLATIONLEVEL : - case WINED3DRS_ADAPTIVETESS_X : - case WINED3DRS_ADAPTIVETESS_Y : - case WINED3DRS_ADAPTIVETESS_Z : - case WINED3DRS_ADAPTIVETESS_W : - case WINED3DRS_ENABLEADAPTIVETESSELLATION: - case WINED3DRS_SRGBWRITEENABLE : - case WINED3DRS_SEPARATEALPHABLENDENABLE : - case WINED3DRS_SRCBLENDALPHA : - case WINED3DRS_DESTBLENDALPHA : - case WINED3DRS_BLENDOPALPHA : - case WINED3DRS_ZVISIBLE : - StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); - break; - - default: - FIXME("(%p)->(%s,%d) unknown state\n", This, debug_d3drenderstate(State), Value); - } - + /* TODO: Mark the state dirty instead of immediate applying */ + StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); LEAVE_GL(); return WINED3D_OK;

1 0

Paul Vriens : shlwapi/tests: Fix typos.
by Alexandre Julliard 15 Dec '06

15 Dec '06

Module: wine Branch: master Commit: bed868c68104a514e44445a2070ab9a21d6bd719 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bed868c68104a514e44445a20… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Dec 14 20:10:26 2006 +0100 shlwapi/tests: Fix typos. --- dlls/shlwapi/tests/path.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index 9746fbc..57fcbff 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -667,13 +667,13 @@ static void test_UrlUnescape(void) for(i=0; i<sizeof(TEST_URL_UNESCAPE)/sizeof(TEST_URL_UNESCAPE[0]); i++) { dwEscaped=INTERNET_MAX_URL_LENGTH; - ok(UrlUnescapeA(TEST_URL_UNESCAPE[i].url, szReturnUrl, &dwEscaped, 0) == S_OK, "UrlEscapeA didn't return 0x%08x from \"%s\"\n", S_OK, TEST_URL_UNESCAPE[i].url); + ok(UrlUnescapeA(TEST_URL_UNESCAPE[i].url, szReturnUrl, &dwEscaped, 0) == S_OK, "UrlUnescapeA didn't return 0x%08x from \"%s\"\n", S_OK, TEST_URL_UNESCAPE[i].url); ok(strcmp(szReturnUrl,TEST_URL_UNESCAPE[i].expect)==0, "Expected \"%s\", but got \"%s\" from \"%s\"\n", TEST_URL_UNESCAPE[i].expect, szReturnUrl, TEST_URL_UNESCAPE[i].url); dwEscaped = INTERNET_MAX_URL_LENGTH; urlW = GetWideString(TEST_URL_UNESCAPE[i].url); expected_urlW = GetWideString(TEST_URL_UNESCAPE[i].expect); - ok(UrlUnescapeW(urlW, ret_urlW, &dwEscaped, 0) == S_OK, "UrlEscapeW didn't return 0x%08x from \"%s\"\n", S_OK, TEST_URL_UNESCAPE[i].url); + ok(UrlUnescapeW(urlW, ret_urlW, &dwEscaped, 0) == S_OK, "UrlUnescapeW didn't return 0x%08x from \"%s\"\n", S_OK, TEST_URL_UNESCAPE[i].url); WideCharToMultiByte(CP_ACP,0,ret_urlW,-1,szReturnUrl,INTERNET_MAX_URL_LENGTH,0,0); ok(lstrcmpW(ret_urlW, expected_urlW)==0, "Expected \"%s\", but got \"%s\" from \"%s\" flags %08lx\n", TEST_URL_UNESCAPE[i].expect, szReturnUrl, TEST_URL_UNESCAPE[i].url, 0L); FreeWideString(urlW);

1 0

Jacek Caban : mshtml: Use pvaIn in exec_print.
by Alexandre Julliard 15 Dec '06

15 Dec '06

Module: wine Branch: master Commit: 902a39f0bdcc8aefc78662ea6a039ed07f0ae4e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=902a39f0bdcc8aefc78662ea6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 14 20:39:21 2006 +0100 mshtml: Use pvaIn in exec_print. --- dlls/mshtml/olecmd.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 49 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 8de5e0d..60518a1 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -222,8 +222,6 @@ static HRESULT exec_print(HTMLDocument * if(pvaOut) FIXME("unsupported pvaOut\n"); - if(pvaIn) - FIXME("unsupported pvaIn\n"); if(!This->nscontainer) return S_OK; @@ -249,6 +247,55 @@ static HRESULT exec_print(HTMLDocument * set_default_templates(settings); + if(pvaIn) { + switch(V_VT(pvaIn)) { + case VT_BYREF|VT_ARRAY: { + VARIANT *opts; + DWORD opts_cnt; + + if(V_ARRAY(pvaIn)->cDims != 1) + WARN("cDims = %d\n", V_ARRAY(pvaIn)->cDims); + + SafeArrayAccessData(V_ARRAY(pvaIn), (void**)&opts); + opts_cnt = V_ARRAY(pvaIn)->rgsabound[0].cElements; + + if(opts_cnt >= 1) { + switch(V_VT(opts)) { + case VT_BSTR: + TRACE("setting footer %s\n", debugstr_w(V_BSTR(opts))); + set_print_template(settings, V_BSTR(opts), TRUE); + break; + case VT_NULL: + break; + default: + WARN("V_VT(opts) = %d\n", V_VT(opts)); + } + } + + if(opts_cnt >= 2) { + switch(V_VT(opts+1)) { + case VT_BSTR: + TRACE("setting footer %s\n", debugstr_w(V_BSTR(opts+1))); + set_print_template(settings, V_BSTR(opts+1), FALSE); + break; + case VT_NULL: + break; + default: + WARN("V_VT(opts) = %d\n", V_VT(opts+1)); + } + } + + if(opts_cnt >= 3) + FIXME("Unsuported opts_cnt %d\n", opts_cnt); + + SafeArrayUnaccessData(V_ARRAY(pvaIn)); + break; + } + default: + FIXME("unsupported vt %x\n", V_VT(pvaIn)); + } + } + nsres = nsIWebBrowserPrint_Print(nsprint, settings, NULL); if(NS_FAILED(nsres)) ERR("Print failed: %08x\n", nsres);

1 0

Vitaliy Margolen : user32: ClipCursor should use virtual screen resolution for empty/invalid rects.
by Alexandre Julliard 14 Dec '06

14 Dec '06

Module: wine Branch: master Commit: 1d9ea46cd45425f87191f4f7895329d261dfc269 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d9ea46cd45425f87191f4f78… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Thu Dec 14 10:33:51 2006 -0700 user32: ClipCursor should use virtual screen resolution for empty/invalid rects. --- dlls/user32/cursoricon.c | 19 +++++++++++-------- dlls/user32/tests/monitor.c | 27 +++++++++++++++++++++++++++ dlls/winex11.drv/winpos.c | 1 + 3 files changed, 39 insertions(+), 8 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index f4d861b..7be797e 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1558,8 +1558,16 @@ HCURSOR WINAPI GetCursor(void) */ BOOL WINAPI ClipCursor( const RECT *rect ) { - if (!rect) SetRectEmpty( &CURSOR_ClipRect ); - else CopyRect( &CURSOR_ClipRect, rect ); + RECT virt; + + SetRect( &virt, 0, 0, GetSystemMetrics( SM_CXVIRTUALSCREEN ), + GetSystemMetrics( SM_CYVIRTUALSCREEN ) ); + OffsetRect( &virt, GetSystemMetrics( SM_XVIRTUALSCREEN ), + GetSystemMetrics( SM_YVIRTUALSCREEN ) ); + + if (!IntersectRect( &CURSOR_ClipRect, &virt, rect )) + CURSOR_ClipRect = virt; + return TRUE; } @@ -1569,12 +1577,7 @@ BOOL WINAPI ClipCursor( const RECT *rect */ BOOL WINAPI GetClipCursor( RECT *rect ) { - if (rect) - { - CopyRect( rect, &CURSOR_ClipRect ); - return TRUE; - } - return FALSE; + return CopyRect( rect, &CURSOR_ClipRect ); } diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 153a353..de91f44 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -141,6 +141,33 @@ static void test_ChangeDisplaySettingsEx dm.dmFields = vid_modes_test[i].fields; res = ChangeDisplaySettingsEx(NULL, &dm, NULL, CDS_FULLSCREEN, NULL); ok(res == vid_modes_test[i].res, "Failed to change resolution[%d]: %d\n", i, res); + + if (res == DISP_CHANGE_SUCCESSFUL) + { + RECT r, r1, virt; + + SetRect(&virt, 0, 0, GetSystemMetrics(SM_CXVIRTUALSCREEN), GetSystemMetrics(SM_CYVIRTUALSCREEN)); + OffsetRect(&virt, GetSystemMetrics(SM_XVIRTUALSCREEN), GetSystemMetrics(SM_YVIRTUALSCREEN)); + + /* Resolution change resets clip rect */ + ok(GetClipCursor(&r), "GetClipCursor() failed\n"); + ok(EqualRect(&r, &virt), "Invalid clip rect: (%d %d) x (%d %d)\n", r.left, r.top, r.right, r.bottom); + + ok(ClipCursor(NULL), "ClipCursor() failed\n"); + ok(GetClipCursor(&r), "GetClipCursor() failed\n"); + ok(EqualRect(&r, &virt), "Invalid clip rect: (%d %d) x (%d %d)\n", r.left, r.top, r.right, r.bottom); + + /* This should always work. Primary monitor is at (0,0) */ + SetRect(&r1, 10, 10, 20, 20); + ok(ClipCursor(&r1), "ClipCursor() failed\n"); + ok(GetClipCursor(&r), "GetClipCursor() failed\n"); + ok(EqualRect(&r, &r1), "Invalid clip rect: (%d %d) x (%d %d)\n", r.left, r.top, r.right, r.bottom); + + SetRect(&r1, virt.left - 10, virt.top - 10, virt.right + 20, virt.bottom + 20); + ok(ClipCursor(&r1), "ClipCursor() failed\n"); + ok(GetClipCursor(&r), "GetClipCursor() failed\n"); + ok(EqualRect(&r, &virt), "Invalid clip rect: (%d %d) x (%d %d)\n", r.left, r.top, r.right, r.bottom); + } } res = ChangeDisplaySettingsEx(NULL, NULL, NULL, CDS_RESET, NULL); ok(res == DISP_CHANGE_SUCCESSFUL, "Failed to reset default resolution: %d\n", res); diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index 5a88a74..6d04769 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -843,6 +843,7 @@ void X11DRV_handle_desktop_resize( unsig X11DRV_SetWindowPos( hwnd, 0, &virtual_screen_rect, &virtual_screen_rect, SWP_NOZORDER|SWP_NOMOVE, NULL ); data->lock_changes--; + ClipCursor(NULL); SendMessageTimeoutW( HWND_BROADCAST, WM_DISPLAYCHANGE, screen_depth, MAKELPARAM( width, height ), SMTO_ABORTIFHUNG, 2000, NULL );

1 0

Ulrich Czekalla : Add ddrawex dll.
by Alexandre Julliard 14 Dec '06

14 Dec '06

Module: wine Branch: master Commit: fe70c54ac0e1984b0e4a3272da95aaa2e2efca56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe70c54ac0e1984b0e4a3272d… Author: Ulrich Czekalla <ulrich.czekalla(a)utoronto.ca> Date: Thu Dec 14 10:39:42 2006 -0500 Add ddrawex dll. --- Makefile.in | 2 + configure | 3 +- configure.ac | 1 + dlls/Makefile.in | 1 + dlls/ddrawex/Makefile.in | 14 ++ dlls/ddrawex/ddrawex.spec | 4 + dlls/ddrawex/ddrawex_private.h | 66 ++++++++ dlls/ddrawex/main.c | 359 ++++++++++++++++++++++++++++++++++++++++ 8 files changed, 449 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fe70c54ac0e1984b0e4a3…

1 0

Ulrich Czekalla : ddraw: Add IDirectDraw3 interface.
by Alexandre Julliard 14 Dec '06

14 Dec '06

Module: wine Branch: master Commit: 398886799e32405c578dadc678620aeecf63a293 URL: http://source.winehq.org/git/wine.git/?a=commit;h=398886799e32405c578dadc67… Author: Ulrich Czekalla <ulrich.czekalla(a)utoronto.ca> Date: Wed Dec 13 20:14:35 2006 -0500 ddraw: Add IDirectDraw3 interface. --- dlls/ddraw/ddraw.c | 5 + dlls/ddraw/ddraw_private.h | 2 + dlls/ddraw/ddraw_thunks.c | 370 ++++++++++++++++++++++++++++++++++++++++++++ include/ddraw.h | 103 ++++++++++++ 4 files changed, 480 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=398886799e32405c578da…

1 0

Günther Brammer : ddraw: Fix IDirectDrawSurfaceImpl_SetColorKey to also change surface_desc.
by Alexandre Julliard 14 Dec '06

14 Dec '06

Module: wine Branch: master Commit: 3c5b9557b548a122a7375cf199b4a9b242506115 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c5b9557b548a122a7375cf19… Author: Günther Brammer <GBrammer(a)gmx.de> Date: Sat Dec 9 23:13:14 2006 +0100 ddraw: Fix IDirectDrawSurfaceImpl_SetColorKey to also change surface_desc. --- dlls/ddraw/surface.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 52 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index cab163b..03ea974 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -2037,6 +2037,58 @@ IDirectDrawSurfaceImpl_SetColorKey(IDire HRESULT hr; TRACE("(%p)->(%x,%p)\n", This, Flags, CKey); + if (CKey) + { + switch (Flags & ~DDCKEY_COLORSPACE) + { + case DDCKEY_DESTBLT: + This->surface_desc.ddckCKDestBlt = *CKey; + This->surface_desc.dwFlags |= DDSD_CKDESTBLT; + break; + + case DDCKEY_DESTOVERLAY: + This->surface_desc.u3.ddckCKDestOverlay = *CKey; + This->surface_desc.dwFlags |= DDSD_CKDESTOVERLAY; + break; + + case DDCKEY_SRCOVERLAY: + This->surface_desc.ddckCKSrcOverlay = *CKey; + This->surface_desc.dwFlags |= DDSD_CKSRCOVERLAY; + break; + + case DDCKEY_SRCBLT: + This->surface_desc.ddckCKSrcBlt = *CKey; + This->surface_desc.dwFlags |= DDSD_CKSRCBLT; + break; + + default: + return DDERR_INVALIDPARAMS; + } + } + else + { + switch (Flags & ~DDCKEY_COLORSPACE) + { + case DDCKEY_DESTBLT: + This->surface_desc.dwFlags &= ~DDSD_CKDESTBLT; + break; + + case DDCKEY_DESTOVERLAY: + This->surface_desc.dwFlags &= ~DDSD_CKDESTOVERLAY; + break; + + case DDCKEY_SRCOVERLAY: + This->surface_desc.dwFlags &= ~DDSD_CKSRCOVERLAY; + break; + + case DDCKEY_SRCBLT: + This->surface_desc.dwFlags &= ~DDSD_CKSRCBLT; + break; + + default: + return DDERR_INVALIDPARAMS; + } + } for(surf = This->first_complex; surf; surf = surf->next_complex) { hr = IWineD3DSurface_SetColorKey(surf->WineD3DSurface,

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 14 Dec '06

14 Dec '06

Module: wine Branch: master Commit: 367f91fb5c36ebbbd66d01c26c55f0c360ac7186 URL: http://source.winehq.org/git/wine.git/?a=commit;h=367f91fb5c36ebbbd66d01c26… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Dec 14 17:59:46 2006 +0100 Assorted spelling fixes. --- dlls/cabinet/fci.c | 8 ++++---- dlls/kernel32/tests/heap.c | 4 ++-- dlls/usp10/usp10.c | 2 +- dlls/wined3d/directx.c | 11 +++++++---- dlls/winedos/int15.c | 2 +- dlls/winspool.drv/tests/info.c | 10 +++++----- programs/wineconsole/wineconsole.c | 2 +- programs/winedbg/break.c | 2 +- 8 files changed, 22 insertions(+), 19 deletions(-) diff --git a/dlls/cabinet/fci.c b/dlls/cabinet/fci.c index a43c681..76ead07 100644 --- a/dlls/cabinet/fci.c +++ b/dlls/cabinet/fci.c @@ -1343,7 +1343,7 @@ static BOOL fci_flush_folder( return FALSE; } - /* Skip a few lines of code. This is catched by the next if. */ + /* Skip a few lines of code. This is caught by the next if. */ p_fci_internal->fGetNextCabInVain=TRUE; } @@ -2251,7 +2251,7 @@ static BOOL fci_flush_cabinet( fci_set_error( FCIERR_NONE, ERROR_FUNCTION_FAILED, TRUE ); return FALSE; } - /* Skip a few lines of code. This is catched by the next if. */ + /* Skip a few lines of code. This is caught by the next if. */ p_fci_internal->fGetNextCabInVain=TRUE; } @@ -2480,7 +2480,7 @@ BOOL __cdecl FCIAddFile( fci_set_error( FCIERR_NONE, ERROR_FUNCTION_FAILED, TRUE ); return FALSE; } - /* Skip a few lines of code. This is catched by the next if. */ + /* Skip a few lines of code. This is caught by the next if. */ p_fci_internal->fGetNextCabInVain=TRUE; } @@ -2647,7 +2647,7 @@ BOOL __cdecl FCIAddFile( fci_set_error( FCIERR_NONE, ERROR_FUNCTION_FAILED, TRUE ); return FALSE; } - /* Skip a few lines of code. This is catched by the next if. */ + /* Skip a few lines of code. This is caught by the next if. */ p_fci_internal->fGetNextCabInVain=TRUE; } diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 4a7326d..d2e8608 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -132,7 +132,7 @@ START_TEST(heap) "MAGIC_DEAD)\n", res, GetLastError()); GlobalFree(gbl); - /* invalid handles are catched in windows: */ + /* invalid handles are caught in windows: */ SetLastError(MAGIC_DEAD); hsecond = GlobalFree(gbl); /* invalid handle: free memory twice */ ok( (hsecond == gbl) && (GetLastError() == ERROR_INVALID_HANDLE), @@ -237,7 +237,7 @@ START_TEST(heap) "MAGIC_DEAD)\n", res, GetLastError()); LocalFree(gbl); - /* invalid handles are catched in windows: */ + /* invalid handles are caught in windows: */ SetLastError(MAGIC_DEAD); hsecond = LocalFree(gbl); /* invalid handle: free memory twice */ ok( (hsecond == gbl) && (GetLastError() == ERROR_INVALID_HANDLE), diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 5f88138..7472218 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -591,7 +591,7 @@ HRESULT WINAPI ScriptXtoCP(int iX, if (iPosX - iX > fAvePosX/2) *piTrailing = 0; else - *piTrailing = 1; /* yep we are over half way */ + *piTrailing = 1; /* yep we are over halfway */ *piCP = item -1; /* Return character position */ TRACE("*piCP=%d iPposX=%d\n", *piCP, iPosX); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b099c2d..6e97cc3 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2267,10 +2267,13 @@ static HRESULT WINAPI IWineD3DImpl_GetDe *pCaps->NumberOfAdaptersInGroup = 1; if(*pCaps->VertexShaderVersion >= WINED3DVS_VERSION(2,0)) { - /* OpenGL supports all formats below, perhaps not always without conversion but it supports them. - Further GLSL doesn't seem to have an official unsigned type as I'm not sure how we handle it - don't advertise it yet. We might need to add some clamping in the shader engine to support it. - TODO: D3DDTCAPS_USHORT2N, D3DDTCAPS_USHORT4N, D3DDTCAPS_UDEC3, D3DDTCAPS_DEC3N */ + /* OpenGL supports all the formats below, perhaps not always + * without conversion, but it supports them. + * Further GLSL doesn't seem to have an official unsigned type so + * don't advertise it yet as I'm not sure how we handle it. + * We might need to add some clamping in the shader engine to + * support it. + * TODO: D3DDTCAPS_USHORT2N, D3DDTCAPS_USHORT4N, D3DDTCAPS_UDEC3, D3DDTCAPS_DEC3N */ *pCaps->DeclTypes = D3DDTCAPS_UBYTE4 | D3DDTCAPS_UBYTE4N | D3DDTCAPS_SHORT2N | diff --git a/dlls/winedos/int15.c b/dlls/winedos/int15.c index 1afbe68..24c9121 100644 --- a/dlls/winedos/int15.c +++ b/dlls/winedos/int15.c @@ -151,7 +151,7 @@ void WINAPI DOSVM_Int15Handler( CONTEXT8 FIXME("INT15: 0xc3\n"); SET_AH( context , 0x86 ); break; - case 0xc4: /* BIOS POS Programm option select */ + case 0xc4: /* BIOS POS Program option select */ FIXME("INT15: option 0xc4 not handled!\n"); break; diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 04b1968..433314b 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -1069,7 +1069,7 @@ static void test_GetPrinterDriverDirecto "'len > 0' or '0' with ERROR_INVALID_ENVIRONMENT)\n", res, GetLastError(), lstrlenA((char *)buffer)); - /* A Setup-Programm (PDFCreator_0.8.0) use empty strings */ + /* A setup program (PDFCreator_0.8.0) use empty strings */ SetLastError(MAGIC_DEAD); res = GetPrinterDriverDirectoryA(empty, empty, 1, buffer, cbBuf*2, &pcbNeeded); ok(res, "returned %d with %d (expected '!=0')\n", res, GetLastError() ); @@ -1097,7 +1097,7 @@ static void test_GetPrintProcessorDirect SetLastError(0xdeadbeef); res = GetPrintProcessorDirectoryA(NULL, NULL, 1, NULL, 0, &cbBuf); - /* The deactivated Spooler is catched here on NT3.51 */ + /* The deactivated Spooler is caught here on NT3.51 */ RETURN_ON_DEACTIVATED_SPOOLER(res) ok( !res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), "returned %d with %d (expected '0' with ERROR_INSUFFICIENT_BUFFER)\n", @@ -1125,7 +1125,7 @@ static void test_GetPrintProcessorDirect res, GetLastError()); #if 0 - /* XPsp2: the programm will crash here, when the spooler is not running */ + /* XPsp2: the program will crash here, when the spooler is not running */ /* GetPrinterDriverDirectory has the same bug */ pcbNeeded = 0; SetLastError(0xdeadbeef); @@ -1226,7 +1226,7 @@ static void test_OpenPrinter(void) SetLastError(MAGIC_DEAD); res = OpenPrinter(NULL, NULL, NULL); - /* The deactivated Spooler is catched here on NT3.51 */ + /* The deactivated Spooler is caught here on NT3.51 */ RETURN_ON_DEACTIVATED_SPOOLER(res) ok(!res && (GetLastError() == ERROR_INVALID_PARAMETER), "returned %d with %d (expected '0' with ERROR_INVALID_PARAMETER)\n", @@ -1237,7 +1237,7 @@ static void test_OpenPrinter(void) hprinter = (HANDLE) MAGIC_DEAD; SetLastError(MAGIC_DEAD); res = OpenPrinter(NULL, &hprinter, NULL); - /* The deactivated Spooler is catched here on XPsp2 */ + /* The deactivated Spooler is caught here on XPsp2 */ RETURN_ON_DEACTIVATED_SPOOLER(res) ok(res || (!res && GetLastError() == ERROR_INVALID_PARAMETER), "returned %d with %d (expected '!=0' or '0' with ERROR_INVALID_PARAMETER)\n", diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 59a32db..91cc581 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -728,7 +728,7 @@ static BOOL WINECON_Spawn(struct inner_d &startup.hStdError, GENERIC_READ|GENERIC_WRITE, TRUE, 0)) { WINE_ERR("Can't dup handles\n"); - /* no need to delete handles, we're exiting the programm anyway */ + /* no need to delete handles, we're exiting the program anyway */ return FALSE; } diff --git a/programs/winedbg/break.c b/programs/winedbg/break.c index c99454c..0ff55e7 100644 --- a/programs/winedbg/break.c +++ b/programs/winedbg/break.c @@ -779,7 +779,7 @@ BOOL break_should_continue(ADDRESS64* ad /*********************************************************************** * break_ajust_pc * - * Adjust PC to the address where the trap (if any) actually occured + * Adjust PC to the address where the trap (if any) actually occurred * Also sets dbg_curr_thread->stopped_xpoint */ void break_adjust_pc(ADDRESS64* addr, DWORD code, BOOL* is_break)

1 0

Francois Gouget : comdlg32: Fix PrintDlg(NULL) and reenable a test that was in an '#if 0'.
by Alexandre Julliard 14 Dec '06

14 Dec '06

Module: wine Branch: master Commit: 2c531ade2e106799d382bda6e8c57531170b879b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c531ade2e106799d382bda6e… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Dec 14 18:13:01 2006 +0100 comdlg32: Fix PrintDlg(NULL) and reenable a test that was in an '#if 0'. Fix the test so it compiles without warnings. --- dlls/comdlg32/printdlg.c | 26 +++++++++++++++++++------- dlls/comdlg32/tests/printdlg.c | 5 +---- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 6b6a725..85ffe00 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -1994,9 +1994,16 @@ static BOOL PRINTDLG_CreateDCW(LPPRINTDL BOOL WINAPI PrintDlgA(LPPRINTDLGA lppd) { BOOL bRet = FALSE; - LPVOID ptr; - HINSTANCE hInst = (HINSTANCE)GetWindowLongPtrA( lppd->hwndOwner, GWLP_HINSTANCE ); + LPVOID ptr; + HINSTANCE hInst; + if (!lppd) + { + COMDLG32_SetCommDlgExtendedError(CDERR_INITIALIZATION); + return FALSE; + } + + hInst = (HINSTANCE)GetWindowLongPtrA( lppd->hwndOwner, GWLP_HINSTANCE ); if(TRACE_ON(commdlg)) { char flagstr[1000] = ""; const struct pd_flags *pflag = pd_flags; @@ -2131,14 +2138,19 @@ BOOL WINAPI PrintDlgA(LPPRINTDLGA lppd) * * See PrintDlgA. */ -BOOL WINAPI PrintDlgW( - LPPRINTDLGW lppd /* [in/out] ptr to PRINTDLG32 struct */ - ) +BOOL WINAPI PrintDlgW(LPPRINTDLGW lppd) { BOOL bRet = FALSE; - LPVOID ptr; - HINSTANCE hInst = (HINSTANCE)GetWindowLongPtrW( lppd->hwndOwner, GWLP_HINSTANCE ); + LPVOID ptr; + HINSTANCE hInst; + + if (!lppd) + { + COMDLG32_SetCommDlgExtendedError(CDERR_INITIALIZATION); + return FALSE; + } + hInst = (HINSTANCE)GetWindowLongPtrW( lppd->hwndOwner, GWLP_HINSTANCE ); if(TRACE_ON(commdlg)) { char flagstr[1000] = ""; const struct pd_flags *pflag = pd_flags; diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index bd3ddf1..0ef12d7 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -46,15 +46,12 @@ static void test_PrintDlgA(void) if (!pDlg) return; -#if 0 /* will crash with unpatched wine */ SetLastError(0xdeadbeef); res = PrintDlgA(NULL); ok( !res && (CommDlgExtendedError() == CDERR_INITIALIZATION), - "returned %ld with 0x%lx and 0x%lx (expected '0' and " \ + "returned %d with 0x%x and 0x%x (expected '0' and " \ "CDERR_INITIALIZATION)\n", res, GetLastError(), CommDlgExtendedError()); - } -#endif ZeroMemory(pDlg, sizeof(PRINTDLGA)); pDlg->lStructSize = sizeof(PRINTDLGA) - 1;

1 0

Francois Gouget : ole32/tests: Replace some '#if 0's with 'if (0)'s.
by Alexandre Julliard 14 Dec '06

14 Dec '06

Module: wine Branch: master Commit: 458ebf423de794ba69e16b4608a8320af08e8018 URL: http://source.winehq.org/git/wine.git/?a=commit;h=458ebf423de794ba69e16b460… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Dec 14 18:11:28 2006 +0100 ole32/tests: Replace some '#if 0's with 'if (0)'s. Fix the code so it compiles. --- dlls/ole32/tests/marshal.c | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index e99983a..fc733ff 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -1456,9 +1456,11 @@ static void test_proxybuffer(REFIID riid ok(refs == 1, "Ref count of outer unknown should have been 1 instead of %d\n", refs); refs = IPSFactoryBuffer_Release(psfb); -#if 0 /* not reliable on native. maybe it leaks references! */ - ok(refs == 0, "Ref-count leak of %ld on IPSFactoryBuffer\n", refs); -#endif + if (0) + { + /* not reliable on native. maybe it leaks references! */ + ok(refs == 0, "Ref-count leak of %d on IPSFactoryBuffer\n", refs); + } refs = IUnknown_Release((IUnknown *)lpvtbl); ok(refs == 0, "Ref-count leak of %d on IRpcProxyBuffer\n", refs); @@ -1487,9 +1489,11 @@ static void test_stubbuffer(REFIID riid) ok_ole_success(hr, IPSFactoryBuffer_CreateStub); refs = IPSFactoryBuffer_Release(psfb); -#if 0 /* not reliable on native. maybe it leaks references */ - ok(refs == 0, "Ref-count leak of %ld on IPSFactoryBuffer\n", refs); -#endif + if (0) + { + /* not reliable on native. maybe it leaks references */ + ok(refs == 0, "Ref-count leak of %d on IPSFactoryBuffer\n", refs); + } ok_more_than_one_lock(); @@ -1732,11 +1736,12 @@ static void test_freethreadedmarshaler(v /* native doesn't allow us to unmarshal or release the stream data, * presumably because it wants us to call CoMarshalInterface instead */ -#if 0 + if (0) + { /* local normal marshaling */ IStream_Seek(pStream, llZero, STREAM_SEEK_SET, NULL); - hr = IMarshal_MarshalInterface(pFTMarshal, pStream, IID_IClassFactory, (IUnknown*)&Test_ClassFactory, MSHCTX_LOCAL, NULL, MSHLFLAGS_NORMAL); + hr = IMarshal_MarshalInterface(pFTMarshal, pStream, &IID_IClassFactory, (IUnknown*)&Test_ClassFactory, MSHCTX_LOCAL, NULL, MSHLFLAGS_NORMAL); ok_ole_success(hr, IMarshal_MarshalInterface); ok_more_than_one_lock(); @@ -1748,7 +1753,7 @@ static void test_freethreadedmarshaler(v ok_ole_success(hr, IMarshal_ReleaseMarshalData); ok_no_locks(); -#endif + } /* inproc table-strong marshaling */

1 0