June 2016 - Wine-Commits - list.winehq.org

Caron Wills : wined3d: Add Nvidia GeForce GTX 880M.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: stable Commit: 7a8f5472ec1cdb9562c19e55a5f2b3a5b74304ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a8f5472ec1cdb9562c19e55a… Author: Caron Wills <caron(a)codeweavers.com> Date: Thu Apr 21 18:06:05 2016 +0000 wined3d: Add Nvidia GeForce GTX 880M. Signed-off-by: Caron Wills <caron(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f52accf86de3f3be387090cf5f1516a693213331) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a053f98..6b1ccc0 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1286,6 +1286,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX850M, "NVIDIA GeForce GTX 850M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX860M, "NVIDIA GeForce GTX 860M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX870M, "NVIDIA GeForce GTX 870M", DRIVER_NVIDIA_GEFORCE8, 3072}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX880M, "NVIDIA GeForce GTX 880M", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950, "NVIDIA GeForce GTX 950", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950M, "NVIDIA GeForce GTX 950M", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX960, "NVIDIA GeForce GTX 960", DRIVER_NVIDIA_GEFORCE8, 4096}, @@ -1739,6 +1740,7 @@ cards_nvidia_binary[] = {"GTX 960", CARD_NVIDIA_GEFORCE_GTX960}, /* GeForce 900 - midend high */ {"GTX 950M", CARD_NVIDIA_GEFORCE_GTX950M}, /* GeForce 900 - midend mobile */ {"GTX 950", CARD_NVIDIA_GEFORCE_GTX950}, /* GeForce 900 - midend */ + {"GTX 880M", CARD_NVIDIA_GEFORCE_GTX880M}, /* GeForce 800 - mobile */ {"GTX 870M", CARD_NVIDIA_GEFORCE_GTX870M}, /* GeForce 800 - mobile */ {"GTX 860M", CARD_NVIDIA_GEFORCE_GTX860M}, /* GeForce 800 - mobile */ {"GTX 850M", CARD_NVIDIA_GEFORCE_GTX850M}, /* GeForce 800 - mobile */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3e857f7..ddbb355 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1631,6 +1631,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX850M = 0x1391, CARD_NVIDIA_GEFORCE_GTX860M = 0x1392, /* Other PCI ID 0x119a */ CARD_NVIDIA_GEFORCE_GTX870M = 0x1199, + CARD_NVIDIA_GEFORCE_GTX880M = 0x1198, CARD_NVIDIA_GEFORCE_GTX950 = 0x1402, CARD_NVIDIA_GEFORCE_GTX950M = 0x139a, CARD_NVIDIA_GEFORCE_GTX960 = 0x1401,

1 0

Caron Wills : wined3d: Add Nvidia GeForce 840M.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: stable Commit: 2e0448428a184fd5397e79d9236593273a90dc31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e0448428a184fd5397e79d92… Author: Caron Wills <caron(a)codeweavers.com> Date: Fri Apr 15 18:10:42 2016 +0000 wined3d: Add Nvidia GeForce 840M. Signed-off-by: Caron Wills <caron(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f8d6eee32a612443d460c34b24c27ab7646da811) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 3 +++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 97c5a16..5ce9937 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1280,6 +1280,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTXTITAN, "NVIDIA GeForce GTX TITAN Black", DRIVER_NVIDIA_GEFORCE8, 6144}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_820M, "NVIDIA GeForce 820M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_830M, "NVIDIA GeForce 830M", DRIVER_NVIDIA_GEFORCE8, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_840M, "NVIDIA GeForce 840M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX860M, "NVIDIA GeForce GTX 860M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950, "NVIDIA GeForce GTX 950", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950M, "NVIDIA GeForce GTX 950M", DRIVER_NVIDIA_GEFORCE8, 4096}, @@ -1735,6 +1736,7 @@ cards_nvidia_binary[] = {"GTX 950M", CARD_NVIDIA_GEFORCE_GTX950M}, /* GeForce 900 - midend mobile */ {"GTX 950", CARD_NVIDIA_GEFORCE_GTX950}, /* GeForce 900 - midend */ {"GTX 860M", CARD_NVIDIA_GEFORCE_GTX860M}, /* GeForce 800 - mobile */ + {"GeForce 840M", CARD_NVIDIA_GEFORCE_840M}, /* GeForce 800 - mobile */ {"GeForce 830M", CARD_NVIDIA_GEFORCE_830M}, /* GeForce 800 - mobile */ {"GeForce 820M", CARD_NVIDIA_GEFORCE_820M}, /* GeForce 800 - mobile */ {"GTX 780 Ti", CARD_NVIDIA_GEFORCE_GTX780TI}, /* Geforce 700 - highend */ @@ -2094,6 +2096,7 @@ cards_nvidia_mesa[] = { /* Maxwell */ {"NV124", CARD_NVIDIA_GEFORCE_GTX970}, + {"NV118", CARD_NVIDIA_GEFORCE_840M}, {"NV117", CARD_NVIDIA_GEFORCE_GTX750}, /* Kepler */ {"NVF1", CARD_NVIDIA_GEFORCE_GTX780TI}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 228e093..a64e6e7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1625,6 +1625,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTXTITAN = 0x100c, CARD_NVIDIA_GEFORCE_820M = 0x0fed, CARD_NVIDIA_GEFORCE_830M = 0x1340, + CARD_NVIDIA_GEFORCE_840M = 0x1341, CARD_NVIDIA_GEFORCE_GTX860M = 0x1392, /* Other PCI ID 0x119a */ CARD_NVIDIA_GEFORCE_GTX950 = 0x1402, CARD_NVIDIA_GEFORCE_GTX950M = 0x139a,

1 0

Caron Wills : wined3d: Add Nvidia GeForce 830M.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: stable Commit: daa7448a75621b3c301d0ec1cf521262f595e330 URL: http://source.winehq.org/git/wine.git/?a=commit;h=daa7448a75621b3c301d0ec1c… Author: Caron Wills <caron(a)codeweavers.com> Date: Thu Apr 14 18:23:11 2016 +0000 wined3d: Add Nvidia GeForce 830M. Signed-off-by: Caron Wills <caron(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e184b81ce264d243c44bff3428149c21e838bf40) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e3ff8e7..97c5a16 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1279,6 +1279,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780TI, "NVIDIA GeForce GTX 780 Ti", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTXTITAN, "NVIDIA GeForce GTX TITAN Black", DRIVER_NVIDIA_GEFORCE8, 6144}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_820M, "NVIDIA GeForce 820M", DRIVER_NVIDIA_GEFORCE8, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_830M, "NVIDIA GeForce 830M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX860M, "NVIDIA GeForce GTX 860M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950, "NVIDIA GeForce GTX 950", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950M, "NVIDIA GeForce GTX 950M", DRIVER_NVIDIA_GEFORCE8, 4096}, @@ -1734,6 +1735,7 @@ cards_nvidia_binary[] = {"GTX 950M", CARD_NVIDIA_GEFORCE_GTX950M}, /* GeForce 900 - midend mobile */ {"GTX 950", CARD_NVIDIA_GEFORCE_GTX950}, /* GeForce 900 - midend */ {"GTX 860M", CARD_NVIDIA_GEFORCE_GTX860M}, /* GeForce 800 - mobile */ + {"GeForce 830M", CARD_NVIDIA_GEFORCE_830M}, /* GeForce 800 - mobile */ {"GeForce 820M", CARD_NVIDIA_GEFORCE_820M}, /* GeForce 800 - mobile */ {"GTX 780 Ti", CARD_NVIDIA_GEFORCE_GTX780TI}, /* Geforce 700 - highend */ {"GTX TITAN Black", CARD_NVIDIA_GEFORCE_GTXTITAN}, /* Geforce 700 - highend */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 34165ea..228e093 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1624,6 +1624,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX780TI = 0x100a, CARD_NVIDIA_GEFORCE_GTXTITAN = 0x100c, CARD_NVIDIA_GEFORCE_820M = 0x0fed, + CARD_NVIDIA_GEFORCE_830M = 0x1340, CARD_NVIDIA_GEFORCE_GTX860M = 0x1392, /* Other PCI ID 0x119a */ CARD_NVIDIA_GEFORCE_GTX950 = 0x1402, CARD_NVIDIA_GEFORCE_GTX950M = 0x139a,

1 0

Caron Wills : wined3d: Add Nvidia GeForce GTX 860.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: stable Commit: e04d4b2b85d6eb8bd7a95b861de06cc056bcbc14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e04d4b2b85d6eb8bd7a95b861… Author: Caron Wills <caron(a)codeweavers.com> Date: Tue Mar 29 17:38:28 2016 +0000 wined3d: Add Nvidia GeForce GTX 860. Signed-off-by: Caron Wills <caron(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6e1f687e4decfaa79def6a42db13f13566035b3d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index acc62d1..acba808 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1276,6 +1276,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX770, "NVIDIA GeForce GTX 770", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780, "NVIDIA GeForce GTX 780", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780TI, "NVIDIA GeForce GTX 780 Ti", DRIVER_NVIDIA_GEFORCE8, 3072}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX860M, "NVIDIA GeForce GTX 860M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950, "NVIDIA GeForce GTX 950", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950M, "NVIDIA GeForce GTX 950M", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX960, "NVIDIA GeForce GTX 960", DRIVER_NVIDIA_GEFORCE8, 4096}, @@ -1729,6 +1730,7 @@ cards_nvidia_binary[] = {"GTX 960", CARD_NVIDIA_GEFORCE_GTX960}, /* GeForce 900 - midend high */ {"GTX 950M", CARD_NVIDIA_GEFORCE_GTX950M}, /* GeForce 900 - midend mobile */ {"GTX 950", CARD_NVIDIA_GEFORCE_GTX950}, /* GeForce 900 - midend */ + {"GTX 860M", CARD_NVIDIA_GEFORCE_GTX860M}, /* GeForce 800 - mobile */ {"GTX 780 Ti", CARD_NVIDIA_GEFORCE_GTX780TI}, /* Geforce 700 - highend */ {"GTX 780", CARD_NVIDIA_GEFORCE_GTX780}, /* Geforce 700 - highend */ {"GTX 770M", CARD_NVIDIA_GEFORCE_GTX770M}, /* Geforce 700 - midend high mobile */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 00b7ac7..36c269e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1621,6 +1621,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX770 = 0x1184, CARD_NVIDIA_GEFORCE_GTX780 = 0x1004, CARD_NVIDIA_GEFORCE_GTX780TI = 0x100a, + CARD_NVIDIA_GEFORCE_GTX860M = 0x1392, /* Other PCI ID 0x119a */ CARD_NVIDIA_GEFORCE_GTX950 = 0x1402, CARD_NVIDIA_GEFORCE_GTX950M = 0x139a, CARD_NVIDIA_GEFORCE_GTX960 = 0x1401,

1 0

Bernhard Übelacker : dinput: Implement device property DIPROP_USERNAME.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: stable Commit: faa89cacd8954993376a13c5855270d5ab25108a URL: http://source.winehq.org/git/wine.git/?a=commit;h=faa89cacd8954993376a13c58… Author: Bernhard Übelacker <bernhardu(a)vr-web.de> Date: Thu Mar 31 05:39:21 2016 +0200 dinput: Implement device property DIPROP_USERNAME. Signed-off-by: Bernhard Übelacker <bernhardu(a)vr-web.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit fbc85ddc28a3ad6002cd415552684bd8c5b27bf2) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput/device.c | 29 +++++++++++++++++++++++++++++ dlls/dinput/device_private.h | 1 + dlls/dinput8/tests/device.c | 29 +++++++++++++++++++++++++++-- 3 files changed, 57 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index e525f01..0b08e15 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -783,6 +783,7 @@ HRESULT _set_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, L DIOBJECTDATAFORMAT *obj_df = NULL; DIPROPDWORD dp; DIPROPRANGE dpr; + DIPROPSTRING dps; WCHAR username[MAX_PATH]; DWORD username_size = MAX_PATH; int i, action = 0, num_actions = 0; @@ -863,6 +864,16 @@ HRESULT _set_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, L else lstrcpynW(username, lpszUserName, MAX_PATH); + dps.diph.dwSize = sizeof(dps); + dps.diph.dwHeaderSize = sizeof(DIPROPHEADER); + dps.diph.dwObj = 0; + dps.diph.dwHow = DIPH_DEVICE; + if (dwFlags & DIDSAM_NOUSER) + dps.wsz[0] = '\0'; + else + lstrcpynW(dps.wsz, username, sizeof(dps.wsz)/sizeof(WCHAR)); + IDirectInputDevice8_SetProperty(iface, DIPROP_USERNAME, &dps.diph); + /* Save the settings to disk */ save_mapping_settings(iface, lpdiaf, username); @@ -1251,6 +1262,15 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, TRACE("buffersize = %d\n", pd->dwData); break; } + case (DWORD_PTR) DIPROP_USERNAME: + { + LPDIPROPSTRING ps = (LPDIPROPSTRING)pdiph; + + if (pdiph->dwSize != sizeof(DIPROPSTRING)) return DIERR_INVALIDPARAM; + + lstrcpynW(ps->wsz, This->username, sizeof(ps->wsz)/sizeof(WCHAR)); + break; + } case (DWORD_PTR) DIPROP_VIDPID: FIXME("DIPROP_VIDPID not implemented\n"); return DIERR_UNSUPPORTED; @@ -1324,6 +1344,15 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetProperty( LeaveCriticalSection(&This->crit); break; } + case (DWORD_PTR) DIPROP_USERNAME: + { + LPCDIPROPSTRING ps = (LPCDIPROPSTRING)pdiph; + + if (pdiph->dwSize != sizeof(DIPROPSTRING)) return DIERR_INVALIDPARAM; + + lstrcpynW(This->username, ps->wsz, sizeof(This->username)/sizeof(WCHAR)); + break; + } default: WARN("Unknown property %s\n", debugstr_guid(rguid)); return DIERR_UNSUPPORTED; diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 52bbec4..c4fbe85 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -81,6 +81,7 @@ struct IDirectInputDeviceImpl /* Action mapping */ int num_actions; /* number of actions mapped */ ActionMap *action_map; /* array of mappings */ + WCHAR username[MAX_PATH]; }; extern BOOL get_app_key(HKEY*, HKEY*) DECLSPEC_HIDDEN; diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 6495559..fc415b7 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -223,8 +223,8 @@ static BOOL CALLBACK enumeration_callback(const DIDEVICEINSTANCEA *lpddi, IDirec dps.wsz[0] = '\0'; hr = IDirectInputDevice_GetProperty(lpdid, DIPROP_USERNAME, &dps.diph); - todo_wine ok (SUCCEEDED(hr), "GetProperty failed hr=%08x\n", hr); - todo_wine ok (!lstrcmpW(usernameW, dps.wsz), "Username not set correctly expected=%s, got=%s\n", wine_dbgstr_wn(usernameW, -1), wine_dbgstr_wn(dps.wsz, -1)); + ok (SUCCEEDED(hr), "GetProperty failed hr=%08x\n", hr); + ok (!lstrcmpW(usernameW, dps.wsz), "Username not set correctly expected=%s, got=%s\n", wine_dbgstr_w(usernameW), wine_dbgstr_w(dps.wsz)); /* Test buffer size */ memset(&dp, 0, sizeof(dp)); @@ -275,6 +275,7 @@ static void test_action_mapping(void) HINSTANCE hinst = GetModuleHandleA(NULL); IDirectInput8A *pDI = NULL; DIACTIONFORMATA af; + DIPROPSTRING dps; struct enum_data data = {pDI, &af, NULL, NULL, NULL, 0}; HWND hwnd; @@ -342,6 +343,30 @@ static void test_action_mapping(void) af.dwDataSize = 4 * sizeof(actionMapping) / sizeof(actionMapping[0]); af.dwNumActions = sizeof(actionMapping) / sizeof(actionMapping[0]); + + /* test DIDSAM_NOUSER */ + dps.diph.dwSize = sizeof(dps); + dps.diph.dwHeaderSize = sizeof(DIPROPHEADER); + dps.diph.dwObj = 0; + dps.diph.dwHow = DIPH_DEVICE; + dps.wsz[0] = '\0'; + + hr = IDirectInputDevice_GetProperty(data.keyboard, DIPROP_USERNAME, &dps.diph); + ok (SUCCEEDED(hr), "GetProperty failed hr=%08x\n", hr); + ok (dps.wsz[0] != 0, "Expected any username, got=%s\n", wine_dbgstr_w(dps.wsz)); + + hr = IDirectInputDevice8_SetActionMap(data.keyboard, data.lpdiaf, NULL, DIDSAM_NOUSER); + ok (SUCCEEDED(hr), "SetActionMap failed hr=%08x\n", hr); + + dps.diph.dwSize = sizeof(dps); + dps.diph.dwHeaderSize = sizeof(DIPROPHEADER); + dps.diph.dwObj = 0; + dps.diph.dwHow = DIPH_DEVICE; + dps.wsz[0] = '\0'; + + hr = IDirectInputDevice_GetProperty(data.keyboard, DIPROP_USERNAME, &dps.diph); + ok (SUCCEEDED(hr), "GetProperty failed hr=%08x\n", hr); + ok (dps.wsz[0] == 0, "Expected empty username, got=%s\n", wine_dbgstr_w(dps.wsz)); } if (data.mouse != NULL)

1 0

Jens Reyer : msiexec: Fix a typo in the manpage.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: stable Commit: 1a8acbf8b7d25fb2a756fe777f6652b93c45b322 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a8acbf8b7d25fb2a756fe777… Author: Jens Reyer <jre.winesim(a)gmail.com> Date: Fri Apr 29 03:03:14 2016 +0200 msiexec: Fix a typo in the manpage. Signed-off-by: Jens Reyer <jre.winesim(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2ba799037f217c8ce91b217fa01240e846e45fd5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/msiexec/msiexec.man.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/msiexec/msiexec.man.in b/programs/msiexec/msiexec.man.in index e7c3798..f24c226 100644 --- a/programs/msiexec/msiexec.man.in +++ b/programs/msiexec/msiexec.man.in @@ -76,7 +76,7 @@ Log all error messages. .IP "\fBa\fR" Log start of actions. .IP "\fBr\fR" -Log action specifc records. +Log action specific records. .IP "\fBu\fR" Log user requests. .IP "\fBc\fR"

1 0

Jens Reyer : winegcc: Document WINEBUILD in the manpage.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: stable Commit: 762e2f2ae7abd394a398710380148003e0fe3399 URL: http://source.winehq.org/git/wine.git/?a=commit;h=762e2f2ae7abd394a39871038… Author: Jens Reyer <jre.winesim(a)gmail.com> Date: Tue Mar 15 17:28:00 2016 +0100 winegcc: Document WINEBUILD in the manpage. Signed-off-by: Jens Reyer <jre.winesim(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d2d44610a2b66d8aff886729db03be7e7da09e6e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/winegcc/winegcc.man.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/winegcc/winegcc.man.in b/tools/winegcc/winegcc.man.in index f4fecc7..b4fc12d 100644 --- a/tools/winegcc/winegcc.man.in +++ b/tools/winegcc/winegcc.man.in @@ -67,6 +67,13 @@ Do not add the winecrt0 library when linking. .IP \fB-Wb,\fIoption\fR Pass an option to winebuild. If \fIoption\fR contains commas, it is split into multiple options at the commas. +.SH ENVIRONMENT +.TP +.B WINEBUILD +Specifies the path and name of the \fBwinebuild\fR binary that will be +launched automatically by \fBwinegcc\fR. +If not set, \fBwinegcc\fR will look for a file named \fIwinebuild\fR +in the path. .SH DEFINES winegcc defines __WINE__, for code that needs to know when it is being compiled under Wine. It also defines WIN32, _WIN32, __WIN32,

1 0

Caron Wills : wined3d: Add Nvidia GeForce GTX 850M.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: stable Commit: b4ee32929c077567ef10f322d06bd9d1762e9168 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4ee32929c077567ef10f322d… Author: Caron Wills <caron(a)codeweavers.com> Date: Tue Apr 19 19:33:49 2016 +0000 wined3d: Add Nvidia GeForce GTX 850M. Signed-off-by: Caron Wills <caron(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e44e6b2244154c9e00f48179737c2b5d1e328201) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 2edfb7c..55a5b68 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1283,6 +1283,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_830M, "NVIDIA GeForce 830M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_840M, "NVIDIA GeForce 840M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_845M, "NVIDIA GeForce 845M", DRIVER_NVIDIA_GEFORCE8, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX850M, "NVIDIA GeForce GTX 850M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX860M, "NVIDIA GeForce GTX 860M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950, "NVIDIA GeForce GTX 950", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950M, "NVIDIA GeForce GTX 950M", DRIVER_NVIDIA_GEFORCE8, 4096}, @@ -1738,6 +1739,7 @@ cards_nvidia_binary[] = {"GTX 950M", CARD_NVIDIA_GEFORCE_GTX950M}, /* GeForce 900 - midend mobile */ {"GTX 950", CARD_NVIDIA_GEFORCE_GTX950}, /* GeForce 900 - midend */ {"GTX 860M", CARD_NVIDIA_GEFORCE_GTX860M}, /* GeForce 800 - mobile */ + {"GTX 850M", CARD_NVIDIA_GEFORCE_GTX850M}, /* GeForce 800 - mobile */ {"GeForce 845M", CARD_NVIDIA_GEFORCE_845M}, /* GeForce 800 - mobile */ {"GeForce 840M", CARD_NVIDIA_GEFORCE_840M}, /* GeForce 800 - mobile */ {"GeForce 830M", CARD_NVIDIA_GEFORCE_830M}, /* GeForce 800 - mobile */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 381de33..de7256a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1628,6 +1628,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_830M = 0x1340, CARD_NVIDIA_GEFORCE_840M = 0x1341, CARD_NVIDIA_GEFORCE_845M = 0x1344, + CARD_NVIDIA_GEFORCE_GTX850M = 0x1391, CARD_NVIDIA_GEFORCE_GTX860M = 0x1392, /* Other PCI ID 0x119a */ CARD_NVIDIA_GEFORCE_GTX950 = 0x1402, CARD_NVIDIA_GEFORCE_GTX950M = 0x139a,

1 0

Kim Malmo : wined3d: Add Nvidia 9700M GT.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: stable Commit: e44f66a77bddd966c7b84a6f4b0d8ea22f84d95c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e44f66a77bddd966c7b84a6f4… Author: Kim Malmo <berencamlost(a)msn.com> Date: Tue Apr 19 18:34:10 2016 +0200 wined3d: Add Nvidia 9700M GT. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5f4c496480d2b07711e37185de616b4d8304e4e5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6a0cfbf..2edfb7c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1223,6 +1223,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9400GT, "NVIDIA GeForce 9400 GT", DRIVER_NVIDIA_GEFORCE8, 256 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9500GT, "NVIDIA GeForce 9500 GT", DRIVER_NVIDIA_GEFORCE8, 256 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9600GT, "NVIDIA GeForce 9600 GT", DRIVER_NVIDIA_GEFORCE8, 384 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9700MGT, "NVIDIA GeForce 9700M GT", DRIVER_NVIDIA_GEFORCE8, 512 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9800GT, "NVIDIA GeForce 9800 GT", DRIVER_NVIDIA_GEFORCE8, 512 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_210, "NVIDIA GeForce 210", DRIVER_NVIDIA_GEFORCE8, 512 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT220, "NVIDIA GeForce GT 220", DRIVER_NVIDIA_GEFORCE8, 512 }, @@ -1806,6 +1807,7 @@ cards_nvidia_binary[] = {"GTS 250", CARD_NVIDIA_GEFORCE_9800GT}, /* Geforce 9 - highend / Geforce 200 - midend */ {"GTS 150", CARD_NVIDIA_GEFORCE_9800GT}, /* Geforce 9 - highend / Geforce 200 - midend */ {"9800", CARD_NVIDIA_GEFORCE_9800GT}, /* Geforce 9 - highend / Geforce 200 - midend */ + {"9700M GT", CARD_NVIDIA_GEFORCE_9700MGT}, /* Geforce 9 - midend */ {"GT 140", CARD_NVIDIA_GEFORCE_9600GT}, /* Geforce 9 - midend */ {"9600", CARD_NVIDIA_GEFORCE_9600GT}, /* Geforce 9 - midend */ {"GT 130", CARD_NVIDIA_GEFORCE_9500GT}, /* Geforce 9 - midend low / Geforce 200 - low */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 70e8af0..381de33 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1568,6 +1568,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_9400GT = 0x042c, CARD_NVIDIA_GEFORCE_9500GT = 0x0640, CARD_NVIDIA_GEFORCE_9600GT = 0x0622, + CARD_NVIDIA_GEFORCE_9700MGT = 0x064a, CARD_NVIDIA_GEFORCE_9800GT = 0x0614, CARD_NVIDIA_GEFORCE_210 = 0x0a23, CARD_NVIDIA_GEFORCE_GT220 = 0x0a20,

1 0

Caron Wills : wined3d: Add Nvidia GeForce 820M.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: stable Commit: 4141d3ecbe13e1ad890a380f2c7102e0b364ba51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4141d3ecbe13e1ad890a380f2… Author: Caron Wills <caron(a)codeweavers.com> Date: Wed Apr 6 14:06:54 2016 +0000 wined3d: Add Nvidia GeForce 820M. Signed-off-by: Caron Wills <caron(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9ecc547c6a91f3fdfe4cddf99690d4613865992b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 3 +++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d7c4563..e3ff8e7 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1278,6 +1278,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780, "NVIDIA GeForce GTX 780", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780TI, "NVIDIA GeForce GTX 780 Ti", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTXTITAN, "NVIDIA GeForce GTX TITAN Black", DRIVER_NVIDIA_GEFORCE8, 6144}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_820M, "NVIDIA GeForce 820M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX860M, "NVIDIA GeForce GTX 860M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950, "NVIDIA GeForce GTX 950", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950M, "NVIDIA GeForce GTX 950M", DRIVER_NVIDIA_GEFORCE8, 4096}, @@ -1733,6 +1734,7 @@ cards_nvidia_binary[] = {"GTX 950M", CARD_NVIDIA_GEFORCE_GTX950M}, /* GeForce 900 - midend mobile */ {"GTX 950", CARD_NVIDIA_GEFORCE_GTX950}, /* GeForce 900 - midend */ {"GTX 860M", CARD_NVIDIA_GEFORCE_GTX860M}, /* GeForce 800 - mobile */ + {"GeForce 820M", CARD_NVIDIA_GEFORCE_820M}, /* GeForce 800 - mobile */ {"GTX 780 Ti", CARD_NVIDIA_GEFORCE_GTX780TI}, /* Geforce 700 - highend */ {"GTX TITAN Black", CARD_NVIDIA_GEFORCE_GTXTITAN}, /* Geforce 700 - highend */ {"GTX 780", CARD_NVIDIA_GEFORCE_GTX780}, /* Geforce 700 - highend */ @@ -2098,6 +2100,7 @@ cards_nvidia_mesa[] = {"NVE4", CARD_NVIDIA_GEFORCE_GTX680}, /* Fermi */ {"NVD9", CARD_NVIDIA_GEFORCE_GT520}, + {"NVD7", CARD_NVIDIA_GEFORCE_820M}, {"NVCF", CARD_NVIDIA_GEFORCE_GTX550}, {"NVCE", CARD_NVIDIA_GEFORCE_GTX560}, {"NVC8", CARD_NVIDIA_GEFORCE_GTX570}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c5a00c8..34165ea 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1623,6 +1623,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX780 = 0x1004, CARD_NVIDIA_GEFORCE_GTX780TI = 0x100a, CARD_NVIDIA_GEFORCE_GTXTITAN = 0x100c, + CARD_NVIDIA_GEFORCE_820M = 0x0fed, CARD_NVIDIA_GEFORCE_GTX860M = 0x1392, /* Other PCI ID 0x119a */ CARD_NVIDIA_GEFORCE_GTX950 = 0x1402, CARD_NVIDIA_GEFORCE_GTX950M = 0x139a,

1 0