December 2006 - Wine-Commits

Rob Shearman : ole32: Execute Reduce using the moniker' s vtable in CreateCompositeMoniker as the moniker isn' t necessarily a composite moniker.
by Alexandre Julliard Dec. 28, 2006

Dec. 28, 2006

Module: wine Branch: master Commit: 3bcea6395ff3d86b7eb1ef8e2c980a6e1e304f3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bcea6395ff3d86b7eb1ef8e2… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Dec 28 02:41:39 2006 +0000 ole32: Execute Reduce using the moniker's vtable in CreateCompositeMoniker as the moniker isn't necessarily a composite moniker. --- dlls/ole32/compositemoniker.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 6438e54..4a0af25 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -466,7 +466,7 @@ CompositeMonikerImpl_Reduce(IMoniker* if res=IMoniker_ComposeWith(iface,antiMk,0,&tempMk); IMoniker_Release(antiMk); - return CompositeMonikerImpl_Reduce(mostRigthMk,pbc,dwReduceHowFar,&tempMk, ppmkReduced); + return IMoniker_Reduce(mostRigthMk,pbc,dwReduceHowFar,&tempMk, ppmkReduced); } else if (*ppmkToLeft==NULL) @@ -486,7 +486,7 @@ CompositeMonikerImpl_Reduce(IMoniker* if /* If any of the components reduces itself, the method returns S_OK and passes back a composite */ /* of the reduced components */ if (IMoniker_Reduce(mostRigthMk,pbc,dwReduceHowFar,NULL,&mostRigthReducedMk) && - CompositeMonikerImpl_Reduce(mostRigthMk,pbc,dwReduceHowFar,&tempMk,&leftReducedComposedMk) + IMoniker_Reduce(mostRigthMk,pbc,dwReduceHowFar,&tempMk,&leftReducedComposedMk) ) return CreateGenericComposite(leftReducedComposedMk,mostRigthReducedMk,ppmkReduced);

1 0

Rob Shearman : ole32: Use the reduced forms of monikers for comparison in the running object table .
by Alexandre Julliard Dec. 28, 2006

Dec. 28, 2006

Module: wine Branch: master Commit: d4b755a8349fac5e9d3c3511621790d4f1de915d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4b755a8349fac5e9d3c35116… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Dec 28 02:41:45 2006 +0000 ole32: Use the reduced forms of monikers for comparison in the running object table. --- dlls/ole32/moniker.c | 41 +++++++++++++++++++++++++++++++++++++++-- 1 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index 6a26304..9567bf2 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -159,6 +159,19 @@ static HRESULT get_moniker_comparison_da return S_OK; } +static HRESULT reduce_moniker(IMoniker *pmk, IMoniker **pmkReduced) +{ + IBindCtx *pbc; + HRESULT hr = CreateBindCtx(0, &pbc); + if (FAILED(hr)) + return hr; + hr = IMoniker_Reduce(pmk, pbc, MKRREDUCE_ALL, NULL, pmkReduced); + if (FAILED(hr)) + ERR("reducing moniker failed with error 0x%08x\n", hr); + IBindCtx_Release(pbc); + return hr; +} + /*********************************************************************** * RunningObjectTable_QueryInterface */ @@ -329,10 +342,19 @@ RunningObjectTableImpl_Register(IRunning return hr; } - hr = get_moniker_comparison_data(pmkObjectName, &rot_entry->moniker_data); + hr = reduce_moniker(pmkObjectName, &pmkObjectName); + if (FAILED(hr)) + { + rot_entry_delete(rot_entry); + return hr; + } + + hr = get_moniker_comparison_data(pmkObjectName, + &rot_entry->moniker_data); if (hr != S_OK) { rot_entry_delete(rot_entry); + IMoniker_Release(pmkObjectName); return hr; } @@ -340,10 +362,12 @@ RunningObjectTableImpl_Register(IRunning if (hr != S_OK) { rot_entry_delete(rot_entry); + IMoniker_Release(pmkObjectName); return hr; } /* marshal moniker */ - hr = CoMarshalInterface(pStream, &IID_IMoniker, (IUnknown *)pmkObjectName, MSHCTX_LOCAL | MSHCTX_NOSHAREDMEM, NULL, MSHLFLAGS_TABLESTRONG); + hr = CoMarshalInterface(pStream, &IID_IMoniker, (IUnknown *)pmkObjectName, + MSHCTX_LOCAL | MSHCTX_NOSHAREDMEM, NULL, MSHLFLAGS_TABLESTRONG); /* FIXME: a cleaner way would be to create an IStream class that writes * directly to an MInterfacePointer */ if (hr == S_OK) @@ -361,6 +385,7 @@ RunningObjectTableImpl_Register(IRunning } } IStream_Release(pStream); + IMoniker_Release(pmkObjectName); if (hr != S_OK) { rot_entry_delete(rot_entry); @@ -433,7 +458,11 @@ RunningObjectTableImpl_IsRunning( IRunni TRACE("(%p,%p)\n",This,pmkObjectName); + hr = reduce_moniker(pmkObjectName, &pmkObjectName); + if (FAILED(hr)) + return hr; hr = get_moniker_comparison_data(pmkObjectName, &moniker_data); + IMoniker_Release(pmkObjectName); if (hr != S_OK) return hr; @@ -480,7 +509,11 @@ RunningObjectTableImpl_GetObject( IRunni *ppunkObject = NULL; + hr = reduce_moniker(pmkObjectName, &pmkObjectName); + if (FAILED(hr)) + return hr; hr = get_moniker_comparison_data(pmkObjectName, &moniker_data); + IMoniker_Release(pmkObjectName); if (hr != S_OK) return hr; @@ -569,7 +602,11 @@ RunningObjectTableImpl_GetTimeOfLastChan if (pmkObjectName==NULL || pfiletime==NULL) return E_INVALIDARG; + hr = reduce_moniker(pmkObjectName, &pmkObjectName); + if (FAILED(hr)) + return hr; hr = get_moniker_comparison_data(pmkObjectName, &moniker_data); + IMoniker_Release(pmkObjectName); if (hr != S_OK) return hr;

1 0

Rob Shearman : ole32: ROTFLAGS_REGISTRATIONKEEPSALIVE and ROTFLAGS_ALLOWANYCLIENT are legal to be used together in RunningObjectTable_Register .
by Alexandre Julliard Dec. 28, 2006

Dec. 28, 2006

Module: wine Branch: master Commit: 83da7dde2a08b3bf48c5beb1295a4d364aeba3b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83da7dde2a08b3bf48c5beb12… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Dec 28 02:41:34 2006 +0000 ole32: ROTFLAGS_REGISTRATIONKEEPSALIVE and ROTFLAGS_ALLOWANYCLIENT are legal to be used together in RunningObjectTable_Register. --- dlls/ole32/moniker.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index 080b936..6a26304 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -282,15 +282,9 @@ RunningObjectTableImpl_Register(IRunning TRACE("(%p,%d,%p,%p,%p)\n",This,grfFlags,punkObject,pmkObjectName,pdwRegister); - /* - * there's only two types of register : strong and or weak registration - * (only one must be passed on parameter) - */ - if ( ( (grfFlags & ROTFLAGS_REGISTRATIONKEEPSALIVE) || !(grfFlags & ROTFLAGS_ALLOWANYCLIENT)) && - (!(grfFlags & ROTFLAGS_REGISTRATIONKEEPSALIVE) || (grfFlags & ROTFLAGS_ALLOWANYCLIENT)) && - (grfFlags) ) + if (grfFlags & ~(ROTFLAGS_REGISTRATIONKEEPSALIVE|ROTFLAGS_ALLOWANYCLIENT)) { - ERR("Invalid combination of ROTFLAGS: %x\n", grfFlags); + ERR("Invalid grfFlags: 0x%08x\n", grfFlags & ~(ROTFLAGS_REGISTRATIONKEEPSALIVE|ROTFLAGS_ALLOWANYCLIENT)); return E_INVALIDARG; }

1 0

Rob Shearman : msxml3: Add a simple test for XMLHTTP.
by Alexandre Julliard Dec. 28, 2006

Dec. 28, 2006

Module: wine Branch: master Commit: 588e423bde1ad5d723aa318125f0b47b24c5cef8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=588e423bde1ad5d723aa31812… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Dec 28 02:40:46 2006 +0000 msxml3: Add a simple test for XMLHTTP. --- dlls/msxml3/tests/domdoc.c | 48 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index a2824fd..4fc139d 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -23,6 +23,7 @@ #include "windows.h" #include "ole2.h" +#include "xmldom.h" #include "msxml2.h" #include <stdio.h> @@ -1090,6 +1091,52 @@ static void test_removeChild(void) IXMLDOMDocument_Release( doc ); } +static void test_XMLHTTP(void) +{ + static const WCHAR wszBody[] = {'m','o','d','e','=','T','e','s','t',0}; + static WCHAR wszPOST[] = {'P','O','S','T',0}; + static WCHAR wszUrl[] = {'h','t','t','p',':','/','/', + 'c','r','o','s','s','o','v','e','r','.','c','o','d','e','w','e','a','v','e','r','s','.','c','o','m','/', + 'p','o','s','t','t','e','s','t','.','p','h','p',0}; + static const WCHAR wszExpectedResponse[] = {'F','A','I','L','E','D',0}; + IXMLHttpRequest *pXMLHttpRequest; + BSTR bstrResponse; + VARIANT dummy; + VARIANT varfalse; + VARIANT varbody; + HRESULT hr = CoCreateInstance(&CLSID_XMLHTTPRequest, NULL, + CLSCTX_INPROC_SERVER, &IID_IXMLHttpRequest, + (void **)&pXMLHttpRequest); + todo_wine { + ok(hr == S_OK, "CoCreateInstance(CLSID_XMLHTTPRequest) should have succeeded instead of failing with 0x%08x\n", hr); + } + if (hr != S_OK) + return; + + VariantInit(&dummy); + V_VT(&dummy) = VT_ERROR; + V_ERROR(&dummy) = DISP_E_MEMBERNOTFOUND; + VariantInit(&varfalse); + V_VT(&varfalse) = VT_BOOL; + V_BOOL(&varfalse) = VARIANT_FALSE; + V_VT(&varbody) = VT_BSTR; + V_BSTR(&varbody) = SysAllocString(wszBody); + + hr = IXMLHttpRequest_open(pXMLHttpRequest, wszPOST, wszUrl, varfalse, dummy, dummy); + ok(hr == S_OK, "IXMLHttpRequest_open should have succeeded instead of failing with 0x%08x\n", hr); + + hr = IXMLHttpRequest_send(pXMLHttpRequest, varbody); + ok(hr == S_OK, "IXMLHttpRequest_send should have succeeded instead of failing with 0x%08x\n", hr); + VariantClear(&varbody); + + hr = IXMLHttpRequest_get_responseText(pXMLHttpRequest, &bstrResponse); + ok(hr == S_OK, "IXMLHttpRequest_get_responseText should have succeeded instead of failing with 0x%08x\n", hr); + /* the server currently returns "FAILED" because the Content-Type header is + * not what the server expects */ + ok(!memcmp(bstrResponse, wszExpectedResponse, sizeof(wszExpectedResponse)), "bstrResponse differs from what was expected\n"); + SysFreeString(bstrResponse); +} + START_TEST(domdoc) { HRESULT r; @@ -1105,6 +1152,7 @@ START_TEST(domdoc) test_get_text(); test_get_childNodes(); test_removeChild(); + test_XMLHTTP(); CoUninitialize(); }

1 0

Vitaliy Margolen : dinput: Move mouse to using new EnumObjects from base class.
by Alexandre Julliard Dec. 28, 2006

Dec. 28, 2006

Module: wine Branch: master Commit: 0eb110f3ca563de0442347138632f7c46f39e3d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eb110f3ca563de0442347138… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Wed Dec 27 16:32:36 2006 -0700 dinput: Move mouse to using new EnumObjects from base class. --- dlls/dinput/mouse.c | 110 ++------------------------------------------------ 1 files changed, 5 insertions(+), 105 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 4549ae0..935c64b 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -42,11 +42,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput); /* Wine mouse driver object instances */ #define WINE_MOUSE_X_AXIS_INSTANCE 0 #define WINE_MOUSE_Y_AXIS_INSTANCE 1 -#define WINE_MOUSE_Z_AXIS_INSTANCE 2 -#define WINE_MOUSE_L_BUTTON_INSTANCE 0 -#define WINE_MOUSE_R_BUTTON_INSTANCE 1 -#define WINE_MOUSE_M_BUTTON_INSTANCE 2 -#define WINE_MOUSE_D_BUTTON_INSTANCE 3 /* ------------------------------- */ /* Wine mouse internal data format */ @@ -208,11 +203,8 @@ static SysMouseImpl *alloc_device(REFGUI df->rgodf[i].dwType = DIDFT_MAKEINSTANCE(i) | DIDFT_PSHBUTTON; newDevice->base.data_format.wine_df = df; - if (create_DataFormat(&c_dfDIMouse2, &newDevice->base.data_format) == DI_OK) - { - IDirectInput_AddRef((LPDIRECTINPUTDEVICE8A)newDevice->dinput); - return newDevice; - } + IDirectInput_AddRef((LPDIRECTINPUTDEVICE8A)newDevice->dinput); + return newDevice; failed: if (df) HeapFree(GetProcessHeap(), 0, df->rgodf); @@ -653,7 +645,7 @@ static HRESULT WINAPI SysMouseAImpl_GetC else devcaps.dwDevType = DIDEVTYPE_MOUSE | (DIDEVTYPEMOUSE_TRADITIONAL << 8); devcaps.dwAxes = 3; - devcaps.dwButtons = 3; + devcaps.dwButtons = 8; devcaps.dwPOVs = 0; devcaps.dwFFSamplePeriod = 0; devcaps.dwFFMinTimeResolution = 0; @@ -668,98 +660,6 @@ static HRESULT WINAPI SysMouseAImpl_GetC /****************************************************************************** - * EnumObjects : enumerate the different buttons and axis... - */ -static HRESULT WINAPI SysMouseAImpl_EnumObjects( - LPDIRECTINPUTDEVICE8A iface, - LPDIENUMDEVICEOBJECTSCALLBACKA lpCallback, - LPVOID lpvRef, - DWORD dwFlags) -{ - SysMouseImpl *This = (SysMouseImpl *)iface; - DIDEVICEOBJECTINSTANCEA ddoi; - - TRACE("(this=%p,%p,%p,%08x)\n", This, lpCallback, lpvRef, dwFlags); - if (TRACE_ON(dinput)) { - TRACE(" - flags = "); - _dump_EnumObjects_flags(dwFlags); - TRACE("\n"); - } - - /* Only the fields till dwFFMaxForce are relevant */ - memset(&ddoi, 0, sizeof(ddoi)); - ddoi.dwSize = FIELD_OFFSET(DIDEVICEOBJECTINSTANCEA, dwFFMaxForce); - - /* In a mouse, we have : two relative axis and three buttons */ - if ((dwFlags == DIDFT_ALL) || - (dwFlags & DIDFT_AXIS)) { - /* X axis */ - ddoi.guidType = GUID_XAxis; - ddoi.dwOfs = This->base.data_format.offsets[WINE_MOUSE_X_POSITION]; - ddoi.dwType = DIDFT_MAKEINSTANCE(WINE_MOUSE_X_AXIS_INSTANCE) | DIDFT_RELAXIS; - strcpy(ddoi.tszName, "X-Axis"); - _dump_OBJECTINSTANCEA(&ddoi); - if (lpCallback(&ddoi, lpvRef) != DIENUM_CONTINUE) return DI_OK; - - /* Y axis */ - ddoi.guidType = GUID_YAxis; - ddoi.dwOfs = This->base.data_format.offsets[WINE_MOUSE_Y_POSITION]; - ddoi.dwType = DIDFT_MAKEINSTANCE(WINE_MOUSE_Y_AXIS_INSTANCE) | DIDFT_RELAXIS; - strcpy(ddoi.tszName, "Y-Axis"); - _dump_OBJECTINSTANCEA(&ddoi); - if (lpCallback(&ddoi, lpvRef) != DIENUM_CONTINUE) return DI_OK; - - /* Z axis */ - ddoi.guidType = GUID_ZAxis; - ddoi.dwOfs = This->base.data_format.offsets[WINE_MOUSE_Z_POSITION]; - ddoi.dwType = DIDFT_MAKEINSTANCE(WINE_MOUSE_Z_AXIS_INSTANCE) | DIDFT_RELAXIS; - strcpy(ddoi.tszName, "Z-Axis"); - _dump_OBJECTINSTANCEA(&ddoi); - if (lpCallback(&ddoi, lpvRef) != DIENUM_CONTINUE) return DI_OK; - } - - if ((dwFlags == DIDFT_ALL) || - (dwFlags & DIDFT_BUTTON)) { - ddoi.guidType = GUID_Button; - - /* Left button */ - ddoi.dwOfs = This->base.data_format.offsets[WINE_MOUSE_L_POSITION]; - ddoi.dwType = DIDFT_MAKEINSTANCE(WINE_MOUSE_L_BUTTON_INSTANCE) | DIDFT_PSHBUTTON; - strcpy(ddoi.tszName, "Left-Button"); - _dump_OBJECTINSTANCEA(&ddoi); - if (lpCallback(&ddoi, lpvRef) != DIENUM_CONTINUE) return DI_OK; - - /* Right button */ - ddoi.dwOfs = This->base.data_format.offsets[WINE_MOUSE_R_POSITION]; - ddoi.dwType = DIDFT_MAKEINSTANCE(WINE_MOUSE_R_BUTTON_INSTANCE) | DIDFT_PSHBUTTON; - strcpy(ddoi.tszName, "Right-Button"); - _dump_OBJECTINSTANCEA(&ddoi); - if (lpCallback(&ddoi, lpvRef) != DIENUM_CONTINUE) return DI_OK; - - /* Middle button */ - ddoi.dwOfs = This->base.data_format.offsets[WINE_MOUSE_M_POSITION]; - ddoi.dwType = DIDFT_MAKEINSTANCE(WINE_MOUSE_M_BUTTON_INSTANCE) | DIDFT_PSHBUTTON; - strcpy(ddoi.tszName, "Middle-Button"); - _dump_OBJECTINSTANCEA(&ddoi); - if (lpCallback(&ddoi, lpvRef) != DIENUM_CONTINUE) return DI_OK; - } - - return DI_OK; -} - -static HRESULT WINAPI SysMouseWImpl_EnumObjects(LPDIRECTINPUTDEVICE8W iface, LPDIENUMDEVICEOBJECTSCALLBACKW lpCallback, LPVOID lpvRef,DWORD dwFlags) -{ - SysMouseImpl *This = (SysMouseImpl *)iface; - - device_enumobjects_AtoWcb_data data; - - data.lpCallBack = lpCallback; - data.lpvRef = lpvRef; - - return SysMouseAImpl_EnumObjects((LPDIRECTINPUTDEVICE8A) This, (LPDIENUMDEVICEOBJECTSCALLBACKA) DIEnumDevicesCallbackAtoW, (LPVOID) &data, dwFlags); -} - -/****************************************************************************** * GetDeviceInfo : get information about a device's identity */ static HRESULT WINAPI SysMouseAImpl_GetDeviceInfo( @@ -801,7 +701,7 @@ static const IDirectInputDevice8AVtbl Sy IDirectInputDevice2AImpl_AddRef, SysMouseAImpl_Release, SysMouseAImpl_GetCapabilities, - SysMouseAImpl_EnumObjects, + IDirectInputDevice2AImpl_EnumObjects, SysMouseAImpl_GetProperty, IDirectInputDevice2AImpl_SetProperty, SysMouseAImpl_Acquire, @@ -843,7 +743,7 @@ static const IDirectInputDevice8WVtbl Sy XCAST(AddRef)IDirectInputDevice2AImpl_AddRef, XCAST(Release)SysMouseAImpl_Release, XCAST(GetCapabilities)SysMouseAImpl_GetCapabilities, - SysMouseWImpl_EnumObjects, + IDirectInputDevice2WImpl_EnumObjects, XCAST(GetProperty)SysMouseAImpl_GetProperty, XCAST(SetProperty)IDirectInputDevice2AImpl_SetProperty, XCAST(Acquire)SysMouseAImpl_Acquire,

1 0

Vitaliy Margolen : dinput: Implement EnumOjects[A|W] in the base device class.
by Alexandre Julliard Dec. 28, 2006

Dec. 28, 2006

Module: wine Branch: master Commit: 42feef0c7bcfa598c8337c61369dfefbf3f7c9fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=42feef0c7bcfa598c8337c613… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Wed Dec 27 16:32:19 2006 -0700 dinput: Implement EnumOjects[A|W] in the base device class. --- dlls/dinput/device.c | 66 +++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 52 insertions(+), 14 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 31e05a5..da3afa4 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -800,13 +800,49 @@ HRESULT WINAPI IDirectInputDevice2AImpl_ LPVOID lpvRef, DWORD dwFlags) { - FIXME("(this=%p,%p,%p,%08x): stub!\n", iface, lpCallback, lpvRef, dwFlags); - if (TRACE_ON(dinput)) { - DPRINTF(" - flags = "); - _dump_EnumObjects_flags(dwFlags); - DPRINTF("\n"); + IDirectInputDevice2AImpl *This = (IDirectInputDevice2AImpl *)iface; + DIDEVICEOBJECTINSTANCEA ddoi; + int i, axis = 0, button = 0; + + TRACE("(%p) %p,%p flags:%08x)\n", iface, lpCallback, lpvRef, dwFlags); + TRACE(" - flags = "); + _dump_EnumObjects_flags(dwFlags); + TRACE("\n"); + + /* Only the fields till dwFFMaxForce are relevant */ + memset(&ddoi, 0, sizeof(ddoi)); + ddoi.dwSize = FIELD_OFFSET(DIDEVICEOBJECTINSTANCEA, dwFFMaxForce); + + for (i = 0; i < This->data_format.wine_df->dwNumObjs; i++) + { + LPDIOBJECTDATAFORMAT odf; + DWORD type; + + odf = (LPDIOBJECTDATAFORMAT)((LPBYTE)This->data_format.wine_df->rgodf + + i * This->data_format.wine_df->dwObjSize); + type = DIEFT_GETTYPE(odf->dwType); + + if (type & DIDFT_AXIS) axis++; + else if (type & DIDFT_BUTTON) button++; + + if (dwFlags != DIDFT_ALL && !(dwFlags & type)) continue; + + ddoi.guidType = *odf->pguid; + ddoi.dwType = odf->dwType; + ddoi.dwFlags = odf->dwFlags; + ddoi.dwOfs = !This->data_format.offsets ? odf->dwOfs : This->data_format.offsets[i]; + + if (IsEqualGUID(&ddoi.guidType, &GUID_XAxis)) strcpy(ddoi.tszName, "X-Axis"); + else if (IsEqualGUID(&ddoi.guidType, &GUID_YAxis)) strcpy(ddoi.tszName, "Y-Axis"); + else if (IsEqualGUID(&ddoi.guidType, &GUID_ZAxis)) strcpy(ddoi.tszName, "Z-Axis"); + else if (type & DIDFT_AXIS) wsprintfA(ddoi.tszName, "%d-Axis", axis - 1); + else if (type & DIDFT_BUTTON) wsprintfA(ddoi.tszName, "Button %d", button - 1); + else FIXME("no name\n"); + + _dump_OBJECTINSTANCEA(&ddoi); + if (lpCallback(&ddoi, lpvRef) != DIENUM_CONTINUE) break; } - + return DI_OK; } @@ -816,14 +852,15 @@ HRESULT WINAPI IDirectInputDevice2WImpl_ LPVOID lpvRef, DWORD dwFlags) { - FIXME("(this=%p,%p,%p,%08x): stub!\n", iface, lpCallback, lpvRef, dwFlags); - if (TRACE_ON(dinput)) { - DPRINTF(" - flags = "); - _dump_EnumObjects_flags(dwFlags); - DPRINTF("\n"); - } - - return DI_OK; + device_enumobjects_AtoWcb_data data; + + data.lpCallBack = lpCallback; + data.lpvRef = lpvRef; + + return IDirectInputDevice2AImpl_EnumObjects( + (LPDIRECTINPUTDEVICE8A) iface, + (LPDIENUMDEVICEOBJECTSCALLBACKA) DIEnumDevicesCallbackAtoW, + (LPVOID) &data, dwFlags); } /****************************************************************************** @@ -884,6 +921,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_ if (pdiph->dwHow == DIPH_DEVICE && pdiph->dwObj) return DIERR_INVALIDPARAM; if (This->acquired) return DIERR_ACQUIRED; if (pdiph->dwHow != DIPH_DEVICE) return DIERR_UNSUPPORTED; + if (!This->data_format.user_df) return DI_OK; TRACE("Axis mode: %s\n", pd->dwData == DIPROPAXISMODE_ABS ? "absolute" : "relative");

1 0

Vitaliy Margolen : dinput: mouse: Copy and modify default data format.
by Alexandre Julliard Dec. 28, 2006

Dec. 28, 2006

Module: wine Branch: master Commit: 18ee811e4cc48d15bb44ffa0ef15a2a80c351ef2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18ee811e4cc48d15bb44ffa0e… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Wed Dec 27 16:31:31 2006 -0700 dinput: mouse: Copy and modify default data format. --- dlls/dinput/mouse.c | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 7b4fef6..4549ae0 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -182,6 +182,8 @@ static BOOL mousedev_enum_deviceW(DWORD static SysMouseImpl *alloc_device(REFGUID rguid, const void *mvt, IDirectInputImpl *dinput) { SysMouseImpl* newDevice; + LPDIDATAFORMAT df = NULL; + int i; newDevice = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(SysMouseImpl)); if (!newDevice) return NULL; @@ -192,13 +194,29 @@ static SysMouseImpl *alloc_device(REFGUI InitializeCriticalSection(&newDevice->base.crit); newDevice->dinput = dinput; - newDevice->base.data_format.wine_df = &c_dfDIMouse2; + /* Create copy of default data format */ + if (!(df = HeapAlloc(GetProcessHeap(), 0, c_dfDIMouse2.dwSize))) goto failed; + memcpy(df, &c_dfDIMouse2, c_dfDIMouse2.dwSize); + if (!(df->rgodf = HeapAlloc(GetProcessHeap(), 0, df->dwNumObjs * df->dwObjSize))) goto failed; + memcpy(df->rgodf, c_dfDIMouse2.rgodf, df->dwNumObjs * df->dwObjSize); + + /* Because we don't do any detection yet just modify instance and type */ + for (i = 0; i < df->dwNumObjs; i++) + if (DIDFT_GETTYPE(df->rgodf[i].dwType) & DIDFT_AXIS) + df->rgodf[i].dwType = DIDFT_MAKEINSTANCE(i) | DIDFT_RELAXIS; + else + df->rgodf[i].dwType = DIDFT_MAKEINSTANCE(i) | DIDFT_PSHBUTTON; + + newDevice->base.data_format.wine_df = df; if (create_DataFormat(&c_dfDIMouse2, &newDevice->base.data_format) == DI_OK) { IDirectInput_AddRef((LPDIRECTINPUTDEVICE8A)newDevice->dinput); return newDevice; } +failed: + if (df) HeapFree(GetProcessHeap(), 0, df->rgodf); + HeapFree(GetProcessHeap(), 0, df); HeapFree(GetProcessHeap(), 0, newDevice); return NULL; } @@ -272,6 +290,8 @@ static ULONG WINAPI SysMouseAImpl_Releas /* Free the data queue */ HeapFree(GetProcessHeap(), 0, This->base.data_queue); + /* Free data format */ + HeapFree(GetProcessHeap(), 0, (LPVOID)This->base.data_format.wine_df); release_DataFormat(&This->base.data_format); IDirectInput_Release((LPDIRECTINPUTDEVICE8A)This->dinput);

1 0

Vitaliy Margolen : dinput: Remove MsgWaitForMultipleObjects calls.
by Alexandre Julliard Dec. 28, 2006

Dec. 28, 2006

Module: wine Branch: master Commit: b22ff8018aca7c365e505f1db7732f7050ae259b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b22ff8018aca7c365e505f1db… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Wed Dec 27 16:30:39 2006 -0700 dinput: Remove MsgWaitForMultipleObjects calls. --- dlls/dinput/keyboard.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 4308b45..34800ff 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -282,9 +282,7 @@ static HRESULT WINAPI SysKeyboardAImpl_G if (!This->base.acquired) return DIERR_NOTACQUIRED; if (len != WINE_DINPUT_KEYBOARD_MAX_KEYS) - return DIERR_INVALIDPARAM; - - MsgWaitForMultipleObjectsEx(0, NULL, 0, QS_ALLINPUT, 0); + return DIERR_INVALIDPARAM; EnterCriticalSection(&This->base.crit); @@ -548,9 +546,7 @@ static HRESULT WINAPI SysKeyboardAImpl_P TRACE("(%p)\n",This); if (!This->base.acquired) return DIERR_NOTACQUIRED; - - MsgWaitForMultipleObjectsEx(0, NULL, 0, QS_ALLINPUT, 0); - return DI_OK; + return DI_NOEFFECT; } static const IDirectInputDevice8AVtbl SysKeyboardAvt =

1 0

Roderick Colenbrander : opengl32: Add OpenGL 2. 1 support and more extensions.
by Alexandre Julliard Dec. 28, 2006

Dec. 28, 2006

Module: wine Branch: master Commit: cb42253ff3321ebb3865cf2e3755d52014f494c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb42253ff3321ebb3865cf2e3… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Thu Dec 28 01:25:39 2006 +0100 opengl32: Add OpenGL 2.1 support and more extensions. --- dlls/opengl32/make_opengl | 2 + dlls/opengl32/opengl_ext.c | 2215 +++++++++++++++++++++++--------------------- 2 files changed, 1177 insertions(+), 1040 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cb42253ff3321ebb3865c…

1 0

Roderick Colenbrander : wgl: Fix wglGetProcAddress bug.
by Alexandre Julliard Dec. 28, 2006

Dec. 28, 2006

Module: wine Branch: master Commit: 402d2777654c068597f2f322f9323954865eb6c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=402d2777654c068597f2f322f… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Thu Dec 28 01:34:27 2006 +0100 wgl: Fix wglGetProcAddress bug. --- dlls/opengl32/wgl.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 684e935..e398a4d 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -223,6 +223,9 @@ PROC WINAPI wglGetProcAddress(LPCSTR lp TRACE("(%s)\n", lpszProc); + if(lpszProc == NULL); + return NULL; + /* First, look if it's not already defined in the 'standard' OpenGL functions */ if ((local_func = GetProcAddress(opengl32_handle, lpszProc)) != NULL) { TRACE(" found function in 'standard' OpenGL functions (%p)\n", local_func); @@ -234,10 +237,14 @@ PROC WINAPI wglGetProcAddress(LPCSTR lp ext_ret = (const OpenGL_extension *) bsearch(&ext, extension_registry, extension_registry_size, sizeof(OpenGL_extension), compar); - /* If nothing was found, we are looking for a WGL extension */ + /* If nothing was found, we are looking for a WGL extension or an unknown GL extension. */ if (ext_ret == NULL) { + /* If the function name starts with a w it is a WGL extension */ + if(lpszProc[0] == 'w') + return wine_wgl.p_wglGetProcAddress(lpszProc); + + /* We are dealing with an unknown GL extension. */ WARN("Extension '%s' not defined in opengl32.dll's function table!\n", lpszProc); - return wine_wgl.p_wglGetProcAddress(lpszProc); } else { /* We are looking for an OpenGL extension */ /* Check if the GL extension required by the function is available */

1 0