March 2018 - Wine-Commits - list.winehq.org

Matteo Bruni : include: Add d3d9 enum values and defines for dual source blending.
by Alexandre Julliard March 12, 2018

March 12, 2018

Module: wine Branch: master Commit: 5147ffe42e626e4c165c4767dfa3cf2d62bfe846 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5147ffe42e626e4c165c4767… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 9 12:10:41 2018 -0600 include: Add d3d9 enum values and defines for dual source blending. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d9caps.h | 32 ++++++++++++++++++-------------- include/d3d9types.h | 4 ++++ 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/include/d3d9caps.h b/include/d3d9caps.h index 424b20c..24ba14c 100644 --- a/include/d3d9caps.h +++ b/include/d3d9caps.h @@ -73,20 +73,24 @@ #define D3DLINECAPS_FOG 0x10 #define D3DLINECAPS_ANTIALIAS 0x20 -#define D3DPBLENDCAPS_ZERO 0x00000001 -#define D3DPBLENDCAPS_ONE 0x00000002 -#define D3DPBLENDCAPS_SRCCOLOR 0x00000004 -#define D3DPBLENDCAPS_INVSRCCOLOR 0x00000008 -#define D3DPBLENDCAPS_SRCALPHA 0x00000010 -#define D3DPBLENDCAPS_INVSRCALPHA 0x00000020 -#define D3DPBLENDCAPS_DESTALPHA 0x00000040 -#define D3DPBLENDCAPS_INVDESTALPHA 0x00000080 -#define D3DPBLENDCAPS_DESTCOLOR 0x00000100 -#define D3DPBLENDCAPS_INVDESTCOLOR 0x00000200 -#define D3DPBLENDCAPS_SRCALPHASAT 0x00000400 -#define D3DPBLENDCAPS_BOTHSRCALPHA 0x00000800 -#define D3DPBLENDCAPS_BOTHINVSRCALPHA 0x00001000 -#define D3DPBLENDCAPS_BLENDFACTOR 0x00002000 +#define D3DPBLENDCAPS_ZERO __MSABI_LONG(0x00000001) +#define D3DPBLENDCAPS_ONE __MSABI_LONG(0x00000002) +#define D3DPBLENDCAPS_SRCCOLOR __MSABI_LONG(0x00000004) +#define D3DPBLENDCAPS_INVSRCCOLOR __MSABI_LONG(0x00000008) +#define D3DPBLENDCAPS_SRCALPHA __MSABI_LONG(0x00000010) +#define D3DPBLENDCAPS_INVSRCALPHA __MSABI_LONG(0x00000020) +#define D3DPBLENDCAPS_DESTALPHA __MSABI_LONG(0x00000040) +#define D3DPBLENDCAPS_INVDESTALPHA __MSABI_LONG(0x00000080) +#define D3DPBLENDCAPS_DESTCOLOR __MSABI_LONG(0x00000100) +#define D3DPBLENDCAPS_INVDESTCOLOR __MSABI_LONG(0x00000200) +#define D3DPBLENDCAPS_SRCALPHASAT __MSABI_LONG(0x00000400) +#define D3DPBLENDCAPS_BOTHSRCALPHA __MSABI_LONG(0x00000800) +#define D3DPBLENDCAPS_BOTHINVSRCALPHA __MSABI_LONG(0x00001000) +#define D3DPBLENDCAPS_BLENDFACTOR __MSABI_LONG(0x00002000) +#ifndef D3D_DISABLE_9EX +#define D3DPBLENDCAPS_SRCCOLOR2 __MSABI_LONG(0x00004000) +#define D3DPBLENDCAPS_INVSRCCOLOR2 __MSABI_LONG(0x00008000) +#endif #define D3DPCMPCAPS_NEVER 0x01 #define D3DPCMPCAPS_LESS 0x02 diff --git a/include/d3d9types.h b/include/d3d9types.h index ed14e9b..bb7e3a0 100644 --- a/include/d3d9types.h +++ b/include/d3d9types.h @@ -679,6 +679,10 @@ typedef enum _D3DBLEND { D3DBLEND_BOTHINVSRCALPHA = 13, D3DBLEND_BLENDFACTOR = 14, D3DBLEND_INVBLENDFACTOR = 15, +#ifndef D3D_DISABLE_9EX + D3DBLEND_SRCCOLOR2 = 16, + D3DBLEND_INVSRCCOLOR2 = 17, +#endif D3DBLEND_FORCE_DWORD = 0x7fffffff } D3DBLEND;

1 0

Matteo Bruni : include: Add a couple of missing d3d8 cap flags.
by Alexandre Julliard March 12, 2018

March 12, 2018

Module: wine Branch: master Commit: 4ccab716dea4feaf4be2a399c831147e3711f0ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ccab716dea4feaf4be2a399… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 9 12:10:43 2018 -0600 include: Add a couple of missing d3d8 cap flags. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d8caps.h | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/include/d3d8caps.h b/include/d3d8caps.h index d11a46f..469dace 100644 --- a/include/d3d8caps.h +++ b/include/d3d8caps.h @@ -86,16 +86,17 @@ #define D3DPCMPCAPS_GREATEREQUAL 0x40 #define D3DPCMPCAPS_ALWAYS 0x80 -#define D3DPMISCCAPS_MASKZ 0x0002 -#define D3DPMISCCAPS_LINEPATTERNREP 0x0004 -#define D3DPMISCCAPS_CULLNONE 0x0010 -#define D3DPMISCCAPS_CULLCW 0x0020 -#define D3DPMISCCAPS_CULLCCW 0x0040 -#define D3DPMISCCAPS_COLORWRITEENABLE 0x0080 -#define D3DPMISCCAPS_CLIPPLANESCALEDPOINTS 0x0100 -#define D3DPMISCCAPS_CLIPTLVERTS 0x0200 -#define D3DPMISCCAPS_TSSARGTEMP 0x0400 -#define D3DPMISCCAPS_BLENDOP 0x0800 +#define D3DPMISCCAPS_MASKZ __MSABI_LONG(0x00000002) +#define D3DPMISCCAPS_LINEPATTERNREP __MSABI_LONG(0x00000004) +#define D3DPMISCCAPS_CULLNONE __MSABI_LONG(0x00000010) +#define D3DPMISCCAPS_CULLCW __MSABI_LONG(0x00000020) +#define D3DPMISCCAPS_CULLCCW __MSABI_LONG(0x00000040) +#define D3DPMISCCAPS_COLORWRITEENABLE __MSABI_LONG(0x00000080) +#define D3DPMISCCAPS_CLIPPLANESCALEDPOINTS __MSABI_LONG(0x00000100) +#define D3DPMISCCAPS_CLIPTLVERTS __MSABI_LONG(0x00000200) +#define D3DPMISCCAPS_TSSARGTEMP __MSABI_LONG(0x00000400) +#define D3DPMISCCAPS_BLENDOP __MSABI_LONG(0x00000800) +#define D3DPMISCCAPS_NULLREFERENCE __MSABI_LONG(0x00001000) #define D3DPRASTERCAPS_DITHER 0x00000001 #define D3DPRASTERCAPS_PAT 0x00000008 @@ -196,12 +197,13 @@ #define D3DTEXOPCAPS_MULTIPLYADD 0x1000000 #define D3DTEXOPCAPS_LERP 0x2000000 -#define D3DVTXPCAPS_TEXGEN 0x01 -#define D3DVTXPCAPS_MATERIALSOURCE7 0x02 -#define D3DVTXPCAPS_DIRECTIONALLIGHTS 0x08 -#define D3DVTXPCAPS_POSITIONALLIGHTS 0x10 -#define D3DVTXPCAPS_LOCALVIEWER 0x20 -#define D3DVTXPCAPS_TWEENING 0x40 +#define D3DVTXPCAPS_TEXGEN __MSABI_LONG(0x00000001) +#define D3DVTXPCAPS_MATERIALSOURCE7 __MSABI_LONG(0x00000002) +#define D3DVTXPCAPS_DIRECTIONALLIGHTS __MSABI_LONG(0x00000008) +#define D3DVTXPCAPS_POSITIONALLIGHTS __MSABI_LONG(0x00000010) +#define D3DVTXPCAPS_LOCALVIEWER __MSABI_LONG(0x00000020) +#define D3DVTXPCAPS_TWEENING __MSABI_LONG(0x00000040) +#define D3DVTXPCAPS_NO_VSDT_UBYTE4 __MSABI_LONG(0x00000080) #define D3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD 0x00000020 #define D3DCAPS3_RESERVED 0x8000001f

1 0

Henri Verbeet : wined3d: Recognise AMD RC410 and RV380.
by Alexandre Julliard March 12, 2018

March 12, 2018

Module: wine Branch: master Commit: 7cc82c1ea6a28253b83e0cc0d57e8e4636f75c53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7cc82c1ea6a28253b83e0cc0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 12 12:54:46 2018 +0330 wined3d: Recognise AMD RC410 and RV380. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 46fbaba..dd738f2 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2212,9 +2212,7 @@ cards_intel[] = {"830M", CARD_INTEL_830M}, }, /* 20101109 - These are never returned by current Gallium radeon - * drivers: R700, RV790, R680, RV535, RV516, R410, RS485, RV360, RV351. - * - * These are returned but not handled: RC410, RV380. */ + * drivers: R700, RV790, R680, RV535, RV516, R410, RS485, RV360, RV351. */ cards_amd_mesa[] = { /* Polaris 10/11 */ @@ -2292,10 +2290,12 @@ cards_amd_mesa[] = {"RS482", CARD_AMD_RADEON_XPRESS_200M}, {"RS480", CARD_AMD_RADEON_XPRESS_200M}, {"RS400", CARD_AMD_RADEON_XPRESS_200M}, + {"RC410", CARD_AMD_RADEON_XPRESS_200M}, /* R300 */ {"R360", CARD_AMD_RADEON_9500}, {"R350", CARD_AMD_RADEON_9500}, {"R300", CARD_AMD_RADEON_9500}, + {"RV380", CARD_AMD_RADEON_9500}, {"RV370", CARD_AMD_RADEON_9500}, {"RV360", CARD_AMD_RADEON_9500}, {"RV351", CARD_AMD_RADEON_9500},

1 0

Józef Kucia : wined3d: Remove PresentationIntervals from WINED3DCAPS.
by Alexandre Julliard March 12, 2018

March 12, 2018

Module: wine Branch: master Commit: 0554d1761184906c7fdaf3c8764fcaaddbc49e85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0554d1761184906c7fdaf3c8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 12 13:53:47 2018 +0100 wined3d: Remove PresentationIntervals from WINED3DCAPS. 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/device.c | 2 +- dlls/d3d9/device.c | 2 +- dlls/wined3d/directx.c | 3 --- include/wine/wined3d.h | 1 - 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 9f92d3c..63a99b4 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -294,7 +294,7 @@ void d3dcaps_from_wined3dcaps(D3DCAPS8 *caps, const WINED3DCAPS *wined3d_caps) caps->Caps = wined3d_caps->Caps; caps->Caps2 = wined3d_caps->Caps2; caps->Caps3 = wined3d_caps->Caps3; - caps->PresentationIntervals = wined3d_caps->PresentationIntervals; + caps->PresentationIntervals = D3DPRESENT_INTERVAL_IMMEDIATE | D3DPRESENT_INTERVAL_ONE; caps->CursorCaps = wined3d_caps->CursorCaps; caps->DevCaps = wined3d_caps->DevCaps; caps->PrimitiveMiscCaps = wined3d_caps->PrimitiveMiscCaps; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index aac0961..f3c24c9 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -330,7 +330,7 @@ void d3dcaps_from_wined3dcaps(D3DCAPS9 *caps, const WINED3DCAPS *wined3d_caps) caps->Caps = wined3d_caps->Caps; caps->Caps2 = wined3d_caps->Caps2; caps->Caps3 = wined3d_caps->Caps3; - caps->PresentationIntervals = wined3d_caps->PresentationIntervals; + caps->PresentationIntervals = D3DPRESENT_INTERVAL_IMMEDIATE | D3DPRESENT_INTERVAL_ONE; caps->CursorCaps = wined3d_caps->CursorCaps; caps->DevCaps = wined3d_caps->DevCaps; caps->PrimitiveMiscCaps = wined3d_caps->PrimitiveMiscCaps; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index dd738f2..f18c4ac 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5643,9 +5643,6 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte WINED3DCAPS3_COPY_TO_VIDMEM | WINED3DCAPS3_COPY_TO_SYSTEMMEM; - caps->PresentationIntervals = WINED3DPRESENT_INTERVAL_IMMEDIATE | - WINED3DPRESENT_INTERVAL_ONE; - caps->CursorCaps = WINED3DCURSORCAPS_COLOR | WINED3DCURSORCAPS_LOWRES; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index b6a2ec3..f0c8ae3 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1863,7 +1863,6 @@ typedef struct _WINED3DCAPS DWORD Caps; DWORD Caps2; DWORD Caps3; - DWORD PresentationIntervals; DWORD CursorCaps; DWORD DevCaps;

1 0

Józef Kucia : d3d9: Validate presentation interval.
by Alexandre Julliard March 12, 2018

March 12, 2018

Module: wine Branch: master Commit: 9d62b50cafc845dfa06b911ac745b8569a3ba46b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d62b50cafc845dfa06b911a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 12 13:53:50 2018 +0100 d3d9: Validate presentation interval. 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/d3d9/device.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 28c96c4..8c74494 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -331,6 +331,19 @@ static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapch WARN("Invalid backbuffer count %u.\n", present_parameters->BackBufferCount); return FALSE; } + switch (present_parameters->PresentationInterval) + { + case D3DPRESENT_INTERVAL_DEFAULT: + case D3DPRESENT_INTERVAL_ONE: + case D3DPRESENT_INTERVAL_TWO: + case D3DPRESENT_INTERVAL_THREE: + case D3DPRESENT_INTERVAL_FOUR: + case D3DPRESENT_INTERVAL_IMMEDIATE: + break; + default: + WARN("Invalid presentation interval %#x.\n", present_parameters->PresentationInterval); + return FALSE; + } swapchain_desc->backbuffer_width = present_parameters->BackBufferWidth; swapchain_desc->backbuffer_height = present_parameters->BackBufferHeight;

1 0

Roderick Colenbrander : winevulkan: Implement vkCreateDevice.
by Alexandre Julliard March 9, 2018

March 9, 2018

Module: wine Branch: master Commit: 6eacdf38e29dcf2d87cb91374fd46987603f5594 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6eacdf38e29dcf2d87cb9137… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Fri Mar 9 08:48:48 2018 -0800 winevulkan: Implement vkCreateDevice. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 39 +++++- dlls/winevulkan/vulkan.c | 70 ++++++++++- dlls/winevulkan/vulkan_private.h | 8 ++ dlls/winevulkan/vulkan_thunks.c | 6 - dlls/winevulkan/vulkan_thunks.h | 248 +++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/vulkan.c | 9 ++ include/wine/vulkan_driver.h | 3 +- 7 files changed, 371 insertions(+), 12 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6eacdf38e29dcf2d87cb…

1 0

Andrey Gusev : ext-ms-win-rtcore-gdi-devcaps-l1-1-0: Add dll.
by Alexandre Julliard March 9, 2018

March 9, 2018

Module: wine Branch: master Commit: fe6670eb7897ae547b7b74bd622f742d3005fbdf URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe6670eb7897ae547b7b74bd… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Mar 9 13:37:03 2018 +0200 ext-ms-win-rtcore-gdi-devcaps-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-devcaps-l1-1-0/Makefile.in | 1 + .../ext-ms-win-rtcore-gdi-devcaps-l1-1-0.spec | 1 + tools/make_specfiles | 1 + 5 files changed, 6 insertions(+) diff --git a/configure b/configure index 1de40bf..1547862 100755 --- a/configure +++ b/configure @@ -1258,6 +1258,7 @@ enable_ext_ms_win_ntuser_window_l1_1_1 enable_ext_ms_win_ntuser_windowclass_l1_1_1 enable_ext_ms_win_oleacc_l1_1_0 enable_ext_ms_win_ras_rasapi32_l1_1_0 +enable_ext_ms_win_rtcore_gdi_devcaps_l1_1_0 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 @@ -18613,6 +18614,7 @@ wine_fn_config_makefile dlls/ext-ms-win-ntuser-window-l1-1-1 enable_ext_ms_win_n wine_fn_config_makefile dlls/ext-ms-win-ntuser-windowclass-l1-1-1 enable_ext_ms_win_ntuser_windowclass_l1_1_1 wine_fn_config_makefile dlls/ext-ms-win-oleacc-l1-1-0 enable_ext_ms_win_oleacc_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-ras-rasapi32-l1-1-0 enable_ext_ms_win_ras_rasapi32_l1_1_0 +wine_fn_config_makefile dlls/ext-ms-win-rtcore-gdi-devcaps-l1-1-0 enable_ext_ms_win_rtcore_gdi_devcaps_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-rtcore-gdi-object-l1-1-0 enable_ext_ms_win_rtcore_gdi_object_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-rtcore-gdi-rgn-l1-1-0 enable_ext_ms_win_rtcore_gdi_rgn_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-rtcore-ntuser-dc-access-l1-1-0 enable_ext_ms_win_rtcore_ntuser_dc_access_l1_1_0 diff --git a/configure.ac b/configure.ac index 664a73e..2adcaf9 100644 --- a/configure.ac +++ b/configure.ac @@ -3255,6 +3255,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-window-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-windowclass-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-oleacc-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ras-rasapi32-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-gdi-devcaps-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-gdi-object-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-gdi-rgn-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-ntuser-dc-access-l1-1-0) diff --git a/dlls/ext-ms-win-rtcore-gdi-devcaps-l1-1-0/Makefile.in b/dlls/ext-ms-win-rtcore-gdi-devcaps-l1-1-0/Makefile.in new file mode 100644 index 0000000..8284a69 --- /dev/null +++ b/dlls/ext-ms-win-rtcore-gdi-devcaps-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-rtcore-gdi-devcaps-l1-1-0.dll diff --git a/dlls/ext-ms-win-rtcore-gdi-devcaps-l1-1-0/ext-ms-win-rtcore-gdi-devcaps-l1-1-0.spec b/dlls/ext-ms-win-rtcore-gdi-devcaps-l1-1-0/ext-ms-win-rtcore-gdi-devcaps-l1-1-0.spec new file mode 100644 index 0000000..25416ef --- /dev/null +++ b/dlls/ext-ms-win-rtcore-gdi-devcaps-l1-1-0/ext-ms-win-rtcore-gdi-devcaps-l1-1-0.spec @@ -0,0 +1 @@ +@ stdcall GetDeviceCaps(long long) gdi32.GetDeviceCaps diff --git a/tools/make_specfiles b/tools/make_specfiles index 09351a5..53a4fec 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -401,6 +401,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-devcaps-l1-1-0", "ext-ms-win-rtcore-gdi-object-l1-1-0", "ext-ms-win-rtcore-gdi-rgn-l1-1-0", ],

1 0

Piotr Caban : concrt140: Add _Runtime_object exports.
by Alexandre Julliard March 9, 2018

March 9, 2018

Module: wine Branch: master Commit: 2a70d840fec35d31a201092a6185e16f9c30f534 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a70d840fec35d31a201092a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 9 09:31:39 2018 -0600 concrt140: Add _Runtime_object exports. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index c8483d6..f0a2cd1 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -30,10 +30,10 @@ @ stub -arch=win64 ??0_ReentrantLock(a)details@Concurrency@@QEAA(a)XZ @ thiscall -arch=i386 ??0_ReentrantPPLLock(a)details@Concurrency@@QAE(a)XZ(ptr) msvcr120.??0_ReentrantPPLLock(a)details@Concurrency@@QAE(a)XZ @ cdecl -arch=win64 ??0_ReentrantPPLLock(a)details@Concurrency@@QEAA(a)XZ(ptr) msvcr120.??0_ReentrantPPLLock(a)details@Concurrency@@QEAA(a)XZ -@ stub -arch=i386 ??0_Runtime_object(a)details@Concurrency@@QAE(a)H@Z -@ stub -arch=win64 ??0_Runtime_object(a)details@Concurrency@@QEAA(a)H@Z -@ stub -arch=i386 ??0_Runtime_object(a)details@Concurrency@@QAE(a)XZ -@ stub -arch=win64 ??0_Runtime_object(a)details@Concurrency@@QEAA(a)XZ +@ thiscall -arch=i386 ??0_Runtime_object(a)details@Concurrency@@QAE(a)H@Z(ptr long) msvcp120.??0_Runtime_object(a)details@Concurrency@@QAE(a)H@Z +@ cdecl -arch=win64 ??0_Runtime_object(a)details@Concurrency@@QEAA(a)H@Z(ptr long) msvcp120.??0_Runtime_object(a)details@Concurrency@@QEAA(a)H@Z +@ thiscall -arch=i386 ??0_Runtime_object(a)details@Concurrency@@QAE(a)XZ(ptr) msvcp120.??0_Runtime_object(a)details@Concurrency@@QAE(a)XZ +@ cdecl -arch=win64 ??0_Runtime_object(a)details@Concurrency@@QEAA(a)XZ(ptr) msvcp120.??0_Runtime_object(a)details@Concurrency@@QEAA(a)XZ @ thiscall -arch=i386 ??0_Scheduler(a)details@Concurrency@@QAE(a)PAVScheduler@2@@Z(ptr ptr) msvcr120.??0_Scheduler(a)details@Concurrency@@QAE(a)PAVScheduler@2@@Z @ cdecl -arch=win64 ??0_Scheduler(a)details@Concurrency@@QEAA(a)PEAVScheduler@2@@Z(ptr ptr) msvcr120.??0_Scheduler(a)details@Concurrency@@QEAA(a)PEAVScheduler@2@@Z @ stub -arch=i386 ??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QAE(a)AAV123@@Z

1 0

Andrey Gusev : ext-ms-win-oleacc-l1-1-0: Add dll.
by Alexandre Julliard March 9, 2018

March 9, 2018

Module: wine Branch: master Commit: 3e21e25cd957e5407d5265ed0a579fb06dc3f1e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e21e25cd957e5407d5265ed… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Mar 9 13:36:43 2018 +0200 ext-ms-win-oleacc-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-oleacc-l1-1-0/Makefile.in | 1 + dlls/ext-ms-win-oleacc-l1-1-0/ext-ms-win-oleacc-l1-1-0.spec | 1 + tools/make_specfiles | 4 ++++ 5 files changed, 9 insertions(+) diff --git a/configure b/configure index 86f3a78..1de40bf 100755 --- a/configure +++ b/configure @@ -1256,6 +1256,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_ntuser_windowclass_l1_1_1 +enable_ext_ms_win_oleacc_l1_1_0 enable_ext_ms_win_ras_rasapi32_l1_1_0 enable_ext_ms_win_rtcore_gdi_object_l1_1_0 enable_ext_ms_win_rtcore_gdi_rgn_l1_1_0 @@ -18610,6 +18611,7 @@ wine_fn_config_makefile dlls/ext-ms-win-ntuser-rectangle-ext-l1-1-0 enable_ext_m wine_fn_config_makefile dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0 enable_ext_ms_win_ntuser_uicontext_ext_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-window-l1-1-1 enable_ext_ms_win_ntuser_window_l1_1_1 wine_fn_config_makefile dlls/ext-ms-win-ntuser-windowclass-l1-1-1 enable_ext_ms_win_ntuser_windowclass_l1_1_1 +wine_fn_config_makefile dlls/ext-ms-win-oleacc-l1-1-0 enable_ext_ms_win_oleacc_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-ras-rasapi32-l1-1-0 enable_ext_ms_win_ras_rasapi32_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-rtcore-gdi-object-l1-1-0 enable_ext_ms_win_rtcore_gdi_object_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-rtcore-gdi-rgn-l1-1-0 enable_ext_ms_win_rtcore_gdi_rgn_l1_1_0 diff --git a/configure.ac b/configure.ac index e1a1a5b..664a73e 100644 --- a/configure.ac +++ b/configure.ac @@ -3253,6 +3253,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-rectangle-ext-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-window-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-windowclass-l1-1-1) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-oleacc-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ras-rasapi32-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-gdi-object-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-gdi-rgn-l1-1-0) diff --git a/dlls/ext-ms-win-oleacc-l1-1-0/Makefile.in b/dlls/ext-ms-win-oleacc-l1-1-0/Makefile.in new file mode 100644 index 0000000..1205dd7 --- /dev/null +++ b/dlls/ext-ms-win-oleacc-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-oleacc-l1-1-0.dll diff --git a/dlls/ext-ms-win-oleacc-l1-1-0/ext-ms-win-oleacc-l1-1-0.spec b/dlls/ext-ms-win-oleacc-l1-1-0/ext-ms-win-oleacc-l1-1-0.spec new file mode 100644 index 0000000..bf21cc4 --- /dev/null +++ b/dlls/ext-ms-win-oleacc-l1-1-0/ext-ms-win-oleacc-l1-1-0.spec @@ -0,0 +1 @@ +@ stdcall AccessibleObjectFromWindow(ptr long ptr ptr) oleacc.AccessibleObjectFromWindow diff --git a/tools/make_specfiles b/tools/make_specfiles index d25e970..09351a5 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -318,6 +318,10 @@ my @dll_groups = "iprop", ], [ + "oleacc", + "ext-ms-win-oleacc-l1-1-0", + ], + [ "shell32", "api-ms-win-downlevel-shell32-l1-1-0", "api-ms-win-shell-shellcom-l1-1-0",

1 0

Andrey Gusev : ext-ms-win-ntuser-draw-l1-1-0: Add dll.
by Alexandre Julliard March 9, 2018

March 9, 2018

Module: wine Branch: master Commit: 99a18a893fe067d505396296079132d304deef1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=99a18a893fe067d505396296… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Mar 9 13:35:50 2018 +0200 ext-ms-win-ntuser-draw-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-ntuser-draw-l1-1-0/Makefile.in | 1 + .../ext-ms-win-ntuser-draw-l1-1-0.spec | 15 +++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 20 insertions(+) diff --git a/configure b/configure index e6e1d68..345c602 100755 --- a/configure +++ b/configure @@ -1248,6 +1248,7 @@ 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_kernel32_package_l1_1_1 +enable_ext_ms_win_ntuser_draw_l1_1_0 enable_ext_ms_win_ntuser_message_l1_1_1 enable_ext_ms_win_ntuser_private_l1_1_1 enable_ext_ms_win_ntuser_rectangle_ext_l1_1_0 @@ -18600,6 +18601,7 @@ wine_fn_config_makefile dlls/ext-ms-win-gdi-draw-l1-1-1 enable_ext_ms_win_gdi_dr wine_fn_config_makefile dlls/ext-ms-win-gdi-render-l1-1-0 enable_ext_ms_win_gdi_render_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-kernel32-package-current-l1-1-0 enable_ext_ms_win_kernel32_package_current_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-kernel32-package-l1-1-1 enable_ext_ms_win_kernel32_package_l1_1_1 +wine_fn_config_makefile dlls/ext-ms-win-ntuser-draw-l1-1-0 enable_ext_ms_win_ntuser_draw_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-message-l1-1-1 enable_ext_ms_win_ntuser_message_l1_1_1 wine_fn_config_makefile dlls/ext-ms-win-ntuser-private-l1-1-1 enable_ext_ms_win_ntuser_private_l1_1_1 wine_fn_config_makefile dlls/ext-ms-win-ntuser-rectangle-ext-l1-1-0 enable_ext_ms_win_ntuser_rectangle_ext_l1_1_0 diff --git a/configure.ac b/configure.ac index e16cc3a..55e8e45 100644 --- a/configure.ac +++ b/configure.ac @@ -3245,6 +3245,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-draw-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-render-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-kernel32-package-current-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-kernel32-package-l1-1-1) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-draw-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-message-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-private-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-rectangle-ext-l1-1-0) diff --git a/dlls/ext-ms-win-ntuser-draw-l1-1-0/Makefile.in b/dlls/ext-ms-win-ntuser-draw-l1-1-0/Makefile.in new file mode 100644 index 0000000..2685115 --- /dev/null +++ b/dlls/ext-ms-win-ntuser-draw-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-ntuser-draw-l1-1-0.dll diff --git a/dlls/ext-ms-win-ntuser-draw-l1-1-0/ext-ms-win-ntuser-draw-l1-1-0.spec b/dlls/ext-ms-win-ntuser-draw-l1-1-0/ext-ms-win-ntuser-draw-l1-1-0.spec new file mode 100644 index 0000000..d21195b --- /dev/null +++ b/dlls/ext-ms-win-ntuser-draw-l1-1-0/ext-ms-win-ntuser-draw-l1-1-0.spec @@ -0,0 +1,15 @@ +@ stdcall BeginPaint(long ptr) user32.BeginPaint +@ stdcall DrawFocusRect(long ptr) user32.DrawFocusRect +@ stdcall EndPaint(long ptr) user32.EndPaint +@ stdcall GetUpdateRect(long ptr long) user32.GetUpdateRect +@ stdcall GetUpdateRgn(long long long) user32.GetUpdateRgn +@ stdcall GetWindowDC(long) user32.GetWindowDC +@ stdcall GetWindowRgnBox(long ptr) user32.GetWindowRgnBox +@ stub GetWindowRgnEx +@ stdcall InvalidateRect(long ptr long) user32.InvalidateRect +@ stdcall InvalidateRgn(long long long) user32.InvalidateRgn +@ stdcall RedrawWindow(long ptr long long) user32.RedrawWindow +@ stdcall SetWindowRgn(long long long) user32.SetWindowRgn +@ stdcall UpdateWindow(long) user32.UpdateWindow +@ stdcall ValidateRect(long ptr) user32.ValidateRect +@ stdcall ValidateRgn(long long) user32.ValidateRgn diff --git a/tools/make_specfiles b/tools/make_specfiles index 31d2f20..96ca63e 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -350,6 +350,7 @@ my @dll_groups = "api-ms-win-rtcore-ntuser-winevent-l1-1-0", "api-ms-win-rtcore-ntuser-wmpointer-l1-1-0", "api-ms-win-rtcore-ntuser-wmpointer-l1-1-3", + "ext-ms-win-ntuser-draw-l1-1-0", "ext-ms-win-ntuser-message-l1-1-1", "ext-ms-win-ntuser-private-l1-1-1", "ext-ms-win-ntuser-rectangle-ext-l1-1-0",

1 0