June 2011 - Wine-commits - list.winehq.org

Lucas Fialho Zawacki : dinput8/tests: Testing BuildActionMap and SetActionMap with keyboard input.
by Alexandre Julliard 28 Jun '11

28 Jun '11

Module: wine Branch: master Commit: 636cc9acff29666ebf7f1d0043db49c37518c7fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=636cc9acff29666ebf7f1d004… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Tue Jun 28 13:54:49 2011 -0300 dinput8/tests: Testing BuildActionMap and SetActionMap with keyboard input. --- dlls/dinput8/tests/device.c | 119 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 119 insertions(+), 0 deletions(-) diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 8344486..af14d60 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -38,6 +38,13 @@ struct enum_data { /* Dummy GUID */ static const GUID ACTION_MAPPING_GUID = { 0x1, 0x2, 0x3, { 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb } }; +enum { + DITEST_AXIS, + DITEST_BUTTON, + DITEST_KEYBOARDSPACE, + DITEST_MOUSEBUTTON0, +}; + static DIACTION actionMapping[]= { /* axis */ @@ -50,6 +57,63 @@ static DIACTION actionMapping[]= { 3, DIMOUSE_BUTTON0 , 0, { "Select" } } }; +static void test_keyboard_input( + LPDIRECTINPUTDEVICE8 lpdid, + DWORD key, + DWORD expected +) +{ + HRESULT hr; + DIDEVICEOBJECTDATA obj_data; + DWORD data_size = 1; + + hr = IDirectInputDevice8_Acquire(lpdid); + todo_wine ok (SUCCEEDED(hr), "Failed to acquire device hr=%08x\n", hr); + + keybd_event( key, 0, 0, 0); + + IDirectInputDevice8_Poll(lpdid); + hr = IDirectInputDevice8_GetDeviceData(lpdid, sizeof(obj_data), &obj_data, &data_size, 0); + + if (data_size != 1) + { + win_skip("We're not able to inject input into Windows dinput8 with events\n"); + return; + } + + ok (data_size == 1, "GetDeviceData did not read any event\n"); + todo_wine ok (obj_data.uAppData == expected, "Retrieval of action failed uAppData=%lu expected=%d\n", obj_data.uAppData, expected); +} + +static void test_build_action_map( + LPDIRECTINPUTDEVICE8 lpdid, + LPDIACTIONFORMAT lpdiaf, + int action_index, + DWORD obj_expected +) +{ + HRESULT hr; + DIACTION *actions; + DWORD obj_instance, how; + GUID assigned_to; + DIDEVICEINSTANCEA ddi; + + ddi.dwSize = sizeof(ddi); + IDirectInputDevice_GetDeviceInfo(lpdid, &ddi); + + hr = IDirectInputDevice8_BuildActionMap(lpdid, lpdiaf, NULL, DIDBAM_INITIALIZE); + ok (SUCCEEDED(hr), "BuildActionMap failed hr=%08x\n", hr); + + actions = lpdiaf->rgoAction; + obj_instance = DIDFT_GETINSTANCE(actions[action_index].dwObjID); + how = actions[action_index].dwHow; + assigned_to = actions[action_index].guidInstance; + + todo_wine ok (how == DIAH_USERCONFIG || how == DIAH_DEFAULT, "Action was not set dwHow=%08x\n", how); + todo_wine ok (obj_instance == obj_expected, "Action not mapped correctly instance=%08x expected=%08x\n", obj_instance, obj_expected); + todo_wine ok (IsEqualGUID(&assigned_to, &ddi.guidInstance), "Action and device GUID do not match action=%d\n", action_index); +} + static BOOL CALLBACK enumeration_callback( LPCDIDEVICEINSTANCE lpddi, LPDIRECTINPUTDEVICE8 lpdid, @@ -57,6 +121,8 @@ static BOOL CALLBACK enumeration_callback( DWORD dwRemaining, LPVOID pvRef) { + HRESULT hr; + DIPROPDWORD dp; struct enum_data *data = pvRef; if (!data) return DIENUM_CONTINUE; @@ -79,6 +145,36 @@ static BOOL CALLBACK enumeration_callback( ok (dwFlags & DIEDBS_MAPPEDPRI1, "Mouse should be mapped as pri1 dwFlags=%08x\n", dwFlags); } + /* Building and setting an action map */ + /* It should not use any pre-stored mappings so we use DIDBAM_INITIALIZE */ + hr = IDirectInputDevice8_BuildActionMap(lpdid, data->lpdiaf, NULL, DIDBAM_INITIALIZE); + ok (SUCCEEDED(hr), "BuildActionMap failed hr=%08x\n", hr); + + /* Device has no data format and thus can't be acquired */ + hr = IDirectInputDevice8_Acquire(lpdid); + ok (hr == DIERR_INVALIDPARAM, "Device was acquired before SetActionMap hr=%08x\n", hr); + + hr = IDirectInputDevice8_SetActionMap(lpdid, data->lpdiaf, NULL, 0); + ok (SUCCEEDED(hr), "SetActionMap failed hr=%08x\n", hr); + + /* Test buffer size */ + memset(&dp, 0, sizeof(dp)); + dp.diph.dwSize = sizeof(dp); + dp.diph.dwHeaderSize = sizeof(DIPROPHEADER); + dp.diph.dwHow = DIPH_DEVICE; + + hr = IDirectInputDevice_GetProperty(lpdid, DIPROP_BUFFERSIZE, &dp.diph); + ok (SUCCEEDED(hr), "GetProperty failed hr=%08x\n", hr); + todo_wine ok (dp.dwData == data->lpdiaf->dwBufferSize, "SetActionMap must set the buffer, buffersize=%d\n", dp.dwData); + + /* SetActionMap has set the data format so now it should work */ + hr = IDirectInputDevice8_Acquire(lpdid); + todo_wine ok (SUCCEEDED(hr), "Acquire failed hr=%08x\n", hr); + + /* SetActionMap should not work on an acquired device */ + hr = IDirectInputDevice8_SetActionMap(lpdid, data->lpdiaf, NULL, 0); + todo_wine ok (hr == DIERR_ACQUIRED, "SetActionMap succeeded with an acquired device hr=%08x\n", hr); + return DIENUM_CONTINUE; } @@ -119,6 +215,7 @@ static void test_action_mapping(void) af.rgoAction = actionMapping; af.guidActionMap = ACTION_MAPPING_GUID; af.dwGenre = 0x01000000; /* DIVIRTUAL_DRIVING_RACE */ + af.dwBufferSize = 32; hr = IDirectInput8_EnumDevicesBySemantics(pDI, 0, &af, enumeration_callback, &data, 0); ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed: hr=%08x\n", hr); @@ -126,6 +223,28 @@ static void test_action_mapping(void) ok (data.keyboard != NULL, "EnumDevicesBySemantics should enumerate the keyboard\n"); ok (data.mouse != NULL, "EnumDevicesBySemantics should enumerate the mouse\n"); + if (data.keyboard != NULL) + { + /* Test keyboard BuildActionMap */ + test_build_action_map(data.keyboard, data.lpdiaf, DITEST_KEYBOARDSPACE, DIK_SPACE); + /* Test keyboard input */ + test_keyboard_input(data.keyboard, VK_SPACE, 2); + + /* Test BuildActionMap with no suitable actions for a device */ + IDirectInputDevice_Unacquire(data.keyboard); + af.dwDataSize = 4 * DITEST_KEYBOARDSPACE; + af.dwNumActions = DITEST_KEYBOARDSPACE; + + hr = IDirectInputDevice8_BuildActionMap(data.keyboard, data.lpdiaf, NULL, DIDBAM_INITIALIZE); + todo_wine ok (hr == DI_NOEFFECT, "BuildActionMap should have no effect with no actions hr=%08x\n", hr); + + hr = IDirectInputDevice8_SetActionMap(data.keyboard, data.lpdiaf, NULL, 0); + todo_wine ok (hr == DI_NOEFFECT, "SetActionMap should have no effect with no actions to map hr=%08x\n", hr); + + af.dwDataSize = 4 * sizeof(actionMapping) / sizeof(actionMapping[0]); + af.dwNumActions = sizeof(actionMapping) / sizeof(actionMapping[0]); + } + /* The call fails with a zeroed GUID */ memset(&af.guidActionMap, 0, sizeof(GUID)); hr = IDirectInput8_EnumDevicesBySemantics(pDI, 0, &af, enumeration_callback, 0, 0);

1 0

Lucas Fialho Zawacki : dinput: SetActionMap setting the device buffer.
by Alexandre Julliard 28 Jun '11

28 Jun '11

Module: wine Branch: master Commit: 2fe9f14b294e57bdbb676d452cb63e98d7ecc45b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fe9f14b294e57bdbb676d452… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Tue Jun 28 13:55:24 2011 -0300 dinput: SetActionMap setting the device buffer. --- dlls/dinput/device.c | 35 +++++++++++++++++++++++---- dlls/dinput/dinput_main.c | 54 ++++++++++++++++++++++++++++++++++++++++++ dlls/dinput/dinput_private.h | 2 + dlls/dinput8/tests/device.c | 2 +- 4 files changed, 87 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 397e70e..5a03a27 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1391,9 +1391,20 @@ HRESULT WINAPI IDirectInputDevice8AImpl_SetActionMap(LPDIRECTINPUTDEVICE8A iface LPCSTR lpszUserName, DWORD dwFlags) { - FIXME("(%p)->(%p,%s,%08x): stub !\n", iface, lpdiaf, lpszUserName, dwFlags); - - return DI_OK; + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); + DIACTIONFORMATW diafW; + HRESULT hr; + + FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", iface, lpdiaf, lpszUserName, dwFlags); + + diafW.rgoAction = HeapAlloc(GetProcessHeap(), 0, sizeof(DIACTIONW)*lpdiaf->dwNumActions); + _copy_diactionformatAtoW(&diafW, lpdiaf); + + hr = IDirectInputDevice8WImpl_SetActionMap(&This->IDirectInputDevice8W_iface, &diafW, NULL, dwFlags); + + HeapFree(GetProcessHeap(), 0, diafW.rgoAction); + + return hr; } HRESULT WINAPI IDirectInputDevice8WImpl_SetActionMap(LPDIRECTINPUTDEVICE8W iface, @@ -1401,8 +1412,22 @@ HRESULT WINAPI IDirectInputDevice8WImpl_SetActionMap(LPDIRECTINPUTDEVICE8W iface LPCWSTR lpszUserName, DWORD dwFlags) { - FIXME("(%p)->(%p,%s,%08x): stub !\n", iface, lpdiaf, debugstr_w(lpszUserName), dwFlags); - + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + DIPROPDWORD dp; + + FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", iface, lpdiaf, debugstr_w(lpszUserName), dwFlags); + + if (This->acquired) return DIERR_ACQUIRED; + + if (lpdiaf->dwBufferSize > 0) + { + dp.diph.dwSize = sizeof(DIPROPDWORD); + dp.dwData = lpdiaf->dwBufferSize; + dp.diph.dwHeaderSize = sizeof(DIPROPHEADER); + dp.diph.dwHow = DIPH_DEVICE; + IDirectInputDevice8_SetProperty(iface, DIPROP_BUFFERSIZE, &dp.diph); + } + return DI_OK; } diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index c032642..1329ec6 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -254,6 +254,60 @@ void _dump_diactionformatA(LPDIACTIONFORMATA lpdiActionFormat) { } } +void _copy_diactionformatAtoW(LPDIACTIONFORMATW to, LPDIACTIONFORMATA from) +{ + int i; + + to->dwSize = sizeof(DIACTIONFORMATW); + to->dwActionSize = sizeof(DIACTIONW); + to->dwDataSize = from->dwDataSize; + to->dwNumActions = from->dwNumActions; + to->guidActionMap = from->guidActionMap; + to->dwGenre = from->dwGenre; + to->dwBufferSize = from->dwBufferSize; + to->lAxisMin = from->lAxisMin; + to->lAxisMax = from->lAxisMax; + to->dwCRC = from->dwCRC; + to->ftTimeStamp = from->ftTimeStamp; + + for (i=0; i < to->dwNumActions; i++) + { + to->rgoAction[i].uAppData = from->rgoAction[i].uAppData; + to->rgoAction[i].dwSemantic = from->rgoAction[i].dwSemantic; + to->rgoAction[i].dwFlags = from->rgoAction[i].dwFlags; + to->rgoAction[i].guidInstance = from->rgoAction[i].guidInstance; + to->rgoAction[i].dwObjID = from->rgoAction[i].dwObjID; + to->rgoAction[i].dwHow = from->rgoAction[i].dwHow; + } +} + +void _copy_diactionformatWtoA(LPDIACTIONFORMATA to, LPDIACTIONFORMATW from) +{ + int i; + + to->dwSize = sizeof(DIACTIONFORMATA); + to->dwActionSize = sizeof(DIACTIONA); + to->dwDataSize = from->dwDataSize; + to->dwNumActions = from->dwNumActions; + to->guidActionMap = from->guidActionMap; + to->dwGenre = from->dwGenre; + to->dwBufferSize = from->dwBufferSize; + to->lAxisMin = from->lAxisMin; + to->lAxisMax = from->lAxisMax; + to->dwCRC = from->dwCRC; + to->ftTimeStamp = from->ftTimeStamp; + + for (i=0; i < to->dwNumActions; i++) + { + to->rgoAction[i].uAppData = from->rgoAction[i].uAppData; + to->rgoAction[i].dwSemantic = from->rgoAction[i].dwSemantic; + to->rgoAction[i].dwFlags = from->rgoAction[i].dwFlags; + to->rgoAction[i].guidInstance = from->rgoAction[i].guidInstance; + to->rgoAction[i].dwObjID = from->rgoAction[i].dwObjID; + to->rgoAction[i].dwHow = from->rgoAction[i].dwHow; + } +} + /****************************************************************************** * IDirectInputA_EnumDevices */ diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index 33cc823..a6ce4d6 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -63,6 +63,8 @@ extern void check_dinput_hooks(LPDIRECTINPUTDEVICE8W) DECLSPEC_HIDDEN; typedef int (*DI_EVENT_PROC)(LPDIRECTINPUTDEVICE8A, WPARAM, LPARAM); extern void _dump_diactionformatA(LPDIACTIONFORMATA) DECLSPEC_HIDDEN; +extern void _copy_diactionformatAtoW(LPDIACTIONFORMATW, LPDIACTIONFORMATA) DECLSPEC_HIDDEN; +extern void _copy_diactionformatWtoA(LPDIACTIONFORMATA, LPDIACTIONFORMATW) DECLSPEC_HIDDEN; #define IS_DIPROP(x) (((ULONG_PTR)(x) >> 16) == 0) diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index af14d60..4841a1f 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -165,7 +165,7 @@ static BOOL CALLBACK enumeration_callback( hr = IDirectInputDevice_GetProperty(lpdid, DIPROP_BUFFERSIZE, &dp.diph); ok (SUCCEEDED(hr), "GetProperty failed hr=%08x\n", hr); - todo_wine ok (dp.dwData == data->lpdiaf->dwBufferSize, "SetActionMap must set the buffer, buffersize=%d\n", dp.dwData); + ok (dp.dwData == data->lpdiaf->dwBufferSize, "SetActionMap must set the buffer, buffersize=%d\n", dp.dwData); /* SetActionMap has set the data format so now it should work */ hr = IDirectInputDevice8_Acquire(lpdid);

1 0

Damjan Jovanovic : rpcrt4: Implement RpcNetworkInqProtseqs.
by Alexandre Julliard 28 Jun '11

28 Jun '11

Module: wine Branch: master Commit: ec2f51369092c5bce9093a0f8dc342d4889896f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec2f51369092c5bce9093a0f8… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Jun 23 07:15:40 2011 +0200 rpcrt4: Implement RpcNetworkInqProtseqs. --- dlls/rpcrt4/rpc_server.c | 18 ------------ dlls/rpcrt4/rpc_transport.c | 65 +++++++++++++++++++++++++++++++++++++++++++ include/rpcdce.h | 6 ++++ 3 files changed, 71 insertions(+), 18 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 3a9ecf8..9fd4cf6 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -825,24 +825,6 @@ static RPC_STATUS RPCRT4_use_protseq(RpcServerProtseq* ps, const char *endpoint) } /*********************************************************************** - * RpcNetworkInqProtseqsA (RPCRT4.@) - */ -RPC_STATUS WINAPI RpcNetworkInqProtseqsA( RPC_PROTSEQ_VECTORA* ProtSeqVector ) -{ - FIXME("(%p): stub\n", ProtSeqVector); - return RPC_S_NO_PROTSEQS_REGISTERED; -} - -/*********************************************************************** - * RpcNetworkInqProtseqsW (RPCRT4.@) - */ -RPC_STATUS WINAPI RpcNetworkInqProtseqsW( RPC_PROTSEQ_VECTORW* ProtSeqVector ) -{ - FIXME("(%p): stub\n", ProtSeqVector); - return RPC_S_NO_PROTSEQS_REGISTERED; -} - -/*********************************************************************** * RpcServerInqBindings (RPCRT4.@) */ RPC_STATUS WINAPI RpcServerInqBindings( RPC_BINDING_VECTOR** BindingVector ) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 0ba9720..467c305 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -3160,3 +3160,68 @@ RPC_STATUS WINAPI RpcProtseqVectorFreeW(RPC_PROTSEQ_VECTORW **protseqs) } return RPC_S_OK; } + +/*********************************************************************** + * RpcNetworkInqProtseqsW (RPCRT4.@) + */ +RPC_STATUS WINAPI RpcNetworkInqProtseqsW( RPC_PROTSEQ_VECTORW** protseqs ) +{ + RPC_PROTSEQ_VECTORW *pvector; + int i = 0; + RPC_STATUS status = RPC_S_OUT_OF_MEMORY; + + TRACE("(%p)\n", protseqs); + + *protseqs = HeapAlloc(GetProcessHeap(), 0, sizeof(RPC_PROTSEQ_VECTORW)+(sizeof(unsigned short*)*ARRAYSIZE(protseq_list))); + if (!*protseqs) + goto end; + pvector = *protseqs; + pvector->Count = 0; + for (i = 0; i < ARRAYSIZE(protseq_list); i++) + { + pvector->Protseq[i] = HeapAlloc(GetProcessHeap(), 0, (strlen(protseq_list[i].name)+1)*sizeof(unsigned short)); + if (pvector->Protseq[i] == NULL) + goto end; + MultiByteToWideChar(CP_ACP, 0, (CHAR*)protseq_list[i].name, -1, + (WCHAR*)pvector->Protseq[i], strlen(protseq_list[i].name) + 1); + pvector->Count++; + } + status = RPC_S_OK; + +end: + if (status != RPC_S_OK) + RpcProtseqVectorFreeW(protseqs); + return status; +} + +/*********************************************************************** + * RpcNetworkInqProtseqsA (RPCRT4.@) + */ +RPC_STATUS WINAPI RpcNetworkInqProtseqsA(RPC_PROTSEQ_VECTORA** protseqs) +{ + RPC_PROTSEQ_VECTORA *pvector; + int i = 0; + RPC_STATUS status = RPC_S_OUT_OF_MEMORY; + + TRACE("(%p)\n", protseqs); + + *protseqs = HeapAlloc(GetProcessHeap(), 0, sizeof(RPC_PROTSEQ_VECTORW)+(sizeof(unsigned char*)*ARRAYSIZE(protseq_list))); + if (!*protseqs) + goto end; + pvector = *protseqs; + pvector->Count = 0; + for (i = 0; i < ARRAYSIZE(protseq_list); i++) + { + pvector->Protseq[i] = HeapAlloc(GetProcessHeap(), 0, strlen(protseq_list[i].name)+1); + if (pvector->Protseq[i] == NULL) + goto end; + strcpy((char*)pvector->Protseq[i], protseq_list[i].name); + pvector->Count++; + } + status = RPC_S_OK; + +end: + if (status != RPC_S_OK) + RpcProtseqVectorFreeA(protseqs); + return status; +} diff --git a/include/rpcdce.h b/include/rpcdce.h index 76994df..bbdc42f 100644 --- a/include/rpcdce.h +++ b/include/rpcdce.h @@ -562,6 +562,12 @@ RPCRTAPI RPC_STATUS RPC_ENTRY #define RpcNetworkIsProtseqValid WINELIB_NAME_AW(RpcNetworkIsProtseqValid) RPCRTAPI RPC_STATUS RPC_ENTRY + RpcNetworkInqProtseqsA( RPC_PROTSEQ_VECTORA** protseqs ); +RPCRTAPI RPC_STATUS RPC_ENTRY + RpcNetworkInqProtseqsW( RPC_PROTSEQ_VECTORW** protseqs ); +#define RpcNetworkInqProtseqs WINELIB_NAME_AW(RpcNetworkInqProtseqs) + +RPCRTAPI RPC_STATUS RPC_ENTRY RpcProtseqVectorFreeA( RPC_PROTSEQ_VECTORA** protseqs ); RPCRTAPI RPC_STATUS RPC_ENTRY RpcProtseqVectorFreeW( RPC_PROTSEQ_VECTORW** protseqs );

1 0

André Hentschel : shdocvw: Add ITaskbarList2 Interface .
by Alexandre Julliard 28 Jun '11

28 Jun '11

Module: wine Branch: master Commit: 84d68639be45080429a184da85cb94744c924b66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84d68639be45080429a184da8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jun 20 22:01:51 2011 +0200 shdocvw: Add ITaskbarList2 Interface. --- dlls/shdocvw/taskbarlist.c | 52 +++++++++++++++++++++++++++---------------- include/shobjidl.idl | 15 ++++++++++++ 2 files changed, 48 insertions(+), 19 deletions(-) diff --git a/dlls/shdocvw/taskbarlist.c b/dlls/shdocvw/taskbarlist.c index d853506..a053cff 100644 --- a/dlls/shdocvw/taskbarlist.c +++ b/dlls/shdocvw/taskbarlist.c @@ -27,23 +27,24 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); struct taskbar_list { - ITaskbarList ITaskbarList_iface; + ITaskbarList2 ITaskbarList2_iface; LONG refcount; }; -static inline struct taskbar_list *impl_from_ITaskbarList(ITaskbarList *iface) +static inline struct taskbar_list *impl_from_ITaskbarList2(ITaskbarList2 *iface) { - return CONTAINING_RECORD(iface, struct taskbar_list, ITaskbarList_iface); + return CONTAINING_RECORD(iface, struct taskbar_list, ITaskbarList2_iface); } /* IUnknown methods */ -static HRESULT STDMETHODCALLTYPE taskbar_list_QueryInterface(ITaskbarList *iface, REFIID riid, void **object) +static HRESULT STDMETHODCALLTYPE taskbar_list_QueryInterface(ITaskbarList2 *iface, REFIID riid, void **object) { TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); - if (IsEqualGUID(riid, &IID_ITaskbarList) - || IsEqualGUID(riid, &IID_IUnknown)) + if (IsEqualGUID(riid, &IID_ITaskbarList) || + IsEqualGUID(riid, &IID_ITaskbarList2) || + IsEqualGUID(riid, &IID_IUnknown)) { IUnknown_AddRef(iface); *object = iface; @@ -56,9 +57,9 @@ static HRESULT STDMETHODCALLTYPE taskbar_list_QueryInterface(ITaskbarList *iface return E_NOINTERFACE; } -static ULONG STDMETHODCALLTYPE taskbar_list_AddRef(ITaskbarList *iface) +static ULONG STDMETHODCALLTYPE taskbar_list_AddRef(ITaskbarList2 *iface) { - struct taskbar_list *This = impl_from_ITaskbarList(iface); + struct taskbar_list *This = impl_from_ITaskbarList2(iface); ULONG refcount = InterlockedIncrement(&This->refcount); TRACE("%p increasing refcount to %u\n", This, refcount); @@ -66,9 +67,9 @@ static ULONG STDMETHODCALLTYPE taskbar_list_AddRef(ITaskbarList *iface) return refcount; } -static ULONG STDMETHODCALLTYPE taskbar_list_Release(ITaskbarList *iface) +static ULONG STDMETHODCALLTYPE taskbar_list_Release(ITaskbarList2 *iface) { - struct taskbar_list *This = impl_from_ITaskbarList(iface); + struct taskbar_list *This = impl_from_ITaskbarList2(iface); ULONG refcount = InterlockedDecrement(&This->refcount); TRACE("%p decreasing refcount to %u\n", This, refcount); @@ -84,42 +85,53 @@ static ULONG STDMETHODCALLTYPE taskbar_list_Release(ITaskbarList *iface) /* ITaskbarList methods */ -static HRESULT STDMETHODCALLTYPE taskbar_list_HrInit(ITaskbarList *iface) +static HRESULT STDMETHODCALLTYPE taskbar_list_HrInit(ITaskbarList2 *iface) { TRACE("iface %p\n", iface); return S_OK; } -static HRESULT STDMETHODCALLTYPE taskbar_list_AddTab(ITaskbarList *iface, HWND hwnd) +static HRESULT STDMETHODCALLTYPE taskbar_list_AddTab(ITaskbarList2 *iface, HWND hwnd) { FIXME("iface %p, hwnd %p stub!\n", iface, hwnd); return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE taskbar_list_DeleteTab(ITaskbarList *iface, HWND hwnd) +static HRESULT STDMETHODCALLTYPE taskbar_list_DeleteTab(ITaskbarList2 *iface, HWND hwnd) { FIXME("iface %p, hwnd %p stub!\n", iface, hwnd); return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE taskbar_list_ActivateTab(ITaskbarList *iface, HWND hwnd) +static HRESULT STDMETHODCALLTYPE taskbar_list_ActivateTab(ITaskbarList2 *iface, HWND hwnd) { FIXME("iface %p, hwnd %p stub!\n", iface, hwnd); return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE taskbar_list_SetActiveAlt(ITaskbarList *iface, HWND hwnd) +static HRESULT STDMETHODCALLTYPE taskbar_list_SetActiveAlt(ITaskbarList2 *iface, HWND hwnd) { FIXME("iface %p, hwnd %p stub!\n", iface, hwnd); return E_NOTIMPL; } -static const struct ITaskbarListVtbl taskbar_list_vtbl = +/* ITaskbarList2 method */ + +static HRESULT STDMETHODCALLTYPE taskbar_list_MarkFullscreenWindow(ITaskbarList2 *iface, + HWND hwnd, + BOOL fullscreen) +{ + FIXME("iface %p, hwnd %p, fullscreen %s stub!\n", iface, hwnd, (fullscreen)?"true":"false"); + + return E_NOTIMPL; +} + +static const struct ITaskbarList2Vtbl taskbar_list_vtbl = { /* IUnknown methods */ taskbar_list_QueryInterface, @@ -131,6 +143,8 @@ static const struct ITaskbarListVtbl taskbar_list_vtbl = taskbar_list_DeleteTab, taskbar_list_ActivateTab, taskbar_list_SetActiveAlt, + /* ITaskbarList2 method */ + taskbar_list_MarkFullscreenWindow, }; HRESULT TaskbarList_Create(IUnknown *outer, REFIID riid, void **taskbar_list) @@ -155,12 +169,12 @@ HRESULT TaskbarList_Create(IUnknown *outer, REFIID riid, void **taskbar_list) return E_OUTOFMEMORY; } - object->ITaskbarList_iface.lpVtbl = &taskbar_list_vtbl; + object->ITaskbarList2_iface.lpVtbl = &taskbar_list_vtbl; object->refcount = 0; - TRACE("Created ITaskbarList %p\n", object); + TRACE("Created ITaskbarList2 %p\n", object); - hr = ITaskbarList_QueryInterface(&object->ITaskbarList_iface, riid, taskbar_list); + hr = ITaskbarList2_QueryInterface(&object->ITaskbarList2_iface, riid, taskbar_list); if (FAILED(hr)) { HeapFree(GetProcessHeap(), 0, object); diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 53afd68..8dd9926 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -1857,6 +1857,21 @@ interface ITaskbarList : IUnknown cpp_quote("EXTERN_C const CLSID CLSID_TaskbarList;") /***************************************************************************** + * ITaskbarList2 interface + */ +[ + object, + uuid(602D4995-B13A-429B-A66E-1935E44F4317), + pointer_default(unique) +] +interface ITaskbarList2 : ITaskbarList +{ + HRESULT MarkFullscreenWindow( + [in] HWND hwnd, + [in] BOOL fullscreen); +} + +/***************************************************************************** * IAutoCompleteDropDown interface */ [

1 0

André Hentschel : tools: Preserve ordinal when updating specfiles.
by Alexandre Julliard 28 Jun '11

28 Jun '11

Module: wine Branch: master Commit: ed3a2765915e5bead74585285532ff880e5bb147 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed3a2765915e5bead74585285… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jun 23 00:02:30 2011 +0200 tools: Preserve ordinal when updating specfiles. --- tools/make_specfiles | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/make_specfiles b/tools/make_specfiles index 9e9b8e8..ff21ca8 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -214,7 +214,7 @@ sub update_spec_file($) { my $callconv = $parent{callconv} ne "stub" ? $parent{callconv} : $parent{spec} =~ /msvc/ ? "cdecl" : "stdcall"; # hack - $_ = sprintf "@ %s %s%s", $callconv, $flags, $func; + $_ = sprintf "$descr{ordinal} %s %s%s", $callconv, $flags, $func; if ($parent{target} =~ /$group_head\./) # use the same forward as parent if possible { @@ -227,7 +227,7 @@ sub update_spec_file($) } else { - $_ = sprintf "@ stub %s%s", $flags, $func; + $_ = sprintf "$descr{ordinal} stub %s%s", $flags, $func; } $_ .= $descr{comment} || "";

1 0

Dylan Smith : ddraw: Partially revert a struct copy change to fix a regression.
by Alexandre Julliard 28 Jun '11

28 Jun '11

Module: wine Branch: master Commit: ced4c383241a1069eca094408d288fbc3784c094 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ced4c383241a1069eca094408… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jun 28 12:41:21 2011 -0400 ddraw: Partially revert a struct copy change to fix a regression. Commit 3871329872afe3976e0b2b85330e3a7c47301658 caused the regression. --- dlls/ddraw/ddraw_private.h | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index c73743a..0f3864a 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -585,10 +585,11 @@ typedef struct #define DD_STRUCT_COPY_BYSIZE_(to,from,from_size) \ do { \ DWORD __size = (to)->dwSize; \ - DWORD __copysize = min(__size, from_size); \ + DWORD __resetsize = min(__size, sizeof(*to)); \ + DWORD __copysize = min(__resetsize, from_size); \ assert(to != from); \ memcpy(to, from, __copysize); \ - memset((char*)(to) + __copysize, 0, __size - __copysize); \ + memset((char*)(to) + __copysize, 0, __resetsize - __copysize); \ (to)->dwSize = __size; /* restore size */ \ } while (0)

1 0

Stefan Dösinger : wined3d: Update the vertex shader when the clipplanes are changed.
by Alexandre Julliard 28 Jun '11

28 Jun '11

Module: wine Branch: master Commit: a27adc478a5f8f46d8c36ce7aa9db3d6fb051633 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a27adc478a5f8f46d8c36ce7a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jun 28 12:40:02 2011 +0200 wined3d: Update the vertex shader when the clipplanes are changed. --- dlls/wined3d/state.c | 71 ++++++++++++++++++++++++++++++------------------- 1 files changed, 43 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index b17a254..bb2b292 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -484,28 +484,59 @@ static void state_alpha(DWORD state, struct wined3d_stateblock *stateblock, stru } } +static void shaderconstant(DWORD state_id, struct wined3d_stateblock *stateblock, struct wined3d_context *context) +{ + const struct wined3d_state *state = &stateblock->state; + struct wined3d_device *device = stateblock->device; + + /* Vertex and pixel shader states will call a shader upload, don't do anything as long one of them + * has an update pending + */ + if(isStateDirty(context, STATE_VDECL) || + isStateDirty(context, STATE_PIXELSHADER)) { + return; + } + + device->shader_backend->shader_load_constants(context, use_ps(state), use_vs(state)); +} + static void state_clipping(DWORD state_id, struct wined3d_stateblock *stateblock, struct wined3d_context *context) { const struct wined3d_state *state = &stateblock->state; DWORD enable = 0xFFFFFFFF; DWORD disable = 0x00000000; - if (!stateblock->device->vs_clipping && use_vs(state)) + if (use_vs(state)) { - /* The spec says that opengl clipping planes are disabled when using shaders. Direct3D planes aren't, - * so that is an issue. The MacOS ATI driver keeps clipping planes activated with shaders in some - * conditions I got sick of tracking down. The shader state handler disables all clip planes because - * of that - don't do anything here and keep them disabled - */ - if (state->render_states[WINED3DRS_CLIPPLANEENABLE]) + const struct wined3d_device *device = stateblock->device; + + if (!device->vs_clipping) { - static BOOL warned = FALSE; - if(!warned) { - FIXME("Clipping not supported with vertex shaders\n"); - warned = TRUE; + /* The spec says that opengl clipping planes are disabled when using shaders. Direct3D planes aren't, + * so that is an issue. The MacOS ATI driver keeps clipping planes activated with shaders in some + * conditions I got sick of tracking down. The shader state handler disables all clip planes because + * of that - don't do anything here and keep them disabled + */ + if (state->render_states[WINED3DRS_CLIPPLANEENABLE]) + { + static BOOL warned = FALSE; + if(!warned) { + FIXME("Clipping not supported with vertex shaders\n"); + warned = TRUE; + } + } + return; + } + + /* glEnable(GL_CLIP_PLANEx) doesn't apply to vertex shaders. The enabled / disabled planes are + * hardcoded into the shader. Update the shader to update the enabled clipplanes */ + if (!isStateDirty(context, device->StateTable[STATE_VSHADER].representative)) + { + device->shader_backend->shader_select(context, use_ps(state), TRUE); + if (!isStateDirty(context, STATE_VERTEXSHADERCONSTANT)) { + shaderconstant(STATE_VERTEXSHADERCONSTANT, stateblock, context); } } - return; } /* TODO: Keep track of previously enabled clipplanes to avoid unnecessary resetting @@ -3460,22 +3491,6 @@ static void tex_coordindex(DWORD state, struct wined3d_stateblock *stateblock, s } } -static void shaderconstant(DWORD state_id, struct wined3d_stateblock *stateblock, struct wined3d_context *context) -{ - const struct wined3d_state *state = &stateblock->state; - struct wined3d_device *device = stateblock->device; - - /* Vertex and pixel shader states will call a shader upload, don't do anything as long one of them - * has an update pending - */ - if(isStateDirty(context, STATE_VDECL) || - isStateDirty(context, STATE_PIXELSHADER)) { - return; - } - - device->shader_backend->shader_load_constants(context, use_ps(state), use_vs(state)); -} - static void tex_bumpenvlscale(DWORD state, struct wined3d_stateblock *stateblock, struct wined3d_context *context) { DWORD stage = (state - STATE_TEXTURESTAGE(0, 0)) / (WINED3D_HIGHEST_TEXTURE_STATE + 1);

1 0

Marcus Meissner : wrc: Fixed some small leaks in PO code (Coverity).
by Alexandre Julliard 28 Jun '11

28 Jun '11

Module: wine Branch: master Commit: b07408cf82a9b7fc4dc093d08d07f835fad3bf48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b07408cf82a9b7fc4dc093d08… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Jun 28 08:31:29 2011 +0200 wrc: Fixed some small leaks in PO code (Coverity). --- tools/wmc/po.c | 1 + tools/wrc/po.c | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/tools/wmc/po.c b/tools/wmc/po.c index 06b5bc7..1cdf521 100644 --- a/tools/wmc/po.c +++ b/tools/wmc/po.c @@ -325,6 +325,7 @@ static char *convert_msgid_ascii( const lanmsg_t *msg, int error_on_invalid_char fprintf( stderr, "%s:%d: ", msg->file, msg->line ); error( "Invalid character %04x in source string\n", msg->msg[i] ); } + free( buffer ); return NULL; } buffer[i] = 0; diff --git a/tools/wrc/po.c b/tools/wrc/po.c index ef1e9f2..af882cb 100644 --- a/tools/wrc/po.c +++ b/tools/wrc/po.c @@ -332,6 +332,7 @@ static char *convert_msgid_ascii( const string_t *str, int error_on_invalid_char print_location( &newstr->loc ); error( "Invalid character %04x in source string\n", newstr->str.wstr[i] ); } + free( buffer); free_string( newstr ); return NULL; } @@ -940,7 +941,11 @@ void add_translations( const char *po_dir ) new_top = new_tail = NULL; name = strmake( "%s/LINGUAS", po_dir ); - if (!(f = fopen( name, "r" ))) return; + if (!(f = fopen( name, "r" ))) + { + free( name ); + return; + } free( name ); while (fgets( buffer, sizeof(buffer), f )) {

1 0

Alistair Leslie-Hughes : mscoree: Define interface IManagedObject.
by Alexandre Julliard 28 Jun '11

28 Jun '11

Module: wine Branch: master Commit: 36b0323cebbd7cc0b99c8704f7d5776786d9c5ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=36b0323cebbd7cc0b99c8704f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jun 28 22:34:03 2011 +1000 mscoree: Define interface IManagedObject. --- include/mscoree.idl | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/include/mscoree.idl b/include/mscoree.idl index f8698cb..4160264 100644 --- a/include/mscoree.idl +++ b/include/mscoree.idl @@ -224,3 +224,17 @@ interface ICLRRuntimeHost : IUnknown [in] LPCWSTR pwzArgument, [out] DWORD *pReturnValue); } + +[ + uuid(C3FCC19E-A970-11d2-8B5A-00A0C9B7C9C4), + local, + object +] +interface IManagedObject : IUnknown +{ + HRESULT GetSerializedBuffer([out] BSTR *pBSTR); + + HRESULT GetObjectIdentity([out] BSTR *pBSTRGUID, + [out] int *AppDomainID, + [out] int *pCCW); +}

1 0

Michał Ziętek : wscript: Implemented Host_get_Name.
by Alexandre Julliard 28 Jun '11

28 Jun '11

Module: wine Branch: master Commit: 2c2527e3cb1a5cd8fb66ac8d96174fa2c911f820 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c2527e3cb1a5cd8fb66ac8d9… Author: Michał Ziętek <smierc.w.wenecji(a)gmail.com> Date: Tue Jun 28 13:37:36 2011 +0200 wscript: Implemented Host_get_Name. --- programs/wscript/host.c | 9 +++++++-- programs/wscript/tests/run.js | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/programs/wscript/host.c b/programs/wscript/host.c index 9634100..3021656 100644 --- a/programs/wscript/host.c +++ b/programs/wscript/host.c @@ -29,6 +29,8 @@ #include <wine/debug.h> +static const WCHAR wshNameW[] = {'W','i','n','d','o','w','s',' ','S','c','r','i','p','t',' ','H','o','s','t',0}; + WINE_DEFAULT_DEBUG_CHANNEL(wscript); static HRESULT WINAPI Host_QueryInterface(IHost *iface, REFIID riid, void **ppv) @@ -94,8 +96,11 @@ static HRESULT WINAPI Host_Invoke(IHost *iface, DISPID dispIdMember, REFIID riid static HRESULT WINAPI Host_get_Name(IHost *iface, BSTR *out_Name) { - WINE_FIXME("(%p)\n", out_Name); - return E_NOTIMPL; + WINE_TRACE("(%p)\n", out_Name); + + if(!(*out_Name = SysAllocString(wshNameW))) + return E_OUTOFMEMORY; + return S_OK; } static HRESULT WINAPI Host_get_Application(IHost *iface, IDispatch **out_Dispatch) diff --git a/programs/wscript/tests/run.js b/programs/wscript/tests/run.js index 809fa2f..84d7789 100644 --- a/programs/wscript/tests/run.js +++ b/programs/wscript/tests/run.js @@ -25,5 +25,6 @@ function ok(expr, msg) { ok(typeof(WScript) === "object", "typeof(WScript) = " + typeof(WScript)); ok(typeof(WSH) === "object", "typeof(WSH) = " + typeof(WSH)); ok(WScript === WSH, "WScript !== WSH"); +ok(WScript.Name === "Windows Script Host", "WScript.Name = " + WScript.Name); winetest.reportSuccess();

1 0