December 2005 - Wine-Commits

Mike McCormack : winecfg: Update Korean translation.
by Alexandre Julliard Dec. 14, 2005

Dec. 14, 2005

Module: wine Branch: refs/heads/master Commit: 12b35c2dd809903d76d1738d1b95f2945db3231a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=12b35c2dd809903d76d1738… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Dec 14 10:51:10 2005 +0100 winecfg: Update Korean translation. --- programs/winecfg/Ko.rc | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/programs/winecfg/Ko.rc b/programs/winecfg/Ko.rc index bc9c355..56e0422 100644 --- a/programs/winecfg/Ko.rc +++ b/programs/winecfg/Ko.rc @@ -156,16 +156,14 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "�� ̹�: ",IDC_STATIC,10,20,60,8 COMBOBOX IDC_AUDIO_DRIVER,70,18,85,85,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "�ڵ��˻�",IDC_AUDIO_AUTODETECT,170,20,49,14 - PUSHBUTTON "��",IDC_AUDIO_CONFIGURE,170,40,49,14 - PUSHBUTTON "��",IDC_AUDIO_CONTROL_PANEL,170,60,49,14 - - GROUPBOX " DirectSound ",IDC_STATIC,8,75,244,120 - - LTEXT "�ϵ�� : ",IDC_STATIC,15,85,90,10 - COMBOBOX IDC_DSOUND_HW_ACCEL,100,83,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "��̹� �ֹ�",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,100,230,10 - + PUSHBUTTON "�ڵ��˻�",IDC_AUDIO_AUTODETECT,170,20,59,14 + PUSHBUTTON "��",IDC_AUDIO_CONFIGURE,170,40,59,14 + PUSHBUTTON "��",IDC_AUDIO_CONTROL_PANEL,170,60,59,14 + CONTROL "��ġ",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,10,40,150,160 + GROUPBOX "DirectSound ",IDC_STATIC,8,205,244,120 + LTEXT "�ϵ�� : ",IDC_STATIC,15,215,90,10 + COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "��̹� �ֹ�",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10 END IDD_APPEARANCE DIALOG DISCARDABLE 0, 0, 260, 250

1 0

H. Verbeet : wined3d: Return the correct vertex declaration.
by Alexandre Julliard Dec. 14, 2005

Dec. 14, 2005

Module: wine Branch: refs/heads/master Commit: dabcbe83e79eae3950385adffbc1108b1d19b57d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dabcbe83e79eae3950385ad… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Dec 14 10:50:27 2005 +0100 wined3d: Return the correct vertex declaration. In IWineD3DDeviceImpl_GetVertexDeclaration, return the vertex declaration in This->stateblock instead of the one in This->updateStateBlock. --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a9c253f..bb9247b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3754,7 +3754,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_GetVer TRACE("(%p) : ppDecl=%p\n", This, ppDecl); - *ppDecl = This->updateStateBlock->vertexDecl; + *ppDecl = This->stateBlock->vertexDecl; if (NULL != *ppDecl) IWineD3DVertexDeclaration_AddRef(*ppDecl); return D3D_OK; }

1 0

Paul Vriens : d3d9: Don't treat missing d3d9.dll as a failure.
by Alexandre Julliard Dec. 14, 2005

Dec. 14, 2005

Module: wine Branch: refs/heads/master Commit: 9a1bc10f5d7d8417110a354e2feadf5ef9da1023 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9a1bc10f5d7d8417110a354… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Wed Dec 14 10:50:52 2005 +0100 d3d9: Don't treat missing d3d9.dll as a failure. --- dlls/d3d9/tests/shader.c | 18 ++++++++++++------ dlls/d3d9/tests/stateblock.c | 18 ++++++++++++------ 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/dlls/d3d9/tests/shader.c b/dlls/d3d9/tests/shader.c index 8622e6e..6da5164 100644 --- a/dlls/d3d9/tests/shader.c +++ b/dlls/d3d9/tests/shader.c @@ -20,19 +20,16 @@ #include <d3d9.h> #include "wine/test.h" +static HMODULE d3d9_handle = 0; + static IDirect3DDevice9 *init_d3d9(void) { IDirect3D9 * (__stdcall * d3d9_create)(UINT SDKVersion) = 0; - HMODULE d3d9_handle = 0; IDirect3D9 *d3d9_ptr = 0; IDirect3DDevice9 *device_ptr = 0; D3DPRESENT_PARAMETERS present_parameters; HRESULT hres; - d3d9_handle = LoadLibrary("d3d9"); - ok(d3d9_handle != NULL, "Failed to load d3d9.\n"); - if (!d3d9_handle) return NULL; - d3d9_create = (void *)GetProcAddress(d3d9_handle, "Direct3DCreate9"); ok(d3d9_create != NULL, "Failed to get address of Direct3DCreate9\n"); if (!d3d9_create) return NULL; @@ -136,7 +133,16 @@ static void test_get_set_pixel_shader(ID START_TEST(shader) { D3DCAPS9 caps; - IDirect3DDevice9 *device_ptr = init_d3d9(); + IDirect3DDevice9 *device_ptr; + + d3d9_handle = LoadLibraryA("d3d9.dll"); + if (!d3d9_handle) + { + trace("Could not load d3d9.dll, skipping tests\n"); + return; + } + + device_ptr = init_d3d9(); if (!device_ptr) return; IDirect3DDevice9_GetDeviceCaps(device_ptr, &caps); diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index dcb49b8..61b5be5 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -19,19 +19,16 @@ #include <d3d9.h> #include "wine/test.h" +static HMODULE d3d9_handle = 0; + static IDirect3DDevice9 *init_d3d9(void) { IDirect3D9 * (__stdcall * d3d9_create)(UINT SDKVersion) = 0; - HMODULE d3d9_handle = 0; IDirect3D9 *d3d9_ptr = 0; IDirect3DDevice9 *device_ptr = 0; D3DPRESENT_PARAMETERS present_parameters; HRESULT hres; - d3d9_handle = LoadLibrary("d3d9"); - ok(d3d9_handle != NULL, "Failed to load d3d9.\n"); - if (!d3d9_handle) return NULL; - d3d9_create = (void *)GetProcAddress(d3d9_handle, "Direct3DCreate9"); ok(d3d9_create != NULL, "Failed to get address of Direct3DCreate9\n"); if (!d3d9_create) return NULL; @@ -83,6 +80,15 @@ static void test_begin_end_state_block(I START_TEST(stateblock) { - IDirect3DDevice9 *device_ptr = init_d3d9(); + IDirect3DDevice9 *device_ptr; + + d3d9_handle = LoadLibraryA("d3d9.dll"); + if (!d3d9_handle) + { + trace("Could not load d3d9.dll, skipping tests\n"); + return; + } + + device_ptr = init_d3d9(); test_begin_end_state_block(device_ptr); }

1 0

Ulrich Czekalla : riched20: Reset selection when text is reset.
by Alexandre Julliard Dec. 14, 2005

Dec. 14, 2005

Module: wine Branch: refs/heads/master Commit: 0f55ef3befa563fd578f7c16dbc65602defd0e1d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0f55ef3befa563fd578f7c1… Author: Ulrich Czekalla <ulrich.czekalla(a)utoronto.ca> Date: Wed Dec 14 10:50:04 2005 +0100 riched20: Reset selection when text is reset. --- dlls/riched20/editor.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 1383bcf..7723865 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1471,6 +1471,7 @@ LRESULT WINAPI RichEditANSIWndProc(HWND TRACE("WM_SETTEXT - NULL\n"); ME_CommitUndo(editor); ME_EmptyUndoStack(editor); + ME_SetSelection(editor, 0, 0); ME_UpdateRepaint(editor); return 0; }

1 0

Aric Stewart : user: GetClipboardFormatNameA fix.
by Alexandre Julliard Dec. 14, 2005

Dec. 14, 2005

Module: wine Branch: refs/heads/master Commit: c50fbab47f99a5787e29892fce6686c5eb92939c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c50fbab47f99a5787e29892… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Dec 14 10:49:54 2005 +0100 user: GetClipboardFormatNameA fix. In the W->A translation make sure we have characters to translate before doing the WideCharToMultiByte with -1. --- dlls/user/clipboard.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user/clipboard.c b/dlls/user/clipboard.c index 5a51f01..2e54f76 100644 --- a/dlls/user/clipboard.c +++ b/dlls/user/clipboard.c @@ -271,7 +271,7 @@ INT WINAPI GetClipboardFormatNameA(UINT ret = GetClipboardFormatNameW( wFormat, p, maxlen ); - if (maxlen > 0 && !WideCharToMultiByte( CP_ACP, 0, p, -1, retStr, maxlen, 0, 0)) + if (ret && maxlen > 0 && !WideCharToMultiByte( CP_ACP, 0, p, -1, retStr, maxlen, 0, 0)) retStr[maxlen-1] = 0; HeapFree( GetProcessHeap(), 0, p ); return ret;

1 0

Saulius Krasuckas : mscms: Move repetitive code to helper macros.
by Alexandre Julliard Dec. 13, 2005

Dec. 13, 2005

Module: wine Branch: refs/heads/master Commit: 2302d2b470d91b408ec51be5feeef44773060825 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2302d2b470d91b408ec51be… Author: Saulius Krasuckas <saulius2(a)ar.fi.lt> Date: Tue Dec 13 18:12:34 2005 +0100 mscms: Move repetitive code to helper macros. --- dlls/mscms/tests/profile.c | 106 +++++++++++++++++--------------------------- 1 files changed, 42 insertions(+), 64 deletions(-) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index 5b0d86f..223dbc1 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -439,46 +439,35 @@ static void test_GetCountColorProfileEle } } +#define fail_GSCSPA(pMachName, dwProfID, pProfName, pdwSz, dwSz, GLE_OK) \ +do { \ + size = dwSz; \ + SetLastError(0); \ + ret = pGetStandardColorSpaceProfileA(pMachName, dwProfID, pProfName, pdwSz);\ + GLE = GetLastError(); \ + ok( !ret && GLE_OK, \ + "GetStandardColorSpaceProfileA() returns %d (GLE=%ld)\n", ret, GLE ); \ +} while (0) + static void test_GetStandardColorSpaceProfileA(void) { BOOL ret; - DWORD size, GLE; + DWORD size, sizeP, GLE; CHAR oldprofile[MAX_PATH]; CHAR newprofile[MAX_PATH]; + sizeP = sizeof(newprofile); + /* Parameter checks */ - SetLastError(0); - ret = pGetStandardColorSpaceProfileA( NULL, 0, newprofile, NULL ); - GLE = GetLastError(); - todo_wine - ok( !ret && GLE == ERROR_INVALID_PARAMETER, - "GetStandardColorSpaceProfileA() returns %d (GLE=%ld)\n", ret, GLE ); - - SetLastError(0); - ret = pGetStandardColorSpaceProfileA( machine, 0, newprofile, &size ); - GLE = GetLastError(); - todo_wine - ok( !ret && (GLE == ERROR_INVALID_PARAMETER || GLE == ERROR_NOT_SUPPORTED), - "GetStandardColorSpaceProfileA() returns %d (GLE=%ld)\n", ret, GLE ); - - size = 0; - - SetLastError(0); - ret = pGetStandardColorSpaceProfileA( NULL, 0, NULL, &size ); - GLE = GetLastError(); - todo_wine - ok( !ret && (GLE == ERROR_INSUFFICIENT_BUFFER || GLE == ERROR_FILE_NOT_FOUND), - "GetStandardColorSpaceProfileA() returns %d (GLE=%ld)\n", ret, GLE ); - - size = sizeof(newprofile); - - SetLastError(0); - ret = pGetStandardColorSpaceProfileA( NULL, 0, newprofile, &size ); - GLE = GetLastError(); - todo_wine - ok( !ret && GLE == ERROR_FILE_NOT_FOUND, - "GetStandardColorSpaceProfileA() returns %d (GLE=%ld)\n", ret, GLE ); + todo_wine + fail_GSCSPA(machine, 0, newprofile, &size, 0, (GLE == ERROR_INVALID_PARAMETER || GLE == ERROR_NOT_SUPPORTED)); + todo_wine + fail_GSCSPA(NULL, 0, newprofile, NULL, 0, (GLE == ERROR_INVALID_PARAMETER)); + todo_wine + fail_GSCSPA(NULL, 0, NULL, &size, 0, (GLE == ERROR_INSUFFICIENT_BUFFER || GLE == ERROR_FILE_NOT_FOUND)); + todo_wine + fail_GSCSPA(NULL, 0, newprofile, &size, sizeP, (GLE == ERROR_FILE_NOT_FOUND)); /* Functional checks */ @@ -504,46 +493,35 @@ static void test_GetStandardColorSpacePr } } +#define fail_GSCSPW(pMachName, dwProfID, pProfName, pdwSz, dwSz, GLE_OK) \ +do { \ + size = dwSz; \ + SetLastError(0); \ + ret = pGetStandardColorSpaceProfileW(pMachName, dwProfID, pProfName, pdwSz);\ + GLE = GetLastError(); \ + ok( !ret && GLE_OK, \ + "GetStandardColorSpaceProfileW() returns %d (GLE=%ld)\n", ret, GLE ); \ +} while (0) + static void test_GetStandardColorSpaceProfileW(void) { BOOL ret; - DWORD size, GLE; + DWORD size, sizeP, GLE; WCHAR oldprofile[MAX_PATH]; WCHAR newprofile[MAX_PATH]; + sizeP = sizeof(newprofile); + /* Parameter checks */ - SetLastError(0); - ret = pGetStandardColorSpaceProfileW( NULL, 0, newprofile, NULL ); - GLE = GetLastError(); - todo_wine - ok( !ret && GLE == ERROR_INVALID_PARAMETER, - "GetStandardColorSpaceProfileW() returns %d (GLE=%ld)\n", ret, GLE ); - - SetLastError(0); - ret = pGetStandardColorSpaceProfileW( machineW, 0, newprofile, &size ); - GLE = GetLastError(); - todo_wine - ok( !ret && GLE == ERROR_INVALID_PARAMETER, - "GetStandardColorSpaceProfileW() returns %d (GLE=%ld)\n", ret, GLE ); - - size = 0; - - SetLastError(0); - ret = pGetStandardColorSpaceProfileW( NULL, 0, NULL, &size ); - GLE = GetLastError(); - todo_wine - ok( !ret && (GLE == ERROR_INSUFFICIENT_BUFFER || GLE == ERROR_FILE_NOT_FOUND), - "GetStandardColorSpaceProfileW() returns %d (GLE=%ld)\n", ret, GLE ); - - size = sizeof(newprofile); - - SetLastError(0); - ret = pGetStandardColorSpaceProfileW( NULL, 0, newprofile, &size ); - GLE = GetLastError(); - todo_wine - ok( !ret && GLE == ERROR_FILE_NOT_FOUND, - "GetStandardColorSpaceProfileW() returns %d (GLE=%ld)\n", ret, GLE ); + todo_wine + fail_GSCSPW(machineW, 0, newprofile, &size, 0, (GLE == ERROR_INVALID_PARAMETER)); + todo_wine + fail_GSCSPW(NULL, 0, newprofile, NULL, 0, (GLE == ERROR_INVALID_PARAMETER)); + todo_wine + fail_GSCSPW(NULL, 0, NULL, &size, 0, (GLE == ERROR_INSUFFICIENT_BUFFER || GLE == ERROR_FILE_NOT_FOUND)); + todo_wine + fail_GSCSPW(NULL, 0, newprofile, &size, sizeP, (GLE == ERROR_FILE_NOT_FOUND)); /* Functional checks */

1 0

Dmitry Timoshkov : x11drv: ScrollDC fix.
by Alexandre Julliard Dec. 13, 2005

Dec. 13, 2005

Module: wine Branch: refs/heads/master Commit: 930e8394a62c70d59ad8b9fb4a9527b7d738fbee URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=930e8394a62c70d59ad8b9f… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Dec 13 17:47:27 2005 +0100 x11drv: ScrollDC fix. There is no need to offset the source rectangle in the reverse direction before scrolling. --- dlls/x11drv/scroll.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/x11drv/scroll.c b/dlls/x11drv/scroll.c index 005804a..78144da 100644 --- a/dlls/x11drv/scroll.c +++ b/dlls/x11drv/scroll.c @@ -94,27 +94,32 @@ BOOL X11DRV_ScrollDC( HDC hdc, INT dx, I * rect are scrolled. So first combine Scroll and Clipping rectangles, * if available */ if( lprcScroll) + { if( lprcClip) IntersectRect( &rcClip, lprcClip, lprcScroll); else rcClip = *lprcScroll; + } else + { if( lprcClip) rcClip = *lprcClip; else GetClipBox( hdc, &rcClip); + } /* Then clip again to get the source rectangle that will remain in the * clipping rect */ rcSrc = rcClip; - OffsetRect( &rcSrc, -dx, -dy); IntersectRect( &rcSrc, &rcSrc, &rcClip); /* now convert to device coordinates */ LPtoDP(hdc, (LPPOINT)&rcSrc, 2); + TRACE("source rect: %s\n", wine_dbgstr_rect(&rcSrc)); + /* also dx and dy */ SetRect(&offset, 0, 0, dx, dy); LPtoDP(hdc, (LPPOINT)&offset, 2); dxdev = offset.right - offset.left; - dydev= offset.bottom - offset.top; + dydev = offset.bottom - offset.top; /* now intersect with the visible region to get the pixels that will * actually scroll */ DstRgn = CreateRectRgnIndirect( &rcSrc); @@ -133,6 +138,8 @@ BOOL X11DRV_ScrollDC( HDC hdc, INT dx, I SelectClipRgn( hdc, DstRgn); GetRgnBox( DstRgn, &rect); DPtoLP(hdc, (LPPOINT)&rect, 2); + TRACE("destination rect: %s\n", wine_dbgstr_rect(&rect)); + BitBlt( hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom -rect.top, hdc, rect.left - dx, rect.top - dy, SRCCOPY); @@ -149,7 +156,7 @@ BOOL X11DRV_ScrollDC( HDC hdc, INT dx, I code = X11DRV_END_EXPOSURES; ExtEscape( hdc, X11DRV_ESCAPE, sizeof(code), (LPSTR)&code, sizeof(ExpRgn), (LPSTR)&ExpRgn ); - /* Covert the combined clip rectangle to device coordinates */ + /* Convert the combined clip rectangle to device coordinates */ LPtoDP(hdc, (LPPOINT)&rcClip, 2); if( hrgn ) SetRectRgn( hrgn, rcClip.left, rcClip.top, rcClip.right,

1 0

Aric Stewart : wininet: HTTP headers reworking.
by Alexandre Julliard Dec. 13, 2005

Dec. 13, 2005

Module: wine Branch: refs/heads/master Commit: 1e946d3e148a6d357fe322fbec78fd4c66b422db URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1e946d3e148a6d357fe322f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Dec 13 17:07:41 2005 +0100 wininet: HTTP headers reworking. Redo how headers are handled, eliminating the concept of Standard Headers and allow all headers to be added multiple times. Allow querying of headers with an index to get the multiple headers. Respect response vs request headers in HttpQueryInfo. Add a number of tests to extensively test header adding and replacing. --- dlls/wininet/http.c | 678 ++++++++++++++++++++++----------------------- dlls/wininet/internet.c | 5 dlls/wininet/internet.h | 5 dlls/wininet/tests/http.c | 154 ++++++++++ 4 files changed, 496 insertions(+), 346 deletions(-)

1 0

Alexandre Julliard : gdi: Added support for doing GetBitmapBits on a DIB section.
by Alexandre Julliard Dec. 13, 2005

Dec. 13, 2005

Module: wine Branch: refs/heads/master Commit: 7e2be17d0f1442559dae38c2982bf4d424ace65a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7e2be17d0f1442559dae38c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 13 17:07:06 2005 +0100 gdi: Added support for doing GetBitmapBits on a DIB section. Simply copy the DIB bits in that case. --- dlls/gdi/bitmap.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/gdi/bitmap.c b/dlls/gdi/bitmap.c index a0c6b25..5c2b6c3 100644 --- a/dlls/gdi/bitmap.c +++ b/dlls/gdi/bitmap.c @@ -307,6 +307,30 @@ LONG WINAPI GetBitmapBits( if (!bmp) return 0; + if (bmp->dib) /* simply copy the bits from the DIB */ + { + DIBSECTION *dib = bmp->dib; + const char *src = dib->dsBm.bmBits; + DWORD max = dib->dsBm.bmWidthBytes * dib->dsBm.bmHeight; + if (count > max) count = max; + ret = count; + if (!bits) goto done; + + if (bmp->dib->dsBmih.biHeight >= 0) /* not top-down, need to flip contents vertically */ + { + src += dib->dsBm.bmWidthBytes * dib->dsBm.bmHeight; + while (count > 0) + { + src -= dib->dsBm.bmWidthBytes; + memcpy( bits, src, min( count, dib->dsBm.bmWidthBytes ) ); + bits = (char *)bits + dib->dsBm.bmWidthBytes; + count -= dib->dsBm.bmWidthBytes; + } + } + else memcpy( bits, src, count ); + goto done; + } + /* If the bits vector is null, the function should return the read size */ if(bits == NULL) {

1 0

Alexandre Julliard : x11drv: Clipping fix with DIB section copy.
by Alexandre Julliard Dec. 13, 2005

Dec. 13, 2005

Module: wine Branch: refs/heads/master Commit: 6b1e75d2785c72c1249a6b8bd89b62110e40b2ef URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6b1e75d2785c72c1249a6b8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 13 17:05:06 2005 +0100 x11drv: Clipping fix with DIB section copy. Use the GC of the destination device in X11DRV_DIB_CopyDIBSection so that the clipping region is taken into account. --- dlls/x11drv/dib.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/x11drv/dib.c b/dlls/x11drv/dib.c index 5666feb..5c6a2b9 100644 --- a/dlls/x11drv/dib.c +++ b/dlls/x11drv/dib.c @@ -4152,7 +4152,7 @@ static void X11DRV_DIB_DoProtectDIBSecti */ static void X11DRV_DIB_DoCopyDIBSection(X_PHYSBITMAP *physBitmap, BOOL toDIB, void *colorMap, int nColorMap, - Drawable dest, + Drawable dest, GC gc, DWORD xSrc, DWORD ySrc, DWORD xDest, DWORD yDest, DWORD width, DWORD height) @@ -4202,7 +4202,7 @@ static void X11DRV_DIB_DoCopyDIBSection( /* Hack for now */ descr.drawable = dest; - descr.gc = BITMAP_GC(physBitmap); + descr.gc = gc; descr.xSrc = xSrc; descr.ySrc = ySrc; descr.xDest = xDest; @@ -4280,7 +4280,7 @@ void X11DRV_DIB_CopyDIBSection(X11DRV_PD } /* perform the copy */ X11DRV_DIB_DoCopyDIBSection(physBitmap, FALSE, colorMap, nColorMap, - physDevDst->drawable, xSrc, ySrc, + physDevDst->drawable, physDevDst->gc, xSrc, ySrc, physDevDst->org.x + xDest, physDevDst->org.y + yDest, width, height); /* free color mapping */ @@ -4299,8 +4299,8 @@ static void X11DRV_DIB_DoUpdateDIBSectio GetObjectW( physBitmap->hbitmap, sizeof(bitmap), &bitmap ); X11DRV_DIB_DoCopyDIBSection(physBitmap, toDIB, physBitmap->colorMap, physBitmap->nColorMap, - physBitmap->pixmap, 0, 0, 0, 0, - bitmap.bmWidth, bitmap.bmHeight); + physBitmap->pixmap, BITMAP_GC(physBitmap), + 0, 0, 0, 0, bitmap.bmWidth, bitmap.bmHeight); } /***********************************************************************

1 0