December 2006 - Wine-commits

Andrew Talbot : advapi32: Eliminate wild pointers.
by Alexandre Julliard 05 Dec '06

05 Dec '06

Module: wine Branch: master Commit: d05fabb660534ef09b5eac18c2aec225a510d791 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d05fabb660534ef09b5eac18c… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Dec 4 22:53:25 2006 +0000 advapi32: Eliminate wild pointers. --- dlls/advapi32/lsa.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index 2e1a04d..01818cf 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -446,7 +446,8 @@ NTSTATUS WINAPI LsaQueryInformationPolic * All other fields are zero. */ PPOLICY_PRIMARY_DOMAIN_INFO pinfo; - pinfo = ADVAPI_GetDomainName(sizeof(*pinfo), (char*)&pinfo->Name - (char*)pinfo); + + pinfo = ADVAPI_GetDomainName(sizeof(*pinfo), offsetof(POLICY_PRIMARY_DOMAIN_INFO, Name)); TRACE("setting domain to %s\n", debugstr_w(pinfo->Name.Buffer)); @@ -497,7 +498,7 @@ NTSTATUS WINAPI LsaQueryInformationPolic */ PPOLICY_DNS_DOMAIN_INFO pinfo; - pinfo = ADVAPI_GetDomainName(sizeof(*pinfo), (char*)&pinfo->Name - (char*)pinfo); + pinfo = ADVAPI_GetDomainName(sizeof(*pinfo), offsetof(POLICY_DNS_DOMAIN_INFO, Name)); TRACE("setting domain to %s\n", debugstr_w(pinfo->Name.Buffer));

1 0

Lei Zhang : riched20: Move EM_EXSETSEL fix into ME_SetSelection.
by Alexandre Julliard 05 Dec '06

05 Dec '06

Module: wine Branch: master Commit: 581321d420e024759f6982af70a4a601efcb116f URL: http://source.winehq.org/git/wine.git/?a=commit;h=581321d420e024759f6982af7… Author: Lei Zhang <thestig(a)google.com> Date: Mon Dec 4 11:54:24 2006 -0800 riched20: Move EM_EXSETSEL fix into ME_SetSelection. --- dlls/riched20/caret.c | 80 ++++++++++++++++++++++++++++++++++++------------ dlls/riched20/editor.c | 59 ++--------------------------------- dlls/riched20/editor.h | 2 +- 3 files changed, 64 insertions(+), 77 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index ce3abb7..a58d9f0 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -78,41 +78,81 @@ int ME_GetTextLengthEx(ME_TextEditor *ed } -void ME_SetSelection(ME_TextEditor *editor, int from, int to) +int ME_SetSelection(ME_TextEditor *editor, int from, int to) { + int selectionEnd = 0; + const int len = ME_GetTextLength(editor); + + /* all negative values are effectively the same */ + if (from < 0) + from = -1; + if (to < 0) + to = -1; + + /* select all */ if (from == 0 && to == -1) { - editor->pCursors[1].pRun = ME_FindItemFwd(editor->pBuffer->pFirst, diRun); + editor->pCursors[1].pRun = ME_FindItemFwd(editor->pBuffer->pFirst, diRun); editor->pCursors[1].nOffset = 0; editor->pCursors[0].pRun = ME_FindItemBack(editor->pBuffer->pLast, diRun); - editor->pCursors[0].nOffset = 0; + editor->pCursors[0].nOffset = 0; ME_InvalidateSelection(editor); ME_ClearTempStyle(editor); - return; + return len + 1; } - if (from == -1 && to == -1) /*-1,-1 means put the selection at the end of the text */ + + /* if both values are equal and also out of bound, that means to */ + /* put the selection at the end of the text */ + if ((from == to) && (to < 0 || to > len)) { - editor->pCursors[1].pRun = editor->pCursors[0].pRun = ME_FindItemBack(editor->pBuffer->pLast, diRun); - editor->pCursors[1].nOffset = editor->pCursors[0].nOffset = 0; - ME_InvalidateSelection(editor); - ME_ClearTempStyle(editor); - return; + selectionEnd = 1; } - if (from == -1) + else { - editor->pCursors[1] = editor->pCursors[0]; - ME_Repaint(editor); - ME_ClearTempStyle(editor); - return; + /* if from is negative and to is positive then selection is */ + /* deselected and caret moved to end of the current selection */ + if (from < 0) + { + int start, end; + ME_GetSelection(editor, &start, &end); + editor->pCursors[1] = editor->pCursors[0]; + ME_Repaint(editor); + ME_ClearTempStyle(editor); + return end; + } + + /* adjust to if it's a negative value */ + if (to < 0) + to = len + 1; + + /* flip from and to if they are reversed */ + if (from>to) + { + int tmp = from; + from = to; + to = tmp; + } + + /* after fiddling with the values, we find from > len && to > len */ + if (from > len) + selectionEnd = 1; + /* special case with to too big */ + else if (to > len) + to = len + 1; } - if (from>to) + + if (selectionEnd) { - int tmp = from; - from = to; - to = tmp; + editor->pCursors[1].pRun = editor->pCursors[0].pRun = ME_FindItemBack(editor->pBuffer->pLast, diRun); + editor->pCursors[1].nOffset = editor->pCursors[0].nOffset = 0; + ME_InvalidateSelection(editor); + ME_ClearTempStyle(editor); + return len; } + ME_RunOfsFromCharOfs(editor, from, &editor->pCursors[1].pRun, &editor->pCursors[1].nOffset); - ME_RunOfsFromCharOfs(editor, to, &editor->pCursors[0].pRun, &editor->pCursors[0].nOffset); + ME_RunOfsFromCharOfs(editor, to, &editor->pCursors[0].pRun, &editor->pCursors[0].nOffset); + return to; } diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 254bbb7..738a6fc 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1615,70 +1615,17 @@ LRESULT WINAPI RichEditANSIWndProc(HWND } case EM_EXSETSEL: { - int start, end; - int swap; + int end; CHARRANGE range = *(CHARRANGE *)lParam; TRACE("EM_EXSETSEL (%d,%d)\n", range.cpMin, range.cpMax); - /* all negative values are effectively the same */ - if (range.cpMin < 0) - range.cpMin = -1; - if (range.cpMax < 0) - range.cpMax = -1; - - if (range.cpMin != range.cpMax) - { - /* if cpMin is negative and cpMax is positive then selection is */ - /* deselected and caret moved to end of the current selection */ - if (range.cpMin < 0) - { - ME_GetSelection(editor, &start, &end); - range.cpMin = end; - range.cpMax = end; - } - else - { - /* adjust cpMax if it's a negative value */ - if (range.cpMax < 0) - range.cpMax = ME_GetTextLength(editor) + 1; - - /* flip cpMin and cpMax if they are reversed */ - if (range.cpMin > range.cpMax) - { - swap = range.cpMin; - range.cpMin = range.cpMax; - range.cpMax = swap; - } - - /* special case with cpMin too big */ - if (range.cpMin > ME_GetTextLength(editor)) - { - range.cpMin = ME_GetTextLength(editor); - range.cpMax = ME_GetTextLength(editor); - } - /* special case with cpMax too big */ - else if (range.cpMax > ME_GetTextLength(editor)) - range.cpMax = ME_GetTextLength(editor) + 1; - } - } - else - { - /* special case with cpMin == cpMax */ - /* make sure both values are within bounds */ - if (range.cpMax < 0 || range.cpMax > ME_GetTextLength(editor)) - { - range.cpMin = ME_GetTextLength(editor); - range.cpMax = range.cpMin; - } - } - ME_InvalidateSelection(editor); - ME_SetSelection(editor, range.cpMin, range.cpMax); + end = ME_SetSelection(editor, range.cpMin, range.cpMax); ME_InvalidateSelection(editor); ME_SendSelChange(editor); - return range.cpMax; + return end; } case EM_SHOWSCROLLBAR: { diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 87742c5..ec56e3f 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -178,7 +178,7 @@ void ME_GetDefaultCharFormat(ME_TextEdit void ME_SetDefaultCharFormat(ME_TextEditor *editor, CHARFORMAT2W *mod); /* caret.c */ -void ME_SetSelection(ME_TextEditor *editor, int from, int to); +int ME_SetSelection(ME_TextEditor *editor, int from, int to); void ME_SelectWord(ME_TextEditor *editor); void ME_HideCaret(ME_TextEditor *ed); void ME_ShowCaret(ME_TextEditor *ed);

1 0

Andrew Talbot : comcat/tests: Cast-qual warnings fix.
by Alexandre Julliard 05 Dec '06

05 Dec '06

Module: wine Branch: master Commit: 70797560b7b70e2ee0ab2372973ed8fb65ecaba5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70797560b7b70e2ee0ab23729… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Dec 4 20:29:24 2006 +0000 comcat/tests: Cast-qual warnings fix. --- dlls/comcat/tests/comcat.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comcat/tests/comcat.c b/dlls/comcat/tests/comcat.c index 798d22c..914cbe8 100644 --- a/dlls/comcat/tests/comcat.c +++ b/dlls/comcat/tests/comcat.c @@ -65,14 +65,14 @@ static void do_enum(void) GUID wanted_guid; ULONG fetched = -1; - static const WCHAR szCatID[] = { + static WCHAR szCatID[] = { '{', 'd','e','a','d','c','a','f','e', '-','0','0','0','0','-','0','0','0','0', '-','0','0','0','0', '-','0','0','0','0','0','0','0','0','0','0','0','0', '}',0}; - static const WCHAR szGuid[] = { + static WCHAR szGuid[] = { '{', 'd','e','a','d','c','a','f','e','-', 'b','e','e','d','-',

1 0

Vitaliy Margolen : dinput: Move mouse event queue into base device class.
by Alexandre Julliard 05 Dec '06

05 Dec '06

Module: wine Branch: master Commit: fb5884203b8e80ed427951801b154f03ee0bb20f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb5884203b8e80ed427951801… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Mon Dec 4 10:54:40 2006 -0700 dinput: Move mouse event queue into base device class. --- dlls/dinput/mouse.c | 170 ++++++++++++--------------------------------------- 1 files changed, 40 insertions(+), 130 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fb5884203b8e80ed42795…

1 0

Vitaliy Margolen : dinput: Move joystick event queue into base device class .
by Alexandre Julliard 05 Dec '06

05 Dec '06

Module: wine Branch: master Commit: aa7eed93941c310ee5ce456271046a305e966172 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa7eed93941c310ee5ce45627… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Mon Dec 4 10:54:49 2006 -0700 dinput: Move joystick event queue into base device class. --- dlls/dinput/joystick_linux.c | 114 ++------------------------- dlls/dinput/joystick_linuxinput.c | 157 ++++++++----------------------------- 2 files changed, 41 insertions(+), 230 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aa7eed93941c310ee5ce4…

1 0

Vitaliy Margolen : dinput: Remove no longer used GEN_EVENT.
by Alexandre Julliard 05 Dec '06

05 Dec '06

Module: wine Branch: master Commit: 03fa9106cf449f233bb9c678844feeb039000e5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=03fa9106cf449f233bb9c6788… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Mon Dec 4 10:54:56 2006 -0700 dinput: Remove no longer used GEN_EVENT. --- dlls/dinput/device_private.h | 22 ---------------------- 1 files changed, 0 insertions(+), 22 deletions(-) diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index c32b4f5..4e63af4 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -64,28 +64,6 @@ extern DataFormat *create_DataFormat(con extern void release_DataFormat(DataFormat *df) ; extern void queue_event(LPDIRECTINPUTDEVICE8A iface, int ofs, DWORD data, DWORD time, DWORD seq); -/* Used to fill events in the queue */ -#define GEN_EVENT(offset,data,xtime,seq) \ -{ \ - /* If queue_len > 0, queuing is requested -> TRACE the event queued */ \ - if (This->queue_len > 0) { \ - int nq; \ - TRACE(" queueing %d at offset %d (queue head %d / size %d)\n", \ - (int) (data), (int) (offset), \ - (int) (This->queue_head), (int) (This->queue_len)); \ - \ - nq = (This->queue_head+1) % This->queue_len; \ - if ((offset >= 0) && (nq != This->queue_tail)) { \ - This->data_queue[This->queue_head].dwOfs = offset; \ - This->data_queue[This->queue_head].dwData = data; \ - This->data_queue[This->queue_head].dwTimeStamp = xtime; \ - This->data_queue[This->queue_head].dwSequence = seq; \ - This->queue_head = nq; \ - } else \ - This->overflow = TRUE; \ - } \ -} - /** * Callback Data used by specific callback * for EnumObject on 'W' interfaces

1 0

Vitaliy Margolen : dinput: Move keyboard event queue into base device class .
by Alexandre Julliard 05 Dec '06

05 Dec '06

Module: wine Branch: master Commit: 564ad7da8c56f1b8839ed51b9aa56ed5d98c37c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=564ad7da8c56f1b8839ed51b9… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Mon Dec 4 10:54:30 2006 -0700 dinput: Move keyboard event queue into base device class. This removes [Get|Set]Property and GetDeviceData. --- dlls/dinput/keyboard.c | 160 +++--------------------------------------------- 1 files changed, 9 insertions(+), 151 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index f8ac0c9..f75d76a 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -49,14 +49,6 @@ struct SysKeyboardImpl struct IDirectInputDevice2AImpl base; IDirectInputImpl* dinput; - - /* SysKeyboardAImpl */ - LPDIDEVICEOBJECTDATA data_queue; /* buffer for 'GetDeviceData'. Alloc at - 'Acquire', Free at 'Unacquire' */ - int queue_len; /* size of the queue - set in 'SetProperty' */ - int queue_head; /* position to write new event into queue */ - int queue_tail; /* next event to read from queue */ - BOOL overflow; /* return DI_BUFFEROVERFLOW in 'GetDeviceData' */ }; static SysKeyboardImpl* current_lock = NULL; @@ -94,7 +86,7 @@ LRESULT CALLBACK KeyboardCallback( int c TRACE(" setting %02X to %02X\n", dik_code, DInputKeyState[dik_code]); EnterCriticalSection(&This->base.crit); - GEN_EVENT(dik_code, new_diks, hook->time, This->dinput->evsequence++); + queue_event((LPDIRECTINPUTDEVICE8A)This, dik_code, new_diks, hook->time, This->dinput->evsequence++); LeaveCriticalSection(&This->base.crit); if (This->base.hEvent) SetEvent(This->base.hEvent); @@ -262,77 +254,13 @@ static ULONG WINAPI SysKeyboardAImpl_Rel set_dinput_hook(WH_KEYBOARD_LL, NULL); - /* Free the data queue */ - HeapFree(GetProcessHeap(), 0, This->data_queue); - DeleteCriticalSection(&This->base.crit); + HeapFree(GetProcessHeap(), 0, This->base.data_queue); + HeapFree(GetProcessHeap(), 0, This); - HeapFree(GetProcessHeap(),0,This); return DI_OK; } -static HRESULT WINAPI SysKeyboardAImpl_SetProperty( - LPDIRECTINPUTDEVICE8A iface,REFGUID rguid,LPCDIPROPHEADER ph -) -{ - SysKeyboardImpl *This = (SysKeyboardImpl *)iface; - - TRACE("(this=%p,%s,%p)\n",This,debugstr_guid(rguid),ph); - TRACE("(size=%d,headersize=%d,obj=%d,how=%d\n", - ph->dwSize, ph->dwHeaderSize, ph->dwObj, ph->dwHow); - if (!HIWORD(rguid)) { - switch (LOWORD(rguid)) { - case (DWORD) DIPROP_BUFFERSIZE: { - LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph; - - TRACE("(buffersize=%d)\n", pd->dwData); - - if (This->base.acquired) - return DIERR_INVALIDPARAM; - - This->queue_len = pd->dwData; - - break; - } - default: - WARN("Unknown type %p\n",rguid); - break; - } - } - return DI_OK; -} - -static HRESULT WINAPI SysKeyboardAImpl_GetProperty( - LPDIRECTINPUTDEVICE8A iface,REFGUID rguid,LPDIPROPHEADER ph -) -{ - SysKeyboardImpl *This = (SysKeyboardImpl *)iface; - - TRACE("(this=%p,%s,%p)\n",This,debugstr_guid(rguid),ph); - TRACE("(size=%d,headersize=%d,obj=%d,how=%d\n", - ph->dwSize, ph->dwHeaderSize, ph->dwObj, ph->dwHow); - if (!HIWORD(rguid)) { - switch (LOWORD(rguid)) { - case (DWORD) DIPROP_BUFFERSIZE: { - LPDIPROPDWORD pd = (LPDIPROPDWORD)ph; - - TRACE("(buffersize=%d)\n", pd->dwData); - - if (This->base.acquired) - return DIERR_INVALIDPARAM; - - pd->dwData = This->queue_len; - - break; - } - default: - WARN("Unknown type %p\n",rguid); - break; - } - } - return DI_OK; -} - static HRESULT WINAPI SysKeyboardAImpl_GetDeviceState( LPDIRECTINPUTDEVICE8A iface,DWORD len,LPVOID ptr ) @@ -364,61 +292,6 @@ static HRESULT WINAPI SysKeyboardAImpl_G return DI_OK; } -static HRESULT WINAPI SysKeyboardAImpl_GetDeviceData( - LPDIRECTINPUTDEVICE8A iface,DWORD dodsize,LPDIDEVICEOBJECTDATA dod, - LPDWORD entries,DWORD flags -) -{ - SysKeyboardImpl *This = (SysKeyboardImpl *)iface; - HRESULT ret = DI_OK; - int len; - - TRACE("(%p) %p -> %p(%d) x%d, 0x%08x\n", - This, dod, entries, entries ? *entries : 0, dodsize, flags); - - if (!This->base.acquired) - return DIERR_NOTACQUIRED; - - if (!This->data_queue) - return DIERR_NOTBUFFERED; - - if (dodsize < sizeof(DIDEVICEOBJECTDATA_DX3)) - return DIERR_INVALIDPARAM; - - MsgWaitForMultipleObjectsEx(0, NULL, 0, QS_ALLINPUT, 0); - EnterCriticalSection(&This->base.crit); - - len = ((This->queue_head < This->queue_tail) ? This->queue_len : 0) + - This->queue_head - This->queue_tail; - if ((*entries != INFINITE) && (len > *entries)) len = *entries; - - if (dod) - { - int i; - for(i = 0; i < len; i++) - { - int n = (This->queue_tail + i) % This->queue_len; - memcpy((char *)dod + dodsize * i, This->data_queue + n, dodsize); - } - } - *entries = len; - - if (This->overflow) - ret = DI_BUFFEROVERFLOW; - - if (!(flags & DIGDD_PEEK)) - { - /* Empty buffer */ - This->queue_tail = (This->queue_tail + len) % This->queue_len; - This->overflow = FALSE; - } - - LeaveCriticalSection(&This->base.crit); - - TRACE("Returning %d events queued\n", *entries); - return ret; -} - static HRESULT WINAPI SysKeyboardAImpl_EnumObjects( LPDIRECTINPUTDEVICE8A iface, LPDIENUMDEVICEOBJECTSCALLBACKA lpCallback, @@ -485,16 +358,6 @@ static HRESULT WINAPI SysKeyboardAImpl_A } current_lock = This; - if (This->queue_len > 0) - { - This->data_queue = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - This->queue_len * sizeof(*(This->data_queue))); - This->queue_head = 0; - This->queue_tail = 0; - This->overflow = FALSE; - } else - This->data_queue = NULL; - set_dinput_hook(WH_KEYBOARD_LL, KeyboardCallback); return DI_OK; @@ -517,11 +380,6 @@ static HRESULT WINAPI SysKeyboardAImpl_U else ERR("this != current_lock\n"); - if (This->queue_len >= 0) { - HeapFree(GetProcessHeap(), 0, This->data_queue); - This->data_queue = NULL; - } - return DI_OK; } @@ -688,12 +546,12 @@ static const IDirectInputDevice8AVtbl Sy SysKeyboardAImpl_Release, SysKeyboardAImpl_GetCapabilities, SysKeyboardAImpl_EnumObjects, - SysKeyboardAImpl_GetProperty, - SysKeyboardAImpl_SetProperty, + IDirectInputDevice2AImpl_GetProperty, + IDirectInputDevice2AImpl_SetProperty, SysKeyboardAImpl_Acquire, SysKeyboardAImpl_Unacquire, SysKeyboardAImpl_GetDeviceState, - SysKeyboardAImpl_GetDeviceData, + IDirectInputDevice2AImpl_GetDeviceData, IDirectInputDevice2AImpl_SetDataFormat, IDirectInputDevice2AImpl_SetEventNotification, IDirectInputDevice2AImpl_SetCooperativeLevel, @@ -730,12 +588,12 @@ static const IDirectInputDevice8WVtbl Sy XCAST(Release)SysKeyboardAImpl_Release, XCAST(GetCapabilities)SysKeyboardAImpl_GetCapabilities, SysKeyboardWImpl_EnumObjects, - XCAST(GetProperty)SysKeyboardAImpl_GetProperty, - XCAST(SetProperty)SysKeyboardAImpl_SetProperty, + XCAST(GetProperty)IDirectInputDevice2AImpl_GetProperty, + XCAST(SetProperty)IDirectInputDevice2AImpl_SetProperty, XCAST(Acquire)SysKeyboardAImpl_Acquire, XCAST(Unacquire)SysKeyboardAImpl_Unacquire, XCAST(GetDeviceState)SysKeyboardAImpl_GetDeviceState, - XCAST(GetDeviceData)SysKeyboardAImpl_GetDeviceData, + XCAST(GetDeviceData)IDirectInputDevice2AImpl_GetDeviceData, XCAST(SetDataFormat)IDirectInputDevice2AImpl_SetDataFormat, XCAST(SetEventNotification)IDirectInputDevice2AImpl_SetEventNotification, XCAST(SetCooperativeLevel)IDirectInputDevice2AImpl_SetCooperativeLevel,

1 0

Vitaliy Margolen : dinput: Implement [Get|Set] Property and GetDeviceData in base Device object.
by Alexandre Julliard 05 Dec '06

05 Dec '06

Module: wine Branch: master Commit: ce0c3cdae7e8a3149425989cf6522a438fceeeaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce0c3cdae7e8a3149425989cf… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Mon Dec 4 10:54:05 2006 -0700 dinput: Implement [Get|Set]Property and GetDeviceData in base Device object. Also add queue_event to replace big macro GEN_EVENT. --- dlls/dinput/device.c | 177 +++++++++++++++++++++++++++++++++++++++--- dlls/dinput/device_private.h | 15 +++- 2 files changed, 176 insertions(+), 16 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 105bb02..7d24dfc 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -448,6 +448,35 @@ BOOL DIEnumDevicesCallbackAtoW(LPCDIDEVI } /****************************************************************************** + * queue_event - add new event to the ring queue + */ + +void queue_event(LPDIRECTINPUTDEVICE8A iface, int ofs, DWORD data, DWORD time, DWORD seq) +{ + IDirectInputDevice2AImpl *This = (IDirectInputDevice2AImpl *)iface; + int next_pos; + + if (!This->queue_len || This->overflow || ofs < 0) return; + + next_pos = (This->queue_head + 1) % This->queue_len; + if (next_pos == This->queue_tail) + { + TRACE(" queue overflowed\n"); + This->overflow = TRUE; + return; + } + + TRACE(" queueing %d at offset %d (queue head %d / size %d)\n", + data, ofs, This->queue_head, This->queue_len); + + This->data_queue[This->queue_head].dwOfs = ofs; + This->data_queue[This->queue_head].dwData = data; + This->data_queue[This->queue_head].dwTimeStamp = time; + This->data_queue[This->queue_head].dwSequence = seq; + This->queue_head = next_pos; +} + +/****************************************************************************** * Acquire */ @@ -459,6 +488,8 @@ HRESULT WINAPI IDirectInputDevice2AImpl_ EnterCriticalSection(&This->crit); res = This->acquired ? S_FALSE : DI_OK; This->acquired = 1; + if (res == DI_OK) + This->queue_head = This->queue_tail = This->overflow = 0; LeaveCriticalSection(&This->crit); return res; @@ -558,10 +589,15 @@ ULONG WINAPI IDirectInputDevice2AImpl_Re { IDirectInputDevice2AImpl *This = (IDirectInputDevice2AImpl *)iface; ULONG ref; + ref = InterlockedDecrement(&(This->ref)); - if (ref == 0) - HeapFree(GetProcessHeap(),0,This); - return ref; + if (ref) return ref; + + DeleteCriticalSection(&This->crit); + HeapFree(GetProcessHeap(), 0, This->data_queue); + HeapFree(GetProcessHeap(), 0, This); + + return DI_OK; } HRESULT WINAPI IDirectInputDevice2AImpl_QueryInterface( @@ -675,17 +711,81 @@ HRESULT WINAPI IDirectInputDevice2WImpl_ return DI_OK; } +/****************************************************************************** + * GetProperty + */ + HRESULT WINAPI IDirectInputDevice2AImpl_GetProperty( - LPDIRECTINPUTDEVICE8A iface, - REFGUID rguid, - LPDIPROPHEADER pdiph) + LPDIRECTINPUTDEVICE8A iface, REFGUID rguid, LPDIPROPHEADER pdiph) { - FIXME("(this=%p,%s,%p): stub!\n", - iface, debugstr_guid(rguid), pdiph); - - if (TRACE_ON(dinput)) - _dump_DIPROPHEADER(pdiph); - + IDirectInputDevice2AImpl *This = (IDirectInputDevice2AImpl *)iface; + + TRACE("(%p) %s,%p\n", iface, debugstr_guid(rguid), pdiph); + _dump_DIPROPHEADER(pdiph); + + if (HIWORD(rguid)) return DI_OK; + + switch (LOWORD(rguid)) + { + case (DWORD) DIPROP_BUFFERSIZE: + { + LPDIPROPDWORD pd = (LPDIPROPDWORD)pdiph; + + if (pdiph->dwSize != sizeof(DIPROPDWORD)) return DIERR_INVALIDPARAM; + + pd->dwData = This->queue_len; + TRACE("buffersize = %d\n", pd->dwData); + break; + } + default: + WARN("Unknown property %s\n", debugstr_guid(rguid)); + break; + } + + return DI_OK; +} + +/****************************************************************************** + * SetProperty + */ + +HRESULT WINAPI IDirectInputDevice2AImpl_SetProperty( + LPDIRECTINPUTDEVICE8A iface, REFGUID rguid, LPCDIPROPHEADER pdiph) +{ + IDirectInputDevice2AImpl *This = (IDirectInputDevice2AImpl *)iface; + + TRACE("(%p) %s,%p\n", iface, debugstr_guid(rguid), pdiph); + _dump_DIPROPHEADER(pdiph); + + if (HIWORD(rguid)) return DI_OK; + + switch (LOWORD(rguid)) + { + case (DWORD) DIPROP_BUFFERSIZE: + { + LPCDIPROPDWORD pd = (LPCDIPROPDWORD)pdiph; + + if (pdiph->dwSize != sizeof(DIPROPDWORD)) return DIERR_INVALIDPARAM; + if (This->acquired) return DIERR_ACQUIRED; + + TRACE("buffersize = %d\n", pd->dwData); + + EnterCriticalSection(&This->crit); + HeapFree(GetProcessHeap(), 0, This->data_queue); + + This->data_queue = !pd->dwData ? NULL : HeapAlloc(GetProcessHeap(), 0, + pd->dwData * sizeof(DIDEVICEOBJECTDATA)); + This->queue_head = This->queue_tail = This->overflow = 0; + This->queue_len = pd->dwData; + + LeaveCriticalSection(&This->crit); + break; + } + default: + WARN("Unknown property %s\n", debugstr_guid(rguid)); + return DIERR_UNSUPPORTED; + } + return DI_OK; } @@ -713,6 +813,59 @@ HRESULT WINAPI IDirectInputDevice2WImpl_ return DI_OK; } +HRESULT WINAPI IDirectInputDevice2AImpl_GetDeviceData( + LPDIRECTINPUTDEVICE8A iface, DWORD dodsize, LPDIDEVICEOBJECTDATA dod, + LPDWORD entries, DWORD flags) +{ + IDirectInputDevice2AImpl *This = (IDirectInputDevice2AImpl *)iface; + HRESULT ret = DI_OK; + int len; + + TRACE("(%p) %p -> %p(%d) x%d, 0x%08x\n", + This, dod, entries, entries ? *entries : 0, dodsize, flags); + + if (!This->acquired) + return DIERR_NOTACQUIRED; + if (!This->queue_len) + return DIERR_NOTBUFFERED; + if (dodsize < sizeof(DIDEVICEOBJECTDATA_DX3)) + return DIERR_INVALIDPARAM; + + IDirectInputDevice2_Poll(iface); + EnterCriticalSection(&This->crit); + + len = This->queue_head - This->queue_tail; + if (len < 0) len += This->queue_len; + + if ((*entries != INFINITE) && (len > *entries)) len = *entries; + + if (dod) + { + int i; + for (i = 0; i < len; i++) + { + int n = (This->queue_tail + i) % This->queue_len; + memcpy((char *)dod + dodsize * i, This->data_queue + n, dodsize); + } + } + *entries = len; + + if (This->overflow) + ret = DI_BUFFEROVERFLOW; + + if (!(flags & DIGDD_PEEK)) + { + /* Advance reading position */ + This->queue_tail = (This->queue_tail + len) % This->queue_len; + This->overflow = FALSE; + } + + LeaveCriticalSection(&This->crit); + + TRACE("Returning %d events queued\n", *entries); + return ret; +} + HRESULT WINAPI IDirectInputDevice2AImpl_GetDeviceInfo( LPDIRECTINPUTDEVICE8A iface, LPDIDEVICEINSTANCEA pdidi) diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 212e598..c32b4f5 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -38,6 +38,12 @@ struct IDirectInputDevice2AImpl DWORD dwCoopLevel; HWND win; int acquired; + + LPDIDEVICEOBJECTDATA data_queue; /* buffer for 'GetDeviceData'. */ + int queue_len; /* size of the queue - set in 'SetProperty' */ + int queue_head; /* position to write new event into queue */ + int queue_tail; /* next event to read from queue */ + BOOL overflow; /* return DI_BUFFEROVERFLOW in 'GetDeviceData' */ }; /* Routines to do DataFormat / WineFormat conversions */ @@ -56,6 +62,7 @@ typedef struct { extern void fill_DataFormat(void *out, const void *in, DataFormat *df) ; extern DataFormat *create_DataFormat(const DIDATAFORMAT *wine_format, LPCDIDATAFORMAT asked_format, int *offset) ; extern void release_DataFormat(DataFormat *df) ; +extern void queue_event(LPDIRECTINPUTDEVICE8A iface, int ofs, DWORD data, DWORD time, DWORD seq); /* Used to fill events in the queue */ #define GEN_EVENT(offset,data,xtime,seq) \ @@ -124,10 +131,8 @@ extern HRESULT WINAPI IDirectInputDevice LPDIENUMDEVICEOBJECTSCALLBACKW lpCallback, LPVOID lpvRef, DWORD dwFlags) ; -extern HRESULT WINAPI IDirectInputDevice2AImpl_GetProperty( - LPDIRECTINPUTDEVICE8A iface, - REFGUID rguid, - LPDIPROPHEADER pdiph) ; +extern HRESULT WINAPI IDirectInputDevice2AImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, REFGUID rguid, LPDIPROPHEADER pdiph); +extern HRESULT WINAPI IDirectInputDevice2AImpl_SetProperty(LPDIRECTINPUTDEVICE8A iface, REFGUID rguid, LPCDIPROPHEADER pdiph); extern HRESULT WINAPI IDirectInputDevice2AImpl_GetObjectInfo( LPDIRECTINPUTDEVICE8A iface, LPDIDEVICEOBJECTINSTANCEA pdidoi, @@ -137,6 +142,8 @@ extern HRESULT WINAPI IDirectInputDevice LPDIDEVICEOBJECTINSTANCEW pdidoi, DWORD dwObj, DWORD dwHow); +extern HRESULT WINAPI IDirectInputDevice2AImpl_GetDeviceData(LPDIRECTINPUTDEVICE8A iface, + DWORD dodsize, LPDIDEVICEOBJECTDATA dod, LPDWORD entries, DWORD flags); extern HRESULT WINAPI IDirectInputDevice2AImpl_GetDeviceInfo( LPDIRECTINPUTDEVICE8A iface, LPDIDEVICEINSTANCEA pdidi) ;

1 0

Mike McCormack : msi: Examine the attributes of all features before setting a component's state.
by Alexandre Julliard 05 Dec '06

05 Dec '06

Module: wine Branch: master Commit: 97419aea801be27ad519eb2dba631b48335095f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97419aea801be27ad519eb2db… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Dec 5 18:24:39 2006 +0900 msi: Examine the attributes of all features before setting a component's state. --- dlls/msi/action.c | 108 ++++++++++++++++++++++++++++++++------------------- dlls/msi/msipriv.h | 4 ++ 2 files changed, 72 insertions(+), 40 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index cd5bf4b..a90a81a 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1786,7 +1786,19 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *pa ComponentList *cl; TRACE("Examining Feature %s (Installed %i, Action %i)\n", - debugstr_w(feature->Feature), feature->Installed, feature->Action); + debugstr_w(feature->Feature), feature->Installed, feature->Action); + + /* features with components that have compressed files are made local */ + LIST_FOR_EACH_ENTRY( cl, &feature->Components, ComponentList, entry ) + { + if (cl->component->Enabled && + cl->component->ForceLocalState && + feature->Action == INSTALLSTATE_SOURCE) + { + msi_feature_set_state( feature, INSTALLSTATE_LOCAL ); + break; + } + } LIST_FOR_EACH_ENTRY( cl, &feature->Components, ComponentList, entry ) { @@ -1795,53 +1807,69 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *pa if (!component->Enabled) continue; - if (component->Attributes & msidbComponentAttributesOptional) - msi_component_set_state( component, INSTALLSTATE_DEFAULT ); - else + switch (feature->Action) { - if (component->Attributes & msidbComponentAttributesSourceOnly) - msi_component_set_state( component, INSTALLSTATE_SOURCE ); + case INSTALLSTATE_ADVERTISED: + component->hasAdvertiseFeature = 1; + break; + case INSTALLSTATE_SOURCE: + component->hasSourceFeature = 1; + break; + case INSTALLSTATE_LOCAL: + component->hasLocalFeature = 1; + break; + case INSTALLSTATE_DEFAULT: + if (feature->Attributes & msidbFeatureAttributesFavorAdvertise) + component->hasAdvertiseFeature = 1; + else if (feature->Attributes & msidbFeatureAttributesFavorSource) + component->hasSourceFeature = 1; else - msi_component_set_state( component, INSTALLSTATE_LOCAL ); + component->hasLocalFeature = 1; + break; + default: + break; } + } + } - if (component->ForceLocalState) + LIST_FOR_EACH_ENTRY( component, &package->components, MSICOMPONENT, entry ) + { + /* if the component isn't enabled, leave it alone */ + if (!component->Enabled) + continue; + + /* check if it's local or source */ + if (!(component->Attributes & msidbComponentAttributesOptional) && + (component->hasLocalFeature || component->hasSourceFeature)) + { + if ((component->Attributes & msidbComponentAttributesSourceOnly) && + !component->ForceLocalState) + msi_component_set_state( component, INSTALLSTATE_SOURCE ); + else msi_component_set_state( component, INSTALLSTATE_LOCAL ); + continue; + } - if (feature->Attributes == msidbFeatureAttributesFavorAdvertise) - { - msi_component_set_state( component, INSTALLSTATE_ADVERTISED ); - } - else if (feature->Attributes == msidbFeatureAttributesFavorLocal) - { - if (!(component->Attributes & msidbComponentAttributesSourceOnly)) - msi_component_set_state( component, INSTALLSTATE_LOCAL ); - } - else if (feature->Attributes == msidbFeatureAttributesFavorSource) - { - if ((component->Action == INSTALLSTATE_UNKNOWN) || - (component->Action == INSTALLSTATE_ABSENT) || - (component->Action == INSTALLSTATE_ADVERTISED) || - (component->Action == INSTALLSTATE_DEFAULT)) - msi_component_set_state( component, INSTALLSTATE_SOURCE ); - } - else if (feature->ActionRequest == INSTALLSTATE_ADVERTISED) - { - if ((component->Action == INSTALLSTATE_UNKNOWN) || - (component->Action == INSTALLSTATE_ABSENT)) - msi_component_set_state( component, INSTALLSTATE_ADVERTISED ); - } - else if (feature->ActionRequest == INSTALLSTATE_ABSENT) - { - if (component->Action == INSTALLSTATE_UNKNOWN) - msi_component_set_state( component, INSTALLSTATE_ABSENT ); - } - else if (feature->ActionRequest == INSTALLSTATE_UNKNOWN) - msi_component_set_state( component, INSTALLSTATE_UNKNOWN ); + /* if any feature is local, the component must be local too */ + if (component->hasLocalFeature) + { + msi_component_set_state( component, INSTALLSTATE_LOCAL ); + continue; + } - if (component->ForceLocalState && feature->Action == INSTALLSTATE_SOURCE) - msi_feature_set_state( feature, INSTALLSTATE_LOCAL ); + if (component->hasSourceFeature) + { + msi_component_set_state( component, INSTALLSTATE_SOURCE ); + continue; } + + if (component->hasAdvertiseFeature) + { + msi_component_set_state( component, INSTALLSTATE_ADVERTISED ); + continue; + } + + TRACE("nobody wants component %s\n", debugstr_w(component->Component)); } LIST_FOR_EACH_ENTRY( component, &package->components, MSICOMPONENT, entry ) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index f6089da..815b70c 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -300,6 +300,10 @@ typedef struct tagMSICOMPONENT INT RefCount; LPWSTR FullKeypath; LPWSTR AdvertiseString; + + int hasAdvertiseFeature:1; + int hasLocalFeature:1; + int hasSourceFeature:1; } MSICOMPONENT; typedef struct tagComponentList

1 0

Mike McCormack : msi: Add the names of features/ components to debugging output.
by Alexandre Julliard 05 Dec '06

05 Dec '06

Module: wine Branch: master Commit: bccab7bb9db6228b998e4b0bf6c13427f783922f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bccab7bb9db6228b998e4b0bf… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Dec 5 18:17:57 2006 +0900 msi: Add the names of features/components to debugging output. --- dlls/msi/tests/package.c | 158 +++++++++++++++++++++++----------------------- 1 files changed, 79 insertions(+), 79 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bccab7bb9db6228b998e4…

1 0