November 2016 - Wine-commits

Hadrien Boizard : uxtheme: Use straight assignments instead of CopyRect().
by Alexandre Julliard 08 Nov '16

08 Nov '16

Module: wine Branch: master Commit: 3155079e413de5afc1c1f3194ff663efbdc0dfb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3155079e413de5afc1c1f3194… Author: Hadrien Boizard <h.boizard(a)gmail.com> Date: Fri Nov 4 16:56:23 2016 +0100 uxtheme: Use straight assignments instead of CopyRect(). Signed-off-by: Hadrien Boizard <h.boizard(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/draw.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 2a37a56..e917dd1 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -686,7 +686,7 @@ static HRESULT UXTHEME_DrawImageBackground(HTHEME hTheme, HDC hdc, int iPartId, } oldSrc = SelectObject(hdcSrc, bmpSrc); - CopyRect(&rcDst, pRect); + rcDst = *pRect; get_transparency (hTheme, iPartId, iStateId, hasAlpha, &transparent, &transparentcolor, FALSE); @@ -863,7 +863,7 @@ draw_error: DeleteDC(hdcSrc); if (bmpSrcResized) DeleteObject(bmpSrcResized); if (hdcOrigSrc) DeleteDC(hdcOrigSrc); - CopyRect(pRect, &rcDst); + *pRect = rcDst; return hr; } @@ -1001,7 +1001,7 @@ static HRESULT UXTHEME_DrawBorderBackground(HTHEME hTheme, HDC hdc, int iPartId, HRESULT hr; RECT rt; - CopyRect(&rt, pRect); + rt = *pRect; hr = UXTHEME_DrawBorderRectangle(hTheme, hdc, iPartId, iStateId, &rt, pOptions); if(FAILED(hr)) @@ -1043,7 +1043,7 @@ HRESULT WINAPI DrawThemeBackgroundEx(HTHEME hTheme, HDC hdc, int iPartId, else IntersectClipRect(hdc, opts->rcClip.left, opts->rcClip.top, opts->rcClip.right, opts->rcClip.bottom); } - CopyRect(&rt, pRect); + rt = *pRect; if(bgtype == BT_IMAGEFILE) hr = UXTHEME_DrawImageBackground(hTheme, hdc, iPartId, iStateId, &rt, opts); @@ -1641,7 +1641,7 @@ HRESULT WINAPI DrawThemeText(HTHEME hTheme, HDC hdc, int iPartId, int iStateId, TRACE("%d %d\n", iPartId, iStateId); - CopyRect(&rt, pRect); + rt = *pRect; opts.dwSize = sizeof(opts); if (flags2 & DTT_GRAYED) { @@ -2033,7 +2033,7 @@ HRESULT WINAPI GetThemeTextExtent(HTHEME hTheme, HDC hdc, int iPartId, oldFont = SelectObject(hdc, hFont); DrawTextW(hdc, pszText, iCharCount, &rt, dwTextFlags|DT_CALCRECT); - CopyRect(pExtentRect, &rt); + *pExtentRect = rt; if(hFont) { SelectObject(hdc, oldFont);

1 0

Alistair Leslie-Hughes : setupapi: Add SetupDiGetDevicePropertyW stub.
by Alexandre Julliard 08 Nov '16

08 Nov '16

Module: wine Branch: master Commit: b32a0eaab9971af4045d6def9c4b2ebaa336636a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b32a0eaab9971af4045d6def9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Nov 4 06:55:22 2016 +0000 setupapi: Add SetupDiGetDevicePropertyW stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 14 ++++++++++++++ dlls/setupapi/setupapi.spec | 1 + include/setupapi.h | 4 ++++ 3 files changed, 19 insertions(+) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 02e75b6..ef1a6b7 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -4143,3 +4143,17 @@ BOOL WINAPI SetupDiGetINFClassW(PCWSTR inf, LPGUID class_guid, PWSTR class_name, return (have_guid || have_name); } + +/*********************************************************************** + * SetupDiGetDevicePropertyW (SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetDevicePropertyW(HDEVINFO info_set, PSP_DEVINFO_DATA info_data, + const DEVPROPKEY *prop_key, DEVPROPTYPE *prop_type, BYTE *prop_buff, + DWORD prop_buff_size, DWORD *required_size, DWORD flags) +{ + FIXME("%p, %p, %p, %p, %p, %d, %p, 0x%08x stub\n", info_set, info_data, prop_key, + prop_type, prop_buff, prop_buff_size, required_size, flags); + + SetLastError(ERROR_NOT_FOUND); + return FALSE; +} diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index cc873ae..da6bf5d 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -342,6 +342,7 @@ @ stub SetupDiGetDeviceInterfaceAlias @ stdcall SetupDiGetDeviceInterfaceDetailA(long ptr ptr long ptr ptr) @ stdcall SetupDiGetDeviceInterfaceDetailW(long ptr ptr long ptr ptr) +@ stdcall SetupDiGetDevicePropertyW(ptr ptr ptr ptr ptr long ptr long) @ stdcall SetupDiGetDeviceRegistryPropertyA(long ptr long ptr ptr long ptr) @ stdcall SetupDiGetDeviceRegistryPropertyW(long ptr long ptr ptr long ptr) @ stub SetupDiGetDriverInfoDetailA diff --git a/include/setupapi.h b/include/setupapi.h index 0d6911d..76e255c 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -1564,8 +1564,12 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailA(HDEVINFO, PSP_DEVICE_INTERFACE_ BOOL WINAPI SetupDiGetDeviceInterfaceDetailW(HDEVINFO, PSP_DEVICE_INTERFACE_DATA, PSP_DEVICE_INTERFACE_DETAIL_DATA_W, DWORD, PDWORD, PSP_DEVINFO_DATA); #define SetupDiGetDeviceInterfaceDetail WINELIB_NAME_AW(SetupDiGetDeviceInterfaceDetail) +BOOL WINAPI SetupDiGetDevicePropertyW(HDEVINFO, PSP_DEVINFO_DATA, const DEVPROPKEY *, DEVPROPTYPE *, BYTE *, DWORD, + DWORD *, DWORD); +#define SetupDiGetDeviceProperty WINELIB_NAME_AW(SetupDiGetDeviceProperty) /* note: A function doesn't exist */ BOOL WINAPI SetupDiGetDeviceRegistryPropertyA(HDEVINFO, PSP_DEVINFO_DATA, DWORD, PDWORD, PBYTE, DWORD, PDWORD); BOOL WINAPI SetupDiGetDeviceRegistryPropertyW(HDEVINFO, PSP_DEVINFO_DATA, DWORD, PDWORD, PBYTE, DWORD, PDWORD); +#define SetupDiGetDeviceRegistryProperty WINELIB_NAME_AW(SetupDiGetDeviceRegistryProperty) BOOL WINAPI SetupDiGetDriverInfoDetailA(HDEVINFO, PSP_DEVINFO_DATA, PSP_DRVINFO_DATA_A, PSP_DRVINFO_DETAIL_DATA_A, DWORD, PDWORD); BOOL WINAPI SetupDiGetDriverInfoDetailW(HDEVINFO, PSP_DEVINFO_DATA, PSP_DRVINFO_DATA_W, PSP_DRVINFO_DETAIL_DATA_W, DWORD, PDWORD); #define SetupDiGetDriverInfoDetail WINELIB_NAME_AW(SetupDiGetDriverInfoDetail)

1 0

Józef Kucia : d3d8/tests: Accept broken behavior for lost device tests.
by Alexandre Julliard 08 Nov '16

08 Nov '16

Module: wine Branch: master Commit: a291270d5c44897e033e7dc52ac2a8525d305224 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a291270d5c44897e033e7dc52… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 8 12:11:51 2016 +0100 d3d8/tests: Accept broken behavior for lost device tests. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index a912592..2b38f17 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -7593,18 +7593,19 @@ static void test_lost_device(void) ret = SetForegroundWindow(GetDesktopWindow()); ok(ret, "Failed to set foreground window.\n"); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); - ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); + /* The device is not lost on Windows 10. */ + ok(hr == D3DERR_DEVICELOST || broken(hr == D3D_OK), "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice8_TestCooperativeLevel(device); - ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_DEVICELOST || broken(hr == D3D_OK), "Got unexpected hr %#x.\n", hr); ret = ShowWindow(window, SW_RESTORE); ok(ret, "Failed to restore window.\n"); ret = SetForegroundWindow(window); ok(ret, "Failed to set foreground window.\n"); hr = IDirect3DDevice8_TestCooperativeLevel(device); - ok(hr == D3DERR_DEVICENOTRESET, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_DEVICENOTRESET || broken(hr == D3D_OK), "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); - ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_DEVICELOST || broken(hr == D3D_OK), "Got unexpected hr %#x.\n", hr); hr = reset_device(device, &device_desc); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); @@ -7639,14 +7640,15 @@ static void test_lost_device(void) hr = reset_device(device, &device_desc); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice8_TestCooperativeLevel(device); - todo_wine ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); + /* The device is not lost on Windows 10. */ + todo_wine ok(hr == D3DERR_DEVICELOST || broken(hr == D3D_OK), "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); - todo_wine ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); + todo_wine ok(hr == D3DERR_DEVICELOST || broken(hr == D3D_OK), "Got unexpected hr %#x.\n", hr); ret = SetForegroundWindow(GetDesktopWindow()); ok(ret, "Failed to set foreground window.\n"); hr = reset_device(device, &device_desc); - ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_DEVICELOST || broken(hr == D3D_OK), "Got unexpected hr %#x.\n", hr); ret = ShowWindow(window, SW_RESTORE); ok(ret, "Failed to restore window.\n"); ret = SetForegroundWindow(window);

1 0

Andrey Gusev : api-ms-win-dx-d3dkmt-l1-1-0: Add dll.
by Alexandre Julliard 08 Nov '16

08 Nov '16

Module: wine Branch: master Commit: d4fab3b42b485e403ef67099c4a90b6a9d36be26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4fab3b42b485e403ef67099c… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Nov 8 14:56:39 2016 +0200 api-ms-win-dx-d3dkmt-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/api-ms-win-dx-d3dkmt-l1-1-0/Makefile.in | 1 + .../api-ms-win-dx-d3dkmt-l1-1-0.spec | 97 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 102 insertions(+) diff --git a/configure b/configure index 663677e..3e183c2 100755 --- a/configure +++ b/configure @@ -1004,6 +1004,7 @@ enable_api_ms_win_downlevel_shlwapi_l1_1_0 enable_api_ms_win_downlevel_shlwapi_l2_1_0 enable_api_ms_win_downlevel_user32_l1_1_0 enable_api_ms_win_downlevel_version_l1_1_0 +enable_api_ms_win_dx_d3dkmt_l1_1_0 enable_api_ms_win_eventing_classicprovider_l1_1_0 enable_api_ms_win_eventing_consumer_l1_1_0 enable_api_ms_win_eventing_controller_l1_1_0 @@ -17710,6 +17711,7 @@ wine_fn_config_dll api-ms-win-downlevel-shlwapi-l1-1-0 enable_api_ms_win_downlev wine_fn_config_dll api-ms-win-downlevel-shlwapi-l2-1-0 enable_api_ms_win_downlevel_shlwapi_l2_1_0 wine_fn_config_dll api-ms-win-downlevel-user32-l1-1-0 enable_api_ms_win_downlevel_user32_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-version-l1-1-0 enable_api_ms_win_downlevel_version_l1_1_0 +wine_fn_config_dll api-ms-win-dx-d3dkmt-l1-1-0 enable_api_ms_win_dx_d3dkmt_l1_1_0 wine_fn_config_dll api-ms-win-eventing-classicprovider-l1-1-0 enable_api_ms_win_eventing_classicprovider_l1_1_0 wine_fn_config_dll api-ms-win-eventing-consumer-l1-1-0 enable_api_ms_win_eventing_consumer_l1_1_0 wine_fn_config_dll api-ms-win-eventing-controller-l1-1-0 enable_api_ms_win_eventing_controller_l1_1_0 diff --git a/configure.ac b/configure.ac index 6c8d671..8fb0de1 100644 --- a/configure.ac +++ b/configure.ac @@ -2781,6 +2781,7 @@ WINE_CONFIG_DLL(api-ms-win-downlevel-shlwapi-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-shlwapi-l2-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-user32-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-version-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-dx-d3dkmt-l1-1-0) WINE_CONFIG_DLL(api-ms-win-eventing-classicprovider-l1-1-0) WINE_CONFIG_DLL(api-ms-win-eventing-consumer-l1-1-0) WINE_CONFIG_DLL(api-ms-win-eventing-controller-l1-1-0) diff --git a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/Makefile.in b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/Makefile.in new file mode 100644 index 0000000..02499fa --- /dev/null +++ b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-dx-d3dkmt-l1-1-0.dll diff --git a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec new file mode 100644 index 0000000..15a2d1d --- /dev/null +++ b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec @@ -0,0 +1,97 @@ +@ stub D3DKMTAcquireKeyedMutex +@ stub D3DKMTAcquireKeyedMutex2 +@ stub D3DKMTCacheHybridQueryValue +@ stub D3DKMTCheckExclusiveOwnership +@ stub D3DKMTCheckMonitorPowerState +@ stub D3DKMTCheckOcclusion +@ stub D3DKMTCheckSharedResourceAccess +@ stub D3DKMTCheckVidPnExclusiveOwnership +@ stub D3DKMTCloseAdapter +@ stub D3DKMTConfigureSharedResource +@ stub D3DKMTCreateAllocation +@ stub D3DKMTCreateAllocation2 +@ stub D3DKMTCreateContext +@ stdcall D3DKMTCreateDCFromMemory(ptr) gdi32.D3DKMTCreateDCFromMemory +@ stub D3DKMTCreateDevice +@ stub D3DKMTCreateKeyedMutex +@ stub D3DKMTCreateKeyedMutex2 +@ stub D3DKMTCreateOutputDupl +@ stub D3DKMTCreateOverlay +@ stub D3DKMTCreateSynchronizationObject +@ stub D3DKMTCreateSynchronizationObject2 +@ stub D3DKMTDestroyAllocation +@ stub D3DKMTDestroyContext +@ stdcall D3DKMTDestroyDCFromMemory(ptr) gdi32.D3DKMTDestroyDCFromMemory +@ stub D3DKMTDestroyDevice +@ stub D3DKMTDestroyKeyedMutex +@ stub D3DKMTDestroyOutputDupl +@ stub D3DKMTDestroyOverlay +@ stub D3DKMTDestroySynchronizationObject +@ stdcall D3DKMTEscape(ptr) gdi32.D3DKMTEscape +@ stub D3DKMTFlipOverlay +@ stub D3DKMTGetCachedHybridQueryValue +@ stub D3DKMTGetContextSchedulingPriority +@ stub D3DKMTGetDeviceState +@ stub D3DKMTGetDisplayModeList +@ stub D3DKMTGetMultisampleMethodList +@ stub D3DKMTGetOverlayState +@ stub D3DKMTGetPresentHistory +@ stub D3DKMTGetPresentQueueEvent +@ stub D3DKMTGetProcessSchedulingPriorityClass +@ stub D3DKMTGetRuntimeData +@ stub D3DKMTGetScanLine +@ stub D3DKMTGetSharedPrimaryHandle +@ stub D3DKMTGetSharedResourceAdapterLuid +@ stub D3DKMTInvalidateActiveVidPn +@ stub D3DKMTLock +@ stub D3DKMTOfferAllocations +@ stub D3DKMTOpenAdapterFromDeviceName +@ stub D3DKMTOpenAdapterFromGdiDisplayName +@ stdcall D3DKMTOpenAdapterFromHdc(ptr) gdi32.D3DKMTOpenAdapterFromHdc +@ stub D3DKMTOpenKeyedMutex +@ stub D3DKMTOpenKeyedMutex2 +@ stub D3DKMTOpenNtHandleFromName +@ stub D3DKMTOpenResource +@ stub D3DKMTOpenResource2 +@ stub D3DKMTOpenResourceFromNtHandle +@ stub D3DKMTOpenSynchronizationObject +@ stub D3DKMTOpenSyncObjectFromNtHandle +@ stub D3DKMTOutputDuplGetFrameInfo +@ stub D3DKMTOutputDuplGetMetaData +@ stub D3DKMTOutputDuplGetPointerShapeData +@ stub D3DKMTOutputDuplPresent +@ stub D3DKMTOutputDuplReleaseFrame +@ stub D3DKMTPollDisplayChildren +@ stub D3DKMTPresent +@ stub D3DKMTQueryAdapterInfo +@ stub D3DKMTQueryAllocationResidency +@ stub D3DKMTQueryRemoteVidPnSourceFromGdiDisplayName +@ stub D3DKMTQueryResourceInfo +@ stub D3DKMTQueryResourceInfoFromNtHandle +@ stub D3DKMTQueryStatistics +@ stub D3DKMTReclaimAllocations +@ stub D3DKMTReleaseKeyedMutex +@ stub D3DKMTReleaseKeyedMutex2 +@ stub D3DKMTReleaseProcessVidPnSourceOwners +@ stub D3DKMTRender +@ stub D3DKMTSetAllocationPriority +@ stub D3DKMTSetContextSchedulingPriority +@ stub D3DKMTSetDisplayMode +@ stub D3DKMTSetDisplayPrivateDriverFormat +@ stub D3DKMTSetGammaRamp +@ stub D3DKMTSetProcessSchedulingPriorityClass +@ stub D3DKMTSetQueuedLimit +@ stub D3DKMTSetStereoEnabled +@ stub D3DKMTSetVidPnSourceOwner +@ stub D3DKMTSharedPrimaryLockNotification +@ stub D3DKMTSharedPrimaryUnLockNotification +@ stub D3DKMTShareObjects +@ stub D3DKMTSignalSynchronizationObject +@ stub D3DKMTSignalSynchronizationObject2 +@ stub D3DKMTUnlock +@ stub D3DKMTUpdateOverlay +@ stub D3DKMTWaitForIdle +@ stub D3DKMTWaitForSynchronizationObject +@ stub D3DKMTWaitForSynchronizationObject2 +@ stub D3DKMTWaitForVerticalBlankEvent +@ stdcall GdiEntry13() gdi32.GdiEntry13 diff --git a/tools/make_specfiles b/tools/make_specfiles index 13e7bba..fc3bb5e 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -293,6 +293,7 @@ my @dll_groups = ], [ "gdi32", + "api-ms-win-dx-d3dkmt-l1-1-0", "ext-ms-win-gdi-dc-create-l1-1-1", "ext-ms-win-gdi-dc-l1-2-0", "ext-ms-win-gdi-devcaps-l1-1-0",

1 0

Huw Davies : rsaenh/tests: Skip broken TLS1 tests on Windows 8 and greater.
by Alexandre Julliard 08 Nov '16

08 Nov '16

Module: wine Branch: master Commit: 0a17b701403411804d401416aff970a229b517f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a17b701403411804d401416a… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 7 17:03:47 2016 +0000 rsaenh/tests: Skip broken TLS1 tests on Windows 8 and greater. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/tests/rsaenh.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index ebdbba8..4286db0 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -2801,8 +2801,18 @@ static void test_schannel_provider(void) if (!result) return; result = CryptCreateHash(hProv, CALG_SCHANNEL_MASTER_HASH, hMasterSecret, 0, &hMasterHash); - ok (result, "%08x\n", GetLastError()); - if (!result) return; + ok (result || + broken(!result), /* Windows 8 and greater */ + "%08x\n", GetLastError()); + if (!result) + { + win_skip("Broken TLS1 hash creation\n"); + CryptDestroyKey(hRSAKey); + CryptDestroyKey(hMasterSecret); + CryptReleaseContext(hProv, 0); + CryptAcquireContextA(&hProv, NULL, NULL, PROV_RSA_SCHANNEL, CRYPT_DELETEKEYSET); + return; + } /* Deriving the server write encryption key from the master hash can't * succeed before the encryption key algorithm is set.

1 0

Aric Stewart : winebus.sys: Add OS/X IOHID bus.
by Alexandre Julliard 08 Nov '16

08 Nov '16

Module: wine Branch: master Commit: 8284be37fc40657301b0ca14f26274d87d8a2b9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8284be37fc40657301b0ca14f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Nov 7 13:42:23 2016 -0600 winebus.sys: Add OS/X IOHID bus. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/Makefile.in | 3 +- dlls/winebus.sys/bus.h | 1 + dlls/winebus.sys/bus_iohid.c | 265 +++++++++++++++++++++++++++++++++++++++++++ dlls/winebus.sys/main.c | 3 + 4 files changed, 271 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8284be37fc40657301b0c…

1 0

Aric Stewart : winebus.sys: Implement removing IOHID devices.
by Alexandre Julliard 08 Nov '16

08 Nov '16

Module: wine Branch: master Commit: 3b132cb9ec91b903ba3da19b019fc8b8e94b4554 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b132cb9ec91b903ba3da19b0… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Nov 7 13:42:27 2016 -0600 winebus.sys: Implement removing IOHID devices. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_iohid.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index 866241e..76db0a2 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -130,7 +130,12 @@ static DWORD CFNumberToDWORD(CFNumberRef num) static int compare_platform_device(DEVICE_OBJECT *device, void *platform_dev) { - return 0; + struct platform_private *private = impl_from_DEVICE_OBJECT(device); + IOHIDDeviceRef dev2 = (IOHIDDeviceRef)platform_dev; + if (private->device != dev2) + return 1; + else + return 0; } static NTSTATUS get_reportdescriptor(DEVICE_OBJECT *device, BYTE *buffer, DWORD length, DWORD *out_length) @@ -207,6 +212,18 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void * } } +static void handle_RemovalCallback(void *context, IOReturn result, void *sender, IOHIDDeviceRef IOHIDDevice) +{ + DEVICE_OBJECT *device; + TRACE("OS/X IOHID Device Removed %p\n", IOHIDDevice); + device = bus_find_hid_device(&iohid_vtbl, IOHIDDevice); + if (device) + { + IoInvalidateDeviceRelations(device, RemovalRelations); + bus_remove_hid_device(device); + } +} + /* This puts the relevant run loop for event handling into a WINE thread */ static DWORD CALLBACK runloop_thread(void *args) { @@ -214,6 +231,7 @@ static DWORD CALLBACK runloop_thread(void *args) IOHIDManagerSetDeviceMatching(hid_manager, NULL); IOHIDManagerRegisterDeviceMatchingCallback(hid_manager, handle_DeviceMatchingCallback, NULL); + IOHIDManagerRegisterDeviceRemovalCallback(hid_manager, handle_RemovalCallback, NULL); IOHIDManagerScheduleWithRunLoop(hid_manager, run_loop, kCFRunLoopDefaultMode); if (IOHIDManagerOpen( hid_manager, 0 ) != kIOReturnSuccess) { @@ -227,6 +245,7 @@ static DWORD CALLBACK runloop_thread(void *args) TRACE("Run Loop exiting\n"); IOHIDManagerRegisterDeviceMatchingCallback(hid_manager, NULL, NULL); + IOHIDManagerRegisterDeviceRemovalCallback(hid_manager, NULL, NULL); IOHIDManagerUnscheduleFromRunLoop(hid_manager, run_loop, kCFRunLoopDefaultMode); CFRelease(hid_manager); return 1;

1 0

Aric Stewart : winebus.sys: IOCTL_HID_GET_DEVICE_DESCRIPTOR for iohid.
by Alexandre Julliard 08 Nov '16

08 Nov '16

Module: wine Branch: master Commit: 7221693538d1dfa814cf5cefd22d49f5efc8527d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7221693538d1dfa814cf5cefd… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Nov 7 13:42:31 2016 -0600 winebus.sys: IOCTL_HID_GET_DEVICE_DESCRIPTOR for iohid. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_iohid.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index 76db0a2..50b5d76 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -140,7 +140,18 @@ static int compare_platform_device(DEVICE_OBJECT *device, void *platform_dev) static NTSTATUS get_reportdescriptor(DEVICE_OBJECT *device, BYTE *buffer, DWORD length, DWORD *out_length) { - return STATUS_NOT_IMPLEMENTED; + struct platform_private *private = impl_from_DEVICE_OBJECT(device); + CFDataRef data = IOHIDDeviceGetProperty(private->device, CFSTR(kIOHIDReportDescriptorKey)); + int data_length = CFDataGetLength(data); + const UInt8 *ptr; + + *out_length = data_length; + if (length < data_length) + return STATUS_BUFFER_TOO_SMALL; + + ptr = CFDataGetBytePtr(data); + memcpy(buffer, ptr, data_length); + return STATUS_SUCCESS; } static NTSTATUS get_string(DEVICE_OBJECT *device, DWORD index, WCHAR *buffer, DWORD length)

1 0

Nikolay Sivov : d3dx10: Implement async data loader interfaces.
by Alexandre Julliard 08 Nov '16

08 Nov '16

Module: wine Branch: master Commit: 16433fa6f61923eaf822cb17ba433cb15f85891d URL: http://source.winehq.org/git/wine.git/?a=commit;h=16433fa6f61923eaf822cb17b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 7 22:41:30 2016 +0100 d3dx10: Implement async data loader interfaces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/async.c | 314 ++++++++++++++++++++++++++++++++++++++++-- dlls/d3dx10_43/tests/d3dx10.c | 118 +++++++++++++--- 2 files changed, 406 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=16433fa6f61923eaf822c…

1 0

Nikolay Sivov : d2d1: Added support for D2D1_DRAW_TEXT_OPTIONS_ENABLE_COLOR_FONT.
by Alexandre Julliard 08 Nov '16

08 Nov '16

Module: wine Branch: master Commit: cec2be48c632716de851960f7840dc905ad163e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cec2be48c632716de851960f7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 7 23:19:14 2016 +0300 d2d1: Added support for D2D1_DRAW_TEXT_OPTIONS_ENABLE_COLOR_FONT. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 2 +- dlls/d2d1/render_target.c | 90 +++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 88 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 021a703..a6bc4f3 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -28,7 +28,7 @@ #ifdef D2D1_INIT_GUID #include "initguid.h" #endif -#include "dwrite.h" +#include "dwrite_2.h" enum d2d_brush_type { diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 798dd0d..d4c812b 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -1565,6 +1565,7 @@ static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawGlyphRun(IDWriteTextRende struct d2d_d3d_render_target *render_target = impl_from_IDWriteTextRenderer(iface); D2D1_POINT_2F baseline_origin = {baseline_origin_x, baseline_origin_y}; struct d2d_draw_text_layout_ctx *context = ctx; + BOOL color_font = FALSE; ID2D1Brush *brush; TRACE("iface %p, ctx %p, baseline_origin_x %.8e, baseline_origin_y %.8e, " @@ -1574,14 +1575,97 @@ static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawGlyphRun(IDWriteTextRende if (desc) WARN("Ignoring glyph run description %p.\n", desc); - if (context->options & ~D2D1_DRAW_TEXT_OPTIONS_NO_SNAP) + if (context->options & ~(D2D1_DRAW_TEXT_OPTIONS_NO_SNAP | D2D1_DRAW_TEXT_OPTIONS_ENABLE_COLOR_FONT)) FIXME("Ignoring options %#x.\n", context->options); brush = d2d_draw_get_text_brush(context, effect); TRACE("%s\n", debugstr_wn(desc->string, desc->stringLength)); - ID2D1RenderTarget_DrawGlyphRun(&render_target->ID2D1RenderTarget_iface, - baseline_origin, glyph_run, brush, measuring_mode); + + if (context->options & D2D1_DRAW_TEXT_OPTIONS_ENABLE_COLOR_FONT) + { + IDWriteFontFace2 *fontface; + + if (SUCCEEDED(IDWriteFontFace_QueryInterface(glyph_run->fontFace, + &IID_IDWriteFontFace2, (void **)&fontface))) + { + color_font = IDWriteFontFace2_IsColorFont(fontface); + IDWriteFontFace2_Release(fontface); + } + } + + if (color_font) + { + IDWriteColorGlyphRunEnumerator *layers; + IDWriteFactory2 *dwrite_factory; + HRESULT hr; + + if (FAILED(hr = DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, &IID_IDWriteFactory2, + (IUnknown **)&dwrite_factory))) + { + ERR("Failed to create dwrite factory, hr %#x.\n", hr); + ID2D1Brush_Release(brush); + return hr; + } + + hr = IDWriteFactory2_TranslateColorGlyphRun(dwrite_factory, baseline_origin_x, baseline_origin_y, + glyph_run, desc, measuring_mode, (DWRITE_MATRIX *)&render_target->drawing_state.transform, 0, &layers); + IDWriteFactory2_Release(dwrite_factory); + if (FAILED(hr)) + { + ERR("Failed to create color glyph run enumerator, hr %#x.\n", hr); + ID2D1Brush_Release(brush); + return hr; + } + + for (;;) + { + const DWRITE_COLOR_GLYPH_RUN *color_run; + ID2D1Brush *color_brush; + D2D1_POINT_2F origin; + BOOL has_run = FALSE; + + if (FAILED(hr = IDWriteColorGlyphRunEnumerator_MoveNext(layers, &has_run))) + { + ERR("Failed to switch color glyph layer, hr %#x.\n", hr); + break; + } + + if (!has_run) + break; + + if (FAILED(hr = IDWriteColorGlyphRunEnumerator_GetCurrentRun(layers, &color_run))) + { + ERR("Failed to get current color run, hr %#x.\n", hr); + break; + } + + if (color_run->paletteIndex == 0xffff) + color_brush = brush; + else + { + if (FAILED(hr = ID2D1RenderTarget_CreateSolidColorBrush(&render_target->ID2D1RenderTarget_iface, + &color_run->runColor, NULL, (ID2D1SolidColorBrush **)&color_brush))) + { + ERR("Failed to create solid color brush, hr %#x.\n", hr); + break; + } + } + + origin.x = color_run->baselineOriginX; + origin.y = color_run->baselineOriginY; + ID2D1RenderTarget_DrawGlyphRun(&render_target->ID2D1RenderTarget_iface, + origin, &color_run->glyphRun, color_brush, measuring_mode); + + if (color_brush != brush) + ID2D1Brush_Release(color_brush); + } + + IDWriteColorGlyphRunEnumerator_Release(layers); + } + else + ID2D1RenderTarget_DrawGlyphRun(&render_target->ID2D1RenderTarget_iface, + baseline_origin, glyph_run, brush, measuring_mode); ID2D1Brush_Release(brush);

1 0