wine-commits February 2021

wine-commits@winehq.org

2 participants
915 discussions

Rémi Bernon : widl: Support WinRT parameterized delegate type.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: wine Branch: master Commit: fecfd245a15b60d44a17c1b7411a282b5e954858 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fecfd245a15b60d44a17c1b7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Feb 18 10:39:00 2021 +0100 widl: Support WinRT parameterized delegate type. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban<jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.foundation.idl | 6 ++++ tools/widl/parser.y | 6 ++++ tools/widl/typetree.c | 76 +++++++++++++++++++++++++++++++++++++----- tools/widl/typetree.h | 2 ++ 4 files changed, 82 insertions(+), 8 deletions(-) diff --git a/include/windows.foundation.idl b/include/windows.foundation.idl index 5f7a49c38e4..bb0fafcab77 100644 --- a/include/windows.foundation.idl +++ b/include/windows.foundation.idl @@ -113,6 +113,12 @@ namespace Windows { } #ifdef __WIDL__ + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(9de1c535-6ae1-11e0-84e1-18a905bcc53f) + ] + delegate HRESULT EventHandler<T>([in] IInspectable *sender, [in] T args); + namespace Collections { [ diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 16d2e0023b7..57e7809fc1a 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1038,6 +1038,12 @@ delegatedef: m_attributes tDELEGATE type ident '(' m_args ')' semicolon_opt { $$ = type_delegate_declare($4->name, current_namespace); $$ = type_delegate_define($$, $1, append_statement(NULL, make_statement_delegate($3, $6))); } + | m_attributes tDELEGATE type ident + '<' { push_parameters_namespace($4->name); } type_parameters '>' + '(' m_args ')' { pop_parameters_namespace($4->name); } semicolon_opt + { $$ = type_parameterized_delegate_declare($4->name, current_namespace, $7); + $$ = type_parameterized_delegate_define($$, $1, append_statement(NULL, make_statement_delegate($3, $10))); + } ; required_types: diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 468b81d450d..0a63b7ebf7f 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -142,15 +142,15 @@ static char const *parameterized_type_shorthands[][2] = { {"Windows_CFoundation_C", "__F"}, }; -static char *format_parameterized_type_c_name(type_t *type, typeref_list_t *params) +static char *format_parameterized_type_c_name(type_t *type, typeref_list_t *params, const char *prefix) { size_t len = 0, pos = 0; char *buf = NULL, *tmp; int i, count = params ? list_count(params) : 0; typeref_t *ref; - pos += append_namespaces(&buf, &len, pos, type->namespace, "__x_", "_C", type->name, use_abi_namespace ? "ABI" : NULL); - pos += strappend(&buf, &len, pos, "_%d", count); + pos += append_namespaces(&buf, &len, pos, type->namespace, "__x_", "_C", "", use_abi_namespace ? "ABI" : NULL); + pos += strappend(&buf, &len, pos, "%s%s_%d", prefix, type->name, count); if (params) LIST_FOR_EACH_ENTRY(ref, params, typeref_t, entry) { for (type = ref->type; type->type_type == TYPE_POINTER; type = type_pointer_get_ref_type(type)) {} @@ -664,12 +664,13 @@ type_t *type_apicontract_define(type_t *apicontract, attr_list_t *attrs) return apicontract; } -static void compute_delegate_iface_names(type_t *delegate) +static void compute_delegate_iface_names(type_t *delegate, type_t *type, typeref_list_t *params) { type_t *iface = delegate->details.delegate.iface; iface->namespace = delegate->namespace; iface->name = strmake("I%s", delegate->name); - iface->c_name = format_namespace(delegate->namespace, "__x_", "_C", iface->name, use_abi_namespace ? "ABI" : NULL); + if (type) iface->c_name = format_parameterized_type_c_name(type, params, "I"); + else iface->c_name = format_namespace(delegate->namespace, "__x_", "_C", iface->name, use_abi_namespace ? "ABI" : NULL); } type_t *type_delegate_declare(char *name, struct namespace *namespace) @@ -707,7 +708,7 @@ type_t *type_delegate_define(type_t *delegate, attr_list_t *attrs, statement_lis delegate->details.delegate.iface = iface; delegate->defined = TRUE; - compute_delegate_iface_names(delegate); + compute_delegate_iface_names(delegate, NULL, NULL); return delegate; } @@ -751,6 +752,46 @@ type_t *type_parameterized_interface_define(type_t *type, attr_list_t *attrs, ty return type; } +type_t *type_parameterized_delegate_declare(char *name, struct namespace *namespace, typeref_list_t *params) +{ + type_t *type = get_type(TYPE_PARAMETERIZED_TYPE, name, namespace, 0); + if (type_get_type_detect_alias(type) != TYPE_PARAMETERIZED_TYPE) + error_loc("pdelegate %s previously not declared a pdelegate at %s:%d\n", + type->name, type->loc_info.input_name, type->loc_info.line_number); + type->details.parameterized.type = make_type(TYPE_DELEGATE); + type->details.parameterized.params = params; + return type; +} + +type_t *type_parameterized_delegate_define(type_t *type, attr_list_t *attrs, statement_list_t *stmts) +{ + type_t *iface, *delegate; + + if (type->defined) + error_loc("pdelegate %s already defined at %s:%d\n", + type->name, type->loc_info.input_name, type->loc_info.line_number); + + type->attrs = check_interface_attrs(type->name, attrs); + + delegate = type->details.parameterized.type; + delegate->attrs = type->attrs; + delegate->details.delegate.iface = make_type(TYPE_INTERFACE); + + iface = delegate->details.delegate.iface; + iface->details.iface = xmalloc(sizeof(*iface->details.iface)); + iface->details.iface->disp_props = NULL; + iface->details.iface->disp_methods = NULL; + iface->details.iface->stmts = stmts; + iface->details.iface->inherit = find_type("IUnknown", NULL, 0); + if (!iface->details.iface->inherit) error_loc("IUnknown is undefined\n"); + iface->details.iface->disp_inherit = NULL; + iface->details.iface->async_iface = NULL; + iface->details.iface->requires = NULL; + + type->defined = TRUE; + return type; +} + type_t *type_parameterized_type_specialize_partial(type_t *type, typeref_list_t *params) { type_t *new_type = duptype(type, 0); @@ -932,6 +973,11 @@ static void type_parameterized_interface_specialize(type_t *tmpl, type_t *iface, iface->details.iface->requires = NULL; } +static void type_parameterized_delegate_specialize(type_t *tmpl, type_t *delegate, typeref_list_t *orig, typeref_list_t *repl) +{ + type_parameterized_interface_specialize(tmpl->details.delegate.iface, delegate->details.delegate.iface, orig, repl); +} + type_t *type_parameterized_type_specialize_declare(type_t *type, typeref_list_t *params) { type_t *tmpl = type->details.parameterized.type; @@ -940,7 +986,13 @@ type_t *type_parameterized_type_specialize_declare(type_t *type, typeref_list_t new_type->namespace = type->namespace; new_type->name = format_parameterized_type_name(type, params); reg_type(new_type, new_type->name, new_type->namespace, 0); - new_type->c_name = format_parameterized_type_c_name(type, params); + new_type->c_name = format_parameterized_type_c_name(type, params, ""); + + if (new_type->type_type == TYPE_DELEGATE) + { + new_type->details.delegate.iface = duptype(tmpl->details.delegate.iface, 0); + compute_delegate_iface_names(new_type, type, params); + } return new_type; } @@ -960,11 +1012,19 @@ type_t *type_parameterized_type_specialize_define(type_t *type) if (type_get_type_detect_alias(tmpl->details.parameterized.type) == TYPE_INTERFACE && type_get_type_detect_alias(iface) == TYPE_INTERFACE) type_parameterized_interface_specialize(tmpl->details.parameterized.type, iface, orig, repl); + else if (type_get_type_detect_alias(tmpl->details.parameterized.type) == TYPE_DELEGATE && + type_get_type_detect_alias(iface) == TYPE_DELEGATE) + type_parameterized_delegate_specialize(tmpl->details.parameterized.type, iface, orig, repl); else - error_loc("pinterface %s previously not declared a pinterface at %s:%d\n", + error_loc("pinterface/pdelegate %s previously not declared a pinterface/pdelegate at %s:%d\n", iface->name, iface->loc_info.input_name, iface->loc_info.line_number); iface->defined = TRUE; + if (iface->type_type == TYPE_DELEGATE) + { + iface = iface->details.delegate.iface; + iface->defined = TRUE; + } compute_method_indexes(iface); return iface; } diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index c2b3b6c90c6..8130174fe2a 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -68,6 +68,8 @@ type_t *type_delegate_declare(char *name, struct namespace *namespace); type_t *type_delegate_define(type_t *delegate, attr_list_t *attrs, statement_list_t *stmts); type_t *type_parameterized_interface_declare(char *name, struct namespace *namespace, typeref_list_t *params); type_t *type_parameterized_interface_define(type_t *type, attr_list_t *attrs, type_t *inherit, statement_list_t *stmts, typeref_list_t *requires); +type_t *type_parameterized_delegate_declare(char *name, struct namespace *namespace, typeref_list_t *params); +type_t *type_parameterized_delegate_define(type_t *type, attr_list_t *attrs, statement_list_t *stmts); type_t *type_parameterized_type_specialize_partial(type_t *type, typeref_list_t *params); type_t *type_parameterized_type_specialize_declare(type_t *type, typeref_list_t *params); type_t *type_parameterized_type_specialize_define(type_t *type);

1 0

Rémi Bernon : widl: Support WinRT delegate type.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: wine Branch: master Commit: 2326d7226da95d7d58d2c1524a8959b3f6f9c127 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2326d7226da95d7d58d2c152… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Feb 18 10:38:59 2021 +0100 widl: Support WinRT delegate type. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban<jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/expr.c | 1 + tools/widl/header.c | 16 +++++++++++----- tools/widl/parser.l | 1 + tools/widl/parser.y | 20 ++++++++++++++++++++ tools/widl/typegen.c | 4 ++++ tools/widl/typelib.c | 1 + tools/widl/typetree.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ tools/widl/typetree.h | 10 ++++++++++ tools/widl/widltypes.h | 7 +++++++ 9 files changed, 104 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2326d7226da95d7d58d2…

1 0

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

18 Feb '21

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

Alexandre Julliard : vcomp: Fix varargs calling conventions.
by Alexandre Julliard 18 Feb '21

18 Feb '21

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

Alexandre Julliard : msports: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: wine Branch: master Commit: e9dd8ac8f2449089ea837005bd8df786d88bef00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9dd8ac8f2449089ea837005… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:46:19 2021 +0100 msports: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msports/Makefile.in | 5 +---- dlls/msports/main.c | 43 ------------------------------------------- 2 files changed, 1 insertion(+), 47 deletions(-) diff --git a/dlls/msports/Makefile.in b/dlls/msports/Makefile.in index f3795c9a32e..17e4804d51f 100644 --- a/dlls/msports/Makefile.in +++ b/dlls/msports/Makefile.in @@ -1,6 +1,3 @@ MODULE = msports.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - main.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/msports/main.c b/dlls/msports/main.c deleted file mode 100644 index 0ad2d1de4dd..00000000000 --- a/dlls/msports/main.c +++ /dev/null @@ -1,43 +0,0 @@ -/* - * msports.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" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msports); - -BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) -{ - TRACE("(%p, %u, %p)\n", instance, reason, reserved); - - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(instance); - break; - } - - return TRUE; -}

1 0

Alexandre Julliard : msls31: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: wine Branch: master Commit: 36d95bfc88a8e860aa7b95e968b0975f6930e446 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36d95bfc88a8e860aa7b95e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:46:05 2021 +0100 msls31: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msls31/Makefile.in | 5 +---- dlls/msls31/msls31_main.c | 42 ------------------------------------------ 2 files changed, 1 insertion(+), 46 deletions(-) diff --git a/dlls/msls31/Makefile.in b/dlls/msls31/Makefile.in index 19f079bb28e..b4d7ab4f904 100644 --- a/dlls/msls31/Makefile.in +++ b/dlls/msls31/Makefile.in @@ -1,6 +1,3 @@ MODULE = msls31.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - msls31_main.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/msls31/msls31_main.c b/dlls/msls31/msls31_main.c deleted file mode 100644 index 84dc528c68a..00000000000 --- a/dlls/msls31/msls31_main.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * msls31.dll - * - * Copyright 2012 Josh DuBois for CodeWeavers - * - * 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" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msls31); - -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - return TRUE; -}

1 0

Alexandre Julliard : msdrm: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 18 Feb '21

18 Feb '21

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

Alexandre Julliard : msdelta: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: wine Branch: master Commit: 5984b855b937c3378f23ac44e84f1c6e0e1c1c71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5984b855b937c3378f23ac44… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:45:30 2021 +0100 msdelta: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdelta/Makefile.in | 5 +---- dlls/msdelta/msdelta_main.c | 40 ---------------------------------------- 2 files changed, 1 insertion(+), 44 deletions(-) diff --git a/dlls/msdelta/Makefile.in b/dlls/msdelta/Makefile.in index 84dae3d114e..5f26bb04dde 100644 --- a/dlls/msdelta/Makefile.in +++ b/dlls/msdelta/Makefile.in @@ -1,6 +1,3 @@ MODULE = msdelta.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - msdelta_main.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/msdelta/msdelta_main.c b/dlls/msdelta/msdelta_main.c deleted file mode 100644 index 5ae82061bd6..00000000000 --- a/dlls/msdelta/msdelta_main.c +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2015 Andrew Eikum for CodeWeavers - * - * 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" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msdelta); - -BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) -{ - TRACE("(%p, %u, %p)\n", instance, reason, reserved); - - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(instance); - break; - } - - return TRUE; -}

1 0

Alexandre Julliard : mscorwks: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: wine Branch: master Commit: 9d1f13438f523a7799631c0324b5ecbaf83eeea2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d1f13438f523a7799631c03… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:45:17 2021 +0100 mscorwks: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscorwks/Makefile.in | 5 +---- dlls/mscorwks/mscorwks_main.c | 36 ------------------------------------ 2 files changed, 1 insertion(+), 40 deletions(-) diff --git a/dlls/mscorwks/Makefile.in b/dlls/mscorwks/Makefile.in index 42a6238a9a9..91d8823d971 100644 --- a/dlls/mscorwks/Makefile.in +++ b/dlls/mscorwks/Makefile.in @@ -1,6 +1,3 @@ MODULE = mscorwks.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - mscorwks_main.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/mscorwks/mscorwks_main.c b/dlls/mscorwks/mscorwks_main.c deleted file mode 100644 index ac7708087f6..00000000000 --- a/dlls/mscorwks/mscorwks_main.c +++ /dev/null @@ -1,36 +0,0 @@ -/* - * .NET workstation runtime - * - * Copyright 2019 Zebediah Figura for CodeWeavers - * - * 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); - } - - return TRUE; -}

1 0

Alexandre Julliard : mscat32: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: wine Branch: master Commit: 1ea7ddf8c6587b8baf6c4ff7cc4595d2f0a58fd3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ea7ddf8c6587b8baf6c4ff7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:45:01 2021 +0100 mscat32: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscat32/Makefile.in | 5 +---- dlls/mscat32/main.c | 40 ---------------------------------------- 2 files changed, 1 insertion(+), 44 deletions(-) diff --git a/dlls/mscat32/Makefile.in b/dlls/mscat32/Makefile.in index 4ccaf8c42c8..cc53ef65cc1 100644 --- a/dlls/mscat32/Makefile.in +++ b/dlls/mscat32/Makefile.in @@ -1,7 +1,4 @@ MODULE = mscat32.dll IMPORTS = wintrust -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - main.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/mscat32/main.c b/dlls/mscat32/main.c deleted file mode 100644 index 8408070282c..00000000000 --- a/dlls/mscat32/main.c +++ /dev/null @@ -1,40 +0,0 @@ -/* mscat32.dll - Backend for Microsoft's MakeCat command-line tool - * - * Copyright (C) 2007 Alexander N. Sørnes <alex(a)thehandofagony.com> - * - * This program 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 program 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 program; 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" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mscat); - - -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(%p, %d, %p)\n",hinstDLL,fdwReason,lpvReserved); - - if (fdwReason == DLL_WINE_PREATTACH) return FALSE; /* prefer native version */ - - if (fdwReason == DLL_PROCESS_ATTACH) - { - DisableThreadLibraryCalls( hinstDLL ); - } - - return TRUE; -}

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
92
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2021