February 2021 - Wine-Commits

Alistair Leslie-Hughes : xactengine3_7: Implement IXACT3Engine PrepareWave.
by Alexandre Julliard Feb. 18, 2021

Feb. 18, 2021

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

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

Feb. 18, 2021

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

Alexandre Julliard : msdrm: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 18, 2021

Feb. 18, 2021

Module: wine Branch: master Commit: 629ee5df464189f1b9869af92d0fa57ea8398d44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=629ee5df464189f1b9869af9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:45:45 2021 +0100 msdrm: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdrm/Makefile.in | 5 +---- dlls/msdrm/main.c | 38 -------------------------------------- 2 files changed, 1 insertion(+), 42 deletions(-) diff --git a/dlls/msdrm/Makefile.in b/dlls/msdrm/Makefile.in index 6f61c26b053..07d04d4f861 100644 --- a/dlls/msdrm/Makefile.in +++ b/dlls/msdrm/Makefile.in @@ -1,6 +1,3 @@ MODULE = msdrm.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - main.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/msdrm/main.c b/dlls/msdrm/main.c deleted file mode 100644 index b278d77c83a..00000000000 --- a/dlls/msdrm/main.c +++ /dev/null @@ -1,38 +0,0 @@ -/* - * msdrm.dll - * - * Copyright 2016 Austin English - * - * 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 - */ - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" - -BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) -{ - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(instance); - break; - } - - return TRUE; -}

1 0

Paul Gofman : ddraw/tests: Also test RT caps for software device.
by Alexandre Julliard Feb. 18, 2021

Feb. 18, 2021

Module: wine Branch: master Commit: 6991d7befa869d76511e0dea2c9e9bed6e34b628 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6991d7befa869d76511e0dea… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Feb 18 00:52:06 2021 +0300 ddraw/tests: Also test RT caps for software device. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 137 +++++++++++++++++++++++---------- dlls/ddraw/tests/ddraw2.c | 166 +++++++++++++++++++++++++++------------- dlls/ddraw/tests/ddraw4.c | 170 ++++++++++++++++++++++++++++------------- dlls/ddraw/tests/ddraw7.c | 191 +++++++++++++++++++++++++++++++--------------- 4 files changed, 453 insertions(+), 211 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6991d7befa869d76511e…

1 0

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

Feb. 18, 2021

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

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

Feb. 18, 2021

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

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

Feb. 18, 2021

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 Feb. 18, 2021

Feb. 18, 2021

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

Vijay Kiran Kamuju : dhtmled.ocx: Add registration script.
by Alexandre Julliard Feb. 18, 2021

Feb. 18, 2021

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

Alexandre Julliard : vcomp: Fix varargs calling conventions.
by Alexandre Julliard Feb. 18, 2021

Feb. 18, 2021

Module: wine Branch: master Commit: 5b1c2668b28d2939cba28e9d6f24034fdc917e44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b1c2668b28d2939cba28e9d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 22:37:28 2021 +0100 vcomp: Fix varargs calling conventions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/main.c | 2 +- dlls/vcomp110/tests/vcomp110.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index fa0b84300f1..90caac83750 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -1772,7 +1772,7 @@ static void CDECL c2vectparallel_wrapper(int start, int end, int step, int end_i _vcomp_fork_call_wrapper(function, nargs, wrapper_args); } -void CDECL C2VectParallel(int start, int end, int step, BOOL end_included, int thread_count, +void WINAPIV C2VectParallel(int start, int end, int step, BOOL end_included, int thread_count, BOOL dynamic_distribution, void *function, int nargs, ...) { struct vcomp_thread_data *thread_data; diff --git a/dlls/vcomp110/tests/vcomp110.c b/dlls/vcomp110/tests/vcomp110.c index 65e3c36aa01..e0be668dffd 100644 --- a/dlls/vcomp110/tests/vcomp110.c +++ b/dlls/vcomp110/tests/vcomp110.c @@ -23,7 +23,7 @@ static HMODULE vcomp_handle; -static void (CDECL *pC2VectParallel)(int start, int end, int step, BOOL end_included, int thread_count, +static void (WINAPIV *pC2VectParallel)(int start, int end, int step, BOOL end_included, int thread_count, BOOL dynamic_distribution, void *function, int nargs, ...); static int (CDECL *p_vcomp_get_thread_num)(void); static int (CDECL *pomp_get_num_threads)(void);

1 0