January 2008 - Wine-Commits

Eric Pouech : richedit: Fixed a couple of charformatXXm structure conversions because of alignment issues .
by Alexandre Julliard Jan. 2, 2008

Jan. 2, 2008

Module: wine Branch: master Commit: a607ad316e88e6c5f952a6c542a9214d3c9fa144 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a607ad316e88e6c5f952a6c54… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Jan 1 22:03:28 2008 +0100 richedit: Fixed a couple of charformatXXm structure conversions because of alignment issues. --- dlls/riched20/style.c | 26 +++++++++++++++++--------- 1 files changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 0530c42..ad508fa 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -25,12 +25,20 @@ WINE_DECLARE_DEBUG_CHANNEL(richedit_style); static int all_refs = 0; +/* the following routines assume that: + * - char2[AW] extends char[AW] by adding fields at the end of the charA form) + * - szFaceName is the last field of char[AW] form, and wWeight the first of 2[AW] + * - the difference between A and W form is the szFaceName as Ansi vs Unicode string + * - because of alignment, offset of wWeight field in 2[AW] structure *IS NOT* + * sizeof(char[AW]) + */ + CHARFORMAT2W *ME_ToCF2W(CHARFORMAT2W *to, CHARFORMAT2W *from) { if (from->cbSize == sizeof(CHARFORMATA)) { CHARFORMATA *f = (CHARFORMATA *)from; - CopyMemory(to, f, sizeof(*f)-sizeof(f->szFaceName)); + CopyMemory(to, f, FIELD_OFFSET(CHARFORMATA, szFaceName)); to->cbSize = sizeof(CHARFORMAT2W); if (f->dwMask & CFM_FACE) { MultiByteToWideChar(0, 0, f->szFaceName, -1, to->szFaceName, sizeof(to->szFaceName)/sizeof(WCHAR)); @@ -42,20 +50,20 @@ CHARFORMAT2W *ME_ToCF2W(CHARFORMAT2W *to, CHARFORMAT2W *from) CHARFORMATW *f = (CHARFORMATW *)from; CopyMemory(to, f, sizeof(*f)); /* theoretically, we don't need to zero the remaining memory */ - ZeroMemory(((CHARFORMATW *)to)+1, sizeof(CHARFORMAT2W)-sizeof(CHARFORMATW)); + ZeroMemory(&to->wWeight, sizeof(CHARFORMAT2W)-FIELD_OFFSET(CHARFORMAT2W, wWeight)); to->cbSize = sizeof(CHARFORMAT2W); return to; } if (from->cbSize == sizeof(CHARFORMAT2A)) { - CHARFORMATA *f = (CHARFORMATA *)from; + CHARFORMAT2A *f = (CHARFORMAT2A *)from; /* copy the A structure without face name */ - CopyMemory(to, f, sizeof(CHARFORMATA)-sizeof(f->szFaceName)); + CopyMemory(to, f, FIELD_OFFSET(CHARFORMATA, szFaceName)); /* convert face name */ if (f->dwMask & CFM_FACE) MultiByteToWideChar(0, 0, f->szFaceName, -1, to->szFaceName, sizeof(to->szFaceName)/sizeof(WCHAR)); /* copy the rest of the 2A structure to 2W */ - CopyMemory(1+((CHARFORMATW *)to), f+1, sizeof(CHARFORMAT2A)-sizeof(CHARFORMATA)); + CopyMemory(&to->wWeight, &f->wWeight, sizeof(CHARFORMAT2A)-FIELD_OFFSET(CHARFORMAT2A, wWeight)); to->cbSize = sizeof(CHARFORMAT2W); return to; } @@ -75,7 +83,7 @@ CHARFORMAT2W *ME_ToCFAny(CHARFORMAT2W *to, CHARFORMAT2W *from) if (to->cbSize == sizeof(CHARFORMATA)) { CHARFORMATA *t = (CHARFORMATA *)to; - CopyMemory(t, from, sizeof(*t)-sizeof(t->szFaceName)); + CopyMemory(t, from, FIELD_OFFSET(CHARFORMATA, szFaceName)); WideCharToMultiByte(0, 0, from->szFaceName, -1, t->szFaceName, sizeof(t->szFaceName), 0, 0); t->cbSize = sizeof(*t); /* it was overwritten by CopyMemory */ return to; @@ -91,15 +99,15 @@ CHARFORMAT2W *ME_ToCFAny(CHARFORMAT2W *to, CHARFORMAT2W *from) { CHARFORMAT2A *t = (CHARFORMAT2A *)to; /* copy the A structure without face name */ - CopyMemory(t, from, sizeof(CHARFORMATA)-sizeof(t->szFaceName)); + CopyMemory(t, from, FIELD_OFFSET(CHARFORMATA, szFaceName)); /* convert face name */ WideCharToMultiByte(0, 0, from->szFaceName, -1, t->szFaceName, sizeof(t->szFaceName), 0, 0); /* copy the rest of the 2A structure to 2W */ - CopyMemory(&t->wWeight, &from->wWeight, sizeof(CHARFORMAT2A)-sizeof(CHARFORMATA)); + CopyMemory(&t->wWeight, &from->wWeight, sizeof(CHARFORMAT2W)-FIELD_OFFSET(CHARFORMAT2W,wWeight)); t->cbSize = sizeof(*t); /* it was overwritten by CopyMemory */ return to; } - assert(to->cbSize >= sizeof(CHARFORMAT2W)); + assert(to->cbSize >= sizeof(CHARFORMAT2W)); return from; }

1 0

Eric Pouech : richedit: Correctly set the CFM_WEIGHT in charformat2.
by Alexandre Julliard Jan. 2, 2008

Jan. 2, 2008

Module: wine Branch: master Commit: be785a295fcfeb2d57db0f9b160620553587752e URL: http://source.winehq.org/git/wine.git/?a=commit;h=be785a295fcfeb2d57db0f9b1… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Jan 1 22:03:34 2008 +0100 richedit: Correctly set the CFM_WEIGHT in charformat2. --- dlls/riched20/style.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index ad508fa..01715ac 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -278,7 +278,7 @@ ME_LogFontFromStyle(HDC hDC, LOGFONTW *lf, const ME_Style *s, int nZoomNumerator lf->lfWeight = 400; if (s->fmt.dwEffects & s->fmt.dwMask & CFM_BOLD) lf->lfWeight = 700; - if (s->fmt.dwEffects & s->fmt.dwMask & CFM_WEIGHT) + if (s->fmt.dwMask & CFM_WEIGHT) lf->lfWeight = s->fmt.wWeight; if (s->fmt.dwEffects & s->fmt.dwMask & CFM_ITALIC) lf->lfItalic = 1;

1 0

Rob Shearman : user32: Add a stub implementation of RegisterServicesProcess .
by Alexandre Julliard Jan. 2, 2008

Jan. 2, 2008

Module: wine Branch: master Commit: 91971561c1e1234a36752c6b6b3cbe4a13cd8b30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91971561c1e1234a36752c6b6… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jan 1 22:35:41 2008 +0000 user32: Add a stub implementation of RegisterServicesProcess. --- dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 417b93e..168ac80 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -563,7 +563,7 @@ # @ stub RegisterMessagePumpHook @ stub RegisterNetworkCapabilities @ stdcall RegisterRawInputDevices(ptr long long) -@ stub RegisterServicesProcess +@ stdcall RegisterServicesProcess(long) @ stdcall RegisterShellHookWindow (long) @ stdcall RegisterSystemThread(long long) @ stdcall RegisterTasklist (long) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index e8aadec..01b396d 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -331,3 +331,12 @@ BOOL WINAPI ExitWindowsEx( UINT flags, DWORD reason ) CloseHandle( pi.hThread ); return TRUE; } + +/*********************************************************************** + * RegisterServicesProcess (USER32.@) + */ +int WINAPI RegisterServicesProcess(DWORD ServicesProcessId) +{ + FIXME("(0x%x): stub\n", ServicesProcessId); + return 0; +}

1 0

Hans Leidekker : msvcrt: Fix spec file entries for the execv functions.
by Alexandre Julliard Jan. 2, 2008

Jan. 2, 2008

Module: wine Branch: master Commit: 428cff6e0b754dbdfd43d4d00610abdce001f9ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=428cff6e0b754dbdfd43d4d00… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Tue Jan 1 16:23:58 2008 +0100 msvcrt: Fix spec file entries for the execv functions. --- dlls/msvcrt/msvcrt.spec | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 568dcc2..9518fa3 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -217,10 +217,10 @@ @ varargs _execle(str str) @ varargs _execlp(str str) @ varargs _execlpe(str str) -@ cdecl _execv(str str) -@ cdecl _execve(str str str) MSVCRT__execve -@ cdecl _execvp(str str) -@ cdecl _execvpe(str str str) +@ cdecl _execv(str ptr) +@ cdecl _execve(str ptr ptr) MSVCRT__execve +@ cdecl _execvp(str ptr) +@ cdecl _execvpe(str ptr ptr) @ cdecl _exit(long) MSVCRT__exit @ cdecl _expand(ptr long) @ cdecl _fcloseall() MSVCRT__fcloseall

1 0

Eric Pouech : richedit: Added support for some message (key, mouse) filtering events.
by Alexandre Julliard Jan. 2, 2008

Jan. 2, 2008

Module: wine Branch: master Commit: 71f52d54bd934a635689e5d178eaa4b8dc88803f URL: http://source.winehq.org/git/wine.git/?a=commit;h=71f52d54bd934a635689e5d17… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Jan 1 22:03:22 2008 +0100 richedit: Added support for some message (key, mouse) filtering events. --- dlls/riched20/editor.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 52 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 01d60c5..12fa18c 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1034,6 +1034,27 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH return -1; } +/* helper to send a msg filter notification */ +static BOOL +ME_FilterEvent(ME_TextEditor *editor, UINT msg, WPARAM* wParam, LPARAM* lParam) +{ + MSGFILTER msgf; + + msgf.nmhdr.hwndFrom = editor->hWnd; + msgf.nmhdr.idFrom = GetWindowLongW(editor->hWnd, GWLP_ID); + msgf.nmhdr.code = EN_MSGFILTER; + msgf.msg = msg; + + msgf.wParam = *wParam; + msgf.lParam = *lParam; + if (SendMessageW(GetParent(editor->hWnd), WM_NOTIFY, msgf.nmhdr.idFrom, (LPARAM)&msgf)) + return FALSE; + *wParam = msgf.wParam; + *lParam = msgf.lParam; + msgf.wParam = *wParam; + + return TRUE; +} static BOOL ME_KeyDown(ME_TextEditor *editor, WORD nKey) @@ -2374,6 +2395,9 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, SetWindowLongPtrW(hWnd, 0, 0); return 0; case WM_LBUTTONDOWN: + if ((editor->nEventMask & ENM_MOUSEEVENTS) && + !ME_FilterEvent(editor, msg, &wParam, &lParam)) + return 0; SetFocus(hWnd); ME_LButtonDown(editor, (short)LOWORD(lParam), (short)HIWORD(lParam)); SetCapture(hWnd); @@ -2381,6 +2405,9 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, ME_SetCursor(editor, LOWORD(lParam)); break; case WM_MOUSEMOVE: + if ((editor->nEventMask & ENM_MOUSEEVENTS) && + !ME_FilterEvent(editor, msg, &wParam, &lParam)) + return 0; if (GetCapture() == hWnd) ME_MouseMove(editor, (short)LOWORD(lParam), (short)HIWORD(lParam)); ME_LinkNotify(editor,msg,wParam,lParam); @@ -2389,14 +2416,26 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, case WM_LBUTTONUP: if (GetCapture() == hWnd) ReleaseCapture(); + if ((editor->nEventMask & ENM_MOUSEEVENTS) && + !ME_FilterEvent(editor, msg, &wParam, &lParam)) + return 0; editor->linesel = 0; ME_SetCursor(editor, LOWORD(lParam)); ME_LinkNotify(editor,msg,wParam,lParam); break; case WM_LBUTTONDBLCLK: + if ((editor->nEventMask & ENM_MOUSEEVENTS) && + !ME_FilterEvent(editor, msg, &wParam, &lParam)) + return 0; ME_LinkNotify(editor,msg,wParam,lParam); ME_SelectWord(editor); break; + case WM_RBUTTONUP: + case WM_RBUTTONDOWN: + if ((editor->nEventMask & ENM_MOUSEEVENTS) && + !ME_FilterEvent(editor, msg, &wParam, &lParam)) + return 0; + goto do_default; case WM_CONTEXTMENU: if (!ME_ShowContextMenu(editor, (short)LOWORD(lParam), (short)HIWORD(lParam))) goto do_default; @@ -2438,7 +2477,15 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, case WM_COMMAND: TRACE("editor wnd command = %d\n", LOWORD(wParam)); return 0; + case WM_KEYUP: + if ((editor->nEventMask & ENM_KEYEVENTS) && + !ME_FilterEvent(editor, msg, &wParam, &lParam)) + return 0; + goto do_default; case WM_KEYDOWN: + if ((editor->nEventMask & ENM_KEYEVENTS) && + !ME_FilterEvent(editor, msg, &wParam, &lParam)) + return 0; if (ME_KeyDown(editor, LOWORD(wParam))) return 0; goto do_default; @@ -2545,7 +2592,11 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, { int gcWheelDelta; UINT pulScrollLines; - + + if ((editor->nEventMask & ENM_MOUSEEVENTS) && + !ME_FilterEvent(editor, msg, &wParam, &lParam)) + return 0; + SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0); gcWheelDelta = -GET_WHEEL_DELTA_WPARAM(wParam);

1 0

Gerald Pfeifer : msi: Remove an extraneous safety check and simplify deformat_string().
by Alexandre Julliard Jan. 2, 2008

Jan. 2, 2008

Module: wine Branch: master Commit: 739152ce3e398e4b8a76cd1f9d585da134e79cbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=739152ce3e398e4b8a76cd1f9… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Jan 1 18:18:51 2008 +0100 msi: Remove an extraneous safety check and simplify deformat_string(). --- dlls/msi/helpers.c | 20 +++++++++----------- 1 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index 172f516..139a447 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -368,18 +368,16 @@ DWORD deformat_string(MSIPACKAGE *package, LPCWSTR ptr, WCHAR** data ) MSI_RecordSetStringW(rec,0,ptr); MSI_FormatRecordW(package,rec,NULL,&size); - if (size >= 0) - { - size++; - *data = msi_alloc(size*sizeof(WCHAR)); - if (size > 1) - MSI_FormatRecordW(package,rec,*data,&size); - else - *data[0] = 0; - msiobj_release( &rec->hdr ); - return sizeof(WCHAR)*size; - } + + size++; + *data = msi_alloc(size*sizeof(WCHAR)); + if (size > 1) + MSI_FormatRecordW(package,rec,*data,&size); + else + *data[0] = 0; + msiobj_release( &rec->hdr ); + return sizeof(WCHAR)*size; } *data = NULL;

1 0

Alexander Dorofeyev : include/d3d.h: Fix method calling macros for IDirect3DTexture.
by Alexandre Julliard Jan. 2, 2008

Jan. 2, 2008

Module: wine Branch: master Commit: e169bb0a7f204ebe0f3053d824a1177bc1dedc65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e169bb0a7f204ebe0f3053d82… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Wed Jan 2 04:38:38 2008 -0800 include/d3d.h: Fix method calling macros for IDirect3DTexture. --- include/d3d.h | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index 76237d7..10e5239 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -578,22 +578,22 @@ DECLARE_INTERFACE_(IDirect3DTexture,IUnknown) #define IDirect3DTexture_AddRef(p) (p)->lpVtbl->AddRef(p) #define IDirect3DTexture_Release(p) (p)->lpVtbl->Release(p) /*** IDirect3DTexture methods ***/ -#define IDirect3DTexture_Initialize(p,a,b,c) (p)->lpVtbl->Initialize(p,a,b,c) -#define IDirect3DTexture_GetHandle(p,a,b,c) (p)->lpVtbl->GetHandle(p,a,b,c) -#define IDirect3DTexture_PaletteChanged(p,a,b,c) (p)->lpVtbl->PaletteChanged(p,a,b,c) -#define IDirect3DTexture_Load(p,a,b,c) (p)->lpVtbl->Load(p,a,b,c) -#define IDirect3DTexture_Unload(p,a,b,c) (p)->lpVtbl->Unload(p,a,b,c) +#define IDirect3DTexture_Initialize(p,a,b) (p)->lpVtbl->Initialize(p,a,b) +#define IDirect3DTexture_GetHandle(p,a,b) (p)->lpVtbl->GetHandle(p,a,b) +#define IDirect3DTexture_PaletteChanged(p,a,b) (p)->lpVtbl->PaletteChanged(p,a,b) +#define IDirect3DTexture_Load(p,a) (p)->lpVtbl->Load(p,a) +#define IDirect3DTexture_Unload(p) (p)->lpVtbl->Unload(p) #else /*** IUnknown methods ***/ #define IDirect3DTexture_QueryInterface(p,a,b) (p)->QueryInterface(a,b) #define IDirect3DTexture_AddRef(p) (p)->AddRef() #define IDirect3DTexture_Release(p) (p)->Release() /*** IDirect3DTexture methods ***/ -#define IDirect3DTexture_Initialize(p,a,b,c) (p)->Initialize(a,b,c) -#define IDirect3DTexture_GetHandle(p,a,b,c) (p)->GetHandle(a,b,c) -#define IDirect3DTexture_PaletteChanged(p,a,b,c) (p)->PaletteChanged(a,b,c) -#define IDirect3DTexture_Load(p,a,b,c) (p)->Load(a,b,c) -#define IDirect3DTexture_Unload(p,a,b,c) (p)->Unload(a,b,c) +#define IDirect3DTexture_Initialize(p,a,b) (p)->Initialize(a,b) +#define IDirect3DTexture_GetHandle(p,a,b) (p)->GetHandle(a,b) +#define IDirect3DTexture_PaletteChanged(p,a,b) (p)->PaletteChanged(a,b) +#define IDirect3DTexture_Load(p,a) (p)->Load(a) +#define IDirect3DTexture_Unload(p) (p)->Unload() #endif

1 0

Hans Leidekker : gdi32: Add a stub implementation for RemoveFontMemResourceEx.
by Alexandre Julliard Jan. 2, 2008

Jan. 2, 2008

Module: wine Branch: master Commit: 864741c1b4e734d552f7dc5891cea8403298f447 URL: http://source.winehq.org/git/wine.git/?a=commit;h=864741c1b4e734d552f7dc589… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Tue Jan 1 16:23:39 2008 +0100 gdi32: Add a stub implementation for RemoveFontMemResourceEx. --- dlls/gdi32/font.c | 9 +++++++++ dlls/gdi32/gdi32.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 7e139c8..152f150 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3308,6 +3308,15 @@ HANDLE WINAPI AddFontMemResourceEx( PVOID pbFont, DWORD cbFont, PVOID pdv, DWORD } /*********************************************************************** + * RemoveFontMemResourceEx (GDI32.@) + */ +BOOL WINAPI RemoveFontMemResourceEx( HANDLE fh ) +{ + FIXME("(%p) stub\n", fh); + return TRUE; +} + +/*********************************************************************** * RemoveFontResourceExA (GDI32.@) */ BOOL WINAPI RemoveFontResourceExA( LPCSTR str, DWORD fl, PVOID pdv ) diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index c04bba7..4b1b6a4 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -397,7 +397,7 @@ @ stdcall RectInRegion(long ptr) @ stdcall RectVisible(long ptr) @ stdcall Rectangle(long long long long long) -# @ stub RemoveFontMemResourceEx +@ stdcall RemoveFontMemResourceEx(ptr) @ stdcall RemoveFontResourceA(str) @ stdcall RemoveFontResourceExA(str long ptr) @ stdcall RemoveFontResourceExW(wstr long ptr)

1 0

Austin English : dplayx: Fix a typo.
by Alexandre Julliard Jan. 2, 2008

Jan. 2, 2008

Module: wine Branch: master Commit: 74399eec9476418e6778cd38e57aebe9e6a774b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74399eec9476418e6778cd38e… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Dec 31 11:45:46 2007 -0600 dplayx: Fix a typo. --- dlls/dplayx/dplayx_queue.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dplayx/dplayx_queue.h b/dlls/dplayx/dplayx_queue.h index ac94530..cfde9df 100644 --- a/dlls/dplayx/dplayx_queue.h +++ b/dlls/dplayx/dplayx_queue.h @@ -122,7 +122,7 @@ do { \ * elm - how to find the next element * field - to be concatenated to rc to compare with fieldToCompare * fieldToCompare - The value that we're comparing against - * compare_cb - Callback to invoke to determine if comparision should continue. + * compare_cb - Callback to invoke to determine if comparison should continue. * Callback must be defined with DPQ_DECL_COMPARECB. * rc - Variable to put the return code. Same type as (head).lpQHFirst */

1 0

Lionel Debroux : dinput: Improve TRACEs and WARNs.
by Alexandre Julliard Jan. 2, 2008

Jan. 2, 2008

Module: wine Branch: master Commit: efc81cb233538ba72198ea9b80b160abfa0e8ecc URL: http://source.winehq.org/git/wine.git/?a=commit;h=efc81cb233538ba72198ea9b8… Author: Lionel Debroux <lionel_debroux(a)yahoo.fr> Date: Sun Dec 30 19:03:34 2007 +0100 dinput: Improve TRACEs and WARNs. --- dlls/dinput/joystick_linux.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index bb967b9..90f20d6 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -376,6 +376,8 @@ static HRESULT alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *di LPDIDATAFORMAT df = NULL; int idx = 0; + TRACE("%s %p %p %p %hu\n", debugstr_guid(rguid), jvt, dinput, pdev, index); + newDevice = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(JoystickImpl)); if (newDevice == 0) { WARN("out of memory\n"); @@ -552,6 +554,7 @@ static HRESULT joydev_create_deviceA(IDirectInputImpl *dinput, REFGUID rguid, RE { unsigned short index; + TRACE("%p %s %p %p\n",dinput, debugstr_guid(rguid), riid, pdev); find_joystick_devices(); *pdev = NULL; @@ -571,7 +574,7 @@ static HRESULT joydev_create_deviceA(IDirectInputImpl *dinput, REFGUID rguid, RE return DIERR_NOINTERFACE; } - WARN("invalid device GUID\n"); + WARN("invalid device GUID %s\n",debugstr_guid(rguid)); return DIERR_DEVICENOTREG; } @@ -579,6 +582,7 @@ static HRESULT joydev_create_deviceW(IDirectInputImpl *dinput, REFGUID rguid, RE { unsigned short index; + TRACE("%p %s %p %p\n",dinput, debugstr_guid(rguid), riid, pdev); find_joystick_devices(); *pdev = NULL; @@ -597,7 +601,7 @@ static HRESULT joydev_create_deviceW(IDirectInputImpl *dinput, REFGUID rguid, RE return DIERR_NOINTERFACE; } - WARN("invalid device GUID\n"); + WARN("invalid device GUID %s\n",debugstr_guid(rguid)); return DIERR_DEVICENOTREG; }

1 0