January 2006 - Wine-Commits

Robert Shearman : ole: Test and implement LPSAFEARRAY marshaling.
by Alexandre Julliard Jan. 27, 2006

Jan. 27, 2006

Module: wine Branch: refs/heads/master Commit: 385e693e4422383d55de2fc8433abf577c3abab2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=385e693e4422383d55de2fc… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Jan 27 12:54:22 2006 +0100 ole: Test and implement LPSAFEARRAY marshaling. --- dlls/oleaut32/oleaut32.spec | 8 - dlls/oleaut32/tests/Makefile.in | 1 dlls/oleaut32/tests/usrmarshal.c | 125 ++++++++++++ dlls/oleaut32/usrmarshal.c | 412 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 542 insertions(+), 4 deletions(-) create mode 100644 dlls/oleaut32/tests/usrmarshal.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=385e693e4422383d55d…

1 0

Robert Shearman : oleaut: Improve the typelib marshaler traces.
by Alexandre Julliard Jan. 27, 2006

Jan. 27, 2006

Module: wine Branch: refs/heads/master Commit: 799ebfc499c185ee1969cbcc5e27567573983fd2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=799ebfc499c185ee1969cbc… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Jan 27 12:54:03 2006 +0100 oleaut: Improve the typelib marshaler traces. Improve the typelib marshaler traces for lazy developers like me who don't want to grep for constants. --- dlls/oleaut32/tmarshal.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index e4fafa2..7c3bddc 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -43,6 +43,7 @@ #include "ole2.h" #include "typelib.h" +#include "variant.h" #include "wine/debug.h" static const WCHAR IDispatchW[] = { 'I','D','i','s','p','a','t','c','h',0}; @@ -501,7 +502,7 @@ serialize_param( { HRESULT hres = S_OK; - TRACE("(tdesc.vt %d)\n",tdesc->vt); + TRACE("(tdesc.vt %s)\n",debugstr_vt(tdesc->vt)); switch (tdesc->vt) { case VT_EMPTY: /* nothing. empty variant for instance */ @@ -551,7 +552,7 @@ serialize_param( VARIANT *vt = (VARIANT*)arg; DWORD vttype = V_VT(vt); - if (debugout) TRACE_(olerelay)("Vt(%ld)(",vttype); + if (debugout) TRACE_(olerelay)("Vt(%s%s)(",debugstr_vt(vttype),debugstr_vf(vttype)); tdesc2.vt = vttype; if (writeit) { hres = xbuf_add(buf,(LPBYTE)&vttype,sizeof(vttype)); @@ -762,7 +763,7 @@ serialize_param( if (debugout) TRACE_(olerelay)("[%ld]",adesc->rgbounds[i].cElements); arrsize *= adesc->rgbounds[i].cElements; } - if (debugout) TRACE_(olerelay)("(vt %d)",adesc->tdescElem.vt); + if (debugout) TRACE_(olerelay)("(vt %s)",debugstr_vt(adesc->tdescElem.vt)); if (debugout) TRACE_(olerelay)("["); for (i=0;i<arrsize;i++) { hres = serialize_param(tinfo, writeit, debugout, dealloc, &adesc->tdescElem, (DWORD*)((LPBYTE)arg+i*_xsize(&adesc->tdescElem)), buf); @@ -791,7 +792,7 @@ deserialize_param( { HRESULT hres = S_OK; - TRACE("vt %d at %p\n",tdesc->vt,arg); + TRACE("vt %s at %p\n",debugstr_vt(tdesc->vt),arg); while (1) { switch (tdesc->vt) { @@ -815,7 +816,7 @@ deserialize_param( memset(&tdesc2,0,sizeof(tdesc2)); tdesc2.vt = vttype; V_VT(vt) = vttype; - if (debugout) TRACE_(olerelay)("Vt(%ld)(",vttype); + if (debugout) TRACE_(olerelay)("Vt(%s%s)(",debugstr_vt(vttype),debugstr_vf(vttype)); hres = deserialize_param(tinfo, readit, debugout, alloc, &tdesc2, (DWORD*)&(V_I4(vt)), buf); TRACE_(olerelay)(")"); return hres;

1 0

Robert Shearman : include: Add types and definitions for RPC user callback routines.
by Alexandre Julliard Jan. 27, 2006

Jan. 27, 2006

Module: wine Branch: refs/heads/master Commit: 3433839b20974e9ebbcc81131280b1c89ccca10f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3433839b20974e9ebbcc811… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Jan 27 12:53:51 2006 +0100 include: Add types and definitions for RPC user callback routines. --- include/rpcndr.h | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/include/rpcndr.h b/include/rpcndr.h index ce32fb4..87d5b51 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -254,6 +254,37 @@ typedef struct _USER_MARSHAL_ROUTINE_QUA USER_MARSHAL_FREEING_ROUTINE pfnFree; } USER_MARSHAL_ROUTINE_QUADRUPLE; +/* 'USRC' */ +#define USER_MARSHAL_CB_SIGNATURE \ + ( (DWORD)'U' | ( (DWORD)'S' << 8 ) | \ + ( (DWORD)'R' << 16 ) | ( (DWORD)'C' << 24 ) ) + +typedef enum +{ + USER_MARSHAL_CB_BUFFER_SIZE, + USER_MARSHAL_CB_MARSHALL, + USER_MARSHAL_CB_UNMARSHALL, + USER_MARSHAL_CB_FREE +} USER_MARSHAL_CB_TYPE; + +typedef struct _USER_MARSHAL_CB +{ + unsigned long Flags; + PMIDL_STUB_MESSAGE pStubMsg; + PFORMAT_STRING pReserve; + unsigned long Signature; + USER_MARSHAL_CB_TYPE CBType; + PFORMAT_STRING pFormat; + PFORMAT_STRING pTypeFormat; +} USER_MARSHAL_CB; + +#define USER_CALL_CTXT_MASK(f) ((f) & 0x00ff) +#define USER_CALL_AUX_MASK(f) ((f) & 0xff00) +#define GET_USER_DATA_REP(f) HIWORD(f) + +#define USER_CALL_IS_ASYNC 0x0100 +#define USER_CALL_NEW_CORRELATION_DESC 0x0200 + typedef struct _MALLOC_FREE_STRUCT { void * (__RPC_USER *pfnAllocate)(size_t);

1 0

Robert Shearman : include: Add new union cases for PROPVARIANT structure.
by Alexandre Julliard Jan. 27, 2006

Jan. 27, 2006

Module: wine Branch: refs/heads/master Commit: b7047df84a5200014378b7c8b7b82e17bae95726 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b7047df84a5200014378b7c… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Jan 27 12:53:42 2006 +0100 include: Add new union cases for PROPVARIANT structure. --- include/propidl.idl | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/include/propidl.idl b/include/propidl.idl index be0b7c0..2b164bb 100644 --- a/include/propidl.idl +++ b/include/propidl.idl @@ -161,6 +161,45 @@ interface IPropertyStorage : IUnknown [case(VT_LPSTR|VT_VECTOR)] CALPSTR calpstr; [case(VT_LPWSTR|VT_VECTOR)] CALPWSTR calpwstr; [case(VT_VARIANT|VT_VECTOR)] CAPROPVARIANT capropvar; + [case(VT_ARRAY|VT_I1, + VT_ARRAY|VT_UI1, + VT_ARRAY|VT_I2, + VT_ARRAY|VT_UI2, + VT_ARRAY|VT_I4, + VT_ARRAY|VT_UI4, + VT_ARRAY|VT_INT, + VT_ARRAY|VT_UINT, + VT_ARRAY|VT_R4, + VT_ARRAY|VT_R8, + VT_ARRAY|VT_CY, + VT_ARRAY|VT_DATE, + VT_ARRAY|VT_BSTR, + VT_ARRAY|VT_BOOL, + VT_ARRAY|VT_DECIMAL, + VT_ARRAY|VT_DISPATCH, + VT_ARRAY|VT_UNKNOWN, + VT_ARRAY|VT_ERROR, + VT_ARRAY|VT_VARIANT)] LPSAFEARRAY parray; + [case(VT_BYREF|VT_I1)] CHAR *pcVal; + [case(VT_BYREF|VT_UI1)] UCHAR *pbVal; + [case(VT_BYREF|VT_I2)] SHORT *piVal; + [case(VT_BYREF|VT_UI2)] USHORT *puiVal; + [case(VT_BYREF|VT_I4)] LONG *plVal; + [case(VT_BYREF|VT_UI4)] ULONG *pulVal; + [case(VT_BYREF|VT_INT)] INT *pintVal; + [case(VT_BYREF|VT_UINT)] UINT *puintVal; + [case(VT_BYREF|VT_R4)] FLOAT *pfltVal; + [case(VT_BYREF|VT_R8)] DOUBLE *pdblVal; + [case(VT_BYREF|VT_BOOL)] VARIANT_BOOL *pboolVal; + [case(VT_BYREF|VT_DECIMAL)] DECIMAL *pdecVal; + [case(VT_BYREF|VT_ERROR)] SCODE *pscode; + [case(VT_BYREF|VT_CY)] CY *pcyVal; + [case(VT_BYREF|VT_DATE)] DATE *pdate; + [case(VT_BYREF|VT_BSTR)] BSTR *pbstrVal; + [case(VT_BYREF|VT_UNKNOWN)] IUnknown **ppunkVal; + [case(VT_BYREF|VT_DISPATCH)] IDispatch **ppdispVal; + [case(VT_BYREF|VT_ARRAY)] LPSAFEARRAY *pparray; + [case(VT_BYREF|VT_VARIANT)] PROPVARIANT *pvarVal; }; };

1 0

Robert Shearman : widl: Implement callback conformance.
by Alexandre Julliard Jan. 27, 2006

Jan. 27, 2006

Module: wine Branch: refs/heads/master Commit: b59c995c89f87151755d7c3b2baafc5c0548174a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b59c995c89f87151755d7c3… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Jan 27 12:53:32 2006 +0100 widl: Implement callback conformance. --- tools/widl/client.c | 35 +++++--- tools/widl/server.c | 33 +++++--- tools/widl/typegen.c | 217 +++++++++++++++++++++++++++++++++++++++++++++----- tools/widl/typegen.h | 2 4 files changed, 242 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=b59c995c89f87151755…

1 0

Alexandre Julliard : riched20: Remove a couple of no longer used functions.
by Alexandre Julliard Jan. 27, 2006

Jan. 27, 2006

Module: wine Branch: refs/heads/master Commit: ba0d6bd0f7052a96efb104b41e6ab5695508811f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ba0d6bd0f7052a96efb104b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 27 12:20:21 2006 +0100 riched20: Remove a couple of no longer used functions. --- dlls/riched20/paint.c | 45 --------------------------------------------- 1 files changed, 0 insertions(+), 45 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index b9745e2..ad4733f 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -94,51 +94,6 @@ void ME_PaintContent(ME_TextEditor *edit ME_DestroyContext(&c); } -static void ME_MarkParagraphRange(ME_TextEditor *editor, ME_DisplayItem *p1, - ME_DisplayItem *p2, int nFlags) -{ - ME_DisplayItem *p3; - if (p1 == p2) - { - p1->member.para.nFlags |= nFlags; - return; - } - if (p1->member.para.nCharOfs > p2->member.para.nCharOfs) - p3 = p1, p1 = p2, p2 = p3; - - p1->member.para.nFlags |= nFlags; - do { - p1 = p1->member.para.next_para; - p1->member.para.nFlags |= nFlags; - } while (p1 != p2); -} - -static void ME_MarkOffsetRange(ME_TextEditor *editor, int from, int to, int nFlags) -{ - ME_Cursor c1, c2; - ME_CursorFromCharOfs(editor, from, &c1); - ME_CursorFromCharOfs(editor, to, &c2); - - ME_MarkParagraphRange(editor, ME_GetParagraph(c1.pRun), ME_GetParagraph(c2.pRun), nFlags); -} - -static void ME_MarkSelectionForRepaint(ME_TextEditor *editor) -{ - int from, to, from2, to2, end; - - end = ME_GetTextLength(editor); - ME_GetSelection(editor, &from, &to); - from2 = editor->nLastSelStart; - to2 = editor->nLastSelEnd; - if (from<from2) ME_MarkOffsetRange(editor, from, from2, MEPF_REPAINT); - if (from>from2) ME_MarkOffsetRange(editor, from2, from, MEPF_REPAINT); - if (to<to2) ME_MarkOffsetRange(editor, to, to2, MEPF_REPAINT); - if (to>to2) ME_MarkOffsetRange(editor, to2, to, MEPF_REPAINT); - - editor->nLastSelStart = from; - editor->nLastSelEnd = to; -} - void ME_Repaint(ME_TextEditor *editor) { ME_Cursor *pCursor = &editor->pCursors[0];

1 0

Mike McCormack : server: Fix the file notification interface to use directory handles.
by Alexandre Julliard Jan. 27, 2006

Jan. 27, 2006

Module: wine Branch: refs/heads/master Commit: 08351071fd304748c86de4d6285f7ef5b8f0bd17 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=08351071fd304748c86de4d… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Jan 27 12:13:56 2006 +0100 server: Fix the file notification interface to use directory handles. --- dlls/kernel/change.c | 39 +++++-- dlls/ntdll/directory.c | 36 ++++++ dlls/ntdll/tests/change.c | 18 +-- include/wine/server_protocol.h | 31 +---- server/change.c | 231 ++++++++++++++++++++++++++-------------- server/file.c | 4 + server/file.h | 1 server/protocol.def | 15 +-- server/request.h | 6 - server/trace.c | 23 +--- 10 files changed, 235 insertions(+), 169 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=08351071fd304748c86…

1 0

Alexandre Julliard : server: Fixed low-level hardware hooks.
by Alexandre Julliard Jan. 27, 2006

Jan. 27, 2006

Module: wine Branch: refs/heads/master Commit: 6d85f3bf218faa25012d7d2f5b1c2aaa52f67631 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6d85f3bf218faa25012d7d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 27 12:12:15 2006 +0100 server: Fixed low-level hardware hooks. The hook thread field has been reused for win events, so it no longer works for low-level hardward hooks. Use the owner field instead. --- server/hook.c | 27 ++++++++++++++++++++------- 1 files changed, 20 insertions(+), 7 deletions(-) diff --git a/server/hook.c b/server/hook.c index dd7b177..f8d4488 100644 --- a/server/hook.c +++ b/server/hook.c @@ -199,6 +199,15 @@ inline static int run_hook_in_current_th return 0; } +/* check if a given hook should run in the owner thread instead of the current thread */ +inline static int run_hook_in_owner_thread( struct hook *hook ) +{ + if ((hook->index == WH_MOUSE_LL - WH_MINHOOK || + hook->index == WH_KEYBOARD_LL - WH_MINHOOK)) + return hook->owner != current; + return 0; +} + /* find the first non-deleted hook in the chain */ inline static struct hook *get_first_valid_hook( struct hook_table *table, int index, int event, user_handle_t win, @@ -389,7 +398,11 @@ DECL_HANDLER(set_hook) if (req->id == WH_KEYBOARD_LL || req->id == WH_MOUSE_LL) { /* low-level hardware hooks are special: always global, but without a module */ - thread = (struct thread *)grab_object( current ); + if (thread) + { + set_error( STATUS_INVALID_PARAMETER ); + goto done; + } module = NULL; global = 1; } @@ -488,10 +501,10 @@ DECL_HANDLER(start_hook_chain) return; /* no hook set */ } - if (hook->thread && hook->thread != current) /* must run in other thread */ + if (run_hook_in_owner_thread( hook )) { - reply->pid = get_process_id( hook->thread->process ); - reply->tid = get_thread_id( hook->thread ); + reply->pid = get_process_id( hook->owner->process ); + reply->tid = get_thread_id( hook->owner ); } else { @@ -541,10 +554,10 @@ DECL_HANDLER(get_next_hook) reply->prev_unicode = hook->unicode; reply->next_unicode = next->unicode; if (next->module) set_reply_data( next->module, next->module_size ); - if (next->thread && next->thread != current) + if (run_hook_in_owner_thread( next )) { - reply->pid = get_process_id( next->thread->process ); - reply->tid = get_thread_id( next->thread ); + reply->pid = get_process_id( next->owner->process ); + reply->tid = get_thread_id( next->owner ); } else {

1 0

Dmitry Timoshkov : user: Postpone resetting SCROLL_TrackingWin untill all notifications are sent.
by Alexandre Julliard Jan. 27, 2006

Jan. 27, 2006

Module: wine Branch: refs/heads/master Commit: ac4de71f853e1b1a89792e4bce0069473c5d4cab URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ac4de71f853e1b1a89792e4… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Jan 27 12:10:40 2006 +0100 user: Postpone resetting SCROLL_TrackingWin untill all notifications are sent. --- dlls/user/scroll.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/user/scroll.c b/dlls/user/scroll.c index 8774a88..8a64672 100644 --- a/dlls/user/scroll.c +++ b/dlls/user/scroll.c @@ -953,7 +953,7 @@ static void SCROLL_HandleScrollEvent( HW { if (SCROLL_MovingThumb) SCROLL_DrawMovingThumb(hdc, &rect, vertical, arrowSize, thumbSize); - SCROLL_TrackingWin = 0; + SCROLL_DrawInterior( hwnd, hdc, nBar, &rect, arrowSize, thumbSize, thumbPos, infoPtr->flags, vertical, FALSE, FALSE ); @@ -1049,8 +1049,12 @@ static void SCROLL_HandleScrollEvent( HW SendMessageW( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL, MAKEWPARAM( SB_THUMBPOSITION, val ), (LPARAM)hwndCtl ); } + /* SB_ENDSCROLL doesn't report thumb position */ SendMessageW( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL, SB_ENDSCROLL, (LPARAM)hwndCtl ); + + /* Terminate tracking */ + SCROLL_TrackingWin = 0; } ReleaseDC( hwnd, hdc ); @@ -1200,6 +1204,10 @@ static BOOL SCROLL_GetScrollInfo(HWND hw info->nMax = infoPtr->maxVal; } + TRACE("cbSize %02x fMask %04x nMin %d nMax %d nPage %u nPos %d nTrackPos %d\n", + info->cbSize, info->fMask, info->nMin, info->nMax, info->nPage, + info->nPos, info->nTrackPos); + return (info->fMask & SIF_ALL) != 0; }

1 0

Eric Pouech : wineoss: Proper support in OSS driver for audio when no mixer is present.
by Alexandre Julliard Jan. 27, 2006

Jan. 27, 2006

Module: wine Branch: refs/heads/master Commit: aef4a77d46a3881ad35c3aeeb70e9ab96efed2b6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=aef4a77d46a3881ad35c3ae… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri Jan 27 12:10:25 2006 +0100 wineoss: Proper support in OSS driver for audio when no mixer is present. Fixed a couple of potential fd leaks. --- dlls/winmm/wineoss/audio.c | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/winmm/wineoss/audio.c b/dlls/winmm/wineoss/audio.c index 7df0bca..596190b 100644 --- a/dlls/winmm/wineoss/audio.c +++ b/dlls/winmm/wineoss/audio.c @@ -740,9 +740,7 @@ static BOOL OSS_WaveOutInit(OSS_DEVICE* } close(mixer); } else { - ERR("open(%s) failed (%s)\n", ossdev->mixer_name , strerror(errno)); - OSS_CloseDevice(ossdev); - return FALSE; + WARN("open(%s) failed (%s)\n", ossdev->mixer_name , strerror(errno)); } } #endif /* SOUND_MIXER_INFO */ @@ -892,9 +890,7 @@ static BOOL OSS_WaveInInit(OSS_DEVICE* o } close(mixer); } else { - ERR("open(%s) failed (%s)\n", ossdev->mixer_name, strerror(errno)); - OSS_CloseDevice(ossdev); - return FALSE; + WARN("open(%s) failed (%s)\n", ossdev->mixer_name, strerror(errno)); } } #endif /* SOUND_MIXER_INFO */ @@ -2254,6 +2250,7 @@ static DWORD wodGetVolume(WORD wDevID, L return MMSYSERR_NOTENABLED; } if (ioctl(mixer, SOUND_MIXER_READ_PCM, &volume) == -1) { + close(mixer); WARN("ioctl(%s, SOUND_MIXER_READ_PCM) failed (%s)\n", WOutDev[wDevID].ossdev->mixer_name, strerror(errno)); return MMSYSERR_NOTENABLED; @@ -2297,12 +2294,12 @@ DWORD wodSetVolume(WORD wDevID, DWORD dw return MMSYSERR_NOTENABLED; } if (ioctl(mixer, SOUND_MIXER_WRITE_PCM, &volume) == -1) { + close(mixer); WARN("ioctl(%s, SOUND_MIXER_WRITE_PCM) failed (%s)\n", WOutDev[wDevID].ossdev->mixer_name, strerror(errno)); return MMSYSERR_NOTENABLED; - } else { - TRACE("volume=%04x\n", (unsigned)volume); } + TRACE("volume=%04x\n", (unsigned)volume); close(mixer); /* save requested volume */

1 0