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

Zebediah Figura : d3dx9: Add stub for D3DXComputeNormalMap.
by Alexandre Julliard March 13, 2018

March 13, 2018

Module: wine Branch: master Commit: 7dbcbed704ca3943109b0d417a97a9814dd5adfb URL: https://source.winehq.org/git/wine.git/?a=commit;h=7dbcbed704ca3943109b0d41… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 13 19:17:38 2018 +0100 d3dx9: Add stub for D3DXComputeNormalMap. Based on a patch by Christian Costa. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_24/d3dx9_24.spec | 2 +- dlls/d3dx9_25/d3dx9_25.spec | 2 +- dlls/d3dx9_26/d3dx9_26.spec | 2 +- dlls/d3dx9_27/d3dx9_27.spec | 2 +- dlls/d3dx9_28/d3dx9_28.spec | 2 +- dlls/d3dx9_29/d3dx9_29.spec | 2 +- dlls/d3dx9_30/d3dx9_30.spec | 2 +- dlls/d3dx9_31/d3dx9_31.spec | 2 +- dlls/d3dx9_32/d3dx9_32.spec | 2 +- dlls/d3dx9_33/d3dx9_33.spec | 2 +- dlls/d3dx9_34/d3dx9_34.spec | 2 +- dlls/d3dx9_35/d3dx9_35.spec | 2 +- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/texture.c | 9 +++++++++ dlls/d3dx9_37/d3dx9_37.spec | 2 +- dlls/d3dx9_38/d3dx9_38.spec | 2 +- dlls/d3dx9_39/d3dx9_39.spec | 2 +- dlls/d3dx9_40/d3dx9_40.spec | 2 +- dlls/d3dx9_41/d3dx9_41.spec | 2 +- dlls/d3dx9_42/d3dx9_42.spec | 2 +- dlls/d3dx9_43/d3dx9_43.spec | 2 +- 21 files changed, 29 insertions(+), 20 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7dbcbed704ca3943109b…

1 0

Matteo Bruni : d3dx9/tests: Add a few missing surface Release() calls.
by Alexandre Julliard March 13, 2018

March 13, 2018

Module: wine Branch: master Commit: ae519aff956cb93f19f80c4461a9cbb062a45b30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae519aff956cb93f19f80c44… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 13 19:17:41 2018 +0100 d3dx9/tests: Add a few missing surface Release() calls. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/texture.c | 138 ++++++++++++++++++------------------------ 1 file changed, 60 insertions(+), 78 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ae519aff956cb93f19f8…

1 0

Sebastian Lackner : ntdll: Correctly handle privileged instructions on x86-64.
by Alexandre Julliard March 13, 2018

March 13, 2018

Module: wine Branch: master Commit: 2f870c1801c8d455faadd6c301aad318f287713b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f870c1801c8d455faadd6c3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Mar 12 23:03:05 2018 -0500 ntdll: Correctly handle privileged instructions on x86-64. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 82 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 81 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 169793b..7b82083 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2721,6 +2721,86 @@ static void raise_generic_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) /*********************************************************************** + * is_privileged_instr + * + * Check if the fault location is a privileged instruction. + */ +static inline DWORD is_privileged_instr( CONTEXT *context ) +{ + const BYTE *instr = (BYTE *)context->Rip; + unsigned int prefix_count = 0; + + for (;;) switch(*instr) + { + /* instruction prefixes */ + case 0x2e: /* %cs: */ + case 0x36: /* %ss: */ + case 0x3e: /* %ds: */ + case 0x26: /* %es: */ + case 0x40: /* rex */ + case 0x41: /* rex */ + case 0x42: /* rex */ + case 0x43: /* rex */ + case 0x44: /* rex */ + case 0x45: /* rex */ + case 0x46: /* rex */ + case 0x47: /* rex */ + case 0x48: /* rex */ + case 0x49: /* rex */ + case 0x4a: /* rex */ + case 0x4b: /* rex */ + case 0x4c: /* rex */ + case 0x4d: /* rex */ + case 0x4e: /* rex */ + case 0x4f: /* rex */ + case 0x64: /* %fs: */ + case 0x65: /* %gs: */ + case 0x66: /* opcode size */ + case 0x67: /* addr size */ + case 0xf0: /* lock */ + case 0xf2: /* repne */ + case 0xf3: /* repe */ + if (++prefix_count >= 15) return EXCEPTION_ILLEGAL_INSTRUCTION; + instr++; + continue; + + case 0x0f: /* extended instruction */ + switch(instr[1]) + { + case 0x06: /* clts */ + case 0x08: /* invd */ + case 0x09: /* wbinvd */ + case 0x20: /* mov crX, reg */ + case 0x21: /* mov drX, reg */ + case 0x22: /* mov reg, crX */ + case 0x23: /* mov reg drX */ + return EXCEPTION_PRIV_INSTRUCTION; + } + return 0; + case 0x6c: /* insb (%dx) */ + case 0x6d: /* insl (%dx) */ + case 0x6e: /* outsb (%dx) */ + case 0x6f: /* outsl (%dx) */ + case 0xcd: /* int $xx */ + case 0xe4: /* inb al,XX */ + case 0xe5: /* in (e)ax,XX */ + case 0xe6: /* outb XX,al */ + case 0xe7: /* out XX,(e)ax */ + case 0xec: /* inb (%dx),%al */ + case 0xed: /* inl (%dx),%eax */ + case 0xee: /* outb %al,(%dx) */ + case 0xef: /* outl %eax,(%dx) */ + case 0xf4: /* hlt */ + case 0xfa: /* cli */ + case 0xfb: /* sti */ + return EXCEPTION_PRIV_INSTRUCTION; + default: + return 0; + } +} + + +/*********************************************************************** * handle_interrupt * * Handle an interrupt. @@ -2790,8 +2870,8 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { CONTEXT *win_context = get_exception_context( rec ); WORD err = ERROR_sig(ucontext); + if (!err && (rec->ExceptionCode = is_privileged_instr( win_context ))) break; if ((err & 7) == 2 && handle_interrupt( err >> 3, rec, win_context )) break; - rec->ExceptionCode = err ? EXCEPTION_ACCESS_VIOLATION : EXCEPTION_PRIV_INSTRUCTION; rec->ExceptionCode = EXCEPTION_ACCESS_VIOLATION; } break;

1 0

Matteo Bruni : d3dx9/tests: Fix checking for D3DUSAGE_AUTOGENMIPMAP support.
by Alexandre Julliard March 13, 2018

March 13, 2018

Module: wine Branch: master Commit: 9682095a3bd31359eb63124d5654a7fcda5f678c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9682095a3bd31359eb63124d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 13 19:17:40 2018 +0100 d3dx9/tests: Fix checking for D3DUSAGE_AUTOGENMIPMAP support. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/texture.c | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 9ae0321..154c569 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -152,7 +152,7 @@ static BOOL is_autogenmipmap_supported(IDirect3DDevice9 *device, D3DRESOURCETYPE mode.Format, D3DUSAGE_AUTOGENMIPMAP, resource_type, D3DFMT_A8R8G8B8); IDirect3D9_Release(d3d9); - return SUCCEEDED(hr); + return hr == D3D_OK; } static void test_D3DXCheckTextureRequirements(IDirect3DDevice9 *device) @@ -626,25 +626,9 @@ static void test_D3DXCheckVolumeTextureRequirements(IDirect3DDevice9 *device) ok(hr == D3D_OK, "D3DXCheckVolumeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); ok(mipmaps == 9, "Returned mipmaps %d, expected %d\n", mipmaps, 9); - if (!is_autogenmipmap_supported(device, D3DRTYPE_VOLUMETEXTURE)) - { - skip("No D3DUSAGE_AUTOGENMIPMAP support for volume textures\n"); - return; - } - - /* mipmaps when D3DUSAGE_AUTOGENMIPMAP is set */ - mipmaps = 0; - hr = D3DXCheckVolumeTextureRequirements(device, NULL, NULL,NULL, &mipmaps, D3DUSAGE_AUTOGENMIPMAP, NULL, D3DPOOL_DEFAULT); - ok(hr == D3D_OK, "D3DXCheckVolumeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); - ok(mipmaps == 0, "Returned mipmaps %d, expected %d\n", mipmaps, 0); - mipmaps = 1; - hr = D3DXCheckVolumeTextureRequirements(device, NULL, NULL,NULL, &mipmaps, D3DUSAGE_AUTOGENMIPMAP, NULL, D3DPOOL_DEFAULT); - ok(hr == D3D_OK, "D3DXCheckVolumeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); - ok(mipmaps == 1, "Returned mipmaps %d, expected %d\n", mipmaps, 1); - mipmaps = 3; - hr = D3DXCheckVolumeTextureRequirements(device, NULL, NULL,NULL, &mipmaps, D3DUSAGE_AUTOGENMIPMAP, NULL, D3DPOOL_DEFAULT); - ok(hr == D3D_OK, "D3DXCheckVolumeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); - ok(mipmaps == 0, "Returned mipmaps %d, expected %d\n", mipmaps, 0); + /* D3DUSAGE_AUTOGENMIPMAP is never supported for volume textures. */ + ok(!is_autogenmipmap_supported(device, D3DRTYPE_VOLUMETEXTURE), + "D3DUSAGE_AUTOGENMIPMAP is unexpectedly supported on volume textures.\n"); } static void test_D3DXCreateTexture(IDirect3DDevice9 *device)

1 0

Andrey Gusev : ext-ms-win-rtcore-ntuser-dpi-l1-2-0: Add dll.
by Alexandre Julliard March 13, 2018

March 13, 2018

Module: wine Branch: master Commit: 09ea42315f635d604766a8535319c6e867f2bfaa URL: https://source.winehq.org/git/wine.git/?a=commit;h=09ea42315f635d604766a853… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Mar 13 15:45:32 2018 +0200 ext-ms-win-rtcore-ntuser-dpi-l1-2-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-dpi-l1-2-0/Makefile.in | 1 + .../ext-ms-win-rtcore-ntuser-dpi-l1-2-0.spec | 1 + tools/make_specfiles | 1 + 5 files changed, 6 insertions(+) diff --git a/configure b/configure index f6a250a..4e545f9 100755 --- a/configure +++ b/configure @@ -1271,6 +1271,7 @@ enable_ext_ms_win_rtcore_gdi_rgn_l1_1_0 enable_ext_ms_win_rtcore_ntuser_cursor_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_dpi_l1_2_0 enable_ext_ms_win_rtcore_ntuser_syscolors_l1_1_0 enable_ext_ms_win_rtcore_ntuser_sysparams_l1_1_0 enable_ext_ms_win_security_credui_l1_1_0 @@ -18636,6 +18637,7 @@ wine_fn_config_makefile dlls/ext-ms-win-rtcore-gdi-rgn-l1-1-0 enable_ext_ms_win_ wine_fn_config_makefile dlls/ext-ms-win-rtcore-ntuser-cursor-l1-1-0 enable_ext_ms_win_rtcore_ntuser_cursor_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 wine_fn_config_makefile dlls/ext-ms-win-rtcore-ntuser-dpi-l1-1-0 enable_ext_ms_win_rtcore_ntuser_dpi_l1_1_0 +wine_fn_config_makefile dlls/ext-ms-win-rtcore-ntuser-dpi-l1-2-0 enable_ext_ms_win_rtcore_ntuser_dpi_l1_2_0 wine_fn_config_makefile dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0 enable_ext_ms_win_rtcore_ntuser_syscolors_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0 enable_ext_ms_win_rtcore_ntuser_sysparams_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-security-credui-l1-1-0 enable_ext_ms_win_security_credui_l1_1_0 diff --git a/configure.ac b/configure.ac index 0347ac7..d4cc5b0 100644 --- a/configure.ac +++ b/configure.ac @@ -3268,6 +3268,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-gdi-rgn-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-ntuser-cursor-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-ntuser-dc-access-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-ntuser-dpi-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-ntuser-dpi-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-security-credui-l1-1-0) diff --git a/dlls/ext-ms-win-rtcore-ntuser-dpi-l1-2-0/Makefile.in b/dlls/ext-ms-win-rtcore-ntuser-dpi-l1-2-0/Makefile.in new file mode 100644 index 0000000..5373a1f --- /dev/null +++ b/dlls/ext-ms-win-rtcore-ntuser-dpi-l1-2-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-rtcore-ntuser-dpi-l1-2-0.dll diff --git a/dlls/ext-ms-win-rtcore-ntuser-dpi-l1-2-0/ext-ms-win-rtcore-ntuser-dpi-l1-2-0.spec b/dlls/ext-ms-win-rtcore-ntuser-dpi-l1-2-0/ext-ms-win-rtcore-ntuser-dpi-l1-2-0.spec new file mode 100644 index 0000000..67c40ab --- /dev/null +++ b/dlls/ext-ms-win-rtcore-ntuser-dpi-l1-2-0/ext-ms-win-rtcore-ntuser-dpi-l1-2-0.spec @@ -0,0 +1 @@ +@ stub GetDpiForMonitorInternal diff --git a/tools/make_specfiles b/tools/make_specfiles index 0c978c0..e02d493 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -376,6 +376,7 @@ my @dll_groups = "ext-ms-win-rtcore-ntuser-cursor-l1-1-0", "ext-ms-win-rtcore-ntuser-dc-access-l1-1-0", "ext-ms-win-rtcore-ntuser-dpi-l1-1-0", + "ext-ms-win-rtcore-ntuser-dpi-l1-2-0", "ext-ms-win-rtcore-ntuser-syscolors-l1-1-0", "ext-ms-win-rtcore-ntuser-sysparams-l1-1-0", ],

1 0

Andrey Gusev : ext-ms-win-ntuser-window-l1-1-4: Add dll.
by Alexandre Julliard March 13, 2018

March 13, 2018

Module: wine Branch: master Commit: 62271dba124a8e0e8b8e2a92335ef33da7ed1dde URL: https://source.winehq.org/git/wine.git/?a=commit;h=62271dba124a8e0e8b8e2a92… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Mar 13 15:45:13 2018 +0200 ext-ms-win-ntuser-window-l1-1-4: 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-window-l1-1-4/Makefile.in | 1 + .../ext-ms-win-ntuser-window-l1-1-4.spec | 3 +++ tools/make_specfiles | 1 + 5 files changed, 8 insertions(+) diff --git a/configure b/configure index b464850..f6a250a 100755 --- a/configure +++ b/configure @@ -1261,6 +1261,7 @@ enable_ext_ms_win_ntuser_private_l1_3_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_ntuser_window_l1_1_4 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 @@ -18625,6 +18626,7 @@ wine_fn_config_makefile dlls/ext-ms-win-ntuser-private-l1-3-1 enable_ext_ms_win_ wine_fn_config_makefile dlls/ext-ms-win-ntuser-rectangle-ext-l1-1-0 enable_ext_ms_win_ntuser_rectangle_ext_l1_1_0 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-window-l1-1-4 enable_ext_ms_win_ntuser_window_l1_1_4 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 diff --git a/configure.ac b/configure.ac index 0795438..0347ac7 100644 --- a/configure.ac +++ b/configure.ac @@ -3258,6 +3258,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-private-l1-3-1) 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-window-l1-1-4) 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) diff --git a/dlls/ext-ms-win-ntuser-window-l1-1-4/Makefile.in b/dlls/ext-ms-win-ntuser-window-l1-1-4/Makefile.in new file mode 100644 index 0000000..9b2e7d1 --- /dev/null +++ b/dlls/ext-ms-win-ntuser-window-l1-1-4/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-ntuser-window-l1-1-4.dll diff --git a/dlls/ext-ms-win-ntuser-window-l1-1-4/ext-ms-win-ntuser-window-l1-1-4.spec b/dlls/ext-ms-win-ntuser-window-l1-1-4/ext-ms-win-ntuser-window-l1-1-4.spec new file mode 100644 index 0000000..77e7b1f --- /dev/null +++ b/dlls/ext-ms-win-ntuser-window-l1-1-4/ext-ms-win-ntuser-window-l1-1-4.spec @@ -0,0 +1,3 @@ +@ stdcall KillTimer(long long) user32.KillTimer +@ stdcall ScreenToClient(long ptr) user32.ScreenToClient +@ stdcall SetTimer(long long long ptr) user32.SetTimer diff --git a/tools/make_specfiles b/tools/make_specfiles index c399779..0c978c0 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -372,6 +372,7 @@ my @dll_groups = "ext-ms-win-ntuser-uicontext-ext-l1-1-0", "ext-ms-win-ntuser-windowclass-l1-1-1", "ext-ms-win-ntuser-window-l1-1-1", + "ext-ms-win-ntuser-window-l1-1-4", "ext-ms-win-rtcore-ntuser-cursor-l1-1-0", "ext-ms-win-rtcore-ntuser-dc-access-l1-1-0", "ext-ms-win-rtcore-ntuser-dpi-l1-1-0",

1 0

Andrey Gusev : ext-ms-win-ntuser-private-l1-3-1: Add dll.
by Alexandre Julliard March 13, 2018

March 13, 2018

Module: wine Branch: master Commit: 15af433a5a2f827e50a2142c9f3ba78c35807138 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15af433a5a2f827e50a2142c… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Mar 13 15:44:55 2018 +0200 ext-ms-win-ntuser-private-l1-3-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-ntuser-private-l1-3-1/Makefile.in | 1 + .../ext-ms-win-ntuser-private-l1-3-1.spec | 7 +++++++ tools/make_specfiles | 1 + 5 files changed, 12 insertions(+) diff --git a/configure b/configure index 1606c2f..b464850 100755 --- a/configure +++ b/configure @@ -1257,6 +1257,7 @@ enable_ext_ms_win_ntuser_message_l1_1_1 enable_ext_ms_win_ntuser_misc_l1_5_1 enable_ext_ms_win_ntuser_mouse_l1_1_0 enable_ext_ms_win_ntuser_private_l1_1_1 +enable_ext_ms_win_ntuser_private_l1_3_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 @@ -18620,6 +18621,7 @@ wine_fn_config_makefile dlls/ext-ms-win-ntuser-message-l1-1-1 enable_ext_ms_win_ wine_fn_config_makefile dlls/ext-ms-win-ntuser-misc-l1-5-1 enable_ext_ms_win_ntuser_misc_l1_5_1 wine_fn_config_makefile dlls/ext-ms-win-ntuser-mouse-l1-1-0 enable_ext_ms_win_ntuser_mouse_l1_1_0 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-private-l1-3-1 enable_ext_ms_win_ntuser_private_l1_3_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 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 diff --git a/configure.ac b/configure.ac index 88e62b2..0795438 100644 --- a/configure.ac +++ b/configure.ac @@ -3254,6 +3254,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-message-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-misc-l1-5-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-mouse-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-private-l1-1-1) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-private-l1-3-1) 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) diff --git a/dlls/ext-ms-win-ntuser-private-l1-3-1/Makefile.in b/dlls/ext-ms-win-ntuser-private-l1-3-1/Makefile.in new file mode 100644 index 0000000..c7866f9 --- /dev/null +++ b/dlls/ext-ms-win-ntuser-private-l1-3-1/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-ntuser-private-l1-3-1.dll diff --git a/dlls/ext-ms-win-ntuser-private-l1-3-1/ext-ms-win-ntuser-private-l1-3-1.spec b/dlls/ext-ms-win-ntuser-private-l1-3-1/ext-ms-win-ntuser-private-l1-3-1.spec new file mode 100644 index 0000000..9ceef76 --- /dev/null +++ b/dlls/ext-ms-win-ntuser-private-l1-3-1/ext-ms-win-ntuser-private-l1-3-1.spec @@ -0,0 +1,7 @@ +1502 stub @ +2506 stub @ +2508 stub @ +2518 stub @ +2548 stub @ +2551 stub @ +2560 stub @ diff --git a/tools/make_specfiles b/tools/make_specfiles index e02d888..c399779 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -366,6 +366,7 @@ my @dll_groups = "ext-ms-win-ntuser-misc-l1-5-1", "ext-ms-win-ntuser-mouse-l1-1-0", "ext-ms-win-ntuser-private-l1-1-1", + "ext-ms-win-ntuser-private-l1-3-1", "ext-ms-win-ntuser-rectangle-ext-l1-1-0", "api-ms-win-ntuser-rectangle-l1-1-0", "ext-ms-win-ntuser-uicontext-ext-l1-1-0",

1 0

Michael Stefaniuc : dmime: Use ParseDescriptor() instead of reimplementing it.
by Alexandre Julliard March 13, 2018

March 13, 2018

Module: wine Branch: master Commit: da4318b291cf5d534696c8719ae8cec240cfadd6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da4318b291cf5d534696c871… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Mar 13 00:23:26 2018 +0100 dmime: Use ParseDescriptor() instead of reimplementing it. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/audiopath.c | 153 +++---------------------------------------------- dlls/dmime/graph.c | 152 +++--------------------------------------------- 2 files changed, 14 insertions(+), 291 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=da4318b291cf5d534696…

1 0

Andrew Wesie : ntdll: Handle icebp on x86-64.
by Alexandre Julliard March 13, 2018

March 13, 2018

Module: wine Branch: master Commit: 5644022c264ce50fe71b7b439c64b020aea61a95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5644022c264ce50fe71b7b43… Author: Andrew Wesie <awesie(a)gmail.com> Date: Mon Mar 12 23:03:07 2018 -0500 ntdll: Handle icebp on x86-64. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 6 ++++++ dlls/ntdll/tests/exception.c | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 05b0906..ee3d1f9 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2917,6 +2917,12 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec->ExceptionCode = EXCEPTION_SINGLE_STEP; break; case TRAP_BRKPT: /* Breakpoint exception */ + /* Check if this is actuallly icebp instruction */ + if (((unsigned char *)rec->ExceptionAddress)[-1] == 0xF1) + { + rec->ExceptionCode = EXCEPTION_SINGLE_STEP; + break; + } rec->ExceptionAddress = (char *)rec->ExceptionAddress - 1; /* back up over the int3 instruction */ /* fall through */ default: diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 7615b5a..320aa77 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -2292,10 +2292,8 @@ static const struct exception /* 35 */ { { 0xa3, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc3 }, /* movl %eax,0xffffffffffffffff; ret */ 0, 9, STATUS_ACCESS_VIOLATION, 2, { 1, 0xffffffffffffffff } }, -#if 0 { { 0xf1, 0x90, 0xc3 }, /* icebp; nop; ret */ 1, 1, STATUS_SINGLE_STEP, 0 }, -#endif { { 0xcd, 0x2c, 0xc3 }, 0, 2, STATUS_ASSERTION_FAILURE, 0 }, };

1 0

Andrew Wesie : ntdll/tests: Test exception codes on x86-64.
by Alexandre Julliard March 13, 2018

March 13, 2018

Module: wine Branch: master Commit: 453c670ab8f46082056f6c3b7aa65d846961c5a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=453c670ab8f46082056f6c3b… Author: Andrew Wesie <awesie(a)gmail.com> Date: Mon Mar 12 23:03:04 2018 -0500 ntdll/tests: Test exception codes on x86-64. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 282 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 282 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=453c670ab8f46082056f…

1 0