July 2011 - Wine-commits - list.winehq.org

Francois Gouget : explorer: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: f00652fc63525a3e73d80ab59d5014a471e9d22f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f00652fc63525a3e73d80ab59… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jul 11 12:03:18 2011 +0200 explorer: Fix compilation on systems that don't support nameless unions. --- programs/explorer/explorer.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index 60f4157..5c9cad2 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -21,6 +21,7 @@ */ #define COBJMACROS +#define NONAMELESSUNION #include "wine/unicode.h" #include "wine/debug.h" @@ -122,7 +123,7 @@ static BOOL create_combobox_item(IShellFolder *folder, LPCITEMIDLIST pidl, IImag switch(strret.uType) { case STRRET_WSTR: - item->pszText = strret.pOleStr; + item->pszText = strret.u.pOleStr; break; default: WINE_FIXME("Unimplemented STRRET type:%u\n",strret.uType);

1 0

Francois Gouget : d3dx9_36/tests: Fix compilation on systems that don' t support nameless structs/unions.
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: 076e1cf085244359a2f8d50d142fcc02eef28c86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=076e1cf085244359a2f8d50d1… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jul 11 12:07:19 2011 +0200 d3dx9_36/tests: Fix compilation on systems that don't support nameless structs/unions. --- dlls/d3dx9_36/tests/line.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/line.c b/dlls/d3dx9_36/tests/line.c index e03fce5..52c153d 100644 --- a/dlls/d3dx9_36/tests/line.c +++ b/dlls/d3dx9_36/tests/line.c @@ -90,7 +90,7 @@ static void test_create_line(IDirect3DDevice9* device) D3DXMatrixIdentity(&world); D3DXMatrixIdentity(&identity); - world._11 = r11; world._12 = r12; world._13 = r13; world._14 = r14; + S(U(world))._11 = r11; S(U(world))._12 = r12; S(U(world))._13 = r13; S(U(world))._14 = r14; hr = IDirect3DDevice9_SetTransform(device, D3DTS_WORLD, &world); ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK);

1 0

Jacek Caban : d3d10.idl: Added CD3D10_TEXTURE1D_DESC declaration.
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: 7b49ddbababa22eb3dd8ac59c29293afb6ece0d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b49ddbababa22eb3dd8ac59c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 11 12:13:23 2011 +0200 d3d10.idl: Added CD3D10_TEXTURE1D_DESC declaration. --- include/d3d10.idl | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/include/d3d10.idl b/include/d3d10.idl index f8a83ef..51b92bd 100644 --- a/include/d3d10.idl +++ b/include/d3d10.idl @@ -514,6 +514,29 @@ typedef struct D3D10_TEXTURE1D_DESC { UINT MiscFlags; } D3D10_TEXTURE1D_DESC; +cpp_quote("#if !defined(D3D10_NO_HELPERS) && defined(__cplusplus)") +cpp_quote("struct CD3D10_TEXTURE1D_DESC : public D3D10_TEXTURE1D_DESC {") +cpp_quote(" CD3D10_TEXTURE1D_DESC() {}") +cpp_quote(" explicit CD3D10_TEXTURE1D_DESC(const D3D10_TEXTURE1D_DESC &o) : D3D10_TEXTURE1D_DESC(o) {}") +cpp_quote(" explicit CD3D10_TEXTURE1D_DESC(DXGI_FORMAT format, UINT width, UINT arraySize = 1, UINT mipLevels = 0,") +cpp_quote(" UINT bindFlags = D3D10_BIND_SHADER_RESOURCE, D3D10_USAGE usage = D3D10_USAGE_DEFAULT, UINT cpuaccessFlags = 0,") +cpp_quote(" UINT miscFlags = 0) {") +cpp_quote(" Width = width;") +cpp_quote(" MipLevels = mipLevels;") +cpp_quote(" ArraySize = arraySize;") +cpp_quote(" Format = format;") +cpp_quote(" Usage = usage;") +cpp_quote(" BindFlags = bindFlags;") +cpp_quote(" CPUAccessFlags = cpuaccessFlags;") +cpp_quote(" MiscFlags = miscFlags;") +cpp_quote(" }") +cpp_quote(" ~CD3D10_TEXTURE1D_DESC() {}") +cpp_quote(" operator const D3D10_TEXTURE1D_DESC&() const {") +cpp_quote(" return *this;") +cpp_quote(" }") +cpp_quote("};") +cpp_quote("#endif") + typedef struct D3D10_TEXTURE2D_DESC { UINT Width; UINT Height;

1 0

Michael Stefaniuc : d3d10core: COM cleanup for the ID3D10Device iface.
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: eeacb8f2c9a9f7c1c09566eaf494aa705664ade5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eeacb8f2c9a9f7c1c09566eaf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 11 12:13:25 2011 +0200 d3d10core: COM cleanup for the ID3D10Device iface. --- dlls/d3d10core/d3d10core_private.h | 2 +- dlls/d3d10core/device.c | 109 +++++++++++++++++++++--------------- dlls/d3d10core/texture.c | 3 +- 3 files changed, 66 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eeacb8f2c9a9f7c1c0956…

1 0

Frédéric Delanoy : winhlp32: Remove dead assignment (Clang).
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: dcf9d74be7ade2a71d8a787a104b561120138d35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcf9d74be7ade2a71d8a787a1… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jul 11 14:49:50 2011 +0200 winhlp32: Remove dead assignment (Clang). --- programs/winhlp32/hlpfile.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c index 5146c38..cf7bcdc 100644 --- a/programs/winhlp32/hlpfile.c +++ b/programs/winhlp32/hlpfile.c @@ -2646,7 +2646,6 @@ static BOOL HLPFILE_DoReadHlpFile(HLPFILE *hlpfile, LPCSTR lpszPath) if (!HLPFILE_Uncompress_Topic(hlpfile)) return FALSE; if (!HLPFILE_ReadFont(hlpfile)) return FALSE; - buf = hlpfile->topic_map[0]; old_index = -1; offs = 0; do

1 0

Lucas Fialho Zawacki : dinput8/tests: Tests for EnumDevicesBySemantics with different enumeration flags.
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: a85f66e7a723bca960d5fb07044fbb838275ef10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a85f66e7a723bca960d5fb070… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Fri Jul 8 15:00:21 2011 -0300 dinput8/tests: Tests for EnumDevicesBySemantics with different enumeration flags. --- dlls/dinput8/tests/device.c | 63 +++++++++++++++++++++++++++++++++++++++--- 1 files changed, 58 insertions(+), 5 deletions(-) diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 3d35632..e86e0d8 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -187,6 +187,28 @@ static BOOL CALLBACK enumeration_callback( return DIENUM_CONTINUE; } +/* A simpler callback function used to count and check + the enumeration of devices. +*/ +static BOOL CALLBACK counting_callback( + LPCDIDEVICEINSTANCE lpddi, + LPDIRECTINPUTDEVICE8 lpdid, + DWORD dwFlags, + DWORD dwRemaining, + LPVOID pvRef) +{ + struct enum_data *data = pvRef; + if (!data) return DIENUM_CONTINUE; + + data->ndevices++; + if (IsEqualGUID(&lpddi->guidInstance, &GUID_SysKeyboard)) + data->keyboard = lpdid; + + if (IsEqualGUID(&lpddi->guidInstance, &GUID_SysMouse)) + data->mouse = lpdid; + + return DIENUM_CONTINUE; +} static void test_action_mapping(void) { @@ -194,7 +216,8 @@ static void test_action_mapping(void) HINSTANCE hinst = GetModuleHandle(NULL); LPDIRECTINPUT8 pDI = NULL; DIACTIONFORMAT af; - struct enum_data data = {pDI, &af, NULL, NULL, 0}; + struct enum_data data = {pDI, &af, NULL, NULL, 0}; + struct enum_data count = {pDI, &af, NULL, NULL, 0}; hr = CoCreateInstance(&CLSID_DirectInput8, 0, 1, &IID_IDirectInput8A, (LPVOID*)&pDI); if (hr == DIERR_OLDDIRECTINPUTVERSION || @@ -226,12 +249,42 @@ static void test_action_mapping(void) af.dwGenre = 0x01000000; /* DIVIRTUAL_DRIVING_RACE */ af.dwBufferSize = 32; - hr = IDirectInput8_EnumDevicesBySemantics(pDI, 0, &af, enumeration_callback, &data, 0); + /* Test enumerating all attached and installed devices */ + count.keyboard = NULL; + count.mouse = NULL; + count.ndevices = 0; + hr = IDirectInput8_EnumDevicesBySemantics(pDI, 0, &af, counting_callback, &count, DIEDBSFL_ATTACHEDONLY); + ok (count.ndevices > 0, "EnumDevicesBySemantics did not call the callback hr=%08x\n", hr); + ok (count.keyboard != NULL, "EnumDevicesBySemantics should enumerate the keyboard\n"); + ok (count.mouse != NULL, "EnumDevicesBySemantics should enumerate the mouse\n"); + + /* Enumerate Force feedback devices. We should get no mouse nor keyboard */ + count.keyboard = NULL; + count.mouse = NULL; + hr = IDirectInput8_EnumDevicesBySemantics(pDI, 0, &af, counting_callback, &count, DIEDBSFL_FORCEFEEDBACK); + ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr); + todo_wine ok (count.keyboard == NULL, "Keyboard should not be enumerated when asking for forcefeedback\n"); + todo_wine ok (count.mouse == NULL, "Mouse should not be enumerated when asking for forcefeedback\n"); + + /* Enumerate available devices. That is devices with not owned by any user. + Before setting the action map for all devices we still have them available. + */ + count.ndevices = 0; + hr = IDirectInput8_EnumDevicesBySemantics(pDI, 0, &af, counting_callback, &count, DIEDBSFL_AVAILABLEDEVICES); + ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr); + ok (count.ndevices > 0, "There should be devices available before action mapping available=%d\n", count.ndevices); + + /* This enumeration builds and sets the action map for all devices */ + hr = IDirectInput8_EnumDevicesBySemantics(pDI, 0, &af, enumeration_callback, &data, DIEDBSFL_ATTACHEDONLY); ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed: hr=%08x\n", hr); - ok (data.ndevices > 0, "EnumDevicesBySemantics did not call the callback hr=%08x\n", hr); - ok (data.keyboard != NULL, "EnumDevicesBySemantics should enumerate the keyboard\n"); - ok (data.mouse != NULL, "EnumDevicesBySemantics should enumerate the mouse\n"); + /* After a succesfull action mapping we should have no devices available */ + count.ndevices = 0; + hr = IDirectInput8_EnumDevicesBySemantics(pDI, 0, &af, counting_callback, &count, DIEDBSFL_AVAILABLEDEVICES); + ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr); + todo_wine ok (count.ndevices == 0, "No device should be available after action mapping available=%d\n", count.ndevices); + + /* Use the devices we collect for some tests */ if (data.keyboard != NULL) { /* Test keyboard BuildActionMap */

1 0

Lucas Fialho Zawacki : dinput: Made EnumDevicesBySemantics more terse.
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: 13421a210b0c6d1b2f97b670744e37b6380945bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=13421a210b0c6d1b2f97b6707… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Fri Jul 8 15:00:40 2011 -0300 dinput: Made EnumDevicesBySemantics more terse. --- dlls/dinput/dinput_main.c | 79 +++++++++++++++++++-------------------------- 1 files changed, 33 insertions(+), 46 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 7b46839..207d559 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -842,12 +842,13 @@ static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics( LPVOID pvRef, DWORD dwFlags ) { + static const REFGUID guids[2] = { &GUID_SysKeyboard, &GUID_SysMouse }; + static const DWORD actionMasks[] = { DIKEYBOARD_MASK, DIMOUSE_MASK }; IDirectInputImpl *This = impl_from_IDirectInput8A( iface ); DIDEVICEINSTANCEA didevi; LPDIRECTINPUTDEVICE8A lpdid; - BOOL ret; - DWORD callbackFlags = 0; - int i; + int i, j; + FIXME("(this=%p,%s,%p,%p,%p,%04x): semi-stub\n", This, ptszUserName, lpdiActionFormat, lpCallback, pvRef, dwFlags); @@ -864,29 +865,22 @@ static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics( didevi.dwSize = sizeof(didevi); - /* enum the keyboard first */ - IDirectInput_CreateDevice(iface, &GUID_SysKeyboard, &lpdid, NULL); - IDirectInputDevice_GetDeviceInfo(lpdid, &didevi); - /* if there's any DIKEYBOARD action, keyboard is priority 1*/ - for(i=0; i < lpdiActionFormat->dwActionSize; i++) - if ((lpdiActionFormat->rgoAction[i].dwSemantic & DIKEYBOARD_MASK) == DIKEYBOARD_MASK) - callbackFlags |= DIEDBS_MAPPEDPRI1; - - ret = lpCallback(&didevi, lpdid, callbackFlags, 1, pvRef); - - if (ret == DIENUM_STOP) return DI_OK; + /* Enumerate keyboard and mouse */ + for(i=0; i < sizeof(guids)/sizeof(guids[0]); i++) + { + DWORD callbackFlags = 0; - callbackFlags = 0; + IDirectInput_CreateDevice(iface, guids[i], &lpdid, NULL); + IDirectInputDevice_GetDeviceInfo(lpdid, &didevi); - /* and then the mouse */ - IDirectInput_CreateDevice(iface, &GUID_SysMouse, &lpdid, NULL); - IDirectInputDevice_GetDeviceInfo(lpdid, &didevi); - /* same as above, but for the mouse */ - for(i=0; i < lpdiActionFormat->dwActionSize; i++) - if ((lpdiActionFormat->rgoAction[i].dwSemantic & DIMOUSE_MASK) == DIMOUSE_MASK) - callbackFlags |= DIEDBS_MAPPEDPRI1; + /* If there's at least one action for the device it's priority 1 */ + for(j=0; j < lpdiActionFormat->dwActionSize; j++) + if ((lpdiActionFormat->rgoAction[j].dwSemantic & actionMasks[j]) == actionMasks[j]) + callbackFlags |= DIEDBS_MAPPEDPRI1; - lpCallback(&didevi, lpdid, callbackFlags, 0, pvRef); + if (lpCallback(&didevi, lpdid, callbackFlags, sizeof(guids)/sizeof(guids[0]) - (i+1), pvRef) == DIENUM_STOP) + return DI_OK; + } return DI_OK; } @@ -897,41 +891,34 @@ static HRESULT WINAPI IDirectInput8WImpl_EnumDevicesBySemantics( LPVOID pvRef, DWORD dwFlags ) { + static const REFGUID guids[2] = { &GUID_SysKeyboard, &GUID_SysMouse }; + static const DWORD actionMasks[] = { DIKEYBOARD_MASK, DIMOUSE_MASK }; IDirectInputImpl *This = impl_from_IDirectInput8W(iface); DIDEVICEINSTANCEW didevi; LPDIRECTINPUTDEVICE8W lpdid; - BOOL ret; - DWORD callbackFlags = 0; - int i; + int i, j; FIXME("(this=%p,%s,%p,%p,%p,%04x): semi-stub\n", This, debugstr_w(ptszUserName), lpdiActionFormat, lpCallback, pvRef, dwFlags); didevi.dwSize = sizeof(didevi); - /* enum the keyboard first */ - IDirectInput_CreateDevice(iface, &GUID_SysKeyboard, &lpdid, NULL); - IDirectInputDevice_GetDeviceInfo(lpdid, &didevi); - /* if there's any DIKEYBOARD action, keyboard is priority 1*/ - for(i=0; i < lpdiActionFormat->dwActionSize; i++) - if ((lpdiActionFormat->rgoAction[i].dwSemantic & DIKEYBOARD_MASK) == DIKEYBOARD_MASK) - callbackFlags |= DIEDBS_MAPPEDPRI1; - - ret = lpCallback(&didevi, lpdid, callbackFlags, 1, pvRef); - - if (ret == DIENUM_STOP) return DI_OK; + /* Enumerate keyboard and mouse */ + for(i=0; i < sizeof(guids)/sizeof(guids[0]); i++) + { + DWORD callbackFlags = 0; - callbackFlags = 0; + IDirectInput_CreateDevice(iface, guids[i], &lpdid, NULL); + IDirectInputDevice_GetDeviceInfo(lpdid, &didevi); - /* and then the mouse */ - IDirectInput_CreateDevice(iface, &GUID_SysMouse, &lpdid, NULL); - IDirectInputDevice_GetDeviceInfo(lpdid, &didevi); - /* same as above, but for the mouse */ - for(i=0; i < lpdiActionFormat->dwActionSize; i++) - if ((lpdiActionFormat->rgoAction[i].dwSemantic & DIMOUSE_MASK) == DIMOUSE_MASK) - callbackFlags |= DIEDBS_MAPPEDPRI1; + /* If there's at least one action for the device it's priority 1 */ + for(j=0; j < lpdiActionFormat->dwActionSize; j++) + if ((lpdiActionFormat->rgoAction[j].dwSemantic & actionMasks[j]) == actionMasks[j]) + callbackFlags |= DIEDBS_MAPPEDPRI1; - lpCallback(&didevi, lpdid, callbackFlags, 0, pvRef); + if (lpCallback(&didevi, lpdid, callbackFlags, sizeof(guids)/sizeof(guids[0]) - (i+1), pvRef) == DIENUM_STOP) + return DI_OK; + } return DI_OK; }

1 0

Lucas Fialho Zawacki : dinput: Prevent EnumDevicesBySematics from enumerating keyboard and mouse as having force feedback .
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: 662d332246085921fb2726f24c720b8774cbe8aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=662d332246085921fb2726f24… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Fri Jul 8 15:00:55 2011 -0300 dinput: Prevent EnumDevicesBySematics from enumerating keyboard and mouse as having force feedback. --- dlls/dinput/dinput_main.c | 4 ++++ dlls/dinput8/tests/device.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 207d559..0f84e7c 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -865,6 +865,8 @@ static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics( didevi.dwSize = sizeof(didevi); + if (dwFlags & DIEDBSFL_FORCEFEEDBACK) return DI_OK; + /* Enumerate keyboard and mouse */ for(i=0; i < sizeof(guids)/sizeof(guids[0]); i++) { @@ -903,6 +905,8 @@ static HRESULT WINAPI IDirectInput8WImpl_EnumDevicesBySemantics( didevi.dwSize = sizeof(didevi); + if (dwFlags & DIEDBSFL_FORCEFEEDBACK) return DI_OK; + /* Enumerate keyboard and mouse */ for(i=0; i < sizeof(guids)/sizeof(guids[0]); i++) { diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index e86e0d8..94b1f2d 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -263,8 +263,8 @@ static void test_action_mapping(void) count.mouse = NULL; hr = IDirectInput8_EnumDevicesBySemantics(pDI, 0, &af, counting_callback, &count, DIEDBSFL_FORCEFEEDBACK); ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr); - todo_wine ok (count.keyboard == NULL, "Keyboard should not be enumerated when asking for forcefeedback\n"); - todo_wine ok (count.mouse == NULL, "Mouse should not be enumerated when asking for forcefeedback\n"); + ok (count.keyboard == NULL, "Keyboard should not be enumerated when asking for forcefeedback\n"); + ok (count.mouse == NULL, "Mouse should not be enumerated when asking for forcefeedback\n"); /* Enumerate available devices. That is devices with not owned by any user. Before setting the action map for all devices we still have them available.

1 0

Alexandre Julliard : gdi32: Export a function to compute the DC clip box.
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: 2ff31091ed633ae564c6eb6dc6554635491b48b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ff31091ed633ae564c6eb6dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 11 13:40:45 2011 +0200 gdi32: Export a function to compute the DC clip box. --- dlls/gdi32/clipping.c | 31 ++++++++++++++++++++++--------- dlls/gdi32/gdi_private.h | 1 + 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index 86b19f1..e9978c3 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -53,6 +53,27 @@ static inline RECT get_clip_rect( DC * dc, int left, int top, int right, int bot } /*********************************************************************** + * get_clip_box + * + * Get the clipping rectangle in device coordinates. + */ +int get_clip_box( DC *dc, RECT *rect ) +{ + int ret = ERROR; + HRGN rgn, clip = get_clip_region( dc ); + + if (!clip) return GetRgnBox( dc->hVisRgn, rect ); + + if ((rgn = CreateRectRgn( 0, 0, 0, 0 ))) + { + CombineRgn( rgn, dc->hVisRgn, clip, RGN_AND ); + ret = GetRgnBox( rgn, rect ); + DeleteObject( rgn ); + } + return ret; +} + +/*********************************************************************** * CLIPPING_UpdateGCRegion * * Update the GC clip region when the ClipRgn or VisRgn have changed. @@ -379,19 +400,11 @@ BOOL WINAPI RectVisible( HDC hdc, const RECT* rect ) INT WINAPI GetClipBox( HDC hdc, LPRECT rect ) { INT ret; - HRGN clip; DC *dc = get_dc_ptr( hdc ); if (!dc) return ERROR; update_dc( dc ); - if ((clip = get_clip_region(dc))) - { - HRGN hrgn = CreateRectRgn( 0, 0, 0, 0 ); - CombineRgn( hrgn, dc->hVisRgn, clip, RGN_AND ); - ret = GetRgnBox( hrgn, rect ); - DeleteObject( hrgn ); - } - else ret = GetRgnBox( dc->hVisRgn, rect ); + ret = get_clip_box( dc, rect ); if (dc->layout & LAYOUT_RTL) { int tmp = rect->left; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 456d92c..82d72e5 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -439,6 +439,7 @@ extern BOOL BITMAP_SetOwnerDC( HBITMAP hbitmap, PHYSDEV physdev ) DECLSPEC_HIDDE extern INT BITMAP_GetWidthBytes( INT bmWidth, INT bpp ) DECLSPEC_HIDDEN; /* clipping.c */ +extern int get_clip_box( DC *dc, RECT *rect ) DECLSPEC_HIDDEN; extern void CLIPPING_UpdateGCRegion( DC * dc ) DECLSPEC_HIDDEN; /* Return the total clip region (if any) */

1 0

Alexandre Julliard : gdi32: Compute StretchBlt rectangles in gdi32.
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: 1805f123b08cac862667d1543e198ece57a6ef77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1805f123b08cac862667d1543… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 11 13:44:26 2011 +0200 gdi32: Compute StretchBlt rectangles in gdi32. --- dlls/gdi32/bitblt.c | 144 +++++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 11 ---- include/wine/gdi_driver.h | 14 +++++ 3 files changed, 158 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 6c556d7..733e2cf 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -40,6 +40,130 @@ static inline BOOL rop_uses_src( DWORD rop ) return ((rop >> 2) & 0x330000) != (rop & 0x330000); } +static inline void swap_ints( int *i, int *j ) +{ + int tmp = *i; + *i = *j; + *j = tmp; +} + +static inline BOOL intersect_rect( RECT *dst, const RECT *src1, const RECT *src2 ) +{ + dst->left = max( src1->left, src2->left ); + dst->top = max( src1->top, src2->top ); + dst->right = min( src1->right, src2->right ); + dst->bottom = min( src1->bottom, src2->bottom ); + return (dst->left < dst->right && dst->top < dst->bottom); +} + +static inline void offset_rect( RECT *rect, int offset_x, int offset_y ) +{ + rect->left += offset_x; + rect->top += offset_y; + rect->right += offset_x; + rect->bottom += offset_y; +} + +static void get_vis_rectangles( DC *dc_dst, struct bitblt_coords *dst, + DC *dc_src, struct bitblt_coords *src ) +{ + RECT rect, clip; + + /* get the destination visible rectangle */ + + rect.left = dst->log_x; + rect.top = dst->log_y; + rect.right = dst->log_x + dst->log_width; + rect.bottom = dst->log_y + dst->log_height; + LPtoDP( dc_dst->hSelf, (POINT *)&rect, 2 ); + dst->x = rect.left; + dst->y = rect.top; + dst->width = rect.right - rect.left; + dst->height = rect.bottom - rect.top; + if (dst->layout & LAYOUT_RTL && dst->layout & LAYOUT_BITMAPORIENTATIONPRESERVED) + { + swap_ints( &rect.left, &rect.right ); + dst->x = rect.left; + dst->width = rect.right - rect.left; + } + if (rect.left > rect.right) { swap_ints( &rect.left, &rect.right ); rect.left++; rect.right++; } + if (rect.top > rect.bottom) { swap_ints( &rect.top, &rect.bottom ); rect.top++; rect.bottom++; } + + get_clip_box( dc_dst, &clip ); + intersect_rect( &dst->visrect, &rect, &clip ); + + /* get the source visible rectangle */ + + if (!src) return; + + rect.left = src->log_x; + rect.top = src->log_y; + rect.right = src->log_x + src->log_width; + rect.bottom = src->log_y + src->log_height; + LPtoDP( dc_src->hSelf, (POINT *)&rect, 2 ); + src->x = rect.left; + src->y = rect.top; + src->width = rect.right - rect.left; + src->height = rect.bottom - rect.top; + if (src->layout & LAYOUT_RTL && src->layout & LAYOUT_BITMAPORIENTATIONPRESERVED) + { + swap_ints( &rect.left, &rect.right ); + src->x = rect.left; + src->width = rect.right - rect.left; + } + if (rect.left > rect.right) { swap_ints( &rect.left, &rect.right ); rect.left++; rect.right++; } + if (rect.top > rect.bottom) { swap_ints( &rect.top, &rect.bottom ); rect.top++; rect.bottom++; } + + /* source is not clipped */ + if (dc_src->header.type == OBJ_MEMDC) + intersect_rect( &src->visrect, &rect, &dc_src->vis_rect ); + else + src->visrect = rect; /* FIXME: clip to device size */ + + /* intersect the rectangles */ + + if ((src->width == dst->width) && (src->height == dst->height)) /* no stretching */ + { + offset_rect( &src->visrect, dst->x - src->x, dst->y - src->y ); + intersect_rect( &rect, &src->visrect, &dst->visrect ); + src->visrect = dst->visrect = rect; + offset_rect( &src->visrect, src->x - dst->x, src->y - dst->y ); + } + else /* stretching */ + { + /* map source rectangle into destination coordinates */ + rect.left = dst->x + (src->visrect.left - src->x)*dst->width/src->width; + rect.top = dst->y + (src->visrect.top - src->y)*dst->height/src->height; + rect.right = dst->x + (src->visrect.right - src->x)*dst->width/src->width; + rect.bottom = dst->y + (src->visrect.bottom - src->y)*dst->height/src->height; + if (rect.left > rect.right) swap_ints( &rect.left, &rect.right ); + if (rect.top > rect.bottom) swap_ints( &rect.top, &rect.bottom ); + + /* avoid rounding errors */ + rect.left--; + rect.top--; + rect.right++; + rect.bottom++; + if (!intersect_rect( &dst->visrect, &rect, &dst->visrect )) return; + + /* map destination rectangle back to source coordinates */ + rect = dst->visrect; + rect.left = src->x + (dst->visrect.left - dst->x)*src->width/dst->width; + rect.top = src->y + (dst->visrect.top - dst->y)*src->height/dst->height; + rect.right = src->x + (dst->visrect.right - dst->x)*src->width/dst->width; + rect.bottom = src->y + (dst->visrect.bottom - dst->y)*src->height/dst->height; + if (rect.left > rect.right) swap_ints( &rect.left, &rect.right ); + if (rect.top > rect.bottom) swap_ints( &rect.top, &rect.bottom ); + + /* avoid rounding errors */ + rect.left--; + rect.top--; + rect.right++; + rect.bottom++; + intersect_rect( &src->visrect, &rect, &src->visrect ); + } +} + /* nulldrv fallback implementation using StretchDIBits */ BOOL CDECL nulldrv_StretchBlt( PHYSDEV dst_dev, INT xDst, INT yDst, INT widthDst, INT heightDst, PHYSDEV src_dev, INT xSrc, INT ySrc, INT widthSrc, INT heightSrc, @@ -149,10 +273,30 @@ BOOL WINAPI StretchBlt( HDC hdcDst, INT xDst, INT yDst, INT widthDst, INT height if ((dcSrc = get_dc_ptr( hdcSrc ))) { + struct bitblt_coords src, dst; PHYSDEV src_dev = GET_DC_PHYSDEV( dcSrc, pStretchBlt ); PHYSDEV dst_dev = GET_DC_PHYSDEV( dcDst, pStretchBlt ); + update_dc( dcSrc ); update_dc( dcDst ); + + src.log_x = xSrc; + src.log_y = ySrc; + src.log_width = widthSrc; + src.log_height = heightSrc; + src.layout = dcSrc->layout; + dst.log_x = xDst; + dst.log_y = yDst; + dst.log_width = widthDst; + dst.log_height = heightDst; + dst.layout = dcDst->layout; + if (rop & NOMIRRORBITMAP) + { + src.layout |= LAYOUT_BITMAPORIENTATIONPRESERVED; + dst.layout |= LAYOUT_BITMAPORIENTATIONPRESERVED; + rop &= ~NOMIRRORBITMAP; + } + get_vis_rectangles( dcDst, &dst, dcSrc, &src ); ret = dst_dev->funcs->pStretchBlt( dst_dev, xDst, yDst, widthDst, heightDst, src_dev, xSrc, ySrc, widthSrc, heightSrc, rop ); release_dc_ptr( dcSrc ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 617504f..149b5ce 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -173,17 +173,6 @@ static inline X11DRV_PDEVICE *get_x11drv_dev( PHYSDEV dev ) return (X11DRV_PDEVICE *)dev; } -struct bitblt_coords -{ - int x; /* original position and width */ - int y; - int width; - int height; - RECT visrect; /* rectangle clipped to the visible part */ - DWORD layout; /* DC layout */ -}; - - extern X_PHYSBITMAP BITMAP_stock_phys_bitmap DECLSPEC_HIDDEN; /* phys bitmap for the default stock bitmap */ /* Retrieve the GC used for bitmap operations */ diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 882d5c5..2804d5c 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -30,4 +30,18 @@ typedef struct gdi_physdev HDC hdc; } *PHYSDEV; +struct bitblt_coords +{ + int log_x; /* original position and size, in logical coords */ + int log_y; + int log_width; + int log_height; + int x; /* mapped position and size, in device coords */ + int y; + int width; + int height; + RECT visrect; /* rectangle clipped to the visible part, in device coords */ + DWORD layout; /* DC layout */ +}; + #endif /* __WINE_WINE_GDI_DRIVER_H */

1 0