November 2016 - Wine-Commits

Józef Kucia : wined3d: Add support for WINED3DFMT_R32_SINT format.
by Alexandre Julliard Nov. 8, 2016

Nov. 8, 2016

Module: wine Branch: master Commit: db4e9f7e1700795be34db083bfd5064ce04c37ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=db4e9f7e1700795be34db083b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 8 12:11:48 2016 +0100 wined3d: Add support for WINED3DFMT_R32_SINT format. 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/wined3d/utils.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 1b70e1c..d683203 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1310,6 +1310,10 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_RED_INTEGER, GL_UNSIGNED_INT, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET, ARB_TEXTURE_RG, NULL}, + {WINED3DFMT_R32_SINT, GL_R32I, GL_R32I, 0, + GL_RED_INTEGER, GL_INT, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET, + ARB_TEXTURE_RG, NULL}, {WINED3DFMT_R16_UNORM, GL_R16, GL_R16, 0, GL_RED, GL_UNSIGNED_SHORT, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING

1 0

Aric Stewart : winebus.sys: Implement removing IOHID devices.
by Alexandre Julliard Nov. 8, 2016

Nov. 8, 2016

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

Huw Davies : rsaenh/tests: Skip broken TLS1 tests on Windows 8 and greater.
by Alexandre Julliard Nov. 8, 2016

Nov. 8, 2016

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

Nikolay Sivov : d2d1: Added support for D2D1_DRAW_TEXT_OPTIONS_ENABLE_COLOR_FONT.
by Alexandre Julliard Nov. 8, 2016

Nov. 8, 2016

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

Andrey Gusev : ext-ms-win-rtcore-gdi-rgn-l1-1-0: Add dll.
by Alexandre Julliard Nov. 7, 2016

Nov. 7, 2016

Module: wine Branch: master Commit: e1ef6972aec91bae0764e9c4c1eb94a70872ed04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1ef6972aec91bae0764e9c4c… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sun Nov 6 00:45:42 2016 +0200 ext-ms-win-rtcore-gdi-rgn-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/ext-ms-win-rtcore-gdi-rgn-l1-1-0/Makefile.in | 1 + .../ext-ms-win-rtcore-gdi-rgn-l1-1-0.spec | 16 ++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 21 insertions(+) diff --git a/configure b/configure index ea52feb..1abd0b1 100755 --- a/configure +++ b/configure @@ -1175,6 +1175,7 @@ enable_ext_ms_win_ntuser_rectangle_ext_l1_1_0 enable_ext_ms_win_ntuser_uicontext_ext_l1_1_0 enable_ext_ms_win_ntuser_window_l1_1_1 enable_ext_ms_win_rtcore_gdi_object_l1_1_0 +enable_ext_ms_win_rtcore_gdi_rgn_l1_1_0 enable_ext_ms_win_rtcore_ntuser_dpi_l1_1_0 enable_ext_ms_win_rtcore_ntuser_sysparams_l1_1_0 enable_faultrep @@ -17944,6 +17945,7 @@ wine_fn_config_dll ext-ms-win-ntuser-rectangle-ext-l1-1-0 enable_ext_ms_win_ntus wine_fn_config_dll ext-ms-win-ntuser-uicontext-ext-l1-1-0 enable_ext_ms_win_ntuser_uicontext_ext_l1_1_0 wine_fn_config_dll ext-ms-win-ntuser-window-l1-1-1 enable_ext_ms_win_ntuser_window_l1_1_1 wine_fn_config_dll ext-ms-win-rtcore-gdi-object-l1-1-0 enable_ext_ms_win_rtcore_gdi_object_l1_1_0 +wine_fn_config_dll ext-ms-win-rtcore-gdi-rgn-l1-1-0 enable_ext_ms_win_rtcore_gdi_rgn_l1_1_0 wine_fn_config_dll ext-ms-win-rtcore-ntuser-dpi-l1-1-0 enable_ext_ms_win_rtcore_ntuser_dpi_l1_1_0 wine_fn_config_dll ext-ms-win-rtcore-ntuser-sysparams-l1-1-0 enable_ext_ms_win_rtcore_ntuser_sysparams_l1_1_0 wine_fn_config_dll faultrep enable_faultrep implib diff --git a/configure.ac b/configure.ac index 398e8e3..100fa35 100644 --- a/configure.ac +++ b/configure.ac @@ -3017,6 +3017,7 @@ WINE_CONFIG_DLL(ext-ms-win-ntuser-rectangle-ext-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-ntuser-uicontext-ext-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-ntuser-window-l1-1-1) WINE_CONFIG_DLL(ext-ms-win-rtcore-gdi-object-l1-1-0) +WINE_CONFIG_DLL(ext-ms-win-rtcore-gdi-rgn-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dpi-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-sysparams-l1-1-0) WINE_CONFIG_DLL(faultrep,,[implib]) diff --git a/dlls/ext-ms-win-rtcore-gdi-rgn-l1-1-0/Makefile.in b/dlls/ext-ms-win-rtcore-gdi-rgn-l1-1-0/Makefile.in new file mode 100644 index 0000000..72a632e --- /dev/null +++ b/dlls/ext-ms-win-rtcore-gdi-rgn-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-rtcore-gdi-rgn-l1-1-0.dll diff --git a/dlls/ext-ms-win-rtcore-gdi-rgn-l1-1-0/ext-ms-win-rtcore-gdi-rgn-l1-1-0.spec b/dlls/ext-ms-win-rtcore-gdi-rgn-l1-1-0/ext-ms-win-rtcore-gdi-rgn-l1-1-0.spec new file mode 100644 index 0000000..c716305 --- /dev/null +++ b/dlls/ext-ms-win-rtcore-gdi-rgn-l1-1-0/ext-ms-win-rtcore-gdi-rgn-l1-1-0.spec @@ -0,0 +1,16 @@ +@ stdcall CombineRgn(long long long long) gdi32.CombineRgn +@ stdcall CreatePolygonRgn(ptr long long) gdi32.CreatePolygonRgn +@ stdcall CreateRectRgn(long long long long) gdi32.CreateRectRgn +@ stdcall CreateRectRgnIndirect(ptr) gdi32.CreateRectRgnIndirect +@ stdcall EqualRgn(long long) gdi32.EqualRgn +@ stdcall ExtCreateRegion(ptr long ptr) gdi32.ExtCreateRegion +@ stdcall FillRgn(long long long) gdi32.FillRgn +@ stdcall GetRegionData(long long ptr) gdi32.GetRegionData +@ stdcall GetRgnBox(long ptr) gdi32.GetRgnBox +@ stdcall IntersectClipRect(long long long long long) gdi32.IntersectClipRect +@ stdcall OffsetRgn(long long long) gdi32.OffsetRgn +@ stdcall RectInRegion(long ptr) gdi32.RectInRegion +@ stdcall SelectClipRgn(long long) gdi32.SelectClipRgn +@ stdcall SetMetaRgn(long) gdi32.SetMetaRgn +@ stdcall SetPolyFillMode(long long) gdi32.SetPolyFillMode +@ stdcall SetRectRgn(long long long long long) gdi32.SetRectRgn diff --git a/tools/make_specfiles b/tools/make_specfiles index 5e5b7ba..56d5a89 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -298,6 +298,7 @@ my @dll_groups = "ext-ms-win-gdi-draw-l1-1-1", "ext-ms-win-gdi-render-l1-1-0", "ext-ms-win-rtcore-gdi-object-l1-1-0", + "ext-ms-win-rtcore-gdi-rgn-l1-1-0", ], [ "combase",

1 0

Andrey Gusev : ext-ms-win-rtcore-gdi-object-l1-1-0: Add dll.
by Alexandre Julliard Nov. 7, 2016

Nov. 7, 2016

Module: wine Branch: master Commit: 0f22cc7bdabce4891e4d226325ea385bf4ff7b9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f22cc7bdabce4891e4d22632… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sun Nov 6 00:27:45 2016 +0200 ext-ms-win-rtcore-gdi-object-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/ext-ms-win-rtcore-gdi-object-l1-1-0/Makefile.in | 1 + .../ext-ms-win-rtcore-gdi-object-l1-1-0.spec | 1 + tools/make_specfiles | 1 + 5 files changed, 6 insertions(+) diff --git a/configure b/configure index 0a9d665..ea52feb 100755 --- a/configure +++ b/configure @@ -1174,6 +1174,7 @@ enable_ext_ms_win_ntuser_private_l1_1_1 enable_ext_ms_win_ntuser_rectangle_ext_l1_1_0 enable_ext_ms_win_ntuser_uicontext_ext_l1_1_0 enable_ext_ms_win_ntuser_window_l1_1_1 +enable_ext_ms_win_rtcore_gdi_object_l1_1_0 enable_ext_ms_win_rtcore_ntuser_dpi_l1_1_0 enable_ext_ms_win_rtcore_ntuser_sysparams_l1_1_0 enable_faultrep @@ -17942,6 +17943,7 @@ wine_fn_config_dll ext-ms-win-ntuser-private-l1-1-1 enable_ext_ms_win_ntuser_pri wine_fn_config_dll ext-ms-win-ntuser-rectangle-ext-l1-1-0 enable_ext_ms_win_ntuser_rectangle_ext_l1_1_0 wine_fn_config_dll ext-ms-win-ntuser-uicontext-ext-l1-1-0 enable_ext_ms_win_ntuser_uicontext_ext_l1_1_0 wine_fn_config_dll ext-ms-win-ntuser-window-l1-1-1 enable_ext_ms_win_ntuser_window_l1_1_1 +wine_fn_config_dll ext-ms-win-rtcore-gdi-object-l1-1-0 enable_ext_ms_win_rtcore_gdi_object_l1_1_0 wine_fn_config_dll ext-ms-win-rtcore-ntuser-dpi-l1-1-0 enable_ext_ms_win_rtcore_ntuser_dpi_l1_1_0 wine_fn_config_dll ext-ms-win-rtcore-ntuser-sysparams-l1-1-0 enable_ext_ms_win_rtcore_ntuser_sysparams_l1_1_0 wine_fn_config_dll faultrep enable_faultrep implib diff --git a/configure.ac b/configure.ac index 892b9a3..398e8e3 100644 --- a/configure.ac +++ b/configure.ac @@ -3016,6 +3016,7 @@ WINE_CONFIG_DLL(ext-ms-win-ntuser-private-l1-1-1) WINE_CONFIG_DLL(ext-ms-win-ntuser-rectangle-ext-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-ntuser-uicontext-ext-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-ntuser-window-l1-1-1) +WINE_CONFIG_DLL(ext-ms-win-rtcore-gdi-object-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dpi-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-sysparams-l1-1-0) WINE_CONFIG_DLL(faultrep,,[implib]) diff --git a/dlls/ext-ms-win-rtcore-gdi-object-l1-1-0/Makefile.in b/dlls/ext-ms-win-rtcore-gdi-object-l1-1-0/Makefile.in new file mode 100644 index 0000000..14d1afa --- /dev/null +++ b/dlls/ext-ms-win-rtcore-gdi-object-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-rtcore-gdi-object-l1-1-0.dll diff --git a/dlls/ext-ms-win-rtcore-gdi-object-l1-1-0/ext-ms-win-rtcore-gdi-object-l1-1-0.spec b/dlls/ext-ms-win-rtcore-gdi-object-l1-1-0/ext-ms-win-rtcore-gdi-object-l1-1-0.spec new file mode 100644 index 0000000..97c9f6e --- /dev/null +++ b/dlls/ext-ms-win-rtcore-gdi-object-l1-1-0/ext-ms-win-rtcore-gdi-object-l1-1-0.spec @@ -0,0 +1 @@ +@ stdcall DeleteObject(long) gdi32.DeleteObject diff --git a/tools/make_specfiles b/tools/make_specfiles index 4d4acf2..5e5b7ba 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -297,6 +297,7 @@ my @dll_groups = "ext-ms-win-gdi-devcaps-l1-1-0", "ext-ms-win-gdi-draw-l1-1-1", "ext-ms-win-gdi-render-l1-1-0", + "ext-ms-win-rtcore-gdi-object-l1-1-0", ], [ "combase",

1 0

Andrey Gusev : ext-ms-win-gdi-render-l1-1-0: Add dll.
by Alexandre Julliard Nov. 7, 2016

Nov. 7, 2016

Module: wine Branch: master Commit: 9d7887f0b1dafa0c8c6d079151931fc460ffff73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d7887f0b1dafa0c8c6d07915… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sun Nov 6 00:10:40 2016 +0200 ext-ms-win-gdi-render-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/ext-ms-win-gdi-render-l1-1-0/Makefile.in | 1 + dlls/ext-ms-win-gdi-render-l1-1-0/ext-ms-win-gdi-render-l1-1-0.spec | 3 +++ tools/make_specfiles | 1 + 5 files changed, 8 insertions(+) diff --git a/configure b/configure index 38a5e28..0a9d665 100755 --- a/configure +++ b/configure @@ -1167,6 +1167,7 @@ enable_ext_ms_win_gdi_dc_create_l1_1_1 enable_ext_ms_win_gdi_dc_l1_2_0 enable_ext_ms_win_gdi_devcaps_l1_1_0 enable_ext_ms_win_gdi_draw_l1_1_1 +enable_ext_ms_win_gdi_render_l1_1_0 enable_ext_ms_win_kernel32_package_current_l1_1_0 enable_ext_ms_win_ntuser_message_l1_1_1 enable_ext_ms_win_ntuser_private_l1_1_1 @@ -17934,6 +17935,7 @@ wine_fn_config_dll ext-ms-win-gdi-dc-create-l1-1-1 enable_ext_ms_win_gdi_dc_crea wine_fn_config_dll ext-ms-win-gdi-dc-l1-2-0 enable_ext_ms_win_gdi_dc_l1_2_0 wine_fn_config_dll ext-ms-win-gdi-devcaps-l1-1-0 enable_ext_ms_win_gdi_devcaps_l1_1_0 wine_fn_config_dll ext-ms-win-gdi-draw-l1-1-1 enable_ext_ms_win_gdi_draw_l1_1_1 +wine_fn_config_dll ext-ms-win-gdi-render-l1-1-0 enable_ext_ms_win_gdi_render_l1_1_0 wine_fn_config_dll ext-ms-win-kernel32-package-current-l1-1-0 enable_ext_ms_win_kernel32_package_current_l1_1_0 wine_fn_config_dll ext-ms-win-ntuser-message-l1-1-1 enable_ext_ms_win_ntuser_message_l1_1_1 wine_fn_config_dll ext-ms-win-ntuser-private-l1-1-1 enable_ext_ms_win_ntuser_private_l1_1_1 diff --git a/configure.ac b/configure.ac index a037569..892b9a3 100644 --- a/configure.ac +++ b/configure.ac @@ -3009,6 +3009,7 @@ WINE_CONFIG_DLL(ext-ms-win-gdi-dc-create-l1-1-1) WINE_CONFIG_DLL(ext-ms-win-gdi-dc-l1-2-0) WINE_CONFIG_DLL(ext-ms-win-gdi-devcaps-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-gdi-draw-l1-1-1) +WINE_CONFIG_DLL(ext-ms-win-gdi-render-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-kernel32-package-current-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-ntuser-message-l1-1-1) WINE_CONFIG_DLL(ext-ms-win-ntuser-private-l1-1-1) diff --git a/dlls/ext-ms-win-gdi-render-l1-1-0/Makefile.in b/dlls/ext-ms-win-gdi-render-l1-1-0/Makefile.in new file mode 100644 index 0000000..0d11c30 --- /dev/null +++ b/dlls/ext-ms-win-gdi-render-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-gdi-render-l1-1-0.dll diff --git a/dlls/ext-ms-win-gdi-render-l1-1-0/ext-ms-win-gdi-render-l1-1-0.spec b/dlls/ext-ms-win-gdi-render-l1-1-0/ext-ms-win-gdi-render-l1-1-0.spec new file mode 100644 index 0000000..2a22583 --- /dev/null +++ b/dlls/ext-ms-win-gdi-render-l1-1-0/ext-ms-win-gdi-render-l1-1-0.spec @@ -0,0 +1,3 @@ +@ stub BeginGdiRendering +@ stub CreateBitmapFromDxSurface2 +@ stub EndGdiRendering diff --git a/tools/make_specfiles b/tools/make_specfiles index ac4f651..4d4acf2 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -296,6 +296,7 @@ my @dll_groups = "ext-ms-win-gdi-dc-l1-2-0", "ext-ms-win-gdi-devcaps-l1-1-0", "ext-ms-win-gdi-draw-l1-1-1", + "ext-ms-win-gdi-render-l1-1-0", ], [ "combase",

1 0

Andrey Gusev : ext-ms-win-rtcore-ntuser-dc-access-l1-1-0: Add dll.
by Alexandre Julliard Nov. 7, 2016

Nov. 7, 2016

Module: wine Branch: master Commit: 9c2c9c71528b55e5c6641b7b0ae75953535c05ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c2c9c71528b55e5c6641b7b0… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sun Nov 6 01:32:00 2016 +0200 ext-ms-win-rtcore-ntuser-dc-access-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/ext-ms-win-rtcore-ntuser-dc-access-l1-1-0/Makefile.in | 1 + .../ext-ms-win-rtcore-ntuser-dc-access-l1-1-0.spec | 2 ++ tools/make_specfiles | 1 + 5 files changed, 7 insertions(+) diff --git a/configure b/configure index 1abd0b1..663677e 100755 --- a/configure +++ b/configure @@ -1176,6 +1176,7 @@ enable_ext_ms_win_ntuser_uicontext_ext_l1_1_0 enable_ext_ms_win_ntuser_window_l1_1_1 enable_ext_ms_win_rtcore_gdi_object_l1_1_0 enable_ext_ms_win_rtcore_gdi_rgn_l1_1_0 +enable_ext_ms_win_rtcore_ntuser_dc_access_l1_1_0 enable_ext_ms_win_rtcore_ntuser_dpi_l1_1_0 enable_ext_ms_win_rtcore_ntuser_sysparams_l1_1_0 enable_faultrep @@ -17946,6 +17947,7 @@ wine_fn_config_dll ext-ms-win-ntuser-uicontext-ext-l1-1-0 enable_ext_ms_win_ntus wine_fn_config_dll ext-ms-win-ntuser-window-l1-1-1 enable_ext_ms_win_ntuser_window_l1_1_1 wine_fn_config_dll ext-ms-win-rtcore-gdi-object-l1-1-0 enable_ext_ms_win_rtcore_gdi_object_l1_1_0 wine_fn_config_dll ext-ms-win-rtcore-gdi-rgn-l1-1-0 enable_ext_ms_win_rtcore_gdi_rgn_l1_1_0 +wine_fn_config_dll ext-ms-win-rtcore-ntuser-dc-access-l1-1-0 enable_ext_ms_win_rtcore_ntuser_dc_access_l1_1_0 wine_fn_config_dll ext-ms-win-rtcore-ntuser-dpi-l1-1-0 enable_ext_ms_win_rtcore_ntuser_dpi_l1_1_0 wine_fn_config_dll ext-ms-win-rtcore-ntuser-sysparams-l1-1-0 enable_ext_ms_win_rtcore_ntuser_sysparams_l1_1_0 wine_fn_config_dll faultrep enable_faultrep implib diff --git a/configure.ac b/configure.ac index 100fa35..6c8d671 100644 --- a/configure.ac +++ b/configure.ac @@ -3018,6 +3018,7 @@ WINE_CONFIG_DLL(ext-ms-win-ntuser-uicontext-ext-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-ntuser-window-l1-1-1) WINE_CONFIG_DLL(ext-ms-win-rtcore-gdi-object-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-rtcore-gdi-rgn-l1-1-0) +WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dc-access-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dpi-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-sysparams-l1-1-0) WINE_CONFIG_DLL(faultrep,,[implib]) diff --git a/dlls/ext-ms-win-rtcore-ntuser-dc-access-l1-1-0/Makefile.in b/dlls/ext-ms-win-rtcore-ntuser-dc-access-l1-1-0/Makefile.in new file mode 100644 index 0000000..0c49ced --- /dev/null +++ b/dlls/ext-ms-win-rtcore-ntuser-dc-access-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-rtcore-ntuser-dc-access-l1-1-0.dll diff --git a/dlls/ext-ms-win-rtcore-ntuser-dc-access-l1-1-0/ext-ms-win-rtcore-ntuser-dc-access-l1-1-0.spec b/dlls/ext-ms-win-rtcore-ntuser-dc-access-l1-1-0/ext-ms-win-rtcore-ntuser-dc-access-l1-1-0.spec new file mode 100644 index 0000000..076c822 --- /dev/null +++ b/dlls/ext-ms-win-rtcore-ntuser-dc-access-l1-1-0/ext-ms-win-rtcore-ntuser-dc-access-l1-1-0.spec @@ -0,0 +1,2 @@ +@ stdcall GetDC(long) user32.GetDC +@ stdcall ReleaseDC(long long) user32.ReleaseDC diff --git a/tools/make_specfiles b/tools/make_specfiles index 56d5a89..13e7bba 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -272,6 +272,7 @@ my @dll_groups = "ext-ms-win-ntuser-rectangle-ext-l1-1-0", "ext-ms-win-ntuser-uicontext-ext-l1-1-0", "ext-ms-win-ntuser-window-l1-1-1", + "ext-ms-win-rtcore-ntuser-dc-access-l1-1-0", "ext-ms-win-rtcore-ntuser-dpi-l1-1-0", "ext-ms-win-rtcore-ntuser-sysparams-l1-1-0", ],

1 0

Andrey Gusev : ext-ms-win-gdi-draw-l1-1-1: Add dll.
by Alexandre Julliard Nov. 7, 2016

Nov. 7, 2016

Module: wine Branch: master Commit: bdd427695a467a36e00b7052015416a48fd2c371 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdd427695a467a36e00b70520… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat Nov 5 23:20:01 2016 +0200 ext-ms-win-gdi-draw-l1-1-1: 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/ext-ms-win-gdi-draw-l1-1-1/Makefile.in | 1 + .../ext-ms-win-gdi-draw-l1-1-1.spec | 36 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 41 insertions(+) diff --git a/configure b/configure index 6685ea8..38a5e28 100755 --- a/configure +++ b/configure @@ -1166,6 +1166,7 @@ enable_explorerframe enable_ext_ms_win_gdi_dc_create_l1_1_1 enable_ext_ms_win_gdi_dc_l1_2_0 enable_ext_ms_win_gdi_devcaps_l1_1_0 +enable_ext_ms_win_gdi_draw_l1_1_1 enable_ext_ms_win_kernel32_package_current_l1_1_0 enable_ext_ms_win_ntuser_message_l1_1_1 enable_ext_ms_win_ntuser_private_l1_1_1 @@ -17932,6 +17933,7 @@ wine_fn_config_test dlls/explorerframe/tests explorerframe_test wine_fn_config_dll ext-ms-win-gdi-dc-create-l1-1-1 enable_ext_ms_win_gdi_dc_create_l1_1_1 wine_fn_config_dll ext-ms-win-gdi-dc-l1-2-0 enable_ext_ms_win_gdi_dc_l1_2_0 wine_fn_config_dll ext-ms-win-gdi-devcaps-l1-1-0 enable_ext_ms_win_gdi_devcaps_l1_1_0 +wine_fn_config_dll ext-ms-win-gdi-draw-l1-1-1 enable_ext_ms_win_gdi_draw_l1_1_1 wine_fn_config_dll ext-ms-win-kernel32-package-current-l1-1-0 enable_ext_ms_win_kernel32_package_current_l1_1_0 wine_fn_config_dll ext-ms-win-ntuser-message-l1-1-1 enable_ext_ms_win_ntuser_message_l1_1_1 wine_fn_config_dll ext-ms-win-ntuser-private-l1-1-1 enable_ext_ms_win_ntuser_private_l1_1_1 diff --git a/configure.ac b/configure.ac index 5f8ad7d..a037569 100644 --- a/configure.ac +++ b/configure.ac @@ -3008,6 +3008,7 @@ WINE_CONFIG_TEST(dlls/explorerframe/tests) WINE_CONFIG_DLL(ext-ms-win-gdi-dc-create-l1-1-1) WINE_CONFIG_DLL(ext-ms-win-gdi-dc-l1-2-0) WINE_CONFIG_DLL(ext-ms-win-gdi-devcaps-l1-1-0) +WINE_CONFIG_DLL(ext-ms-win-gdi-draw-l1-1-1) WINE_CONFIG_DLL(ext-ms-win-kernel32-package-current-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-ntuser-message-l1-1-1) WINE_CONFIG_DLL(ext-ms-win-ntuser-private-l1-1-1) diff --git a/dlls/ext-ms-win-gdi-draw-l1-1-1/Makefile.in b/dlls/ext-ms-win-gdi-draw-l1-1-1/Makefile.in new file mode 100644 index 0000000..d7f6c5d --- /dev/null +++ b/dlls/ext-ms-win-gdi-draw-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-gdi-draw-l1-1-1.dll diff --git a/dlls/ext-ms-win-gdi-draw-l1-1-1/ext-ms-win-gdi-draw-l1-1-1.spec b/dlls/ext-ms-win-gdi-draw-l1-1-1/ext-ms-win-gdi-draw-l1-1-1.spec new file mode 100644 index 0000000..f0fdb43 --- /dev/null +++ b/dlls/ext-ms-win-gdi-draw-l1-1-1/ext-ms-win-gdi-draw-l1-1-1.spec @@ -0,0 +1,36 @@ +@ stdcall BitBlt(long long long long long long long long long) gdi32.BitBlt +@ stdcall CreateBitmap(long long long long ptr) gdi32.CreateBitmap +@ stdcall CreateBitmapIndirect(ptr) gdi32.CreateBitmapIndirect +@ stdcall CreateCompatibleBitmap(long long long) gdi32.CreateCompatibleBitmap +@ stdcall CreateDIBSection(long ptr long ptr long long) gdi32.CreateDIBSection +@ stdcall CreatePatternBrush(long) gdi32.CreatePatternBrush +@ stdcall CreatePen(long long long) gdi32.CreatePen +@ stdcall CreateSolidBrush(long) gdi32.CreateSolidBrush +@ stdcall DPtoLP(long ptr long) gdi32.DPtoLP +@ stdcall GdiAlphaBlend(long long long long long long long long long long long) gdi32.GdiAlphaBlend +@ stdcall GdiFlush() gdi32.GdiFlush +@ stdcall GetBitmapBits(long long ptr) gdi32.GetBitmapBits +@ stdcall GetBkColor(long) gdi32.GetBkColor +@ stdcall GetBkMode(long) gdi32.GetBkMode +@ stdcall GetDIBits(long long long long ptr ptr long) gdi32.GetDIBits +@ stdcall GetPixel(long long long) gdi32.GetPixel +@ stdcall GetViewportOrgEx(long ptr) gdi32.GetViewportOrgEx +@ stdcall GetWorldTransform(long ptr) gdi32.GetWorldTransform +@ stdcall LineTo(long long long) gdi32.LineTo +@ stdcall MoveToEx(long long long ptr) gdi32.MoveToEx +@ stdcall OffsetViewportOrgEx(long long long ptr) gdi32.OffsetViewportOrgEx +@ stdcall PatBlt(long long long long long long) gdi32.PatBlt +@ stdcall PolyBezierTo(long ptr long) gdi32.PolyBezierTo +@ stdcall Polyline(long ptr long) gdi32.Polyline +@ stdcall Rectangle(long long long long long) gdi32.Rectangle +@ stdcall SetBkColor(long long) gdi32.SetBkColor +@ stdcall SetBkMode(long long) gdi32.SetBkMode +@ stdcall SetDIBits(long long long long ptr ptr long) gdi32.SetDIBits +@ stdcall SetGraphicsMode(long long) gdi32.SetGraphicsMode +@ stdcall SetLayout(long long) gdi32.SetLayout +@ stdcall SetStretchBltMode(long long) gdi32.SetStretchBltMode +@ stdcall SetWindowExtEx(long long long ptr) gdi32.SetWindowExtEx +@ stdcall SetWindowOrgEx(long long long ptr) gdi32.SetWindowOrgEx +@ stdcall SetWorldTransform(long ptr) gdi32.SetWorldTransform +@ stdcall StretchBlt(long long long long long long long long long long long) gdi32.StretchBlt +@ stdcall StretchDIBits(long long long long long long long long long ptr ptr long long) gdi32.StretchDIBits diff --git a/tools/make_specfiles b/tools/make_specfiles index c2748d8..ac4f651 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -295,6 +295,7 @@ my @dll_groups = "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", + "ext-ms-win-gdi-draw-l1-1-1", ], [ "combase",

1 0

Donat Enikeev : crypt32/tests: Testing priorities and flags of stores in a collection; and whether certs are saved in registry endpoint.
by Alexandre Julliard Nov. 7, 2016

Nov. 7, 2016

Module: wine Branch: master Commit: 30164ea3e8d42a6afa21e40f8886e646562c64ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=30164ea3e8d42a6afa21e40f8… Author: Donat Enikeev <donat(a)enikeev.net> Date: Mon Nov 7 17:37:48 2016 +0100 crypt32/tests: Testing priorities and flags of stores in a collection; and whether certs are saved in registry endpoint. Signed-off-by: Donat Enikeev <donat(a)enikeev.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/Makefile.in | 2 +- dlls/crypt32/tests/store.c | 285 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 286 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=30164ea3e8d42a6afa21e…

1 0