wine-commits November 2014

wine-commits@winehq.org

2 participants
394 discussions

Sebastian Lackner : ws2_32/tests: Wait for thread termination before cleaning up winsock.
by Alexandre Julliard 20 Nov '14

20 Nov '14

Module: wine Branch: master Commit: 69cc90957c2118fc503ea9e18e7b2a14243c7685 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69cc90957c2118fc503ea9e18… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Nov 20 12:51:06 2014 +0100 ws2_32/tests: Wait for thread termination before cleaning up winsock. --- dlls/ws2_32/tests/sock.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 0c39545..acc2783 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4354,7 +4354,11 @@ end: if (dst != INVALID_SOCKET) closesocket(dst); if (hThread != NULL) + { + dwRet = WaitForSingleObject(hThread, 500); + ok(dwRet == WAIT_OBJECT_0, "failed to wait for thread termination: %d\n", GetLastError()); CloseHandle(hThread); + } if (ov.hEvent) CloseHandle(ov.hEvent); HeapFree(GetProcessHeap(), 0, buffer);

1 0

Jacek Caban : mshtml: Added HTMLFrameBase2:: allowTransparency semi-stub implementation.
by Alexandre Julliard 20 Nov '14

20 Nov '14

Module: wine Branch: master Commit: 504872741c9b9ce6be7a7e6d4309b8887f462901 URL: http://source.winehq.org/git/wine.git/?a=commit;h=504872741c9b9ce6be7a7e6d4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 20 11:20:21 2014 +0100 mshtml: Added HTMLFrameBase2::allowTransparency semi-stub implementation. --- dlls/mshtml/htmlframebase.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlframebase.c b/dlls/mshtml/htmlframebase.c index bd5c1de..d6e5ed2 100644 --- a/dlls/mshtml/htmlframebase.c +++ b/dlls/mshtml/htmlframebase.c @@ -667,15 +667,20 @@ static HRESULT WINAPI HTMLFrameBase2_get_readyState(IHTMLFrameBase2 *iface, BSTR static HRESULT WINAPI HTMLFrameBase2_put_allowTransparency(IHTMLFrameBase2 *iface, VARIANT_BOOL v) { HTMLFrameBase *This = impl_from_IHTMLFrameBase2(iface); - FIXME("(%p)->(%x)\n", This, v); - return E_NOTIMPL; + + FIXME("(%p)->(%x) semi-stub\n", This, v); + + return S_OK; } static HRESULT WINAPI HTMLFrameBase2_get_allowTransparency(IHTMLFrameBase2 *iface, VARIANT_BOOL *p) { HTMLFrameBase *This = impl_from_IHTMLFrameBase2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + FIXME("(%p)->(%p) semi-stub\n", This, p); + + *p = VARIANT_TRUE; + return S_OK; } static const IHTMLFrameBase2Vtbl HTMLFrameBase2Vtbl = {

1 0

Jacek Caban : mshtml: Added IHTMLDOMTextNode2 stub interface.
by Alexandre Julliard 20 Nov '14

20 Nov '14

Module: wine Branch: master Commit: d3714ba72d09fa3edfadf37dbbeacdb9eaec0be3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3714ba72d09fa3edfadf37db… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 20 11:19:41 2014 +0100 mshtml: Added IHTMLDOMTextNode2 stub interface. --- dlls/mshtml/htmltextnode.c | 119 +++++++++++++++++++++++++++++++++++++++++-- dlls/mshtml/mshtml_private.h | 1 + 2 files changed, 115 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmltextnode.c b/dlls/mshtml/htmltextnode.c index 27e00c0..66af237 100644 --- a/dlls/mshtml/htmltextnode.c +++ b/dlls/mshtml/htmltextnode.c @@ -36,6 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); struct HTMLDOMTextNode { HTMLDOMNode node; IHTMLDOMTextNode IHTMLDOMTextNode_iface; + IHTMLDOMTextNode2 IHTMLDOMTextNode2_iface; nsIDOMText *nstext; }; @@ -170,6 +171,112 @@ static const IHTMLDOMTextNodeVtbl HTMLDOMTextNodeVtbl = { HTMLDOMTextNode_splitText }; +static inline HTMLDOMTextNode *impl_from_IHTMLDOMTextNode2(IHTMLDOMTextNode2 *iface) +{ + return CONTAINING_RECORD(iface, HTMLDOMTextNode, IHTMLDOMTextNode2_iface); +} + +static HRESULT WINAPI HTMLDOMTextNode2_QueryInterface(IHTMLDOMTextNode2 *iface, REFIID riid, void **ppv) +{ + HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); + + return IHTMLDOMNode_QueryInterface(&This->node.IHTMLDOMNode_iface, riid, ppv); +} + +static ULONG WINAPI HTMLDOMTextNode2_AddRef(IHTMLDOMTextNode2 *iface) +{ + HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); + + return IHTMLDOMNode_AddRef(&This->node.IHTMLDOMNode_iface); +} + +static ULONG WINAPI HTMLDOMTextNode2_Release(IHTMLDOMTextNode2 *iface) +{ + HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); + + return IHTMLDOMNode_Release(&This->node.IHTMLDOMNode_iface); +} + +static HRESULT WINAPI HTMLDOMTextNode2_GetTypeInfoCount(IHTMLDOMTextNode2 *iface, UINT *pctinfo) +{ + HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); + return IDispatchEx_GetTypeInfoCount(&This->node.dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI HTMLDOMTextNode2_GetTypeInfo(IHTMLDOMTextNode2 *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); + return IDispatchEx_GetTypeInfo(&This->node.dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLDOMTextNode2_GetIDsOfNames(IHTMLDOMTextNode2 *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); + return IDispatchEx_GetIDsOfNames(&This->node.dispex.IDispatchEx_iface, riid, rgszNames, cNames, + lcid, rgDispId); +} + +static HRESULT WINAPI HTMLDOMTextNode2_Invoke(IHTMLDOMTextNode2 *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); + return IDispatchEx_Invoke(&This->node.dispex.IDispatchEx_iface, dispIdMember, riid, lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLDOMTextNode2_substringData(IHTMLDOMTextNode2 *iface, LONG offset, LONG count, BSTR *string) +{ + HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); + FIXME("(%p)->(%d %d %p)\n", This, offset, count, string); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMTextNode2_appendData(IHTMLDOMTextNode2 *iface, BSTR string) +{ + HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(string)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMTextNode2_insertData(IHTMLDOMTextNode2 *iface, LONG offset, BSTR string) +{ + HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); + FIXME("(%p)->(%d %s)\n", This, offset, debugstr_w(string)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMTextNode2_deleteData(IHTMLDOMTextNode2 *iface, LONG offset, LONG count) +{ + HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); + FIXME("(%p)->(%d %d)\n", This, offset, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMTextNode2_replaceData(IHTMLDOMTextNode2 *iface, LONG offset, LONG count, BSTR string) +{ + HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); + FIXME("(%p)->(%d %d %s)\n", This, offset, count, debugstr_w(string)); + return E_NOTIMPL; +} + +static const IHTMLDOMTextNode2Vtbl HTMLDOMTextNode2Vtbl = { + HTMLDOMTextNode2_QueryInterface, + HTMLDOMTextNode2_AddRef, + HTMLDOMTextNode2_Release, + HTMLDOMTextNode2_GetTypeInfoCount, + HTMLDOMTextNode2_GetTypeInfo, + HTMLDOMTextNode2_GetIDsOfNames, + HTMLDOMTextNode2_Invoke, + HTMLDOMTextNode2_substringData, + HTMLDOMTextNode2_appendData, + HTMLDOMTextNode2_insertData, + HTMLDOMTextNode2_deleteData, + HTMLDOMTextNode2_replaceData +}; + static inline HTMLDOMTextNode *impl_from_HTMLDOMNode(HTMLDOMNode *iface) { return CONTAINING_RECORD(iface, HTMLDOMTextNode, node); @@ -179,14 +286,14 @@ static HRESULT HTMLDOMTextNode_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) { HTMLDOMTextNode *This = impl_from_HTMLDOMNode(iface); - *ppv = NULL; + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); - if(IsEqualGUID(&IID_IHTMLDOMTextNode, riid)) { - TRACE("(%p)->(IID_IHTMLDOMTextNode %p)\n", This, ppv); + if(IsEqualGUID(&IID_IHTMLDOMTextNode, riid)) *ppv = &This->IHTMLDOMTextNode_iface; - }else { + else if(IsEqualGUID(&IID_IHTMLDOMTextNode2, riid)) + *ppv = &This->IHTMLDOMTextNode2_iface; + else return HTMLDOMNode_QI(&This->node, riid, ppv); - } IUnknown_AddRef((IUnknown*)*ppv); return S_OK; @@ -212,6 +319,7 @@ static const tid_t HTMLDOMTextNode_iface_tids[] = { IHTMLDOMNode_tid, IHTMLDOMNode2_tid, IHTMLDOMTextNode_tid, + IHTMLDOMTextNode2_tid, 0 }; static dispex_static_data_t HTMLDOMTextNode_dispex = { @@ -232,6 +340,7 @@ HRESULT HTMLDOMTextNode_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, HTMLDO ret->node.vtbl = &HTMLDOMTextNodeImplVtbl; ret->IHTMLDOMTextNode_iface.lpVtbl = &HTMLDOMTextNodeVtbl; + ret->IHTMLDOMTextNode2_iface.lpVtbl = &HTMLDOMTextNode2Vtbl; init_dispex(&ret->node.dispex, (IUnknown*)&ret->IHTMLDOMTextNode_iface, &HTMLDOMTextNode_dispex); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 9c38df7..1870e03 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -140,6 +140,7 @@ typedef struct event_target_t event_target_t; XIID(IHTMLDOMNode) \ XIID(IHTMLDOMNode2) \ XIID(IHTMLDOMTextNode) \ + XIID(IHTMLDOMTextNode2) \ XIID(IHTMLElement) \ XIID(IHTMLElement2) \ XIID(IHTMLElement3) \

1 0

Qian Hong : comdlg32/tests: Fixed memory leak (Valgrind).
by Alexandre Julliard 20 Nov '14

20 Nov '14

Module: wine Branch: master Commit: 0380ee031c17accb316926c7117eedd403e339b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0380ee031c17accb316926c71… Author: Qian Hong <qhong(a)codeweavers.com> Date: Thu Nov 20 13:02:41 2014 +0800 comdlg32/tests: Fixed memory leak (Valgrind). --- dlls/comdlg32/tests/printdlg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index 871807b..7e06c97 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -531,6 +531,7 @@ static void test_PrintDlgExW(void) if (!winetest_interactive) { skip("interactive PrintDlgEx tests (set WINETEST_INTERACTIVE=1)\n"); + HeapFree(GetProcessHeap(), 0, pDlg); return; }

1 0

Sebastian Lackner : server: Fix several fd leaks on error in new_process wineserver call.
by Alexandre Julliard 20 Nov '14

20 Nov '14

Module: wine Branch: master Commit: b985b677e8f2c21c93296c90114e3b9017c5b4b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b985b677e8f2c21c93296c901… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Nov 20 04:12:48 2014 +0100 server: Fix several fd leaks on error in new_process wineserver call. --- server/process.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/server/process.c b/server/process.c index 7b9a3b2..4a356b9 100644 --- a/server/process.c +++ b/server/process.c @@ -911,14 +911,21 @@ DECL_HANDLER(new_process) } /* build the startup info for a new process */ - if (!(info = alloc_object( &startup_info_ops ))) return; + if (!(info = alloc_object( &startup_info_ops ))) + { + close( socket_fd ); + return; + } info->exe_file = NULL; info->process = NULL; info->data = NULL; if (req->exe_file && !(info->exe_file = get_file_obj( current->process, req->exe_file, FILE_READ_DATA ))) + { + close( socket_fd ); goto done; + } info->data_size = get_req_data_size(); info->info_size = min( req->info_size, info->data_size ); @@ -929,7 +936,11 @@ DECL_HANDLER(new_process) data_size_t env_size = info->data_size - info->info_size; data_size_t info_size = min( req->info_size, FIELD_OFFSET( startup_info_t, curdir_len )); - if (!(info->data = mem_alloc( sizeof(*info->data) + env_size ))) goto done; + if (!(info->data = mem_alloc( sizeof(*info->data) + env_size ))) + { + close( socket_fd ); + goto done; + } memcpy( info->data, get_req_data(), info_size ); memset( (char *)info->data + info_size, 0, sizeof(*info->data) - info_size ); memcpy( info->data + 1, (const char *)get_req_data() + req->info_size, env_size ); @@ -940,7 +951,11 @@ DECL_HANDLER(new_process) { data_size_t pos = sizeof(*info->data); - if (!(info->data = memdup( get_req_data(), info->data_size ))) goto done; + if (!(info->data = memdup( get_req_data(), info->data_size ))) + { + close( socket_fd ); + goto done; + } #define FIXUP_LEN(len) do { (len) = min( (len), info->info_size - pos ); pos += (len); } while(0) FIXUP_LEN( info->data->curdir_len ); FIXUP_LEN( info->data->dllpath_len );

1 0

Sebastian Lackner : server: Always remove inflight fd if alloc_console fails.
by Alexandre Julliard 20 Nov '14

20 Nov '14

Module: wine Branch: master Commit: 9aad600d8656b8515fb90989873030b28d3d8c9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aad600d8656b8515fb909898… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Nov 20 04:01:51 2014 +0100 server: Always remove inflight fd if alloc_console fails. --- server/console.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/server/console.c b/server/console.c index c83ec01..4c2d61d 100644 --- a/server/console.c +++ b/server/console.c @@ -1392,6 +1392,16 @@ DECL_HANDLER(alloc_console) int fd; int attach = 0; + if (req->input_fd != -1) + { + if ((fd = thread_get_inflight_fd( current, req->input_fd )) == -1) + { + set_error( STATUS_INVALID_PARAMETER ); + return; + } + } + else fd = -1; + switch (req->pid) { case 0: @@ -1399,6 +1409,7 @@ DECL_HANDLER(alloc_console) renderer = current; if (!(process = current->process->parent)) { + if (fd != -1) close( fd ); set_error( STATUS_ACCESS_DENIED ); return; } @@ -1415,23 +1426,19 @@ DECL_HANDLER(alloc_console) default: /* renderer is current, console to be attached to req->pid */ renderer = current; - if (!(process = get_process_from_id( req->pid ))) return; + if (!(process = get_process_from_id( req->pid ))) + { + if (fd != -1) close( fd ); + return; + } } if (attach && process->console) { + if (fd != -1) close( fd ); set_error( STATUS_ACCESS_DENIED ); goto the_end; } - if (req->input_fd != -1) - { - if ((fd = thread_get_inflight_fd( current, req->input_fd )) == -1) - { - set_error( STATUS_INVALID_PARAMETER ); - goto the_end; - } - } - else fd = -1; if ((console = (struct console_input*)create_console_input( renderer, fd ))) {

1 0

Sebastian Lackner : server: Avoid calling close on negative value in create_console_output handler ( Coverity).
by Alexandre Julliard 20 Nov '14

20 Nov '14

Module: wine Branch: master Commit: d00e8ebda7e05738de5bed3fea1397b64691b929 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d00e8ebda7e05738de5bed3fe… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Nov 19 19:46:03 2014 +0100 server: Avoid calling close on negative value in create_console_output handler (Coverity). --- server/console.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/console.c b/server/console.c index b7f8206..c83ec01 100644 --- a/server/console.c +++ b/server/console.c @@ -1609,12 +1609,12 @@ DECL_HANDLER(create_console_output) else fd = -1; if (!(console = console_input_get( req->handle_in, FILE_WRITE_PROPERTIES ))) { - close(fd); + if (fd != -1) close( fd ); return; } if (console_input_is_bare( console ) ^ (fd != -1)) { - close( fd ); + if (fd != -1) close( fd ); release_object( console ); set_error( STATUS_INVALID_HANDLE ); return;

1 0

Bruno Jesus : dbghelp: Remove a dead assignment (Cppcheck).
by Alexandre Julliard 20 Nov '14

20 Nov '14

Module: wine Branch: master Commit: a5c3f38773aaf5333e2d2a1ad64d5c619075cdfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5c3f38773aaf5333e2d2a1ad… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Nov 19 23:36:14 2014 -0200 dbghelp: Remove a dead assignment (Cppcheck). --- dlls/dbghelp/pe_module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index f43d971..b793edb 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -515,7 +515,7 @@ static BOOL pe_load_stabs(const struct process* pcs, struct module* module) static BOOL pe_load_dwarf(struct module* module) { struct image_file_map* fmap = &module->format_info[DFI_PE]->u.pe_info->fmap; - BOOL ret = FALSE; + BOOL ret; ret = dwarf2_parse(module, module->module.BaseOfImage - fmap->u.pe.ntheader.OptionalHeader.ImageBase,

1 0

Bruno Jesus : dinput: Fix device type dump.
by Alexandre Julliard 20 Nov '14

20 Nov '14

Module: wine Branch: master Commit: c257e8adf6eb198c441accfc48c3d3b9b5366337 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c257e8adf6eb198c441accfc4… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Nov 19 23:30:08 2014 -0200 dinput: Fix device type dump. --- dlls/dinput/joystick.c | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 0d61f57..edbb64e 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -400,16 +400,38 @@ HRESULT WINAPI JoystickAGenericImpl_SetProperty(LPDIRECTINPUTDEVICE8A iface, REF return JoystickWGenericImpl_SetProperty(IDirectInputDevice8W_from_impl(This), rguid, ph); } +#define DEBUG_TYPE(x) case (x): str = #x; break void _dump_DIDEVCAPS(const DIDEVCAPS *lpDIDevCaps) { + int type = GET_DIDEVICE_TYPE(lpDIDevCaps->dwDevType); + const char *str; TRACE("dwSize: %d\n", lpDIDevCaps->dwSize); TRACE("dwFlags: %08x\n", lpDIDevCaps->dwFlags); - TRACE("dwDevType: %08x %s\n", lpDIDevCaps->dwDevType, - lpDIDevCaps->dwDevType == DIDEVTYPE_DEVICE ? "DIDEVTYPE_DEVICE" : - lpDIDevCaps->dwDevType == DIDEVTYPE_MOUSE ? "DIDEVTYPE_MOUSE" : - lpDIDevCaps->dwDevType == DIDEVTYPE_KEYBOARD ? "DIDEVTYPE_KEYBOARD" : - lpDIDevCaps->dwDevType == DIDEVTYPE_JOYSTICK ? "DIDEVTYPE_JOYSTICK" : - lpDIDevCaps->dwDevType == DIDEVTYPE_HID ? "DIDEVTYPE_HID" : "UNKNOWN"); + switch(type) + { + /* Directx <= 7 definitions */ + DEBUG_TYPE(DIDEVTYPE_DEVICE); + DEBUG_TYPE(DIDEVTYPE_MOUSE); + DEBUG_TYPE(DIDEVTYPE_KEYBOARD); + DEBUG_TYPE(DIDEVTYPE_JOYSTICK); + DEBUG_TYPE(DIDEVTYPE_HID); + /* Directx >= 8 definitions */ + DEBUG_TYPE(DI8DEVTYPE_DEVICE); + DEBUG_TYPE(DI8DEVTYPE_MOUSE); + DEBUG_TYPE(DI8DEVTYPE_KEYBOARD); + DEBUG_TYPE(DI8DEVTYPE_JOYSTICK); + DEBUG_TYPE(DI8DEVTYPE_GAMEPAD); + DEBUG_TYPE(DI8DEVTYPE_DRIVING); + DEBUG_TYPE(DI8DEVTYPE_FLIGHT); + DEBUG_TYPE(DI8DEVTYPE_1STPERSON); + DEBUG_TYPE(DI8DEVTYPE_DEVICECTRL); + DEBUG_TYPE(DI8DEVTYPE_SCREENPOINTER); + DEBUG_TYPE(DI8DEVTYPE_REMOTE); + DEBUG_TYPE(DI8DEVTYPE_SUPPLEMENTAL); + default: str = "UNKNOWN"; + } + + TRACE("dwDevType: %08x %s\n", lpDIDevCaps->dwDevType, str); TRACE("dwAxes: %d\n", lpDIDevCaps->dwAxes); TRACE("dwButtons: %d\n", lpDIDevCaps->dwButtons); TRACE("dwPOVs: %d\n", lpDIDevCaps->dwPOVs); @@ -421,6 +443,7 @@ void _dump_DIDEVCAPS(const DIDEVCAPS *lpDIDevCaps) TRACE("dwFFDriverVersion: %d\n", lpDIDevCaps->dwFFDriverVersion); } } +#undef DEBUG_TYPE HRESULT WINAPI JoystickWGenericImpl_GetCapabilities(LPDIRECTINPUTDEVICE8W iface, LPDIDEVCAPS lpDIDevCaps) {

1 0

André Hentschel : gdi32: Remove unused string (Clang) .
by Alexandre Julliard 20 Nov '14

20 Nov '14

Module: wine Branch: master Commit: d9d17252957311adb94fa6c9a15f5410cb42db77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9d17252957311adb94fa6c9a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 19 22:09:17 2014 +0100 gdi32: Remove unused string (Clang). --- dlls/gdi32/freetype.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 924f5f3..b063c80 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -529,10 +529,6 @@ static const WCHAR system_link[] = {'S','o','f','t','w','a','r','e','\\','M','i' 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','F','o','n','t','L','i','n','k','\\', 'S','y','s','t','e','m','L','i','n','k',0}; -static const WCHAR internal_system_link[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\', - 'F','o','n','t','L','i','n','k','\\', - 'S','y','s','t','e','m','L','i','n','k',0}; - /**************************************** * Notes on .fon files *

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
40
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2014