February 2008 - Wine-Commits

Alexandre Julliard : comctl32: Remove unnecessary \n in trace.
by Alexandre Julliard Feb. 18, 2008

Feb. 18, 2008

Module: wine Branch: master Commit: 543909958f3efcea3f356c246b82b8e69faef3dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=543909958f3efcea3f356c246… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Feb 17 20:26:13 2008 +0100 comctl32: Remove unnecessary \n in trace. --- dlls/comctl32/listview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 16bf38a..006991f 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -611,7 +611,7 @@ static const char* debugnmlistview(const NMLISTVIEW *plvnm) { if (!plvnm) return "(null)"; return wine_dbg_sprintf("iItem=%d, iSubItem=%d, uNewState=0x%x," - " uOldState=0x%x, uChanged=0x%x, ptAction=%s, lParam=%ld\n", + " uOldState=0x%x, uChanged=0x%x, ptAction=%s, lParam=%ld", plvnm->iItem, plvnm->iSubItem, plvnm->uNewState, plvnm->uOldState, plvnm->uChanged, wine_dbgstr_point(&plvnm->ptAction), plvnm->lParam); }

1 0

Alistair Leslie-Hughes : msxml3: Implement IXMLDOMProcessingInstruction target.
by Alexandre Julliard Feb. 16, 2008

Feb. 16, 2008

Module: wine Branch: master Commit: 701991ca326c47c158d85760c33b10f7550a8cad URL: http://source.winehq.org/git/wine.git/?a=commit;h=701991ca326c47c158d85760c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Feb 16 22:02:40 2008 +1100 msxml3: Implement IXMLDOMProcessingInstruction target. --- dlls/msxml3/pi.c | 5 +++-- dlls/msxml3/tests/domdoc.c | 12 ++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 054d7f8..1129690 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -433,8 +433,9 @@ static HRESULT WINAPI dom_pi_get_target( IXMLDOMProcessingInstruction *iface, BSTR *p) { - FIXME("\n"); - return E_NOTIMPL; + /* target returns the same value as nodeName property */ + dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); + return IXMLDOMNode_get_nodeName( This->node, p ); } static HRESULT WINAPI dom_pi_get_data( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index cbc7c6b..424de18 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -618,6 +618,18 @@ static void test_domdoc( void ) ok( V_VT(&var) == VT_NULL, "incorrect dataType type\n"); VariantClear(&var); + /* test nodeName */ + r = IXMLDOMProcessingInstruction_get_nodeName(nodePI, &str); + ok(r == S_OK, "ret %08x\n", r ); + ok( !lstrcmpW( str, _bstr_("xml") ), "incorrect nodeName string\n"); + SysFreeString(str); + + /* test Target */ + r = IXMLDOMProcessingInstruction_get_target(nodePI, &str); + ok(r == S_OK, "ret %08x\n", r ); + ok( !lstrcmpW( str, _bstr_("xml") ), "incorrect target string\n"); + SysFreeString(str); + /* test nodeTypeString */ r = IXMLDOMProcessingInstruction_get_nodeTypeString(nodePI, &str); ok(r == S_OK, "ret %08x\n", r );

1 0

Aric Stewart : imm: Ensure hCompStr handle is not NULL and check for empty composition strings properly .
by Alexandre Julliard Feb. 16, 2008

Feb. 16, 2008

Module: wine Branch: master Commit: fd67f32ee38d5d3fc49f301f22a60f9cfce41db9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd67f32ee38d5d3fc49f301f2… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Feb 15 13:22:28 2008 -0600 imm: Ensure hCompStr handle is not NULL and check for empty composition strings properly. --- dlls/imm32/imm.c | 24 +++++++++++++++++++++--- 1 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 78c61ce..6b4e288 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -194,6 +194,18 @@ static LRESULT ImmInternalSendIMENotify(WPARAM notify, LPARAM lParam) return 0; } +static HIMCC ImmCreateBlankCompStr(void) +{ + HIMCC rc; + LPCOMPOSITIONSTRING ptr; + rc = ImmCreateIMCC(sizeof(COMPOSITIONSTRING)); + ptr = (LPCOMPOSITIONSTRING)ImmLockIMCC(rc); + memset(ptr,0,sizeof(COMPOSITIONSTRING)); + ptr->dwSize = sizeof(COMPOSITIONSTRING); + ImmUnlockIMCC(rc); + return rc; +} + static void ImmInternalSetOpenStatus(BOOL fOpen) { TRACE("Setting internal state to %s\n",(fOpen)?"OPEN":"CLOSED"); @@ -202,7 +214,7 @@ static void ImmInternalSetOpenStatus(BOOL fOpen) { ShowWindow(hwndDefault,SW_HIDE); ImmDestroyIMCC(root_context->IMC.hCompStr); - root_context->IMC.hCompStr = NULL; + root_context->IMC.hCompStr = ImmCreateBlankCompStr(); } root_context->IMC.fOpen = fOpen; @@ -597,6 +609,9 @@ HIMC WINAPI ImmCreateContext(void) new_context = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(InputContextData)); + /* hCompStr is never NULL */ + new_context->IMC.hCompStr = ImmCreateBlankCompStr(); + return (HIMC)new_context; } @@ -1411,14 +1426,17 @@ BOOL WINAPI ImmNotifyIME( TRACE("%s - %s\n","NI_COMPOSITIONSTR","CPS_CANCEL"); { BOOL send; + LPCOMPOSITIONSTRING lpCompStr; if (pX11DRV_ForceXIMReset) pX11DRV_ForceXIMReset(root_context->IMC.hWnd); - send = (root_context->IMC.hCompStr!=NULL); + lpCompStr = ImmLockIMCC(root_context->IMC.hCompStr); + send = (lpCompStr->dwCompStrLen != 0); + ImmUnlockIMCC(root_context->IMC.hCompStr); ImmDestroyIMCC(root_context->IMC.hCompStr); - root_context->IMC.hCompStr = NULL; + root_context->IMC.hCompStr = ImmCreateBlankCompStr(); if (send) ImmInternalPostIMEMessage(WM_IME_COMPOSITION, 0,

1 0

Alistair Leslie-Hughes : msxml3: Implement IXMLDOMAttribute name property.
by Alexandre Julliard Feb. 16, 2008

Feb. 16, 2008

Module: wine Branch: master Commit: e9063b77769be6c2ed5bff2d3da17741d898459d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9063b77769be6c2ed5bff2d3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Feb 16 22:31:01 2008 +1100 msxml3: Implement IXMLDOMAttribute name property. --- dlls/msxml3/attribute.c | 5 +++-- dlls/msxml3/tests/domdoc.c | 12 ++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index 805bafe..49c39fe 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -433,8 +433,9 @@ static HRESULT WINAPI domattr_get_name( IXMLDOMAttribute *iface, BSTR *p) { - FIXME("\n"); - return E_NOTIMPL; + /* name property returns the same value as nodeName */ + domattr *This = impl_from_IXMLDOMAttribute( iface ); + return IXMLDOMNode_get_nodeName( This->node, p ); } static HRESULT WINAPI domattr_get_value( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 424de18..2401878 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -2128,6 +2128,18 @@ static void test_xmlTypes(void) ok( !lstrcmpW( str, _bstr_("attribute") ), "incorrect nodeTypeString string\n"); SysFreeString(str); + /* test nodeName */ + hr = IXMLDOMAttribute_get_nodeName(pAttrubute, &str); + ok(hr == S_OK, "ret %08x\n", hr ); + ok( !lstrcmpW( str, szAttribute ), "incorrect nodeName string\n"); + SysFreeString(str); + + /* test name property */ + hr = IXMLDOMAttribute_get_name(pAttrubute, &str); + ok(hr == S_OK, "ret %08x\n", hr ); + ok( !lstrcmpW( str, szAttribute ), "incorrect name string\n"); + SysFreeString(str); + hr = IXMLDOMAttribute_get_xml(pAttrubute, &str); ok(hr == S_OK, "ret %08x\n", hr ); ok( !lstrcmpW( str, szAttributeXML ), "incorrect attribute xml\n");

1 0

James Hawkins : tools/wine.inf: Create fake dlls for itircl.dll and itss. dll.
by Alexandre Julliard Feb. 16, 2008

Feb. 16, 2008

Module: wine Branch: master Commit: 0d2f7322d390700199b7a26bb4b3e9696de196a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d2f7322d390700199b7a26bb… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Fri Feb 15 17:40:35 2008 -0600 tools/wine.inf: Create fake dlls for itircl.dll and itss.dll. --- tools/wine.inf | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 66140fe..fbb78ab 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2230,6 +2230,8 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,hhctrl.ocx 11,,imaadp32.acm 11,,imagehlp.dll +11,,itircl.dll +11,,itss.dll 11,,kernel32.dll 11,,msadp32.acm 11,,msg711.acm

1 0

Marcus Meissner : dinput: Removed superflous < 0 check.
by Alexandre Julliard Feb. 16, 2008

Feb. 16, 2008

Module: wine Branch: master Commit: f1a688a9462373c6b2dcd6d0992cc2d36ab5d397 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1a688a9462373c6b2dcd6d09… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Feb 15 20:46:23 2008 +0100 dinput: Removed superflous < 0 check. --- dlls/dinput/effect_linuxinput.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index 6cc5ad2..0dfbe23 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -185,8 +185,8 @@ static void _dump_DIEFFECT(LPCDIEFFECT eff, REFGUID guid) _dump_DIEFFECT_flags(eff->dwFlags); TRACE(" - dwDuration: %d\n", eff->dwDuration); TRACE(" - dwGain: %d\n", eff->dwGain); - if ((eff->dwGain > 10000) || (eff->dwGain < 0)) - WARN("dwGain is out of range (0 - 10,000)\n"); + if (eff->dwGain > 10000) + WARN("dwGain is out of range (>10,000)\n"); TRACE(" - dwTriggerButton: %d\n", eff->dwTriggerButton); TRACE(" - dwTriggerRepeatInterval: %d\n", eff->dwTriggerRepeatInterval); TRACE(" - cAxes: %d\n", eff->cAxes);

1 0

James Hawkins : itircl: Add a stub implementation of itircl.dll.
by Alexandre Julliard Feb. 16, 2008

Feb. 16, 2008

Module: wine Branch: master Commit: 58b0686e951364686c3b5b55c18566df0960fd96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58b0686e951364686c3b5b55c… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Fri Feb 15 17:39:46 2008 -0600 itircl: Add a stub implementation of itircl.dll. --- Makefile.in | 2 + configure | 3 ++ configure.ac | 1 + dlls/Makefile.in | 1 + dlls/itircl/Makefile.in | 13 ++++++++++++ dlls/itircl/itircl.spec | 4 +++ dlls/itircl/itircl_main.c | 49 +++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 73 insertions(+), 0 deletions(-) diff --git a/Makefile.in b/Makefile.in index 5558f39..4b4fcf1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -268,6 +268,7 @@ ALL_MAKEFILES = \ dlls/inseng/Makefile \ dlls/iphlpapi/Makefile \ dlls/iphlpapi/tests/Makefile \ + dlls/itircl/Makefile \ dlls/itss/Makefile \ dlls/itss/tests/Makefile \ dlls/kernel32/Makefile \ @@ -658,6 +659,7 @@ dlls/inkobj/Makefile: dlls/inkobj/Makefile.in dlls/Makedll.rules dlls/inseng/Makefile: dlls/inseng/Makefile.in dlls/Makedll.rules dlls/iphlpapi/Makefile: dlls/iphlpapi/Makefile.in dlls/Makedll.rules dlls/iphlpapi/tests/Makefile: dlls/iphlpapi/tests/Makefile.in dlls/Maketest.rules +dlls/itircl/Makefile: dlls/itircl/Makefile.in dlls/Makedll.rules dlls/itss/Makefile: dlls/itss/Makefile.in dlls/Makedll.rules dlls/itss/tests/Makefile: dlls/itss/tests/Makefile.in dlls/Maketest.rules dlls/kernel32/Makefile: dlls/kernel32/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index e16fd36..0eb274a 100755 --- a/configure +++ b/configure @@ -21387,6 +21387,8 @@ ac_config_files="$ac_config_files dlls/iphlpapi/Makefile" ac_config_files="$ac_config_files dlls/iphlpapi/tests/Makefile" +ac_config_files="$ac_config_files dlls/itircl/Makefile" + ac_config_files="$ac_config_files dlls/itss/Makefile" ac_config_files="$ac_config_files dlls/itss/tests/Makefile" @@ -22593,6 +22595,7 @@ do "dlls/inseng/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/inseng/Makefile" ;; "dlls/iphlpapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/iphlpapi/Makefile" ;; "dlls/iphlpapi/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/iphlpapi/tests/Makefile" ;; + "dlls/itircl/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/itircl/Makefile" ;; "dlls/itss/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/itss/Makefile" ;; "dlls/itss/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/itss/tests/Makefile" ;; "dlls/kernel32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/kernel32/Makefile" ;; diff --git a/configure.ac b/configure.ac index 21f07c6..a9252e0 100644 --- a/configure.ac +++ b/configure.ac @@ -1767,6 +1767,7 @@ AC_CONFIG_FILES([dlls/inkobj/Makefile]) AC_CONFIG_FILES([dlls/inseng/Makefile]) AC_CONFIG_FILES([dlls/iphlpapi/Makefile]) AC_CONFIG_FILES([dlls/iphlpapi/tests/Makefile]) +AC_CONFIG_FILES([dlls/itircl/Makefile]) AC_CONFIG_FILES([dlls/itss/Makefile]) AC_CONFIG_FILES([dlls/itss/tests/Makefile]) AC_CONFIG_FILES([dlls/kernel32/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 4d02b13..d29aafb 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -97,6 +97,7 @@ BASEDIRS = \ inkobj \ inseng \ iphlpapi \ + itircl \ itss \ kernel32 \ localspl \ diff --git a/dlls/itircl/Makefile.in b/dlls/itircl/Makefile.in new file mode 100644 index 0000000..9787cb5 --- /dev/null +++ b/dlls/itircl/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = itircl.dll +IMPORTS = kernel32 + +C_SRCS = \ + itircl_main.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/itircl/itircl.spec b/dlls/itircl/itircl.spec new file mode 100644 index 0000000..c5fc87a --- /dev/null +++ b/dlls/itircl/itircl.spec @@ -0,0 +1,4 @@ +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub DllRegisterServer +@ stub DllUnregisterServer diff --git a/dlls/itircl/itircl_main.c b/dlls/itircl/itircl_main.c new file mode 100644 index 0000000..e8279cc --- /dev/null +++ b/dlls/itircl/itircl_main.c @@ -0,0 +1,49 @@ +/* + * itircl main + * + * Copyright 2008 James Hawkins + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(itircl); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + default: + break; + } + + return TRUE; +}

1 0

Marcus Meissner : dinput: Add debug output for IDirectInput8A:: EnumDevicesBySemantics.
by Alexandre Julliard Feb. 16, 2008

Feb. 16, 2008

Module: wine Branch: master Commit: da77b8a0f31db84183e351448ff852ece181d5fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=da77b8a0f31db84183e351448… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri Feb 15 15:01:03 2008 +0100 dinput: Add debug output for IDirectInput8A::EnumDevicesBySemantics. --- dlls/dinput/dinput_main.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 0424f72..2e4b4f5 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -666,11 +666,22 @@ static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics( LPVOID pvRef, DWORD dwFlags ) { - IDirectInputImpl *This = impl_from_IDirectInput8A( iface ); + IDirectInputImpl *This = impl_from_IDirectInput8A( iface ); - FIXME("(this=%p,%s,%p,%p,%p,%04x): stub\n", This, ptszUserName, lpdiActionFormat, - lpCallback, pvRef, dwFlags); - return 0; + FIXME("(this=%p,%s,%p,%p,%p,%04x): stub\n", This, ptszUserName, lpdiActionFormat, + lpCallback, pvRef, dwFlags); +#define X(x) if (dwFlags & x) FIXME("\tdwFlags |= "#x"\n"); + X(DIEDBSFL_ATTACHEDONLY) + X(DIEDBSFL_THISUSER) + X(DIEDBSFL_FORCEFEEDBACK) + X(DIEDBSFL_AVAILABLEDEVICES) + X(DIEDBSFL_MULTIMICEKEYBOARDS) + X(DIEDBSFL_NONGAMINGDEVICES) +#undef X + + _dump_diactionformatA(lpdiActionFormat); + + return DI_OK; } static HRESULT WINAPI IDirectInput8WImpl_EnumDevicesBySemantics(

1 0

James Hawkins : tools/wine.inf: Create a fake file for hh.exe.
by Alexandre Julliard Feb. 16, 2008

Feb. 16, 2008

Module: wine Branch: master Commit: 26424a0a59c80b5f6b866450f1c21ce0b31b281f URL: http://source.winehq.org/git/wine.git/?a=commit;h=26424a0a59c80b5f6b866450f… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Fri Feb 15 17:38:45 2008 -0600 tools/wine.inf: Create a fake file for hh.exe. --- tools/wine.inf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 312d66c..66140fe 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2203,6 +2203,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" [FakeDllsSection] 10,,explorer.exe +10,,hh.exe 10,,notepad.exe 10,,regedit.exe 10,,twain_32.dll

1 0

Marcus Meissner : dinput: Add a dumper for LPDIACTIONFORMAT.
by Alexandre Julliard Feb. 16, 2008

Feb. 16, 2008

Module: wine Branch: master Commit: 9ce27fc7c104abdc6b0d5d55060c1311627ce491 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ce27fc7c104abdc6b0d5d550… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri Feb 15 14:50:15 2008 +0100 dinput: Add a dumper for LPDIACTIONFORMAT. Also make the DINPUT_instance static. --- dlls/dinput/device.c | 2 +- dlls/dinput/dinput_main.c | 31 ++++++++++++++++++++++++++++++- dlls/dinput/dinput_private.h | 4 ++-- 3 files changed, 33 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 43cd946..8641803 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1339,7 +1339,7 @@ HRESULT WINAPI IDirectInputDevice8AImpl_BuildActionMap(LPDIRECTINPUTDEVICE8A ifa DWORD dwFlags) { FIXME("(%p)->(%p,%s,%08x): stub !\n", iface, lpdiaf, lpszUserName, dwFlags); - + _dump_diactionformatA(lpdiaf); return DI_OK; } diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 2638710..0424f72 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -82,7 +82,7 @@ static const struct dinput_device *dinput_devices[] = }; #define NB_DINPUT_DEVICES (sizeof(dinput_devices)/sizeof(dinput_devices[0])) -HINSTANCE DINPUT_instance = NULL; +static HINSTANCE DINPUT_instance = NULL; BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserv) { @@ -210,6 +210,35 @@ static void _dump_EnumDevices_dwFlags(DWORD dwFlags) { TRACE("\n"); } +void _dump_diactionformatA(LPDIACTIONFORMATA lpdiActionFormat) { + int i; + + FIXME("diaf.dwSize = %d\n", lpdiActionFormat->dwSize); + FIXME("diaf.dwActionSize = %d\n", lpdiActionFormat->dwActionSize); + FIXME("diaf.dwDataSize = %d\n", lpdiActionFormat->dwDataSize); + FIXME("diaf.dwNumActions = %d\n", lpdiActionFormat->dwNumActions); + FIXME("diaf.rgoAction = %p\n", lpdiActionFormat->rgoAction); + for (i=0;i<lpdiActionFormat->dwNumActions;i++) { + FIXME("diaf.rgoAction[%d]:\n", i); + FIXME("\tuAppData=%lx\n", lpdiActionFormat->rgoAction[i].uAppData); + FIXME("\tdwSemantics=%x\n", lpdiActionFormat->rgoAction[i].dwSemantics); + FIXME("\tdwFlags=%x\n", lpdiActionFormat->rgoAction[i].dwFlags); + FIXME("\tszActionName=%s\n", debugstr_a(lpdiActionFormat->rgoAction[i].lptszActionName)); + FIXME("\tguidInstance=%s\n", debugstr_guid(&lpdiActionFormat->rgoAction[i].guidInstance)); + FIXME("\tdwObjID=%x\n", lpdiActionFormat->rgoAction[i].dwObjID); + FIXME("\tdwHow=%x\n", lpdiActionFormat->rgoAction[i].dwHow); + } + FIXME("diaf.guidActionMap = %s\n", debugstr_guid(&lpdiActionFormat->guidActionMap)); + FIXME("diaf.dwGenre = %d\n", lpdiActionFormat->dwGenre); + FIXME("diaf.dwBufferSize = %d\n", lpdiActionFormat->dwBufferSize); + FIXME("diaf.lAxisMin = %d\n", lpdiActionFormat->lAxisMin); + FIXME("diaf.lAxisMax = %d\n", lpdiActionFormat->lAxisMax); + FIXME("diaf.hInstString = %p\n", lpdiActionFormat->hInstString); + FIXME("diaf.ftTimeStamp ...\n"); + FIXME("diaf.dwCRC = %x\n", lpdiActionFormat->dwCRC); + FIXME("diaf.tszActionMap = %s\n", debugstr_a(lpdiActionFormat->tszActionMap)); +} + /****************************************************************************** * IDirectInputA_EnumDevices */ diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index a9d12de..15783e2 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -59,9 +59,9 @@ extern const struct dinput_device keyboard_device; extern const struct dinput_device joystick_linux_device; extern const struct dinput_device joystick_linuxinput_device; -extern HINSTANCE DINPUT_instance; - extern void check_dinput_hooks(LPDIRECTINPUTDEVICE8A); typedef void (*DI_EVENT_PROC)(LPDIRECTINPUTDEVICE8A, WPARAM, LPARAM); +extern void _dump_diactionformatA(LPDIACTIONFORMATA); + #endif /* __WINE_DLLS_DINPUT_DINPUT_PRIVATE_H */

1 0