August 2012 - Wine-commits - list.winehq.org

Rico Schüller : d3dx9: Improve ID3DXConstantTable:: GetConstant().
by Alexandre Julliard 27 Aug '12

27 Aug '12

Module: wine Branch: master Commit: ea4f402164cde73a1029eca67c83b82babf44327 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea4f402164cde73a1029eca67… Author: Rico Schüller <kgbricola(a)web.de> Date: Sat Aug 25 16:28:22 2012 +0200 d3dx9: Improve ID3DXConstantTable::GetConstant(). --- dlls/d3dx9_36/shader.c | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index e6e0e26..db48dd8 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -970,19 +970,32 @@ static UINT WINAPI ID3DXConstantTableImpl_GetSamplerIndex(ID3DXConstantTable *if static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstant(ID3DXConstantTable *iface, D3DXHANDLE constant, UINT index) { struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); + struct ctab_constant *c; TRACE("(%p)->(%p, %d)\n", This, constant, index); if (constant) { - FIXME("Only top level constants supported\n"); - return NULL; + c = get_valid_constant(This, constant); + if (c && index < c->desc.StructMembers) + { + c = &c->constants[index]; + TRACE("Returning constant %p\n", c); + return handle_from_constant(c); + } + } + else + { + if (index < This->desc.Constants) + { + c = &This->constants[index]; + TRACE("Returning constant %p\n", c); + return handle_from_constant(c); + } } - if (index >= This->desc.Constants) - return NULL; - - return handle_from_constant(&This->constants[index]); + WARN("Index out of range\n"); + return NULL; } static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstantByName(ID3DXConstantTable *iface, D3DXHANDLE constant, LPCSTR name)

1 0

Rico Schüller : d3dx9: Improve ID3DXConstantTable:: GetConstantDesc().
by Alexandre Julliard 27 Aug '12

27 Aug '12

Module: wine Branch: master Commit: fa7422bc4ee4f9724a7b2327b1e428c5fdb4833b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa7422bc4ee4f9724a7b2327b… Author: Rico Schüller <kgbricola(a)web.de> Date: Sat Aug 25 16:28:27 2012 +0200 d3dx9: Improve ID3DXConstantTable::GetConstantDesc(). --- dlls/d3dx9_36/shader.c | 21 ++++++--------------- 1 files changed, 6 insertions(+), 15 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index db48dd8..ec5a924 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -923,27 +923,18 @@ static HRESULT WINAPI ID3DXConstantTableImpl_GetConstantDesc(ID3DXConstantTable D3DXCONSTANT_DESC *desc, UINT *count) { struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); - struct ctab_constant *constant_info; + struct ctab_constant *c = get_valid_constant(This, constant); TRACE("(%p)->(%p, %p, %p)\n", This, constant, desc, count); - if (!constant) - return D3DERR_INVALIDCALL; - - /* Applications can pass the name of the constant in place of the handle */ - if (!is_valid_constant(This, constant)) + if (!c) { - constant = ID3DXConstantTable_GetConstantByName(iface, NULL, constant); - if (!constant) - return D3DERR_INVALIDCALL; + WARN("Invalid argument specified\n"); + return D3DERR_INVALIDCALL; } - constant_info = constant_from_handle(constant); - - if (desc) - *desc = constant_info->desc; - if (count) - *count = 1; + if (desc) *desc = c->desc; + if (count) *count = 1; return D3D_OK; }

1 0

Rico Schüller : d3dx9: Implement ID3DXConstantTable:: GetConstantElement().
by Alexandre Julliard 27 Aug '12

27 Aug '12

Module: wine Branch: master Commit: 4d59b503de9d4bc464e10fe1a62d594e307bc375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d59b503de9d4bc464e10fe1a… Author: Rico Schüller <kgbricola(a)web.de> Date: Sat Aug 25 16:28:30 2012 +0200 d3dx9: Implement ID3DXConstantTable::GetConstantElement(). --- dlls/d3dx9_36/shader.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index ec5a924..e30292f 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1005,9 +1005,18 @@ static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstantByName(ID3DXConstantT static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstantElement(ID3DXConstantTable *iface, D3DXHANDLE constant, UINT index) { struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); + struct ctab_constant *c = get_valid_constant(This, constant); + + TRACE("(%p)->(%p, %d)\n", This, constant, index); - FIXME("(%p)->(%p, %d): stub\n", This, constant, index); + if (c && index < c->desc.Elements) + { + if (c->constants) c = &c->constants[index]; + TRACE("Returning constant %p\n", c); + return handle_from_constant(c); + } + WARN("Invalid argument specified\n"); return NULL; }

1 0

Rico Schüller : d3dx9: Fix RegisterCount calculation.
by Alexandre Julliard 27 Aug '12

27 Aug '12

Module: wine Branch: master Commit: 053e5b59ec5d546b5fa2fd315caccadb98eb8cf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=053e5b59ec5d546b5fa2fd315… Author: Rico Schüller <kgbricola(a)web.de> Date: Sat Aug 25 16:28:34 2012 +0200 d3dx9: Fix RegisterCount calculation. --- dlls/d3dx9_36/shader.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index e30292f..162909b 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1616,8 +1616,6 @@ static HRESULT parse_ctab_constant_type(const char *ctab, DWORD typeoffset, stru if (count) { - WORD size_element = 0; - constant->constants = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*constant->constants) * count); if (!constant->constants) { @@ -1634,8 +1632,7 @@ static HRESULT parse_ctab_constant_type(const char *ctab, DWORD typeoffset, stru if (hr != D3D_OK) goto error; - if (i == 0) size_element = constant->constants[i].desc.RegisterCount; - size += size_element; + size += constant->constants[i].desc.RegisterCount; } } else

1 0

Rico Schüller : d3dx9/tests: Add tests for ID3DXConstantTable::GetConstantDesc().
by Alexandre Julliard 27 Aug '12

27 Aug '12

Module: wine Branch: master Commit: fdbcbb0c91859a959b0a92efd198201c1d021f23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdbcbb0c91859a959b0a92efd… Author: Rico Schüller <kgbricola(a)web.de> Date: Sat Aug 25 16:28:39 2012 +0200 d3dx9/tests: Add tests for ID3DXConstantTable::GetConstantDesc(). --- dlls/d3dx9_36/tests/shader.c | 216 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 216 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fdbcbb0c91859a959b0a9…

1 0

Lucas Zawacki : dinput8/tests: Added tests for saving and retrieving settings with SetActionMap.
by Alexandre Julliard 27 Aug '12

27 Aug '12

Module: wine Branch: master Commit: 77cab1ce989a3831470bbd2795576493e1803b84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77cab1ce989a3831470bbd279… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Fri Aug 24 14:04:51 2012 -0300 dinput8/tests: Added tests for saving and retrieving settings with SetActionMap. --- dlls/dinput8/tests/device.c | 134 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 130 insertions(+), 4 deletions(-) diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 2deb348..e5b3f6a 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -132,7 +132,7 @@ static void test_build_action_map( ddi.dwSize = sizeof(ddi); IDirectInputDevice_GetDeviceInfo(lpdid, &ddi); - hr = IDirectInputDevice8_BuildActionMap(lpdid, lpdiaf, NULL, DIDBAM_INITIALIZE); + hr = IDirectInputDevice8_BuildActionMap(lpdid, lpdiaf, NULL, DIDBAM_HWDEFAULTS); ok (SUCCEEDED(hr), "BuildActionMap failed hr=%08x\n", hr); actions = lpdiaf->rgoAction; @@ -195,8 +195,8 @@ static BOOL CALLBACK enumeration_callback( } /* 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); + /* It should not use any pre-stored mappings so we use DIDBAM_HWDEFAULTS */ + hr = IDirectInputDevice8_BuildActionMap(lpdid, data->lpdiaf, NULL, DIDBAM_HWDEFAULTS); ok (SUCCEEDED(hr), "BuildActionMap failed hr=%08x\n", hr); /* Device has no data format and thus can't be acquired */ @@ -322,7 +322,7 @@ static void test_action_mapping(void) af.dwDataSize = 4 * DITEST_KEYBOARDSPACE; af.dwNumActions = DITEST_KEYBOARDSPACE; - hr = IDirectInputDevice8_BuildActionMap(data.keyboard, data.lpdiaf, NULL, DIDBAM_INITIALIZE); + hr = IDirectInputDevice8_BuildActionMap(data.keyboard, data.lpdiaf, NULL, DIDBAM_HWDEFAULTS); 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); @@ -342,11 +342,137 @@ static void test_action_mapping(void) } } +static void test_save_settings(void) +{ + HRESULT hr; + HINSTANCE hinst = GetModuleHandle(NULL); + LPDIRECTINPUT8 pDI = NULL; + DIACTIONFORMAT af; + IDirectInputDevice8A *pKey; + + static const GUID mapping_guid = { 0xcafecafe, 0x2, 0x3, { 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb } }; + static DIACTION actions[] = { + { 0, DIKEYBOARD_A , 0, { "Blam" } }, + { 1, DIKEYBOARD_B , 0, { "Kapow"} } + }; + static const DWORD results[] = { + DIDFT_MAKEINSTANCE(DIK_A) | DIDFT_PSHBUTTON, + DIDFT_MAKEINSTANCE(DIK_B) | DIDFT_PSHBUTTON + }; + static const DWORD other_results[] = { + DIDFT_MAKEINSTANCE(DIK_C) | DIDFT_PSHBUTTON, + DIDFT_MAKEINSTANCE(DIK_D) | DIDFT_PSHBUTTON + }; + + hr = CoCreateInstance(&CLSID_DirectInput8, 0, CLSCTX_INPROC_SERVER, &IID_IDirectInput8A, (LPVOID*)&pDI); + if (hr == DIERR_OLDDIRECTINPUTVERSION || + hr == DIERR_BETADIRECTINPUTVERSION || + hr == REGDB_E_CLASSNOTREG) + { + win_skip("ActionMapping requires dinput8\n"); + return; + } + ok (SUCCEEDED(hr), "DirectInput8 Create failed: hr=%08x\n", hr); + if (FAILED(hr)) return; + + hr = IDirectInput8_Initialize(pDI,hinst, DIRECTINPUT_VERSION); + if (hr == DIERR_OLDDIRECTINPUTVERSION || hr == DIERR_BETADIRECTINPUTVERSION) + { + win_skip("ActionMapping requires dinput8\n"); + return; + } + ok (SUCCEEDED(hr), "DirectInput8 Initialize failed: hr=%08x\n", hr); + if (FAILED(hr)) return; + + hr = IDirectInput_CreateDevice(pDI, &GUID_SysKeyboard, &pKey, NULL); + ok (SUCCEEDED(hr), "IDirectInput_Create device failed hr: 0x%08x\n", hr); + if (FAILED(hr)) return; + + memset (&af, 0, sizeof(af)); + af.dwSize = sizeof(af); + af.dwActionSize = sizeof(DIACTION); + af.dwDataSize = 4 * sizeof(actions) / sizeof(actions[0]); + af.dwNumActions = sizeof(actions) / sizeof(actions[0]); + af.rgoAction = actions; + af.guidActionMap = mapping_guid; + af.dwGenre = 0x01000000; /* DIVIRTUAL_DRIVING_RACE */ + af.dwBufferSize = 32; + + /* Easy case. Ask for default mapping, save, ask for previous map and read it back */ + hr = IDirectInputDevice8_BuildActionMap(pKey, &af, NULL, DIDBAM_HWDEFAULTS); + ok (SUCCEEDED(hr), "BuildActionMap failed hr=%08x\n", hr); + + ok (results[0] == af.rgoAction[0].dwObjID, + "Mapped incorrectly expected: 0x%08x got: 0x%08x\n", results[0], af.rgoAction[0].dwObjID); + + ok (results[1] == af.rgoAction[1].dwObjID, + "Mapped incorrectly expected: 0x%08x got: 0x%08x\n", results[1], af.rgoAction[1].dwObjID); + + hr = IDirectInputDevice8_SetActionMap(pKey, &af, NULL, DIDSAM_FORCESAVE); + ok (SUCCEEDED(hr), "SetActionMap failed hr=%08x\n", hr); + + if (hr == DI_SETTINGSNOTSAVED) + { + skip ("Cant test saving settings if SetActionMap returns DI_SETTINGSNOTSAVED\n"); + return; + } + + af.rgoAction[0].dwObjID = 0; + af.rgoAction[1].dwObjID = 0; + memset(&af.rgoAction[0].guidInstance, 0, sizeof(GUID)); + memset(&af.rgoAction[1].guidInstance, 0, sizeof(GUID)); + + hr = IDirectInputDevice8_BuildActionMap(pKey, &af, NULL, 0); + ok (SUCCEEDED(hr), "BuildActionMap failed hr=%08x\n", hr); + + ok (results[0] == af.rgoAction[0].dwObjID, + "Mapped incorrectly expected: 0x%08x got: 0x%08x\n", results[0], af.rgoAction[0].dwObjID); + ok (IsEqualGUID(&GUID_SysKeyboard, &af.rgoAction[0].guidInstance), "Action should be mapped to keyboard\n"); + + ok (results[1] == af.rgoAction[1].dwObjID, + "Mapped incorrectly expected: 0x%08x got: 0x%08x\n", results[1], af.rgoAction[1].dwObjID); + ok (IsEqualGUID(&GUID_SysKeyboard, &af.rgoAction[1].guidInstance), "Action should be mapped to keyboard\n"); + + /* Hard case. Customized mapping, save, ask for previous map and read it back */ + af.rgoAction[0].dwObjID = other_results[0]; + af.rgoAction[0].dwHow = DIAH_USERCONFIG; + af.rgoAction[0].guidInstance = GUID_SysKeyboard; + af.rgoAction[1].dwObjID = other_results[1]; + af.rgoAction[1].dwHow = DIAH_USERCONFIG; + af.rgoAction[1].guidInstance = GUID_SysKeyboard; + + hr = IDirectInputDevice8_SetActionMap(pKey, &af, NULL, DIDSAM_FORCESAVE); + ok (SUCCEEDED(hr), "SetActionMap failed hr=%08x\n", hr); + + if (hr == DI_SETTINGSNOTSAVED) + { + skip ("Cant test saving settings if SetActionMap returns DI_SETTINGSNOTSAVED\n"); + return; + } + + af.rgoAction[0].dwObjID = 0; + af.rgoAction[1].dwObjID = 0; + memset(&af.rgoAction[0].guidInstance, 0, sizeof(GUID)); + memset(&af.rgoAction[1].guidInstance, 0, sizeof(GUID)); + + hr = IDirectInputDevice8_BuildActionMap(pKey, &af, NULL, 0); + ok (SUCCEEDED(hr), "BuildActionMap failed hr=%08x\n", hr); + + todo_wine ok (other_results[0] == af.rgoAction[0].dwObjID, + "Mapped incorrectly expected: 0x%08x got: 0x%08x\n", other_results[0], af.rgoAction[0].dwObjID); + todo_wine ok (IsEqualGUID(&GUID_SysKeyboard, &af.rgoAction[0].guidInstance), "Action should be mapped to keyboard\n"); + + todo_wine ok (other_results[1] == af.rgoAction[1].dwObjID, + "Mapped incorrectly expected: 0x%08x got: 0x%08x\n", other_results[1], af.rgoAction[1].dwObjID); + todo_wine ok (IsEqualGUID(&GUID_SysKeyboard, &af.rgoAction[1].guidInstance), "Action should be mapped to keyboard\n"); +} + START_TEST(device) { CoInitialize(NULL); test_action_mapping(); + test_save_settings(); CoUninitialize(); }

1 0

Lucas Zawacki : dinput: SetActionMap saving mappings.
by Alexandre Julliard 27 Aug '12

27 Aug '12

Module: wine Branch: master Commit: af1dcde288b96e1e12a76861b78b1801f5d52d67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af1dcde288b96e1e12a76861b… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Fri Aug 24 14:04:52 2012 -0300 dinput: SetActionMap saving mappings. --- dlls/dinput/device.c | 143 ++++++++++++++++++++++++++++++++++++++++++ dlls/dinput/dinput_private.h | 2 + dlls/dinput8/tests/device.c | 8 +- 3 files changed, 149 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index bf5fd1b..098efb7 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -598,10 +598,142 @@ static DWORD semantic_to_obj_id(IDirectInputDeviceImpl* This, DWORD dwSemantic) return type | (0x0000ff00 & (obj_instance << 8)); } +/* + * get_mapping_key + * Retrieves an open registry key to save the mapping, parametrized for an username, + * specific device and specific action mapping guid. + */ +static HKEY get_mapping_key(const WCHAR *device, const WCHAR *username, const WCHAR *guid) +{ + static const WCHAR subkey[] = { + 'S','o','f','t','w','a','r','e','\\', + 'W','i','n','e','\\', + 'D','i','r','e','c','t','I','n','p','u','t','\\', + 'M','a','p','p','i','n','g','s','\\','%','s','\\','%','s','\\','%','s','\0'}; + HKEY hkey; + WCHAR *keyname; + + keyname = HeapAlloc(GetProcessHeap(), 0, + sizeof(WCHAR) * (lstrlenW(subkey) + strlenW(username) + strlenW(device) + strlenW(guid))); + sprintfW(keyname, subkey, username, device, guid); + + /* The key used is HKCU\Software\Wine\DirectInput\Mappings\[username]\[device]\[mapping_guid] */ + if (RegCreateKeyW(HKEY_CURRENT_USER, keyname, &hkey)) + hkey = 0; + + HeapFree(GetProcessHeap(), 0, keyname); + + return hkey; +} + +static HRESULT save_mapping_settings(IDirectInputDevice8W *iface, LPDIACTIONFORMATW lpdiaf, LPCWSTR lpszUsername) +{ + WCHAR *guid_str = NULL; + DIDEVICEINSTANCEW didev; + HKEY hkey; + int i; + + didev.dwSize = sizeof(didev); + IDirectInputDevice8_GetDeviceInfo(iface, &didev); + + if (StringFromCLSID(&lpdiaf->guidActionMap, &guid_str) != S_OK) + return DI_SETTINGSNOTSAVED; + + hkey = get_mapping_key(didev.tszInstanceName, lpszUsername, guid_str); + + if (!hkey) + { + CoTaskMemFree(guid_str); + return DI_SETTINGSNOTSAVED; + } + + /* Write each of the actions mapped for this device. + Format is "dwSemantic"="dwObjID" and key is of type REG_DWORD + */ + for (i = 0; i < lpdiaf->dwNumActions; i++) + { + static const WCHAR format[] = {'%','x','\0'}; + WCHAR label[9]; + + if (IsEqualGUID(&didev.guidInstance, &lpdiaf->rgoAction[i].guidInstance) && + lpdiaf->rgoAction[i].dwHow != DIAH_UNMAPPED) + { + sprintfW(label, format, lpdiaf->rgoAction[i].dwSemantic); + RegSetValueExW(hkey, label, 0, REG_DWORD, (const BYTE*) &lpdiaf->rgoAction[i].dwObjID, sizeof(DWORD)); + } + } + + RegCloseKey(hkey); + CoTaskMemFree(guid_str); + + return DI_OK; +} + +static BOOL load_mapping_settings(IDirectInputDeviceImpl *This, LPDIACTIONFORMATW lpdiaf, const WCHAR *username) +{ + HKEY hkey; + WCHAR *guid_str; + DIDEVICEINSTANCEW didev; + int i; + + didev.dwSize = sizeof(didev); + IDirectInputDevice8_GetDeviceInfo(&This->IDirectInputDevice8W_iface, &didev); + + if (StringFromCLSID(&lpdiaf->guidActionMap, &guid_str) != S_OK) + return FALSE; + + hkey = get_mapping_key(didev.tszInstanceName, username, guid_str); + + if (!hkey) + { + CoTaskMemFree(guid_str); + return FALSE; + } + + /* Try to read each action in the DIACTIONFORMAT from registry */ + for (i = 0; i < lpdiaf->dwNumActions; i++) + { + static const WCHAR format[] = {'%','x','\0'}; + DWORD id, size = sizeof(DWORD); + WCHAR label[9]; + + sprintfW(label, format, lpdiaf->rgoAction[i].dwSemantic); + + if (!RegQueryValueExW(hkey, label, 0, NULL, (LPBYTE) &id, &size)) + { + lpdiaf->rgoAction[i].dwObjID = id; + lpdiaf->rgoAction[i].guidInstance = didev.guidInstance; + lpdiaf->rgoAction[i].dwHow = DIAH_USERCONFIG; + } + } + + RegCloseKey(hkey); + CoTaskMemFree(guid_str); + + return TRUE; +} + HRESULT _build_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, LPCWSTR lpszUserName, DWORD dwFlags, DWORD devMask, LPCDIDATAFORMAT df) { IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + WCHAR username[MAX_PATH]; + DWORD username_size = MAX_PATH; int i, has_actions = 0; + BOOL load_success = FALSE; + + /* Unless asked the contrary by these flags, try to load a previous mapping */ + if (!(dwFlags & DIDBAM_HWDEFAULTS)) + { + /* Retrieve logged user name if necessary */ + if (lpszUserName == NULL) + GetUserNameW(username, &username_size); + else + lstrcpynW(username, lpszUserName, MAX_PATH); + + load_success = load_mapping_settings(This, lpdiaf, username); + } + + if (load_success) return DI_OK; for (i=0; i < lpdiaf->dwNumActions; i++) { @@ -650,6 +782,8 @@ HRESULT _set_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, L DIOBJECTDATAFORMAT *obj_df = NULL; DIPROPDWORD dp; DIPROPRANGE dpr; + WCHAR username[MAX_PATH]; + DWORD username_size = MAX_PATH; int i, action = 0, num_actions = 0; unsigned int offset = 0; @@ -722,6 +856,15 @@ HRESULT _set_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, L IDirectInputDevice8_SetProperty(iface, DIPROP_BUFFERSIZE, &dp.diph); } + /* Retrieve logged user name if necessary */ + if (lpszUserName == NULL) + GetUserNameW(username, &username_size); + else + lstrcpynW(username, lpszUserName, MAX_PATH); + + /* Save the settings to disk */ + save_mapping_settings(iface, lpdiaf, username); + return IDirectInputDevice8WImpl_SetActionMap(iface, lpdiaf, lpszUserName, dwFlags); } diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index 8efb42e..e593b40 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -70,6 +70,8 @@ extern void _copy_diactionformatWtoA(LPDIACTIONFORMATA, LPDIACTIONFORMATW) DECLS extern HRESULT _configure_devices(IDirectInput8W *iface, LPDICONFIGUREDEVICESCALLBACK lpdiCallback, LPDICONFIGUREDEVICESPARAMSW lpdiCDParams, DWORD dwFlags, LPVOID pvRefData) DECLSPEC_HIDDEN; +extern WCHAR* get_mapping_path(const WCHAR *device, const WCHAR *username) DECLSPEC_HIDDEN; + #define IS_DIPROP(x) (((ULONG_PTR)(x) >> 16) == 0) #define DIKEYBOARD_MASK 0x81000000 diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index e5b3f6a..76f9120 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -458,13 +458,13 @@ static void test_save_settings(void) hr = IDirectInputDevice8_BuildActionMap(pKey, &af, NULL, 0); ok (SUCCEEDED(hr), "BuildActionMap failed hr=%08x\n", hr); - todo_wine ok (other_results[0] == af.rgoAction[0].dwObjID, + ok (other_results[0] == af.rgoAction[0].dwObjID, "Mapped incorrectly expected: 0x%08x got: 0x%08x\n", other_results[0], af.rgoAction[0].dwObjID); - todo_wine ok (IsEqualGUID(&GUID_SysKeyboard, &af.rgoAction[0].guidInstance), "Action should be mapped to keyboard\n"); + ok (IsEqualGUID(&GUID_SysKeyboard, &af.rgoAction[0].guidInstance), "Action should be mapped to keyboard\n"); - todo_wine ok (other_results[1] == af.rgoAction[1].dwObjID, + ok (other_results[1] == af.rgoAction[1].dwObjID, "Mapped incorrectly expected: 0x%08x got: 0x%08x\n", other_results[1], af.rgoAction[1].dwObjID); - todo_wine ok (IsEqualGUID(&GUID_SysKeyboard, &af.rgoAction[1].guidInstance), "Action should be mapped to keyboard\n"); + ok (IsEqualGUID(&GUID_SysKeyboard, &af.rgoAction[1].guidInstance), "Action should be mapped to keyboard\n"); } START_TEST(device)

1 0

Marek Chmiel : dssenh/tests: Added key exchange tests for the DSSENH cryptographic service provider.
by Alexandre Julliard 27 Aug '12

27 Aug '12

Module: wine Branch: master Commit: 97fda5a413aa33d37515fe59be9d8ee4a0ab13bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=97fda5a413aa33d37515fe59b… Author: Marek Chmiel <kcmark(a)gmail.com> Date: Sat Aug 18 00:02:33 2012 -0500 dssenh/tests: Added key exchange tests for the DSSENH cryptographic service provider. --- dlls/dssenh/tests/dssenh.c | 396 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 396 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=97fda5a413aa33d37515f…

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 27 Aug '12

27 Aug '12

Module: wine Branch: master Commit: 1e86d79036b8f0d9ceedeac45b6e8ac6d5bfcc64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e86d79036b8f0d9ceedeac45… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Fri Aug 24 22:13:34 2012 +0300 po: Update Lithuanian translation. --- po/lt.po | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/po/lt.po b/po/lt.po index ac8298f..0586696 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-07-17 20:09+0300\n" +"PO-Revision-Date: 2012-08-24 22:13+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -3455,6 +3455,8 @@ msgid "" "After disabling or enabling a device, the connected joysticks won't be " "updated here until you restart this applet." msgstr "" +"Po įtaiso išjungimo ar įjungimo, prijungtos vairasvirtės nebus automatiškai " +"čia atnaujintos, kol nepaleisite šios programėlės iš naujo." #: joy.rc:47 msgid "Test Joystick"

1 0

Alexandre Julliard : git-notify: Update the address of the CIA bot.
by Alexandre Julliard 27 Aug '12

27 Aug '12

Module: tools Branch: master Commit: 371d8133814468cd5d0fcf2a87fca22404ea6018 URL: http://source.winehq.org/git/tools.git/?a=commit;h=371d8133814468cd5d0fcf2a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 22 21:01:21 2012 +0200 git-notify: Update the address of the CIA bot. --- git-notify | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/git-notify b/git-notify index d79cfcc..9918117 100755 --- a/git-notify +++ b/git-notify @@ -42,7 +42,7 @@ sub get_repos_name(); my $mailer = "/usr/bin/mail"; # CIA notification address -my $cia_address = "cia\(a)cia.navi.cx"; +my $cia_address = "cia\(a)cia.vc"; # debug mode my $debug = 0;

1 0