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

Alexandre Julliard : taskschd: Use --prefer_native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard March 2, 2021

March 2, 2021

Module: wine Branch: master Commit: 3fce5dc4924abf58d3c1039f4191de8182b1afeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fce5dc4924abf58d3c1039f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 10:56:02 2021 +0100 taskschd: Use --prefer_native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/Makefile.in | 2 +- dlls/taskschd/taskschd.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/taskschd/Makefile.in b/dlls/taskschd/Makefile.in index 8d12fed057c..0ad00898ace 100644 --- a/dlls/taskschd/Makefile.in +++ b/dlls/taskschd/Makefile.in @@ -1,7 +1,7 @@ MODULE = taskschd.dll IMPORTS = oleaut32 ole32 advapi32 xmllite rpcrt4 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ folder.c \ diff --git a/dlls/taskschd/taskschd.c b/dlls/taskschd/taskschd.c index b68c352824d..42cd7711fa4 100644 --- a/dlls/taskschd/taskschd.c +++ b/dlls/taskschd/taskschd.c @@ -121,9 +121,6 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) { switch (reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: schd_instance = hinst; DisableThreadLibraryCalls(hinst);

1 0

Alexandre Julliard : propsys: Use --prefer_native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard March 2, 2021

March 2, 2021

Module: wine Branch: master Commit: f99113192ffac37506a905827415d3d21d0ebbf8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f99113192ffac37506a90582… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 10:55:15 2021 +0100 propsys: Use --prefer_native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/Makefile.in | 2 +- dlls/propsys/propsys_main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/propsys/Makefile.in b/dlls/propsys/Makefile.in index ec0b223cc92..d8a7a7888bb 100644 --- a/dlls/propsys/Makefile.in +++ b/dlls/propsys/Makefile.in @@ -2,7 +2,7 @@ MODULE = propsys.dll IMPORTLIB = propsys IMPORTS = ole32 oleaut32 uuid -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ propstore.c \ diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index 91ebc62127a..ee67ab35f17 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -42,8 +42,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: propsys_hInstance = hinstDLL; DisableThreadLibraryCalls(hinstDLL);

1 0

Alexandre Julliard : netprofm: Use --prefer_native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard March 2, 2021

March 2, 2021

Module: wine Branch: master Commit: ff798c087291616af13371816fff4a4721c0a1ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff798c087291616af1337181… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 10:55:09 2021 +0100 netprofm: Use --prefer_native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netprofm/Makefile.in | 2 +- dlls/netprofm/main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/netprofm/Makefile.in b/dlls/netprofm/Makefile.in index d57d1d60c45..951ca67bf80 100644 --- a/dlls/netprofm/Makefile.in +++ b/dlls/netprofm/Makefile.in @@ -1,7 +1,7 @@ MODULE = netprofm.dll IMPORTS = iphlpapi -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ list.c \ diff --git a/dlls/netprofm/main.c b/dlls/netprofm/main.c index d1e622f0878..1763080ec3f 100644 --- a/dlls/netprofm/main.c +++ b/dlls/netprofm/main.c @@ -35,8 +35,6 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { switch (reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: instance = hinst; DisableThreadLibraryCalls( hinst );

1 0

Alexandre Julliard : netcfgx: Use --prefer_native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard March 2, 2021

March 2, 2021

Module: wine Branch: master Commit: 8af301140ccd18af511a72687c63d38e53d4a8b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8af301140ccd18af511a7268… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 10:55:04 2021 +0100 netcfgx: Use --prefer_native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netcfgx/Makefile.in | 2 +- dlls/netcfgx/main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/netcfgx/Makefile.in b/dlls/netcfgx/Makefile.in index d4dae8f318d..99302ef2672 100644 --- a/dlls/netcfgx/Makefile.in +++ b/dlls/netcfgx/Makefile.in @@ -1,7 +1,7 @@ MODULE = netcfgx.dll IMPORTS = uuid -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c \ diff --git a/dlls/netcfgx/main.c b/dlls/netcfgx/main.c index 0a3102a81fc..f7373599554 100644 --- a/dlls/netcfgx/main.c +++ b/dlls/netcfgx/main.c @@ -128,8 +128,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); break;

1 0

Alexandre Julliard : wiaservc: Use --prefer_native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard March 2, 2021

March 2, 2021

Module: wine Branch: master Commit: 005e641ec4faed6441c0778d5c6202fc0071c17c URL: https://source.winehq.org/git/wine.git/?a=commit;h=005e641ec4faed6441c0778d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 10:56:43 2021 +0100 wiaservc: Use --prefer_native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wiaservc/Makefile.in | 2 +- dlls/wiaservc/wiaservc_main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/wiaservc/Makefile.in b/dlls/wiaservc/Makefile.in index 2a8d8900419..e810fa23bc3 100644 --- a/dlls/wiaservc/Makefile.in +++ b/dlls/wiaservc/Makefile.in @@ -1,7 +1,7 @@ MODULE = wiaservc.dll IMPORTS = uuid ole32 advapi32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ factory.c \ diff --git a/dlls/wiaservc/wiaservc_main.c b/dlls/wiaservc/wiaservc_main.c index a5f9607665d..3293f485158 100644 --- a/dlls/wiaservc/wiaservc_main.c +++ b/dlls/wiaservc/wiaservc_main.c @@ -47,8 +47,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); hInst = hinstDLL;

1 0

Alexandre Julliard : qdvd: Use --prefer_native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard March 2, 2021

March 2, 2021

Module: wine Branch: master Commit: aeaf884a47c4a9061959f5db6a08d0c20281388e URL: https://source.winehq.org/git/wine.git/?a=commit;h=aeaf884a47c4a9061959f5db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 10:55:21 2021 +0100 qdvd: Use --prefer_native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qdvd/Makefile.in | 2 +- dlls/qdvd/qdvd_main.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/qdvd/Makefile.in b/dlls/qdvd/Makefile.in index bda22a79074..85f88675b21 100644 --- a/dlls/qdvd/Makefile.in +++ b/dlls/qdvd/Makefile.in @@ -1,7 +1,7 @@ MODULE = qdvd.dll IMPORTS = strmbase strmiids uuid ole32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ graph.c \ diff --git a/dlls/qdvd/qdvd_main.c b/dlls/qdvd/qdvd_main.c index 2fdb108877d..cf0620511cc 100644 --- a/dlls/qdvd/qdvd_main.c +++ b/dlls/qdvd/qdvd_main.c @@ -104,9 +104,6 @@ static struct class_factory navigator_cf = {{&class_factory_vtbl}, navigator_cre BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) { - if (reason == DLL_WINE_PREATTACH) - return FALSE; /* prefer native version */ - if (reason == DLL_PROCESS_ATTACH) { qdvd_instance = instance;

1 0

Nikolay Sivov : wbemdisp: Keep property member types.
by Alexandre Julliard March 2, 2021

March 2, 2021

Module: wine Branch: master Commit: 63a9e7e88e29e5aaac987e008d3bd7e78bb85d3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=63a9e7e88e29e5aaac987e00… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 2 09:25:04 2021 +0300 wbemdisp: Keep property member types. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemdisp/locator.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index deef4d83fb8..59a8150a155 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -527,6 +527,7 @@ struct member BSTR name; BOOL is_method; DISPID dispid; + CIMTYPE type; }; struct object @@ -1090,6 +1091,7 @@ static HRESULT init_members( struct object *object ) { IWbemClassObject *sig_in, *sig_out; unsigned int i, capacity = 0, count = 0; + CIMTYPE type; HRESULT hr; BSTR name; @@ -1098,12 +1100,13 @@ static HRESULT init_members( struct object *object ) hr = IWbemClassObject_BeginEnumeration( object->object, 0 ); if (SUCCEEDED( hr )) { - while (IWbemClassObject_Next( object->object, 0, &name, NULL, NULL, NULL ) == S_OK) + while (IWbemClassObject_Next( object->object, 0, &name, NULL, &type, NULL ) == S_OK) { if (!object_reserve_member( object, count + 1, &capacity )) goto error; object->members[count].name = name; object->members[count].is_method = FALSE; object->members[count].dispid = 0; + object->members[count].type = type; count++; TRACE( "added property %s\n", debugstr_w(name) ); }

1 0

Alexandre Julliard : mmcndmgr: Use --prefer_native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard March 2, 2021

March 2, 2021

Module: wine Branch: master Commit: af904dd33f6e243988fff5e6d4feacb7210982bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=af904dd33f6e243988fff5e6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 10:54:53 2021 +0100 mmcndmgr: Use --prefer_native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmcndmgr/Makefile.in | 2 +- dlls/mmcndmgr/mmcndmgr.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/mmcndmgr/Makefile.in b/dlls/mmcndmgr/Makefile.in index 3bc8209fc5c..4a038fa4c61 100644 --- a/dlls/mmcndmgr/Makefile.in +++ b/dlls/mmcndmgr/Makefile.in @@ -1,7 +1,7 @@ MODULE = mmcndmgr.dll IMPORTS = uuid oleaut32 ole32 user32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ mmcndmgr.c diff --git a/dlls/mmcndmgr/mmcndmgr.c b/dlls/mmcndmgr/mmcndmgr.c index 4e6e2e6d2ba..82f866860d6 100644 --- a/dlls/mmcndmgr/mmcndmgr.c +++ b/dlls/mmcndmgr/mmcndmgr.c @@ -177,8 +177,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: MMC_hInstance = hinstDLL; break;

1 0

Alexandre Julliard : dx8vb: Use --prefer_native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard March 2, 2021

March 2, 2021

Module: wine Branch: master Commit: 095b40f40c1b4c14541764099eac17eb34305228 URL: https://source.winehq.org/git/wine.git/?a=commit;h=095b40f40c1b4c1454176409… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 10:54:18 2021 +0100 dx8vb: Use --prefer_native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dx8vb/Makefile.in | 2 +- dlls/dx8vb/main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/dx8vb/Makefile.in b/dlls/dx8vb/Makefile.in index 727265c6983..184d2a3c367 100644 --- a/dlls/dx8vb/Makefile.in +++ b/dlls/dx8vb/Makefile.in @@ -1,7 +1,7 @@ MODULE = dx8vb.dll IMPORTS = uuid ole32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/dx8vb/main.c b/dlls/dx8vb/main.c index 7dbe47d25af..4784c84e203 100644 --- a/dlls/dx8vb/main.c +++ b/dlls/dx8vb/main.c @@ -44,8 +44,6 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) switch (reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(instance); instance_dx8vb = instance;

1 0

Alexandre Julliard : adsldp: Use --prefer_native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard March 2, 2021

March 2, 2021

Module: wine Branch: master Commit: 55ae768fdcdb9286adde36198d519c04ebab1273 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55ae768fdcdb9286adde3619… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 10:53:33 2021 +0100 adsldp: Use --prefer_native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/Makefile.in | 2 +- dlls/adsldp/adsldp.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/adsldp/Makefile.in b/dlls/adsldp/Makefile.in index a99917a16ad..9420a8a92c9 100644 --- a/dlls/adsldp/Makefile.in +++ b/dlls/adsldp/Makefile.in @@ -2,7 +2,7 @@ MODULE = adsldp.dll IMPORTS = ole32 oleaut32 secur32 activeds uuid DELAYIMPORTS = netapi32 wldap32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ adsldp.c \ diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 13bd73c1296..63f800b5061 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -2135,9 +2135,6 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) switch (reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: adsldp_hinst = hinst; DisableThreadLibraryCalls(hinst);

1 0