February 2021 - Wine-commits

Alistair Leslie-Hughes : xactengine3_7: Implement IXACT3Engine PrepareWave.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: wine Branch: master Commit: 5626c163db492a2cb0412c3f54b2a26b2de0170b URL: https://source.winehq.org/git/wine.git/?a=commit;h=5626c163db492a2cb0412c3f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 5 16:19:44 2021 +1100 xactengine3_7: Implement IXACT3Engine PrepareWave. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49689 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xactengine3_7/xact_dll.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 281aecc154b..8b9ee33ab5c 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -995,8 +995,35 @@ static HRESULT WINAPI IXACT3EngineImpl_PrepareWave(IXACT3Engine *iface, IXACT3Wave **ppWave) { XACT3EngineImpl *This = impl_from_IXACT3Engine(iface); - FIXME("(%p): stub!\n", This); - return E_NOTIMPL; + XACT3WaveImpl *wave; + FACTWave *fwave = NULL; + UINT ret; + + TRACE("(%p)->(0x%08x, %s, %d, %d, %d, %d, %p)\n", This, dwFlags, debugstr_a(szWavePath), + wStreamingPacketSize, dwAlignment, dwPlayOffset, nLoopCount, ppWave); + + ret = FACTAudioEngine_PrepareWave(This->fact_engine, dwFlags, szWavePath, wStreamingPacketSize, + dwAlignment, dwPlayOffset, nLoopCount, &fwave); + if(ret != 0 || !fwave) + { + ERR("Failed to CreateWave: %d (%p)\n", ret, fwave); + return E_FAIL; + } + + wave = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*wave)); + if (!wave) + { + FACTWave_Destroy(fwave); + return E_OUTOFMEMORY; + } + + wave->IXACT3Wave_iface.lpVtbl = &XACT3Wave_Vtbl; + wave->fact_wave = fwave; + *ppWave = &wave->IXACT3Wave_iface; + + TRACE("Created Wave: %p\n", wave); + + return S_OK; } enum {

1 0

Vijay Kiran Kamuju : dhtmled.ocx: Add registration script.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: wine Branch: master Commit: 55b2213acecced1ae7684cb34bb51c897e01d174 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55b2213acecced1ae7684cb3… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Feb 6 10:14:46 2021 +0100 dhtmled.ocx: Add registration script. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dhtmled.ocx/Makefile.in | 2 ++ dlls/dhtmled.ocx/dhtmled.rc | 20 ++++++++++++++++++++ dlls/dhtmled.ocx/dhtmled.rgs | 19 +++++++++++++++++++ 3 files changed, 41 insertions(+) diff --git a/dlls/dhtmled.ocx/Makefile.in b/dlls/dhtmled.ocx/Makefile.in index c483de93a05..d4de46adf8c 100644 --- a/dlls/dhtmled.ocx/Makefile.in +++ b/dlls/dhtmled.ocx/Makefile.in @@ -3,6 +3,8 @@ IMPORTS = uuid EXTRADLLFLAGS = -mno-cygwin +RC_SRCS = dhtmled.rc + C_SRCS = \ edit.c \ main.c diff --git a/dlls/dhtmled.ocx/dhtmled.rc b/dlls/dhtmled.ocx/dhtmled.rc new file mode 100644 index 00000000000..631697c9b63 --- /dev/null +++ b/dlls/dhtmled.ocx/dhtmled.rc @@ -0,0 +1,20 @@ +/* + * Copyright 2021 Vijay Kiran Kamuju + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* @makedep: dhtmled.rgs */ +1 WINE_REGISTRY dhtmled.rgs diff --git a/dlls/dhtmled.ocx/dhtmled.rgs b/dlls/dhtmled.ocx/dhtmled.rgs new file mode 100644 index 00000000000..59946fff17f --- /dev/null +++ b/dlls/dhtmled.ocx/dhtmled.rgs @@ -0,0 +1,19 @@ +HKCR +{ + NoRemove CLSID + { + '{2d360200-fff5-11d1-8d03-00a0c959bc0a}' + { + Control + MiscStatus = s '0' + { + '1' = s '131473' + } + } + } + DHTMLEdit.DHTMLEdit = s 'DHTML Control for IE5' + { + CLSID = s '{2d360200-fff5-11d1-8d03-00a0c959bc0a}' + CurVer = s 'DHTMLEdit.DHTMLEdit.1' + } +}

1 0

Vijay Kiran Kamuju : dhtmled.ocx: Implement IOleObject::GetMiscStatus function.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: wine Branch: master Commit: d2c2987bcef21c08aacaba95af76ef381e0907e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2c2987bcef21c08aacaba95… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Feb 6 10:16:24 2021 +0100 dhtmled.ocx: Implement IOleObject::GetMiscStatus function. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50620 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dhtmled.ocx/Makefile.in | 2 +- dlls/dhtmled.ocx/edit.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dhtmled.ocx/Makefile.in b/dlls/dhtmled.ocx/Makefile.in index d4de46adf8c..a6c053a2737 100644 --- a/dlls/dhtmled.ocx/Makefile.in +++ b/dlls/dhtmled.ocx/Makefile.in @@ -1,5 +1,5 @@ MODULE = dhtmled.ocx -IMPORTS = uuid +IMPORTS = uuid ole32 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/dhtmled.ocx/edit.c b/dlls/dhtmled.ocx/edit.c index 874b6554e59..dfa300b9590 100644 --- a/dlls/dhtmled.ocx/edit.c +++ b/dlls/dhtmled.ocx/edit.c @@ -737,9 +737,9 @@ static HRESULT WINAPI OleObject_EnumAdvise(IOleObject *iface, IEnumSTATDATA **ad static HRESULT WINAPI OleObject_GetMiscStatus(IOleObject *iface, DWORD aspect, DWORD *status) { DHTMLEditImpl *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%u, %p) stub\n", This, aspect, status); - *status = 0; - return E_NOTIMPL; + TRACE("(%p)->(%u, %p)\n", This, aspect, status); + + return OleRegGetMiscStatus(&CLSID_DHTMLEdit, aspect, status); } static HRESULT WINAPI OleObject_SetColorScheme(IOleObject *iface, LOGPALETTE *palette)

1 0

Zhiyi Zhang : user32: Send a WM_ACTIVATE message after restoring a minimized top level window.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: wine Branch: master Commit: 3898ad408bb7ad50555ce6bce0fc02ab60eb5caf URL: https://source.winehq.org/git/wine.git/?a=commit;h=3898ad408bb7ad50555ce6bc… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Feb 10 14:33:27 2021 +0800 user32: Send a WM_ACTIVATE message after restoring a minimized top level window. The WmShowRestoreMinimizedOverlappedSeq message sequence in tests clearly show that there is a WM_ACTIVATE message at the end of ShowWindow() calls after restoring a minimized window, and it's not from SetFocus(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47507 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 247 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/user32/winpos.c | 8 +- 2 files changed, 253 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3898ad408bb7ad50555c…

1 0

Nicholas Fraser : configure: Add --enable-build-id option.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: wine Branch: master Commit: 13ca3c883334801e2cadc699c2d35bb783e435dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=13ca3c883334801e2cadc699… Author: Nicholas Fraser <nfraser(a)codeweavers.com> Date: Tue Feb 16 16:15:32 2021 -0500 configure: Add --enable-build-id option. Build-ids are required for doing certain kinds of performance tracing. For example build-ids let Linux perf find the correct objects and transfer them to other machines via "perf archive". Signed-off-by: Nicholas Fraser <nfraser(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 11 ++++++++++ 2 files changed, 82 insertions(+) diff --git a/configure b/configure index fc6c7dede2f..08936ff0ec1 100755 --- a/configure +++ b/configure @@ -842,6 +842,7 @@ enable_option_checking enable_win16 enable_win64 enable_tests +enable_build_id enable_maintainer_mode enable_silent_rules enable_werror @@ -2580,6 +2581,7 @@ Optional Features: --enable-win64 build a Win64 emulator on AMD64 (won't run Win32 binaries) --disable-tests do not build the regression tests + --enable-build-id include .buildid section in output objects --enable-maintainer-mode enable maintainer-specific build rules --enable-silent-rules use silent build rules (override: "make V=1") @@ -3910,6 +3912,11 @@ if test "${enable_tests+set}" = set; then : enableval=$enable_tests; fi +# Check whether --enable-build-id was given. +if test "${enable_build_id+set}" = set; then : + enableval=$enable_build_id; +fi + # Check whether --enable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then : enableval=$enable_maintainer_mode; @@ -10677,6 +10684,41 @@ if test "x$ac_cv_crosscflags__Werror" = xyes; then : EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -Werror" fi fi + if test "x$enable_build_id" = "xyes" + then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -Wl,--build-id" >&5 +$as_echo_n "checking whether the cross-compiler supports -Wl,--build-id... " >&6; } +if ${ac_cv_crosscflags__Wl___build_id+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +ac_wine_try_cflags_saved_cc=$CC +ac_wine_try_cflags_saved_exeext=$ac_exeext +CFLAGS="$CFLAGS $EXTRACROSSCFLAGS -nostartfiles -nodefaultlibs -Wl,--build-id" +CC="$CROSSCC" +ac_exeext=".exe" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int __cdecl mainCRTStartup(void) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_crosscflags__Wl___build_id=yes +else + ac_cv_crosscflags__Wl___build_id=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +CC=$ac_wine_try_cflags_saved_cc +ac_exeext=$ac_wine_try_cflags_saved_exeext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crosscflags__Wl___build_id" >&5 +$as_echo "$ac_cv_crosscflags__Wl___build_id" >&6; } +if test "x$ac_cv_crosscflags__Wl___build_id" = xyes; then : + CROSSCFLAGS="$CROSSCFLAGS -Wl,--build-id" + CROSSLDFLAGS="$CROSSLDFLAGS -Wl,--build-id" +fi + fi CFLAGS=$saved_CFLAGS CC="$ac_save_CC" @@ -17795,6 +17837,35 @@ fi $as_echo "$ac_cv_cflags__Werror" >&6; } if test "x$ac_cv_cflags__Werror" = xyes; then : EXTRACFLAGS="$EXTRACFLAGS -Werror" +fi + fi + if test "x$enable_build_id" = "xyes" + then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,--build-id" >&5 +$as_echo_n "checking whether the compiler supports -Wl,--build-id... " >&6; } +if ${ac_cv_cflags__Wl___build_id+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Wl,--build-id" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__Wl___build_id=yes +else + ac_cv_cflags__Wl___build_id=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl___build_id" >&5 +$as_echo "$ac_cv_cflags__Wl___build_id" >&6; } +if test "x$ac_cv_cflags__Wl___build_id" = xyes; then : + CFLAGS="$CFLAGS -Wl,--build-id" + LDFLAGS="$LDFLAGS -Wl,--build-id" fi fi fi diff --git a/configure.ac b/configure.ac index 5e392ff5ed6..caff5d1fe52 100644 --- a/configure.ac +++ b/configure.ac @@ -31,6 +31,7 @@ dnl **** Command-line arguments **** AC_ARG_ENABLE(win16, AS_HELP_STRING([--disable-win16],[do not include Win16 support])) AC_ARG_ENABLE(win64, AS_HELP_STRING([--enable-win64],[build a Win64 emulator on AMD64 (won't run Win32 binaries)])) AC_ARG_ENABLE(tests, AS_HELP_STRING([--disable-tests],[do not build the regression tests])) +AC_ARG_ENABLE(build-id, AS_HELP_STRING([--enable-build-id],[include .buildid section in output objects])) AC_ARG_ENABLE(maintainer-mode, AS_HELP_STRING([--enable-maintainer-mode],[enable maintainer-specific build rules])) AC_ARG_ENABLE(silent-rules, AS_HELP_STRING([--enable-silent-rules],[use silent build rules (override: "make V=1")])) AC_ARG_ENABLE(werror, AS_HELP_STRING([--enable-werror],[treat compilation warnings as errors])) @@ -1086,6 +1087,11 @@ then then WINE_TRY_CROSSCFLAGS([-Werror]) fi + if test "x$enable_build_id" = "xyes" + then + WINE_TRY_CROSSCFLAGS([-Wl,--build-id], [CROSSCFLAGS="$CROSSCFLAGS -Wl,--build-id" + CROSSLDFLAGS="$CROSSLDFLAGS -Wl,--build-id"]) + fi CFLAGS=$saved_CFLAGS CC="$ac_save_CC" @@ -2111,6 +2117,11 @@ char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy= then WINE_TRY_CFLAGS([-Werror]) fi + if test "x$enable_build_id" = "xyes" + then + WINE_TRY_CFLAGS([-Wl,--build-id], [CFLAGS="$CFLAGS -Wl,--build-id" + LDFLAGS="$LDFLAGS -Wl,--build-id"]) + fi fi dnl **** Disable Fortify, it has too many false positives

1 0

Henri Verbeet : d3d11: Advertise support for shader model 4 compute shaders if compute shaders are supported.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: wine Branch: master Commit: 26ba84ad4dfaa143d7a87d67d4ac2f6a86e0b51b URL: https://source.winehq.org/git/wine.git/?a=commit;h=26ba84ad4dfaa143d7a87d67… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 18 18:19:42 2021 +0100 d3d11: Advertise support for shader model 4 compute shaders if compute shaders are supported. I.e., if we support shader model 5 compute shaders for feature level 11.0, we also support shader model 4 compute shaders for feature level 10.x. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 87bdd594d81..b0041c85881 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3779,7 +3779,17 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFeatureSupport(ID3D11Device2 return E_INVALIDARG; } - options->ComputeShaders_Plus_RawAndStructuredBuffers_Via_Shader_4_x = FALSE; + wined3d_mutex_lock(); + hr = wined3d_device_get_device_caps(device->wined3d_device, &wined3d_caps); + wined3d_mutex_unlock(); + if (FAILED(hr)) + { + WARN("Failed to get device caps, hr %#x.\n", hr); + return hr; + } + + options->ComputeShaders_Plus_RawAndStructuredBuffers_Via_Shader_4_x + = wined3d_caps.max_feature_level >= WINED3D_FEATURE_LEVEL_11; return S_OK; }

1 0

Henri Verbeet : wined3d: Recognise the read-only depth/stencil view flags in wined3d_debug_view_desc().
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: wine Branch: master Commit: b8719736c5a022fa9c50f64adfc3ef58b40460f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8719736c5a022fa9c50f64a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 18 18:19:43 2021 +0100 wined3d: Recognise the read-only depth/stencil view flags in wined3d_debug_view_desc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 6839065365f..233cd49209f 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4702,6 +4702,8 @@ const char *wined3d_debug_view_desc(const struct wined3d_view_desc *d, const str VIEW_FLAG_TO_STR(WINED3D_VIEW_BUFFER_COUNTER); VIEW_FLAG_TO_STR(WINED3D_VIEW_TEXTURE_CUBE); VIEW_FLAG_TO_STR(WINED3D_VIEW_TEXTURE_ARRAY); + VIEW_FLAG_TO_STR(WINED3D_VIEW_READ_ONLY_DEPTH); + VIEW_FLAG_TO_STR(WINED3D_VIEW_READ_ONLY_STENCIL); #undef VIEW_FLAG_TO_STR if (flags) FIXME("Unrecognised view flag(s) %#x.\n", flags);

1 0

Floris Renaud : po: Update Dutch translation.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: wine Branch: master Commit: 717dd6cee400f806f3432129ff8f048ef061e830 URL: https://source.winehq.org/git/wine.git/?a=commit;h=717dd6cee400f806f3432129… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Wed Feb 17 21:59:33 2021 +0100 po: Update Dutch translation. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nl.po | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/po/nl.po b/po/nl.po index 27ef0b5aaba..d727b541ffa 100644 --- a/po/nl.po +++ b/po/nl.po @@ -6043,7 +6043,7 @@ msgstr "Geen MDI-kindvenster.\n" #: dlls/kernel32/winerror.mc:2628 msgid "Popup menu already active.\n" -msgstr "Popup-menu reeds actief.\n" +msgstr "Pop-up menu reeds actief.\n" #: dlls/kernel32/winerror.mc:2633 msgid "No scrollbars.\n" @@ -8102,7 +8102,7 @@ msgstr "client" #: dlls/oleacc/oleacc.rc:42 msgid "popup menu" -msgstr "popupmenu" +msgstr "pop-up menu" #: dlls/oleacc/oleacc.rc:43 msgid "menu item" @@ -12961,7 +12961,7 @@ msgstr "&Verwijder dubbelen" #: programs/conhost/conhost.rc:65 msgid "Popup menu" -msgstr "Popup menu" +msgstr "Pop-up menu" #: programs/conhost/conhost.rc:66 msgid "&Control" @@ -13021,7 +13021,7 @@ msgstr "H&oogte :" #: programs/conhost/conhost.rc:111 msgid "End of program" -msgstr "Programma is beëindigd" +msgstr "Einde programma" #: programs/conhost/conhost.rc:112 msgid "&Close console" @@ -13029,7 +13029,7 @@ msgstr "&Console afsluiten" #: programs/conhost/conhost.rc:114 msgid "Edition" -msgstr "Versie" +msgstr "Modus" #: programs/conhost/conhost.rc:120 msgid "Console parameters" @@ -16108,7 +16108,8 @@ msgstr "" #: programs/wineboot/wineboot.rc:46 msgid "The Wine configuration in %s is being updated, please wait..." msgstr "" -"De Wine configuratie in %s wordt bijgewerkt, even geduld alstublieft..." +"De Wine configuratie in %s wordt bijgewerkt.\n" +"Even geduld alstublieft..." #: programs/winecfg/winecfg.rc:140 msgid "" @@ -16205,7 +16206,7 @@ msgid "" msgstr "" "Elke DLL (Dynamic Link Library) kan apart worden ingesteld op " "'ingebouwd' (de versie van Wine) of 'windows' (afkomstig van Windows of " -"meegeleverd met een programma." +"meegeleverd met een programma)." #: programs/winecfg/winecfg.rc:193 msgid "&New override for library:"

1 0

Alexandre Julliard : winebuild: Add a --prefer-native option to set a Wine-specific flag in the PE header.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: wine Branch: master Commit: ad438726691e6b8077e7f1ddcbee9abf67f3840e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad438726691e6b8077e7f1dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:06:06 2021 +0100 winebuild: Add a --prefer-native option to set a Wine-specific flag in the PE header. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 4 +++- tools/winebuild/main.c | 8 ++++++++ tools/winebuild/spec32.c | 13 +++++++++++++ tools/winebuild/winebuild.man.in | 4 ++++ 4 files changed, 28 insertions(+), 1 deletion(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 104c77db593..84938aabf4f 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -217,7 +217,8 @@ struct strarray #define IMAGE_FILE_UP_SYSTEM_ONLY 0x4000 #define IMAGE_FILE_BYTES_REVERSED_HI 0x8000 -#define IMAGE_DLLCHARACTERISTICS_NX_COMPAT 0x0100 +#define IMAGE_DLLCHARACTERISTICS_PREFER_NATIVE 0x0010 /* Wine extension */ +#define IMAGE_DLLCHARACTERISTICS_NX_COMPAT 0x0100 #define IMAGE_SUBSYSTEM_NATIVE 1 #define IMAGE_SUBSYSTEM_WINDOWS_GUI 2 @@ -380,6 +381,7 @@ extern int unwind_tables; extern int use_msvcrt; extern int unix_lib; extern int safe_seh; +extern int prefer_native; extern char *input_file_name; extern char *spec_file_name; diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 1477df7f259..72e13b7992b 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -49,6 +49,7 @@ int unwind_tables = 0; int use_msvcrt = 0; int unix_lib = 0; int safe_seh = 0; +int prefer_native = 0; #ifdef __i386__ enum target_cpu target_cpu = CPU_x86; @@ -294,6 +295,7 @@ static const char usage_str[] = " --nxcompat=y|n Set the NX compatibility flag (default: yes)\n" " -N, --dll-name=DLLNAME Set the DLL name (default: from input file name)\n" " -o, --output=NAME Set the output file name (default: stdout)\n" +" --prefer-native Set the flag to prefer loading native at run time\n" " -r, --res=RSRC.RES Load resources from RSRC.RES\n" " --safeseh Mark object files as SEH compatible\n" " --save-temps Do not delete the generated intermediate files\n" @@ -329,6 +331,7 @@ enum long_options_values LONG_OPT_LDCMD, LONG_OPT_NMCMD, LONG_OPT_NXCOMPAT, + LONG_OPT_PREFER_NATIVE, LONG_OPT_RESOURCES, LONG_OPT_SAFE_SEH, LONG_OPT_SAVE_TEMPS, @@ -356,6 +359,7 @@ static const struct option long_options[] = { "ld-cmd", 1, 0, LONG_OPT_LDCMD }, { "nm-cmd", 1, 0, LONG_OPT_NMCMD }, { "nxcompat", 1, 0, LONG_OPT_NXCOMPAT }, + { "prefer-native", 0, 0, LONG_OPT_PREFER_NATIVE }, { "resources", 0, 0, LONG_OPT_RESOURCES }, { "safeseh", 0, 0, LONG_OPT_SAFE_SEH }, { "save-temps", 0, 0, LONG_OPT_SAVE_TEMPS }, @@ -575,6 +579,10 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) case LONG_OPT_SAFE_SEH: safe_seh = 1; break; + case LONG_OPT_PREFER_NATIVE: + prefer_native = 1; + spec->dll_characteristics |= IMAGE_DLLCHARACTERISTICS_PREFER_NATIVE; + break; case LONG_OPT_RESOURCES: set_exec_mode( MODE_RESOURCES ); break; diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 678f104c555..8d7e48d2da4 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -1076,6 +1076,19 @@ void make_builtin_files( char *argv[] ) if (header.e_lfanew < sizeof(header) + sizeof(builtin_signature)) fatal_error( "%s: Not enough space (%x) for Wine signature\n", argv[i], header.e_lfanew ); write( fd, builtin_signature, sizeof(builtin_signature) ); + + if (prefer_native) + { + unsigned int pos = header.e_lfanew + 0x5e; /* OptionalHeader.DllCharacteristics */ + unsigned short dll_charact; + lseek( fd, pos, SEEK_SET ); + if (read( fd, &dll_charact, sizeof(dll_charact) ) == sizeof(dll_charact)) + { + dll_charact |= IMAGE_DLLCHARACTERISTICS_PREFER_NATIVE; + lseek( fd, pos, SEEK_SET ); + write( fd, &dll_charact, sizeof(dll_charact) ); + } + } } else fatal_error( "%s: Unrecognized file format\n", argv[i] ); close( fd ); diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index c1de885dac2..d55c00b2d24 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -209,6 +209,10 @@ output file name ends in .o, the text output is sent to a temporary file that is then assembled to produce the specified .o file. .TP +.B --prefer-native +Specify that the native DLL should be preferred if available at run +time. This can be used on modules that are mostly unimplemented. +.TP .BI \-r,\ --res= rsrc.res Load resources from the specified binary resource file. The \fIrsrc.res\fR file can be produced from a source resource file with

1 0

Alexandre Julliard : ntdll: Check the prefer-native flag in the PE header for default load order.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: wine Branch: master Commit: 37600028fca8fc7c78b7374dc45513930e0161e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37600028fca8fc7c78b7374d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:11:22 2021 +0100 ntdll: Check the prefer-native flag in the PE header for default load order. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 16 +++++++-------- dlls/ntdll/unix/loader.c | 52 +++++++++++++++++++++++++++++------------------- dlls/ntdll/unixlib.h | 4 ++-- 3 files changed, 42 insertions(+), 30 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=37600028fca8fc7c78b7…

1 0