October 2006 - Wine-Commits

Andrew Talbot : user: Dead code fix (Coverity).
by Alexandre Julliard Oct. 17, 2006

Oct. 17, 2006

Module: wine Branch: master Commit: f0a43c62a081e5412b4860acea4b6560c28a572b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0a43c62a081e5412b4860ace… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Oct 14 15:20:20 2006 +0100 user: Dead code fix (Coverity). --- dlls/user/dde_client.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/user/dde_client.c b/dlls/user/dde_client.c index f2e4a3d..977e428 100644 --- a/dlls/user/dde_client.c +++ b/dlls/user/dde_client.c @@ -254,7 +254,6 @@ HCONV WINAPI DdeReconnect(HCONV hConv) { HWND hwndClient = pConv->hwndClient; HWND hwndServer = pConv->hwndServer; - ATOM aSrv, aTpc; SetWindowLongPtrW(pConv->hwndClient, GWL_WDML_CONVERSATION, 0);

1 0

Jeff Latimer : usp10: Fix dead code in ScriptItemize.
by Alexandre Julliard Oct. 17, 2006

Oct. 17, 2006

Module: wine Branch: master Commit: 292c99e3290736a3fe75e50a11105f929e30915b URL: http://source.winehq.org/git/wine.git/?a=commit;h=292c99e3290736a3fe75e50a1… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Tue Oct 17 19:11:25 2006 +1000 usp10: Fix dead code in ScriptItemize. --- dlls/usp10/tests/usp10.c | 13 ++++++++++++- dlls/usp10/usp10.c | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 378bf68..31df9c7 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -46,7 +46,8 @@ static void test_ScriptItemIzeShapePlace WCHAR TestItem1[] = {'T', 'e', 's', 't', 'a', 0}; WCHAR TestItem2[] = {'T', 'e', 's', 't', 'b', 0}; WCHAR TestItem3[] = {'T', 'e', 's', 't', 'c',' ','1','2','3',' ',' ','e','n','d',0}; - WCHAR TestItem4[] = {'T', 'e', 's', 't', 'c',' ',0x0684,0x0694,0x06a4,' ',' ','e','n','d',0}; + WCHAR TestItem4[] = {'T', 'e', 's', 't', 'c',' ',0x0684,0x0694,0x06a4,' ',' ','e','n','d',0}; + WCHAR TestItem5[] = {0x0684,'T','e','s','t','c',' ',0x0684,0x0694,0x06a4,' ',' ','e','n','d',0}; SCRIPT_CACHE psc; int cChars; @@ -243,6 +244,16 @@ static void test_ScriptItemIzeShapePlace hr = ScriptFreeCache( &psc); ok (!psc, "psc is not null after ScriptFreeCache\n"); } + + /* + * This test is for when the first unicode character requires bidi support + */ + cInChars = (sizeof(TestItem5)-1)/sizeof(WCHAR); + hr = ScriptItemize(TestItem5, cInChars, cMaxItems, NULL, NULL, pItem, &pcItems); + ok (hr == 0, "ScriptItemize should return 0, returned %08x\n", hr); + ok (pcItems == 4, "There should have been 4 items, found %d\n", pcItems); + ok (pItem[0].a.s.uBidiLevel == 1, "The first character should have been bidi=1 not %d\n", + pItem[0].a.s.uBidiLevel); } void test_ScriptGetCMap(HDC hdc, unsigned short pwOutGlyphs[256]) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 6a52933..9fd6c1e 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -326,7 +326,7 @@ #define Script_Numeric 5 pItems[index].a.fLogicalOrder = 0; pItems[index].a.fNoGlyphIndex = 0; /* set the SCRIPT_STATE */ - if (New_Script == Script_Arabic) + if (pItems[index].a.eScript == Script_Arabic) pItems[index].a.s.uBidiLevel = 1; else pItems[index].a.s.uBidiLevel = 0;

1 0

Vitaliy Margolen : dinput: Add SetCooperativeLevel test for joystick.
by Alexandre Julliard Oct. 17, 2006

Oct. 17, 2006

Module: wine Branch: master Commit: 35ee9b05d9077faf3111865a56363b021c527846 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35ee9b05d9077faf3111865a5… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Sun Oct 15 11:30:38 2006 -0600 dinput: Add SetCooperativeLevel test for joystick. --- dlls/dinput/tests/joystick.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index a465809..ad13bca 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -123,6 +123,18 @@ static BOOL CALLBACK EnumAxes( return DIENUM_CONTINUE; } +static const HRESULT SetCoop_null_window[16] = { + E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, + E_INVALIDARG, E_HANDLE, E_HANDLE, E_INVALIDARG, + E_INVALIDARG, E_HANDLE, S_OK, E_INVALIDARG, + E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG}; + +static const HRESULT SetCoop_real_window[16] = { + E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, + E_INVALIDARG, S_OK, S_OK, E_INVALIDARG, + E_INVALIDARG, S_OK, S_OK, E_INVALIDARG, + E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG}; + static BOOL CALLBACK EnumJoysticks( LPCDIDEVICEINSTANCE lpddi, LPVOID pvRef) @@ -193,6 +205,17 @@ static BOOL CALLBACK EnumJoysticks( if (hr != DI_OK) goto RELEASE; + for (i=0; i<16; i++) + { + hr = IDirectInputDevice_SetCooperativeLevel(pJoystick, NULL, i); + ok(hr == SetCoop_null_window[i], "SetCooperativeLevel(NULL, %d): %s\n", i, DXGetErrorString8(hr)); + } + for (i=0; i<16; i++) + { + hr = IDirectInputDevice_SetCooperativeLevel(pJoystick, hWnd, i); + ok(hr == SetCoop_real_window[i], "SetCooperativeLevel(hwnd, %d): %s\n", i, DXGetErrorString8(hr)); + } + hr = IDirectInputDevice_SetCooperativeLevel(pJoystick, hWnd, DISCL_NONEXCLUSIVE | DISCL_BACKGROUND); ok(hr==DI_OK,"IDirectInputDevice_SetCooperativeLevel() failed: %s\n",

1 0

Vitaliy Margolen : dinput: Add SetCooperativeLevel tests to keyboard.
by Alexandre Julliard Oct. 17, 2006

Oct. 17, 2006

Module: wine Branch: master Commit: d35e4cd83cde7bb931f8c79a3633dece1bee55f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d35e4cd83cde7bb931f8c79a3… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Sun Oct 15 11:30:22 2006 -0600 dinput: Add SetCooperativeLevel tests to keyboard. --- dlls/dinput/tests/keyboard.c | 81 ++++++++++++++++++++++++++++++++++-------- 1 files changed, 65 insertions(+), 16 deletions(-) diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index 6b4a2fa..68155a1 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -18,6 +18,7 @@ #define DIRECTINPUT_VERSION 0x0700 +#define COBJMACROS #define NONAMELESSSTRUCT #define NONAMELESSUNION #include <windows.h> @@ -67,27 +68,15 @@ const char * get_file_version(const char return version; } -static void keyboard_tests(DWORD version) +static void acquire_tests(LPDIRECTINPUT pDI, HWND hwnd) { HRESULT hr; - LPDIRECTINPUT pDI; LPDIRECTINPUTDEVICE pKeyboard; - HINSTANCE hInstance = GetModuleHandle(NULL); BYTE kbd_state[256]; - ULONG ref; - hr = DirectInputCreate(hInstance, version, &pDI, NULL); - ok(SUCCEEDED(hr), "DirectInputCreate() failed: %s\n", DXGetErrorString8(hr)); - if (FAILED(hr)) return; - - hr = IDirectInput_CreateDevice(pDI, &GUID_SysKeyboard, &pKeyboard, NULL); ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %s\n", DXGetErrorString8(hr)); - if (FAILED(hr)) - { - IDirectInput_Release(pDI); - return; - } + if (FAILED(hr)) return; hr = IDirectInputDevice_SetDataFormat(pKeyboard, &c_dfDIKeyboard); ok(SUCCEEDED(hr), "IDirectInputDevice_SetDataFormat() failed: %s\n", DXGetErrorString8(hr)); @@ -103,8 +92,68 @@ static void keyboard_tests(DWORD version ok(hr == DIERR_INVALIDPARAM, "IDirectInputDevice_GetDeviceState(10,) should have failed: %s\n", DXGetErrorString8(hr)); hr = IDirectInputDevice_GetDeviceState(pKeyboard, sizeof(kbd_state), kbd_state); ok(SUCCEEDED(hr), "IDirectInputDevice_GetDeviceState() failed: %s\n", DXGetErrorString8(hr)); - - ref = IDirectInput_Release(pDI); +} + +static const HRESULT SetCoop_null_window[16] = { + E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, + E_INVALIDARG, E_HANDLE, E_HANDLE, E_INVALIDARG, + E_INVALIDARG, E_HANDLE, S_OK, E_INVALIDARG, + E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG}; + +static const HRESULT SetCoop_real_window[16] = { + E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, + E_INVALIDARG, S_OK, S_OK, E_INVALIDARG, + E_INVALIDARG, E_NOTIMPL, S_OK, E_INVALIDARG, + E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG}; + +static void test_set_coop(LPDIRECTINPUT pDI, HWND hwnd) +{ + HRESULT hr; + LPDIRECTINPUTDEVICE pKeyboard = NULL; + int i; + + hr = IDirectInput_CreateDevice(pDI, &GUID_SysKeyboard, &pKeyboard, NULL); + ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %s\n", DXGetErrorString8(hr)); + if (FAILED(hr)) return; + + for (i=0; i<16; i++) + { + hr = IDirectInputDevice_SetCooperativeLevel(pKeyboard, NULL, i); + ok(hr == SetCoop_null_window[i], "SetCooperativeLevel(NULL, %d): %s\n", i, DXGetErrorString8(hr)); + } + for (i=0; i<16; i++) + { + hr = IDirectInputDevice_SetCooperativeLevel(pKeyboard, hwnd, i); + ok(hr == SetCoop_real_window[i], "SetCooperativeLevel(hwnd, %d): %s\n", i, DXGetErrorString8(hr)); + } + + if (pKeyboard) IUnknown_Release(pKeyboard); +} + +static void keyboard_tests(DWORD version) +{ + HRESULT hr; + LPDIRECTINPUT pDI = NULL; + HINSTANCE hInstance = GetModuleHandle(NULL); + HWND hwnd; + ULONG ref = 0; + + hr = DirectInputCreate(hInstance, version, &pDI, NULL); + ok(SUCCEEDED(hr), "DirectInputCreate() failed: %s\n", DXGetErrorString8(hr)); + if (FAILED(hr)) return; + + hwnd = CreateWindow("static", "Title", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 10, 10, 200, 200, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "err: %d\n", GetLastError()); + + if (hwnd) + { + acquire_tests(pDI, hwnd); + test_set_coop(pDI, hwnd); + } + + DestroyWindow(hwnd); + if (pDI) ref = IUnknown_Release(pDI); ok(!ref, "IDirectInput_Release() reference count = %d\n", ref); }

1 0

Vitaliy Margolen : dinput: Move SetEventNotification and associated event into base class.
by Alexandre Julliard Oct. 17, 2006

Oct. 17, 2006

Module: wine Branch: master Commit: af34ef12ba8a70a9b51a35cabb0f01a0e9809441 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af34ef12ba8a70a9b51a35cab… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Sun Oct 15 11:29:48 2006 -0600 dinput: Move SetEventNotification and associated event into base class. --- dlls/dinput/device.c | 12 +++++++++--- dlls/dinput/device_private.h | 1 + dlls/dinput/joystick_linux.c | 18 ++---------------- dlls/dinput/joystick_linuxinput.c | 18 ++---------------- dlls/dinput/keyboard.c | 17 +++-------------- dlls/dinput/mouse.c | 23 +++-------------------- 6 files changed, 20 insertions(+), 69 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index adb9faa..d10500b 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -475,11 +475,17 @@ HRESULT WINAPI IDirectInputDevice2AImpl_ return DI_OK; } +/****************************************************************************** + * SetEventNotification : specifies event to be sent on state change + */ HRESULT WINAPI IDirectInputDevice2AImpl_SetEventNotification( - LPDIRECTINPUTDEVICE8A iface,HANDLE hnd -) { + LPDIRECTINPUTDEVICE8A iface, HANDLE event) +{ IDirectInputDevice2AImpl *This = (IDirectInputDevice2AImpl *)iface; - FIXME("(this=%p,%p): stub\n",This,hnd); + + TRACE("(%p) %p\n", This, event); + + This->hEvent = event; return DI_OK; } diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index b5c88bf..e2bc197 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -33,6 +33,7 @@ struct IDirectInputDevice2AImpl const void *lpVtbl; LONG ref; GUID guid; + HANDLE hEvent; }; /* Routines to do DataFormat / WineFormat conversions */ diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 885d91f..9ffab1f 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -103,7 +103,6 @@ struct JoystickImpl DataFormat *transform; /* wine to user format converter */ int *offsets; /* object offsets */ ObjProps *props; - HANDLE hEvent; LPDIDEVICEOBJECTDATA data_queue; int queue_head, queue_tail, queue_len; BOOL acquired; @@ -1213,19 +1212,6 @@ static HRESULT WINAPI JoystickAImpl_SetP return DI_OK; } -/****************************************************************************** - * SetEventNotification : specifies event to be sent on state change - */ -static HRESULT WINAPI JoystickAImpl_SetEventNotification( - LPDIRECTINPUTDEVICE8A iface, HANDLE hnd -) { - JoystickImpl *This = (JoystickImpl *)iface; - - TRACE("(this=%p,%p)\n",This,hnd); - This->hEvent = hnd; - return DI_OK; -} - static HRESULT WINAPI JoystickAImpl_GetCapabilities( LPDIRECTINPUTDEVICE8A iface, LPDIDEVCAPS lpDIDevCaps) @@ -1662,7 +1648,7 @@ static const IDirectInputDevice8AVtbl Jo JoystickAImpl_GetDeviceState, JoystickAImpl_GetDeviceData, JoystickAImpl_SetDataFormat, - JoystickAImpl_SetEventNotification, + IDirectInputDevice2AImpl_SetEventNotification, IDirectInputDevice2AImpl_SetCooperativeLevel, JoystickAImpl_GetObjectInfo, JoystickAImpl_GetDeviceInfo, @@ -1704,7 +1690,7 @@ static const IDirectInputDevice8WVtbl Sy XCAST(GetDeviceState)JoystickAImpl_GetDeviceState, XCAST(GetDeviceData)JoystickAImpl_GetDeviceData, XCAST(SetDataFormat)JoystickAImpl_SetDataFormat, - XCAST(SetEventNotification)JoystickAImpl_SetEventNotification, + XCAST(SetEventNotification)IDirectInputDevice2AImpl_SetEventNotification, XCAST(SetCooperativeLevel)IDirectInputDevice2AImpl_SetCooperativeLevel, IDirectInputDevice2WImpl_GetObjectInfo, JoystickWImpl_GetDeviceInfo, diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 335dc89..04ec9d3 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -137,7 +137,6 @@ struct JoystickImpl LPDIDATAFORMAT df; DataFormat *transform; /* wine to user format converter */ int *offsets; /* object offsets */ - HANDLE hEvent; LPDIDEVICEOBJECTDATA data_queue; int queue_head, queue_tail, queue_len; BOOL overflow; @@ -1167,19 +1166,6 @@ static HRESULT WINAPI JoystickAImpl_SetP return 0; } -/****************************************************************************** - * SetEventNotification : specifies event to be sent on state change - */ -static HRESULT WINAPI JoystickAImpl_SetEventNotification( - LPDIRECTINPUTDEVICE8A iface, HANDLE hnd -) { - JoystickImpl *This = (JoystickImpl *)iface; - - TRACE("(this=%p,%p)\n",This,hnd); - This->hEvent = hnd; - return DI_OK; -} - static HRESULT WINAPI JoystickAImpl_GetCapabilities( LPDIRECTINPUTDEVICE8A iface, LPDIDEVCAPS lpDIDevCaps) @@ -1808,7 +1794,7 @@ static const IDirectInputDevice8AVtbl Jo JoystickAImpl_GetDeviceState, JoystickAImpl_GetDeviceData, JoystickAImpl_SetDataFormat, - JoystickAImpl_SetEventNotification, + IDirectInputDevice2AImpl_SetEventNotification, IDirectInputDevice2AImpl_SetCooperativeLevel, IDirectInputDevice2AImpl_GetObjectInfo, IDirectInputDevice2AImpl_GetDeviceInfo, @@ -1850,7 +1836,7 @@ static const IDirectInputDevice8WVtbl Jo XCAST(GetDeviceState)JoystickAImpl_GetDeviceState, XCAST(GetDeviceData)JoystickAImpl_GetDeviceData, XCAST(SetDataFormat)JoystickAImpl_SetDataFormat, - XCAST(SetEventNotification)JoystickAImpl_SetEventNotification, + XCAST(SetEventNotification)IDirectInputDevice2AImpl_SetEventNotification, XCAST(SetCooperativeLevel)IDirectInputDevice2AImpl_SetCooperativeLevel, IDirectInputDevice2WImpl_GetObjectInfo, IDirectInputDevice2WImpl_GetDeviceInfo, diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 8dcf063..71e2c8b 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -50,7 +50,6 @@ struct SysKeyboardImpl IDirectInputImpl* dinput; - HANDLE hEvent; /* SysKeyboardAImpl */ int acquired; @@ -101,7 +100,7 @@ LRESULT CALLBACK KeyboardCallback( int c GEN_EVENT(dik_code, new_diks, hook->time, This->dinput->evsequence++); LeaveCriticalSection(&This->crit); - if (This->hEvent) SetEvent(This->hEvent); + if (This->base.hEvent) SetEvent(This->base.hEvent); return CallNextHookEx(0, code, wparam, lparam); } @@ -531,16 +530,6 @@ static HRESULT WINAPI SysKeyboardAImpl_U return DI_OK; } -static HRESULT WINAPI SysKeyboardAImpl_SetEventNotification(LPDIRECTINPUTDEVICE8A iface, - HANDLE hnd) { - SysKeyboardImpl *This = (SysKeyboardImpl *)iface; - - TRACE("(this=%p,%p)\n",This,hnd); - - This->hEvent = hnd; - return DI_OK; -} - /****************************************************************************** * GetCapabilities : get the device capablitites */ @@ -699,7 +688,7 @@ static const IDirectInputDevice8AVtbl Sy SysKeyboardAImpl_GetDeviceState, SysKeyboardAImpl_GetDeviceData, IDirectInputDevice2AImpl_SetDataFormat, - SysKeyboardAImpl_SetEventNotification, + IDirectInputDevice2AImpl_SetEventNotification, IDirectInputDevice2AImpl_SetCooperativeLevel, SysKeyboardAImpl_GetObjectInfo, SysKeyboardAImpl_GetDeviceInfo, @@ -741,7 +730,7 @@ static const IDirectInputDevice8WVtbl Sy XCAST(GetDeviceState)SysKeyboardAImpl_GetDeviceState, XCAST(GetDeviceData)SysKeyboardAImpl_GetDeviceData, XCAST(SetDataFormat)IDirectInputDevice2AImpl_SetDataFormat, - XCAST(SetEventNotification)SysKeyboardAImpl_SetEventNotification, + XCAST(SetEventNotification)IDirectInputDevice2AImpl_SetEventNotification, XCAST(SetCooperativeLevel)IDirectInputDevice2AImpl_SetCooperativeLevel, SysKeyboardWImpl_GetObjectInfo, SysKeyboardWImpl_GetDeviceInfo, diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 894dcb2..a596c7f 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -136,7 +136,6 @@ struct SysMouseImpl WARP_STATUS need_warp; DWORD last_warped; int acquired; - HANDLE hEvent; CRITICAL_SECTION crit; /* This is for mouse reporting. */ @@ -538,7 +537,7 @@ static LRESULT CALLBACK dinput_mouse_hoo end: /* Mouse moved -> send event if asked */ - if (This->hEvent) SetEvent(This->hEvent); + if (This->base.hEvent) SetEvent(This->base.hEvent); LeaveCriticalSection(&(This->crit)); @@ -911,22 +910,6 @@ static HRESULT WINAPI SysMouseAImpl_GetP return DI_OK; } - - -/****************************************************************************** - * SetEventNotification : specifies event to be sent on state change - */ -static HRESULT WINAPI SysMouseAImpl_SetEventNotification(LPDIRECTINPUTDEVICE8A iface, - HANDLE hnd) { - SysMouseImpl *This = (SysMouseImpl *)iface; - - TRACE("(this=%p,%p)\n",This,hnd); - - This->hEvent = hnd; - - return DI_OK; -} - /****************************************************************************** * GetCapabilities : get the device capablitites */ @@ -1107,7 +1090,7 @@ static const IDirectInputDevice8AVtbl Sy SysMouseAImpl_GetDeviceState, SysMouseAImpl_GetDeviceData, SysMouseAImpl_SetDataFormat, - SysMouseAImpl_SetEventNotification, + IDirectInputDevice2AImpl_SetEventNotification, SysMouseAImpl_SetCooperativeLevel, IDirectInputDevice2AImpl_GetObjectInfo, SysMouseAImpl_GetDeviceInfo, @@ -1149,7 +1132,7 @@ static const IDirectInputDevice8WVtbl Sy XCAST(GetDeviceState)SysMouseAImpl_GetDeviceState, XCAST(GetDeviceData)SysMouseAImpl_GetDeviceData, XCAST(SetDataFormat)SysMouseAImpl_SetDataFormat, - XCAST(SetEventNotification)SysMouseAImpl_SetEventNotification, + XCAST(SetEventNotification)IDirectInputDevice2AImpl_SetEventNotification, XCAST(SetCooperativeLevel)SysMouseAImpl_SetCooperativeLevel, IDirectInputDevice2WImpl_GetObjectInfo, SysMouseWImpl_GetDeviceInfo,

1 0

Vitaliy Margolen : dinput: Use dinput device as a base class for keyboard, mouse and joystick.
by Alexandre Julliard Oct. 17, 2006

Oct. 17, 2006

Module: wine Branch: master Commit: 7d838d9e6f3e45c9335526c764681b9ce01ba387 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d838d9e6f3e45c9335526c76… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Sun Oct 15 11:29:30 2006 -0600 dinput: Use dinput device as a base class for keyboard, mouse and joystick. --- dlls/dinput/device_private.h | 6 +++--- dlls/dinput/joystick_linux.c | 13 ++++++------- dlls/dinput/joystick_linuxinput.c | 13 ++++++------- dlls/dinput/keyboard.c | 12 +++++------- dlls/dinput/mouse.c | 12 +++++------- 5 files changed, 25 insertions(+), 31 deletions(-) diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index a2777c2..b5c88bf 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -30,9 +30,9 @@ #include "dinput.h" typedef struct IDirectInputDevice2AImpl IDirectInputDevice2AImpl; struct IDirectInputDevice2AImpl { - const IDirectInputDevice2AVtbl *lpVtbl; - LONG ref; - GUID guid; + const void *lpVtbl; + LONG ref; + GUID guid; }; /* Routines to do DataFormat / WineFormat conversions */ diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 62a59c1..885d91f 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -89,9 +89,8 @@ static const IDirectInputDevice8AVtbl Jo static const IDirectInputDevice8WVtbl JoystickWvt; struct JoystickImpl { - const void *lpVtbl; - LONG ref; - GUID guid; + struct IDirectInputDevice2AImpl base; + char dev[32]; /* The 'parent' DInput */ @@ -495,12 +494,12 @@ #ifdef JSIOCGBUTTONS } #endif - newDevice->lpVtbl = jvt; - newDevice->ref = 1; + newDevice->base.lpVtbl = jvt; + newDevice->base.ref = 1; newDevice->dinput = dinput; newDevice->acquired = FALSE; newDevice->overflow = FALSE; - CopyMemory(&(newDevice->guid),rguid,sizeof(*rguid)); + CopyMemory(&newDevice->base.guid, rguid, sizeof(*rguid)); /* setup_dinput_options may change these */ newDevice->deadzone = 5000; @@ -672,7 +671,7 @@ static ULONG WINAPI JoystickAImpl_Releas JoystickImpl *This = (JoystickImpl *)iface; ULONG ref; - ref = InterlockedDecrement((&This->ref)); + ref = InterlockedDecrement(&This->base.ref); if (ref) return ref; diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index ef8af3d..335dc89 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -118,9 +118,8 @@ #define AXE_ABSFLAT 4 struct JoystickImpl { - const void *lpVtbl; - LONG ref; - GUID guid; + struct IDirectInputDevice2AImpl base; + struct JoyDev *joydev; /* The 'parent' DInput */ @@ -373,15 +372,15 @@ static JoystickImpl *alloc_device(REFGUI return NULL; } - newDevice->lpVtbl = jvt; - newDevice->ref = 1; + newDevice->base.lpVtbl = jvt; + newDevice->base.ref = 1; + memcpy(&newDevice->base.guid, rguid, sizeof(*rguid)); newDevice->joyfd = -1; newDevice->dinput = dinput; newDevice->joydev = joydev; #ifdef HAVE_STRUCT_FF_EFFECT_DIRECTION newDevice->ff_state = FF_STATUS_STOPPED; #endif - memcpy(&(newDevice->guid),rguid,sizeof(*rguid)); for (i=0;i<ABS_MAX;i++) { /* apps expect the range to be the same they would get from the * GetProperty/range method */ @@ -522,7 +521,7 @@ static ULONG WINAPI JoystickAImpl_Releas JoystickImpl *This = (JoystickImpl *)iface; ULONG ref; - ref = InterlockedDecrement(&(This->ref)); + ref = InterlockedDecrement(&This->base.ref); if (ref) return ref; diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 8cff814..8dcf063 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -46,9 +46,7 @@ static const IDirectInputDevice8WVtbl Sy typedef struct SysKeyboardImpl SysKeyboardImpl; struct SysKeyboardImpl { - const void *lpVtbl; - LONG ref; - GUID guid; + struct IDirectInputDevice2AImpl base; IDirectInputImpl* dinput; @@ -204,9 +202,9 @@ static SysKeyboardImpl *alloc_device(REF SysKeyboardImpl* newDevice; newDevice = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(SysKeyboardImpl)); - newDevice->lpVtbl = kvt; - newDevice->ref = 1; - memcpy(&(newDevice->guid),rguid,sizeof(*rguid)); + newDevice->base.lpVtbl = kvt; + newDevice->base.ref = 1; + memcpy(&newDevice->base.guid, rguid, sizeof(*rguid)); newDevice->dinput = dinput; InitializeCriticalSection(&(newDevice->crit)); @@ -263,7 +261,7 @@ static ULONG WINAPI SysKeyboardAImpl_Rel SysKeyboardImpl *This = (SysKeyboardImpl *)iface; ULONG ref; - ref = InterlockedDecrement(&(This->ref)); + ref = InterlockedDecrement(&This->base.ref); if (ref) return ref; set_dinput_hook(WH_KEYBOARD_LL, NULL); diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index b426af1..894dcb2 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -108,9 +108,7 @@ typedef enum { struct SysMouseImpl { - const void *lpVtbl; - LONG ref; - GUID guid; + struct IDirectInputDevice2AImpl base; IDirectInputImpl *dinput; @@ -251,10 +249,10 @@ static SysMouseImpl *alloc_device(REFGUI }; SysMouseImpl* newDevice; newDevice = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(SysMouseImpl)); - newDevice->ref = 1; - newDevice->lpVtbl = mvt; + newDevice->base.lpVtbl = mvt; + newDevice->base.ref = 1; + memcpy(&newDevice->base.guid, rguid, sizeof(*rguid)); InitializeCriticalSection(&(newDevice->crit)); - memcpy(&(newDevice->guid),rguid,sizeof(*rguid)); /* Per default, Wine uses its internal data format */ newDevice->df = (DIDATAFORMAT *) &Wine_InternalMouseFormat; @@ -327,7 +325,7 @@ static ULONG WINAPI SysMouseAImpl_Releas SysMouseImpl *This = (SysMouseImpl *)iface; ULONG ref; - ref = InterlockedDecrement(&(This->ref)); + ref = InterlockedDecrement(&This->base.ref); if (ref) return ref;

1 0

Vitaliy Margolen : dinput: Move SetCooperativeLevel into base class.
by Alexandre Julliard Oct. 17, 2006

Oct. 17, 2006

Module: wine Branch: master Commit: 1dae4c683264349da217b08ee21b7fe337c6d070 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dae4c683264349da217b08ee… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Sun Oct 15 11:30:07 2006 -0600 dinput: Move SetCooperativeLevel into base class. --- dlls/dinput/device.c | 41 +++++++++++++++++++++++---- dlls/dinput/device_private.h | 2 + dlls/dinput/mouse.c | 63 +++++++----------------------------------- 3 files changed, 46 insertions(+), 60 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index d10500b..7ba7177 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -463,15 +463,42 @@ HRESULT WINAPI IDirectInputDevice2AImpl_ return DI_OK; } +/****************************************************************************** + * SetCooperativeLevel + * + * Set cooperative level and the source window for the events. + */ HRESULT WINAPI IDirectInputDevice2AImpl_SetCooperativeLevel( - LPDIRECTINPUTDEVICE8A iface,HWND hwnd,DWORD dwflags -) { + LPDIRECTINPUTDEVICE8A iface, HWND hwnd, DWORD dwflags) +{ IDirectInputDevice2AImpl *This = (IDirectInputDevice2AImpl *)iface; - TRACE("(this=%p,%p,0x%08x)\n", This, hwnd, dwflags); - if (TRACE_ON(dinput)) { - TRACE(" cooperative level : "); - _dump_cooperativelevel_DI(dwflags); - } + + TRACE("(%p) %p,0x%08x\n", This, hwnd, dwflags); + TRACE(" cooperative level : "); + _dump_cooperativelevel_DI(dwflags); + + if ((dwflags & (DISCL_EXCLUSIVE | DISCL_NONEXCLUSIVE)) == 0 || + (dwflags & (DISCL_EXCLUSIVE | DISCL_NONEXCLUSIVE)) == (DISCL_EXCLUSIVE | DISCL_NONEXCLUSIVE) || + (dwflags & (DISCL_FOREGROUND | DISCL_BACKGROUND)) == 0 || + (dwflags & (DISCL_FOREGROUND | DISCL_BACKGROUND)) == (DISCL_FOREGROUND | DISCL_BACKGROUND)) + return DIERR_INVALIDPARAM; + + if (dwflags == (DISCL_NONEXCLUSIVE | DISCL_BACKGROUND)) + hwnd = GetDesktopWindow(); + + if (!hwnd) return E_HANDLE; + + /* For security reasons native does not allow exclusive background level + for mouse and keyboard only */ + if (dwflags & DISCL_EXCLUSIVE && dwflags & DISCL_BACKGROUND && + (IsEqualGUID(&This->guid, &GUID_SysMouse) || + IsEqualGUID(&This->guid, &GUID_SysKeyboard))) + return DIERR_UNSUPPORTED; + + /* Store the window which asks for the mouse */ + This->win = hwnd; + This->dwCoopLevel = dwflags; + return DI_OK; } diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index e2bc197..bf787a5 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -34,6 +34,8 @@ struct IDirectInputDevice2AImpl LONG ref; GUID guid; HANDLE hEvent; + DWORD dwCoopLevel; + HWND win; }; /* Routines to do DataFormat / WineFormat conversions */ diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index a596c7f..6e22c1c 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -124,8 +124,6 @@ struct SysMouseImpl LONG prevX, prevY; /* These are used in case of relative -> absolute transitions */ POINT org_coords; - HWND win; - DWORD dwCoopLevel; POINT mapped_center; DWORD win_centerX, win_centerY; LPDIDEVICEOBJECTDATA data_queue; @@ -250,6 +248,7 @@ static SysMouseImpl *alloc_device(REFGUI newDevice = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(SysMouseImpl)); newDevice->base.lpVtbl = mvt; newDevice->base.ref = 1; + newDevice->base.dwCoopLevel = DISCL_NONEXCLUSIVE | DISCL_BACKGROUND; memcpy(&newDevice->base.guid, rguid, sizeof(*rguid)); InitializeCriticalSection(&(newDevice->crit)); @@ -261,7 +260,6 @@ static SysMouseImpl *alloc_device(REFGUI newDevice->wine_df->internal_format_size = Wine_InternalMouseFormat.dwDataSize; newDevice->wine_df->dt = NULL; newDevice->dinput = dinput; - newDevice->dwCoopLevel = DISCL_NONEXCLUSIVE | DISCL_BACKGROUND; return newDevice; } @@ -344,47 +342,6 @@ static ULONG WINAPI SysMouseAImpl_Releas return 0; } - -/****************************************************************************** - * SetCooperativeLevel : store the window in which we will do our - * grabbing. - */ -static HRESULT WINAPI SysMouseAImpl_SetCooperativeLevel( - LPDIRECTINPUTDEVICE8A iface,HWND hwnd,DWORD dwflags -) -{ - SysMouseImpl *This = (SysMouseImpl *)iface; - - TRACE("(this=%p,%p,0x%08x)\n", This, hwnd, dwflags); - - if (TRACE_ON(dinput)) { - TRACE(" cooperative level : "); - _dump_cooperativelevel_DI(dwflags); - } - - if ((dwflags & (DISCL_EXCLUSIVE | DISCL_NONEXCLUSIVE)) == 0 || - (dwflags & (DISCL_EXCLUSIVE | DISCL_NONEXCLUSIVE)) == (DISCL_EXCLUSIVE | DISCL_NONEXCLUSIVE) || - (dwflags & (DISCL_FOREGROUND | DISCL_BACKGROUND)) == 0 || - (dwflags & (DISCL_FOREGROUND | DISCL_BACKGROUND)) == (DISCL_FOREGROUND | DISCL_BACKGROUND)) - return DIERR_INVALIDPARAM; - - if (dwflags == (DISCL_NONEXCLUSIVE | DISCL_BACKGROUND)) - hwnd = GetDesktopWindow(); - - if (!hwnd) return E_HANDLE; - - if (dwflags & DISCL_EXCLUSIVE && dwflags & DISCL_BACKGROUND) { - return DIERR_UNSUPPORTED; - } - - /* Store the window which asks for the mouse */ - This->win = hwnd; - This->dwCoopLevel = dwflags; - - return DI_OK; -} - - /****************************************************************************** * SetDataFormat : the application can choose the format of the data * the device driver sends back with GetDeviceState. @@ -430,7 +387,7 @@ static LRESULT CALLBACK dinput_mouse_hoo if (code != HC_ACTION) return CallNextHookEx( 0, code, wparam, lparam ); EnterCriticalSection(&(This->crit)); - dwCoop = This->dwCoopLevel; + dwCoop = This->base.dwCoopLevel; if (wparam == WM_MOUSEMOVE) { if (This->absolute) { @@ -553,7 +510,7 @@ static BOOL dinput_window_check(SysMouse DWORD centerX, centerY; /* make sure the window hasn't moved */ - if(!GetWindowRect(This->win, &rect)) + if(!GetWindowRect(This->base.win, &rect)) return FALSE; centerX = (rect.right - rect.left) / 2; centerY = (rect.bottom - rect.top ) / 2; @@ -563,7 +520,7 @@ static BOOL dinput_window_check(SysMouse } This->mapped_center.x = This->win_centerX; This->mapped_center.y = This->win_centerY; - MapWindowPoints(This->win, HWND_DESKTOP, &This->mapped_center, 1); + MapWindowPoints(This->base.win, HWND_DESKTOP, &This->mapped_center, 1); return TRUE; } @@ -605,12 +562,12 @@ static HRESULT WINAPI SysMouseAImpl_Acqu This->m_state.rgbButtons[2] = GetKeyState(VK_MBUTTON) & 0x80; /* Install our mouse hook */ - if (This->dwCoopLevel & DISCL_EXCLUSIVE) + if (This->base.dwCoopLevel & DISCL_EXCLUSIVE) ShowCursor(FALSE); /* hide cursor */ set_dinput_hook(WH_MOUSE_LL, dinput_mouse_hook); /* Get the window dimension and find the center */ - GetWindowRect(This->win, &rect); + GetWindowRect(This->base.win, &rect); This->win_centerX = (rect.right - rect.left) / 2; This->win_centerY = (rect.bottom - rect.top ) / 2; @@ -618,7 +575,7 @@ static HRESULT WINAPI SysMouseAImpl_Acqu if (This->absolute == 0) { This->mapped_center.x = This->win_centerX; This->mapped_center.y = This->win_centerY; - MapWindowPoints(This->win, HWND_DESKTOP, &This->mapped_center, 1); + MapWindowPoints(This->base.win, HWND_DESKTOP, &This->mapped_center, 1); TRACE("Warping mouse to %d - %d\n", This->mapped_center.x, This->mapped_center.y); SetCursorPos( This->mapped_center.x, This->mapped_center.y ); This->last_warped = GetCurrentTime(); @@ -647,7 +604,7 @@ static HRESULT WINAPI SysMouseAImpl_Unac } set_dinput_hook(WH_MOUSE_LL, NULL); - if (This->dwCoopLevel & DISCL_EXCLUSIVE) + if (This->base.dwCoopLevel & DISCL_EXCLUSIVE) ShowCursor(TRUE); /* show cursor */ /* No more locks */ @@ -1091,7 +1048,7 @@ static const IDirectInputDevice8AVtbl Sy SysMouseAImpl_GetDeviceData, SysMouseAImpl_SetDataFormat, IDirectInputDevice2AImpl_SetEventNotification, - SysMouseAImpl_SetCooperativeLevel, + IDirectInputDevice2AImpl_SetCooperativeLevel, IDirectInputDevice2AImpl_GetObjectInfo, SysMouseAImpl_GetDeviceInfo, IDirectInputDevice2AImpl_RunControlPanel, @@ -1133,7 +1090,7 @@ static const IDirectInputDevice8WVtbl Sy XCAST(GetDeviceData)SysMouseAImpl_GetDeviceData, XCAST(SetDataFormat)SysMouseAImpl_SetDataFormat, XCAST(SetEventNotification)IDirectInputDevice2AImpl_SetEventNotification, - XCAST(SetCooperativeLevel)SysMouseAImpl_SetCooperativeLevel, + XCAST(SetCooperativeLevel)IDirectInputDevice2AImpl_SetCooperativeLevel, IDirectInputDevice2WImpl_GetObjectInfo, SysMouseWImpl_GetDeviceInfo, XCAST(RunControlPanel)IDirectInputDevice2AImpl_RunControlPanel,

1 0

Mike McCormack : msi: Fix tables with binary data where the key is an integer.
by Alexandre Julliard Oct. 17, 2006

Oct. 17, 2006

Module: wine Branch: master Commit: 98a42ad575544aeee4b66a6f0ec3a6ad005faa43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98a42ad575544aeee4b66a6f0… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Oct 17 18:00:33 2006 +0900 msi: Fix tables with binary data where the key is an integer. --- dlls/msi/table.c | 40 +++++++++++++++++++++++++++++----------- dlls/msi/tests/db.c | 2 -- 2 files changed, 29 insertions(+), 13 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 68d246a..087f407 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -27,16 +27,17 @@ #define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" #include "winerror.h" -#include "wine/debug.h" #include "msi.h" #include "msiquery.h" #include "objbase.h" #include "objidl.h" -#include "msipriv.h" #include "winnls.h" - +#include "msipriv.h" #include "query.h" +#include "wine/debug.h" +#include "wine/unicode.h" + WINE_DEFAULT_DEBUG_CHANNEL(msidb); #define MSITABLE_HASH_TABLE_SIZE 37 @@ -1104,6 +1105,7 @@ static UINT TABLE_fetch_stream( struct t LPWSTR full_name; DWORD len; static const WCHAR szDot[] = { '.', 0 }; + WCHAR number[0x20]; if( !view->ops->fetch_int ) return ERROR_INVALID_PARAMETER; @@ -1118,15 +1120,31 @@ static UINT TABLE_fetch_stream( struct t if( r != ERROR_SUCCESS ) return r; - /* now get the column with the name of the stream */ - r = view->ops->fetch_int( view, row, ival, &refcol ); - if( r != ERROR_SUCCESS ) - return r; + /* check the column value is in range */ + if (ival < 0 || ival > tv->num_cols || ival == col) + { + ERR("bad column ref (%u) for stream\n", ival); + return ERROR_FUNCTION_FAILED; + } - /* lookup the string value from the string table */ - sval = msi_string_lookup_id( tv->db->strings, refcol ); - if( !sval ) - return ERROR_INVALID_PARAMETER; + if ( tv->columns[ival - 1].type & MSITYPE_STRING ) + { + /* now get the column with the name of the stream */ + r = view->ops->fetch_int( view, row, ival, &refcol ); + if ( r != ERROR_SUCCESS ) + return r; + + /* lookup the string value from the string table */ + sval = msi_string_lookup_id( tv->db->strings, refcol ); + if ( !sval ) + return ERROR_INVALID_PARAMETER; + } + else + { + static const WCHAR fmt[] = { '%','d',0 }; + sprintfW( number, fmt, ival ); + sval = number; + } len = lstrlenW( tv->name ) + 2 + lstrlenW( sval ); full_name = msi_alloc( len*sizeof(WCHAR) ); diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index f7dce1e..534c2d5 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1983,7 +1983,6 @@ static void test_try_transform(void) r = do_query(hdb, query, &hrec); ok(r == ERROR_SUCCESS, "select query failed\n"); - todo_wine { /* check the contents of the stream */ sz = sizeof buffer; r = MsiRecordReadStream( hrec, 1, buffer, &sz ); @@ -1991,7 +1990,6 @@ static void test_try_transform(void) ok(!memcmp(buffer, "naengmyon", 9), "stream data was wrong\n"); ok(sz == 9, "stream data was wrong size\n"); if (hrec) MsiCloseHandle(hrec); - } MsiCloseHandle( hdb );

1 0

Mikołaj Zalewski : comctl32: rebar: Use SM_CYEDGE for heights in NCCalcSize.
by Alexandre Julliard Oct. 17, 2006

Oct. 17, 2006

Module: wine Branch: master Commit: 4205c64e8b5a5a4221de5e11c70cb734a4f71e12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4205c64e8b5a5a4221de5e11c… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Tue Oct 17 09:02:41 2006 +0200 comctl32: rebar: Use SM_CYEDGE for heights in NCCalcSize. --- dlls/comctl32/rebar.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index d2c8b94..1188029 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -4119,11 +4119,12 @@ REBAR_NCCalcSize (REBAR_INFO *infoPtr, W if (infoPtr->dwStyle & WS_BORDER) { rect->left = min(rect->left + GetSystemMetrics(SM_CXEDGE), rect->right); rect->right = max(rect->right - GetSystemMetrics(SM_CXEDGE), rect->left); - rect->top = min(rect->top + GetSystemMetrics(SM_CXEDGE), rect->bottom); - rect->bottom = max(rect->bottom - GetSystemMetrics(SM_CXEDGE), rect->top); + rect->top = min(rect->top + GetSystemMetrics(SM_CYEDGE), rect->bottom); + rect->bottom = max(rect->bottom - GetSystemMetrics(SM_CYEDGE), rect->top); } else if ((theme = GetWindowTheme (infoPtr->hwndSelf))) { + /* FIXME: should use GetThemeInt */ rect->top = min(rect->top + 1, rect->bottom); } TRACE("new client=(%d,%d)-(%d,%d)\n", rect->left, rect->top, rect->right, rect->bottom);

1 0

Mike McCormack : msi: Stream fields shouldn't be treated as strings.
by Alexandre Julliard Oct. 17, 2006

Oct. 17, 2006

Module: wine Branch: master Commit: 1f737c035efc2bd8736d7e1b20c3137e271ab170 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f737c035efc2bd8736d7e1b2… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Oct 17 17:48:53 2006 +0900 msi: Stream fields shouldn't be treated as strings. --- dlls/msi/table.c | 4 +++- dlls/msi/tests/db.c | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 22b5a71..68d246a 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1293,7 +1293,9 @@ static UINT table_validate_new( MSITABLE if ( tv->columns[i].type & MSITYPE_NULLABLE ) continue; - if ( tv->columns[i].type & MSITYPE_STRING ) + if ( MSITYPE_IS_BINARY(tv->columns[i].type) ) + TRACE("skipping binary column\n"); + else if ( tv->columns[i].type & MSITYPE_STRING ) { LPCWSTR str; diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 68c7682..f7dce1e 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1906,6 +1906,20 @@ static void test_try_transform(void) r = run_query(hdb, 0, query); ok(r == ERROR_SUCCESS, "failed to add table\n"); + hrec = MsiCreateRecord(2); + r = MsiRecordSetInteger(hrec, 1, 2); + ok(r == ERROR_SUCCESS, "failed to set integer\n"); + + write_file("testdata.bin", "lamyon", 6); + r = MsiRecordSetStream(hrec, 2, "testdata.bin"); + ok(r == ERROR_SUCCESS, "failed to set stream\n"); + + query = "INSERT INTO `BINARY` ( `ID`, `BLOB` ) VALUES ( ?, ? )"; + r = run_query(hdb, hrec, query); + ok(r == ERROR_SUCCESS, "failed to add row with blob\n"); + + MsiCloseHandle(hrec); + r = MsiDatabaseCommit( hdb ); ok( r == ERROR_SUCCESS , "Failed to commit database\n" );

1 0