December 2006 - Wine-Commits

Vitaliy Margolen : dinput: Make mouse use axis mode flag set in base class. Add tests.
by Alexandre Julliard Dec. 18, 2006

Dec. 18, 2006

Module: wine Branch: master Commit: 975d7ff2920048bebaabaff8df9b95b5914a5bce URL: http://source.winehq.org/git/wine.git/?a=commit;h=975d7ff2920048bebaabaff8d… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Dec 17 23:22:34 2006 -0700 dinput: Make mouse use axis mode flag set in base class. Add tests. --- dlls/dinput/mouse.c | 50 +++--------- dlls/dinput/tests/Makefile.in | 1 + dlls/dinput/tests/device.c | 174 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 188 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=975d7ff2920048bebaaba…

1 0

Vitaliy Margolen : dinput: Add handling of AXISMODE property to base device object.
by Alexandre Julliard Dec. 18, 2006

Dec. 18, 2006

Module: wine Branch: master Commit: 7b07e4b5638544a23c22aa6f737e63f85854124f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b07e4b5638544a23c22aa6f7… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Dec 17 23:22:11 2006 -0700 dinput: Add handling of AXISMODE property to base device object. --- dlls/dinput/device.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 7586530..6b05ed6 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -876,6 +876,25 @@ HRESULT WINAPI IDirectInputDevice2AImpl_ switch (LOWORD(rguid)) { + case (DWORD) DIPROP_AXISMODE: + { + LPCDIPROPDWORD pd = (LPCDIPROPDWORD)pdiph; + + if (pdiph->dwSize != sizeof(DIPROPDWORD)) return DIERR_INVALIDPARAM; + if (pdiph->dwHow == DIPH_DEVICE && pdiph->dwObj) return DIERR_INVALIDPARAM; + if (This->acquired) return DIERR_ACQUIRED; + if (pdiph->dwHow != DIPH_DEVICE) return DIERR_UNSUPPORTED; + + TRACE("Axis mode: %s\n", pd->dwData == DIPROPAXISMODE_ABS ? "absolute" : + "relative"); + + EnterCriticalSection(&This->crit); + This->data_format.user_df->dwFlags &= ~DIDFT_AXIS; + This->data_format.user_df->dwFlags |= pd->dwData == DIPROPAXISMODE_ABS ? + DIDF_ABSAXIS : DIDF_RELAXIS; + LeaveCriticalSection(&This->crit); + break; + } case (DWORD) DIPROP_BUFFERSIZE: { LPCDIPROPDWORD pd = (LPCDIPROPDWORD)pdiph;

1 0

Vitaliy Margolen : dinput: Zero out returned information struct.
by Alexandre Julliard Dec. 18, 2006

Dec. 18, 2006

Module: wine Branch: master Commit: 350c66fec223178072c8fc8449e11ac683e77bb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=350c66fec223178072c8fc844… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Dec 17 23:21:10 2006 -0700 dinput: Zero out returned information struct. --- dlls/dinput/joystick_linuxinput.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 82b8d07..aea00df 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -975,6 +975,7 @@ static HRESULT WINAPI JoystickAImpl_Enum TRACE("\n"); } + memset(&ddoi, 0, sizeof(ddoi)); /* Only the fields till dwFFMaxForce are relevant */ ddoi.dwSize = FIELD_OFFSET(DIDEVICEOBJECTINSTANCEA, dwFFMaxForce);

1 0

Vitaliy Margolen : dinput: Don't return non existent keys.
by Alexandre Julliard Dec. 18, 2006

Dec. 18, 2006

Module: wine Branch: master Commit: 1db55d2511e766003e83245e83b91ec9ef4e6fe4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1db55d2511e766003e83245e8… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Dec 17 23:20:52 2006 -0700 dinput: Don't return non existent keys. --- dlls/dinput/keyboard.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index cbf06ab..14562b4 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -316,12 +316,13 @@ static HRESULT WINAPI SysKeyboardAImpl_E memset(&ddoi, 0, sizeof(ddoi)); ddoi.dwSize = FIELD_OFFSET(DIDEVICEOBJECTINSTANCEA, dwFFMaxForce); - for (i = 0; i < WINE_DINPUT_KEYBOARD_MAX_KEYS; i++) { - /* Report 255 keys :-) */ + for (i = 0; i < This->base.data_format.wine_df->dwNumObjs; i++) + { + if (!GetKeyNameTextA(((i & 0x7f) << 16) | ((i & 0x80) << 17), ddoi.tszName, sizeof(ddoi.tszName))) + continue; ddoi.guidType = GUID_Key; ddoi.dwOfs = i; ddoi.dwType = DIDFT_MAKEINSTANCE(i) | DIDFT_BUTTON; - GetKeyNameTextA(((i & 0x7f) << 16) | ((i & 0x80) << 17), ddoi.tszName, sizeof(ddoi.tszName)); _dump_OBJECTINSTANCEA(&ddoi); if (lpCallback(&ddoi, lpvRef) != DIENUM_CONTINUE) return DI_OK; } @@ -452,7 +453,8 @@ SysKeyboardAImpl_GetObjectInfo( ddoi.guidType = GUID_Key; ddoi.dwOfs = dwObj; ddoi.dwType = DIDFT_MAKEINSTANCE(dwObj) | DIDFT_BUTTON; - GetKeyNameTextA(((dwObj & 0x7f) << 16) | ((dwObj & 0x80) << 17), ddoi.tszName, sizeof(ddoi.tszName)); + if (!GetKeyNameTextA(((dwObj & 0x7f) << 16) | ((dwObj & 0x80) << 17), ddoi.tszName, sizeof(ddoi.tszName))) + return DIERR_OBJECTNOTFOUND; /* And return our just filled device object instance structure */ memcpy(pdidoi, &ddoi, (dwSize < sizeof(ddoi) ? dwSize : sizeof(ddoi))); @@ -485,7 +487,8 @@ static HRESULT WINAPI SysKeyboardWImpl_G ddoi.guidType = GUID_Key; ddoi.dwOfs = dwObj; ddoi.dwType = DIDFT_MAKEINSTANCE(dwObj) | DIDFT_BUTTON; - GetKeyNameTextW(((dwObj & 0x7f) << 16) | ((dwObj & 0x80) << 17), ddoi.tszName, sizeof(ddoi.tszName)); + if (!GetKeyNameTextW(((dwObj & 0x7f) << 16) | ((dwObj & 0x80) << 17), ddoi.tszName, sizeof(ddoi.tszName))) + return DIERR_OBJECTNOTFOUND; /* And return our just filled device object instance structure */ memcpy(pdidoi, &ddoi, (dwSize < sizeof(ddoi) ? dwSize : sizeof(ddoi)));

1 0

Rob Shearman : kernel32: Protect global alloc functions against integer overflows on the size parameter .
by Alexandre Julliard Dec. 18, 2006

Dec. 18, 2006

Module: wine Branch: master Commit: c3b4fe391986737c1c41f33d1e5f9937388f7c9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3b4fe391986737c1c41f33d1… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Dec 17 23:47:06 2006 +0000 kernel32: Protect global alloc functions against integer overflows on the size parameter. --- dlls/kernel32/heap.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 5d7f61c..44545cd 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -365,6 +365,12 @@ HGLOBAL WINAPI GlobalAlloc( } else /* HANDLE */ { + if (size > INT_MAX-HGLOBAL_STORAGE) + { + SetLastError(ERROR_OUTOFMEMORY); + return 0; + } + RtlLockHeap(GetProcessHeap()); pintern = HeapAlloc(GetProcessHeap(), 0, sizeof(GLOBAL32_INTERN)); @@ -658,7 +664,12 @@ HGLOBAL WINAPI GlobalReAlloc( hnew=hmem; if(pintern->Pointer) { - if((palloc = HeapReAlloc(GetProcessHeap(), heap_flags, + if(size > INT_MAX-HGLOBAL_STORAGE) + { + SetLastError(ERROR_OUTOFMEMORY); + hnew = 0; + } + else if((palloc = HeapReAlloc(GetProcessHeap(), heap_flags, (char *) pintern->Pointer-HGLOBAL_STORAGE, size+HGLOBAL_STORAGE)) == NULL) hnew = 0; /* Block still valid */ @@ -667,7 +678,12 @@ HGLOBAL WINAPI GlobalReAlloc( } else { - if((palloc=HeapAlloc(GetProcessHeap(), heap_flags, size+HGLOBAL_STORAGE)) + if(size > INT_MAX-HGLOBAL_STORAGE) + { + SetLastError(ERROR_OUTOFMEMORY); + hnew = 0; + } + else if((palloc=HeapAlloc(GetProcessHeap(), heap_flags, size+HGLOBAL_STORAGE)) == NULL) hnew = 0; else

1 0

Rob Shearman : ole32: Fix SetSize for HGLOBAL streams in the case of being out-of-memory.
by Alexandre Julliard Dec. 18, 2006

Dec. 18, 2006

Module: wine Branch: master Commit: fb883d868776b2cc08eeb5c4ec7523b7dabea492 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb883d868776b2cc08eeb5c4e… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Dec 17 23:48:25 2006 +0000 ole32: Fix SetSize for HGLOBAL streams in the case of being out-of-memory. --- dlls/ole32/hglobalstream.c | 2 +- dlls/ole32/tests/hglobalstream.c | 2 -- 2 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/hglobalstream.c b/dlls/ole32/hglobalstream.c index 0b7f2ef..99669d3 100644 --- a/dlls/ole32/hglobalstream.c +++ b/dlls/ole32/hglobalstream.c @@ -426,7 +426,7 @@ static HRESULT WINAPI HGLOBALStreamImpl_ supportHandle = GlobalReAlloc(This->supportHandle, libNewSize.u.LowPart, 0); if (supportHandle == 0) - return STG_E_MEDIUMFULL; + return E_OUTOFMEMORY; This->supportHandle = supportHandle; This->streamSize.u.LowPart = libNewSize.u.LowPart; diff --git a/dlls/ole32/tests/hglobalstream.c b/dlls/ole32/tests/hglobalstream.c index 4fc6ef9..c6eaa19 100644 --- a/dlls/ole32/tests/hglobalstream.c +++ b/dlls/ole32/tests/hglobalstream.c @@ -79,9 +79,7 @@ static void test_streamonhglobal(IStream ull.u.HighPart = -1; ull.u.LowPart = -1; hr = IStream_SetSize(pStream, ull); - todo_wine { ok(hr == E_OUTOFMEMORY, "IStream_SetSize with large size should have returned E_OUTOFMEMORY instead of 0x%08x\n", hr); - } } START_TEST(hglobalstream)

1 0

Rob Shearman : ole32: Implement HMETAFILE and HMETAFILEPICT user marshaling functions and add tests for these .
by Alexandre Julliard Dec. 18, 2006

Dec. 18, 2006

Module: wine Branch: master Commit: fda6498284b7d03ad7f6a70e1700bdfdeb99f091 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fda6498284b7d03ad7f6a70e1… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Dec 17 23:46:11 2006 +0000 ole32: Implement HMETAFILE and HMETAFILEPICT user marshaling functions and add tests for these. --- dlls/ole32/ole32.spec | 16 +- dlls/ole32/tests/usrmarshal.c | 155 ++++++++++++++++ dlls/ole32/usrmarshal.c | 407 ++++++++++++++++++++++++++++++++++++++++- 3 files changed, 567 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fda6498284b7d03ad7f6a…

1 0

Rob Shearman : ole32: Move the user marshal tests to usrmarshal.c.
by Alexandre Julliard Dec. 18, 2006

Dec. 18, 2006

Module: wine Branch: master Commit: 3bb4760f8801508982c6577889d99c67cf96ce69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bb4760f8801508982c657788… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Dec 17 23:45:55 2006 +0000 ole32: Move the user marshal tests to usrmarshal.c. --- dlls/ole32/tests/Makefile.in | 3 +- dlls/ole32/tests/marshal.c | 189 ---------------------------------- dlls/ole32/tests/usrmarshal.c | 226 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 228 insertions(+), 190 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3bb4760f8801508982c65…

1 0

Rob Shearman : ole32: Add documentation for the user marshaling functions.
by Alexandre Julliard Dec. 18, 2006

Dec. 18, 2006

Module: wine Branch: master Commit: 4babec19284831656542ec7ee07a9ae8f99db889 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4babec19284831656542ec7ee… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Dec 17 23:45:08 2006 +0000 ole32: Add documentation for the user marshaling functions. --- dlls/ole32/usrmarshal.c | 450 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 450 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4babec19284831656542e…

1 0

Rob Shearman : ole32: Support reading and writing custom clipformats in the data cache.
by Alexandre Julliard Dec. 18, 2006

Dec. 18, 2006

Module: wine Branch: master Commit: cc30255c8a6ca3c8f04995ab8184cea106dcc0d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc30255c8a6ca3c8f04995ab8… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Dec 17 23:44:18 2006 +0000 ole32: Support reading and writing custom clipformats in the data cache. --- dlls/ole32/datacache.c | 125 +++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 109 insertions(+), 16 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 33795f3..249882e 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -67,13 +67,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); * * This structure represents the header of the \002OlePresXXX stream in * the OLE object strorage. - * - * Most fields are still unknown. */ typedef struct PresentationDataHeader { - DWORD unknown1; /* -1 */ - DWORD clipformat; + /* clipformat: + * - standard clipformat: + * DWORD length = 0xffffffff; + * DWORD cfFormat; + * - or custom clipformat: + * DWORD length; + * CHAR format_name[length]; (null-terminated) + */ DWORD unknown3; /* 4, possibly TYMED_ISTREAM */ DVASPECT dvAspect; DWORD lindex; @@ -355,7 +359,6 @@ static BOOL DataCache_IsPresentationStre LPCWSTR name = elem->pwcsName; return (elem->type == STGTY_STREAM) - && (elem->cbSize.u.LowPart >= sizeof(PresentationDataHeader)) && (strlenW(name) == 11) && (strncmpW(name, OlePres, 8) == 0) && (name[8] >= '0') && (name[8] <= '9') @@ -363,6 +366,71 @@ static BOOL DataCache_IsPresentationStre && (name[10] >= '0') && (name[10] <= '9'); } +static HRESULT read_clipformat(IStream *stream, CLIPFORMAT *clipformat) +{ + DWORD length; + HRESULT hr; + ULONG read; + + *clipformat = 0; + + hr = IStream_Read(stream, &length, sizeof(length), &read); + if (hr != S_OK || read != sizeof(length)) + return DV_E_CLIPFORMAT; + if (length == -1) + { + DWORD cf; + hr = IStream_Read(stream, &cf, sizeof(cf), 0); + if (hr != S_OK || read != sizeof(cf)) + return DV_E_CLIPFORMAT; + *clipformat = cf; + } + else + { + char *format_name = HeapAlloc(GetProcessHeap(), 0, length); + if (!format_name) + return E_OUTOFMEMORY; + hr = IStream_Read(stream, format_name, length, &read); + if (hr != S_OK || read != length || format_name[length - 1] != '\0') + { + HeapFree(GetProcessHeap(), 0, format_name); + return DV_E_CLIPFORMAT; + } + *clipformat = RegisterClipboardFormatA(format_name); + HeapFree(GetProcessHeap(), 0, format_name); + } + return S_OK; +} + +static HRESULT write_clipformat(IStream *stream, CLIPFORMAT clipformat) +{ + DWORD length; + HRESULT hr; + + if (clipformat < 0xc000) + length = -1; + else + length = GetClipboardFormatNameA(clipformat, NULL, 0); + hr = IStream_Write(stream, &length, sizeof(length), NULL); + if (FAILED(hr)) + return hr; + if (clipformat < 0xc000) + { + DWORD cf = clipformat; + hr = IStream_Write(stream, &cf, sizeof(cf), NULL); + } + else + { + char *format_name = HeapAlloc(GetProcessHeap(), 0, length); + if (!format_name) + return E_OUTOFMEMORY; + GetClipboardFormatNameA(clipformat, format_name, length); + hr = IStream_Write(stream, format_name, length, NULL); + HeapFree(GetProcessHeap(), 0, format_name); + } + return hr; +} + /************************************************************************ * DataCacheEntry_OpenPresStream * @@ -414,8 +482,12 @@ static HRESULT DataCacheEntry_OpenPresSt { PresentationDataHeader header; ULONG actual_read; + CLIPFORMAT clipformat; + + hr = read_clipformat(pStm, &clipformat); - hr = IStream_Read(pStm, &header, sizeof(header), &actual_read); + if (hr == S_OK) + hr = IStream_Read(pStm, &header, sizeof(header), &actual_read); /* can't use SUCCEEDED(hr): S_FALSE counts as an error */ if (hr == S_OK && actual_read == sizeof(header) @@ -464,11 +536,14 @@ static HRESULT DataCacheEntry_LoadData(D { IStream* presStream = NULL; HRESULT hres; + ULARGE_INTEGER current_pos; STATSTG streamInfo; void* metafileBits; METAFILEPICT *mfpict; HGLOBAL hmfpict; PresentationDataHeader header; + CLIPFORMAT clipformat; + static const LARGE_INTEGER offset_zero; /* * Open the presentation stream. @@ -491,13 +566,27 @@ static HRESULT DataCacheEntry_LoadData(D * Read the header. */ + hres = read_clipformat(presStream, &clipformat); + if (FAILED(hres)) + { + IStream_Release(presStream); + return hres; + } + hres = IStream_Read( presStream, &header, sizeof(PresentationDataHeader), NULL); + if (hres != S_OK) + { + IStream_Release(presStream); + return E_FAIL; + } + + hres = IStream_Seek(presStream, offset_zero, STREAM_SEEK_CUR, &current_pos); - streamInfo.cbSize.QuadPart -= sizeof(PresentationDataHeader); + streamInfo.cbSize.QuadPart -= current_pos.QuadPart; hmfpict = GlobalAlloc(GMEM_MOVEABLE, sizeof(METAFILEPICT)); if (!hmfpict) @@ -586,11 +675,10 @@ static HRESULT DataCacheEntry_Save(DataC if (FAILED(hr)) return hr; - /* custom clipformat */ - if (This->data_cf >= 0xc000) - FIXME("custom clipboard format not serialized properly\n"); - header.unknown1 = -1; - header.clipformat = This->data_cf; + hr = write_clipformat(pres_stream, This->data_cf); + if (FAILED(hr)) + return hr; + if (This->fmtetc.ptd) FIXME("ptd not serialized\n"); header.unknown3 = 4; @@ -1251,10 +1339,15 @@ static HRESULT WINAPI DataCache_Load( &pStm); if (SUCCEEDED(hr)) { - PresentationDataHeader header; - ULONG actual_read; + PresentationDataHeader header; + ULONG actual_read; + CLIPFORMAT clipformat; + + hr = read_clipformat(pStm, &clipformat); - hr = IStream_Read(pStm, &header, sizeof(header), &actual_read); + if (hr == S_OK) + hr = IStream_Read(pStm, &header, sizeof(header), + &actual_read); /* can't use SUCCEEDED(hr): S_FALSE counts as an error */ if (hr == S_OK && actual_read == sizeof(header)) @@ -1262,7 +1355,7 @@ static HRESULT WINAPI DataCache_Load( DataCacheEntry *cache_entry; FORMATETC fmtetc; - fmtetc.cfFormat = header.clipformat; + fmtetc.cfFormat = clipformat; fmtetc.ptd = NULL; /* FIXME */ fmtetc.dwAspect = header.dvAspect; fmtetc.lindex = header.lindex;

1 0