May 2020 - Wine-commits - list.winehq.org

Martin Storsjo : ucrtbase: Extend the printf tests even further.
by Alexandre Julliard 20 May '20

20 May '20

Module: wine Branch: master Commit: 7265cd17b547388ee0080079b772c2ae1722a9bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=7265cd17b547388ee0080079… Author: Martin Storsjo <martin(a)martin.st> Date: Wed May 20 00:44:14 2020 +0300 ucrtbase: Extend the printf tests even further. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/printf.c | 93 +++++++++++++++++++++++--------------------- 1 file changed, 48 insertions(+), 45 deletions(-) diff --git a/dlls/ucrtbase/tests/printf.c b/dlls/ucrtbase/tests/printf.c index 3b48e08b10..7647ac57e2 100644 --- a/dlls/ucrtbase/tests/printf.c +++ b/dlls/ucrtbase/tests/printf.c @@ -90,52 +90,55 @@ static int WINAPIV vsprintf_wrapper(unsigned __int64 options, char *str, static void test_snprintf (void) { - const char *tests[] = {"short", "justfit", "justfits", "muchlonger"}; + const char *tests[] = {"short", "justfit", "justfits", "muchlonger", "", "1"}; char buffer[8]; - const int bufsiz = sizeof buffer; - unsigned int i; - - /* Legacy _snprintf style termination */ - for (i = 0; i < ARRAY_SIZE(tests); i++) { - const char *fmt = tests[i]; - const int expect = strlen(fmt) > bufsiz ? -1 : strlen(fmt); - const int n = vsprintf_wrapper (_CRT_INTERNAL_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, buffer, bufsiz, fmt); - const int valid = n < 0 ? bufsiz : (n == bufsiz ? n : n+1); - - ok (n == expect, "\"%s\": expected %d, returned %d\n", - fmt, expect, n); - ok (!memcmp (fmt, buffer, valid), - "\"%s\": rendered \"%.*s\"\n", fmt, valid, buffer); - } - - /* C99 snprintf style termination */ - for (i = 0; i < ARRAY_SIZE(tests); i++) { - const char *fmt = tests[i]; - const int expect = strlen(fmt); - const int n = vsprintf_wrapper (_CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, buffer, bufsiz, fmt); - const int valid = n >= bufsiz ? bufsiz - 1 : n < 0 ? 0 : n; - - ok (n == expect, "\"%s\": expected %d, returned %d\n", - fmt, expect, n); - ok (!memcmp (fmt, buffer, valid), - "\"%s\": rendered \"%.*s\"\n", fmt, valid, buffer); - ok (buffer[valid] == '\0', - "\"%s\": Missing null termination (ret %d) - is %d\n", fmt, n, buffer[valid]); - } - - /* swprintf style termination */ - for (i = 0; i < ARRAY_SIZE(tests); i++) { - const char *fmt = tests[i]; - const int expect = strlen(fmt) >= bufsiz ? -2 : strlen(fmt); - const int n = vsprintf_wrapper (0, buffer, bufsiz, fmt); - const int valid = n < 0 ? bufsiz - 1 : n; - - ok (n == expect, "\"%s\": expected %d, returned %d\n", - fmt, expect, n); - ok (!memcmp (fmt, buffer, valid), - "\"%s\": rendered \"%.*s\"\n", fmt, valid, buffer); - ok (buffer[valid] == '\0', - "\"%s\": Missing null termination (ret %d) - is %d\n", fmt, n, buffer[valid]); + int bufsizes[] = { 0, 1, sizeof(buffer) }; + unsigned int i, j; + + for (j = 0; j < ARRAY_SIZE(bufsizes); j++) { + const int bufsiz = bufsizes[j]; + /* Legacy _snprintf style termination */ + for (i = 0; i < ARRAY_SIZE(tests); i++) { + const char *fmt = tests[i]; + const int expect = strlen(fmt) > bufsiz ? -1 : strlen(fmt); + const int n = vsprintf_wrapper (_CRT_INTERNAL_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, buffer, bufsiz, fmt); + const int valid = n < 0 ? bufsiz : (n == bufsiz ? n : n+1); + + ok (n == expect, "\"%s\": expected %d, returned %d\n", + fmt, expect, n); + ok (!memcmp (fmt, buffer, valid), + "\"%s\": rendered \"%.*s\"\n", fmt, valid, buffer); + } + + /* C99 snprintf style termination */ + for (i = 0; i < ARRAY_SIZE(tests); i++) { + const char *fmt = tests[i]; + const int expect = strlen(fmt); + const int n = vsprintf_wrapper (_CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, buffer, bufsiz, fmt); + const int valid = n >= bufsiz ? (bufsiz > 0 ? bufsiz - 1 : 0) : n < 0 ? 0 : n; + + ok (n == expect, "\"%s\": expected %d, returned %d\n", + fmt, expect, n); + ok (!memcmp (fmt, buffer, valid), + "\"%s\": rendered \"%.*s\" bufsiz %d\n", fmt, valid, buffer, bufsiz); + ok (bufsiz == 0 || buffer[valid] == '\0', + "\"%s\": Missing null termination (ret %d) - is %d (bufsiz %d)\n", fmt, n, buffer[valid], bufsiz); + } + + /* swprintf style termination */ + for (i = 0; i < ARRAY_SIZE(tests); i++) { + const char *fmt = tests[i]; + const int expect = strlen(fmt) >= bufsiz ? bufsiz > 0 ? -2 : -1 : strlen(fmt); + const int n = vsprintf_wrapper (0, buffer, bufsiz, fmt); + const int valid = n < 0 ? bufsiz > 0 ? bufsiz - 1 : 0 : n; + + ok (n == expect, "\"%s\": expected %d, returned %d\n", + fmt, expect, n); + ok (!memcmp (fmt, buffer, valid), + "\"%s\": rendered \"%.*s\" bufsiz %d\n", fmt, valid, buffer, bufsiz); + ok (bufsiz == 0 || buffer[valid] == '\0', + "\"%s\": Missing null termination (ret %d) - is %d\n", fmt, n, buffer[valid]); + } } ok (vsprintf_wrapper (_CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, NULL, 0, "abcd") == 4,

1 0

Alistair Leslie-Hughes : shell32: Correct if condition.
by Alexandre Julliard 20 May '20

20 May '20

Module: wine Branch: master Commit: 839f468dce6e716632965d348910e4278bff5a85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=839f468dce6e716632965d34… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 20 11:01:42 2020 +1000 shell32: Correct if condition. Spotted by Rafał Mikrut. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49203 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlview.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index ff1332087d..63512deb4b 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -1838,7 +1838,7 @@ static HRESULT WINAPI IShellView_fnTranslateAccelerator(IShellView3 *iface, MSG FIXME("(%p)->(%p: hwnd=%x msg=%x lp=%x wp=%x) stub\n",This,lpmsg, lpmsg->hwnd, lpmsg->message, lpmsg->lParam, lpmsg->wParam); #endif - if ((lpmsg->message>=WM_KEYFIRST) && (lpmsg->message>=WM_KEYLAST)) + if ((lpmsg->message>=WM_KEYFIRST) && (lpmsg->message<=WM_KEYLAST)) { TRACE("-- key=0x04%lx\n",lpmsg->wParam) ; }

1 0

Chip Davis : preloader: Depend on wine_info.plist.
by Alexandre Julliard 20 May '20

20 May '20

Module: wine Branch: master Commit: c1b78caf1d5607c8933fa1a65b4cce5f6ab75f09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1b78caf1d5607c8933fa1a6… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Tue May 19 20:43:09 2020 -0500 preloader: Depend on wine_info.plist. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/loader/Makefile.in b/loader/Makefile.in index 75b0b7b9dd..cb38a7f545 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -29,7 +29,9 @@ wine64_DEPS = $(WINELOADER_DEPENDS) wine64_LDFLAGS = $(WINELOADER_LDFLAGS) $(LDEXECFLAGS) -lwine $(PTHREAD_LIBS) wine_preloader_OBJS = preloader.o preloader_mac.o +wine_preloader_DEPS = $(WINELOADER_DEPENDS) wine_preloader_LDFLAGS = $(WINEPRELOADER_LDFLAGS) wine64_preloader_OBJS = preloader.o preloader_mac.o +wine64_preloader_DEPS = $(WINELOADER_DEPENDS) wine64_preloader_LDFLAGS = $(WINEPRELOADER_LDFLAGS)

1 0

Zebediah Figura : include: Add asferr.h.
by Alexandre Julliard 20 May '20

20 May '20

Module: wine Branch: master Commit: b8abb6e99cfe5bbaaeafb2437ee97369807503ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8abb6e99cfe5bbaaeafb243… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 20 00:08:02 2020 -0500 include: Add asferr.h. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/asferr.h | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++ include/wmsdk.h | 4 +-- 3 files changed, 75 insertions(+), 3 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 6ab53a95af..6aff236a7c 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -18,6 +18,7 @@ SOURCES = \ appcompatapi.h \ appmgmt.h \ appmodel.h \ + asferr.h \ asptlb.idl \ asynot.idl \ asysta.idl \ diff --git a/include/asferr.h b/include/asferr.h new file mode 100644 index 0000000000..5d60c9947f --- /dev/null +++ b/include/asferr.h @@ -0,0 +1,73 @@ +/* + * Copyright (C) 2020 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 + */ + +#ifndef _ASFERR_H +#define _ASFERR_H + +#ifdef RC_INVOKED +#define _ASF_HRESULT_TYPEDEF_(x) x +#else +#define _ASF_HRESULT_TYPEDEF_(x) ((HRESULT)x) +#endif + +#define ASF_S_OPAQUEPACKET _ASF_HRESULT_TYPEDEF_(0x000d07f0) + +#define ASF_E_BUFFEROVERRUN _ASF_HRESULT_TYPEDEF_(0xc00d07d0) +#define ASF_E_BUFFERTOOSMALL _ASF_HRESULT_TYPEDEF_(0xc00d07d1) +#define ASF_E_BADLANGUAGEID _ASF_HRESULT_TYPEDEF_(0xc00d07d2) +#define ASF_E_NOPAYLOADLENGTH _ASF_HRESULT_TYPEDEF_(0xc00d07db) +#define ASF_E_TOOMANYPAYLOADS _ASF_HRESULT_TYPEDEF_(0xc00d07dc) +#define ASF_E_PACKETCONTENTTOOLARGE _ASF_HRESULT_TYPEDEF_(0xc00d07de) +#define ASF_E_UNKNOWNPACKETSIZE _ASF_HRESULT_TYPEDEF_(0xc00d07e0) +#define ASF_E_INVALIDHEADER _ASF_HRESULT_TYPEDEF_(0xc00d07e2) +#define ASF_E_NOCLOCKOBJECT _ASF_HRESULT_TYPEDEF_(0xc00d07e6) +#define ASF_E_UNKNOWNCLOCKTYPE _ASF_HRESULT_TYPEDEF_(0xc00d07eb) +#define ASF_E_OPAQUEPACKET _ASF_HRESULT_TYPEDEF_(0xc00d07ed) +#define ASF_E_WRONGVERSION _ASF_HRESULT_TYPEDEF_(0xc00d07ee) +#define ASF_E_OVERFLOW _ASF_HRESULT_TYPEDEF_(0xc00d07ef) +#define ASF_E_NOTFOUND _ASF_HRESULT_TYPEDEF_(0xc00d07f0) +#define ASF_E_OBJECTTOOBIG _ASF_HRESULT_TYPEDEF_(0xc00d07f3) +#define ASF_E_UNEXPECTEDVALUE _ASF_HRESULT_TYPEDEF_(0xc00d07f4) +#define ASF_E_INVALIDSTATE _ASF_HRESULT_TYPEDEF_(0xc00d07f5) +#define ASF_E_NOLIBRARY _ASF_HRESULT_TYPEDEF_(0xc00d07f6) +#define ASF_E_ALREADYINITIALIZED _ASF_HRESULT_TYPEDEF_(0xc00d07f7) +#define ASF_E_INVALIDINIT _ASF_HRESULT_TYPEDEF_(0xc00d07f8) +#define ASF_E_NOHEADEROBJECT _ASF_HRESULT_TYPEDEF_(0xc00d07f9) +#define ASF_E_NODATAOBJECT _ASF_HRESULT_TYPEDEF_(0xc00d07fa) +#define ASF_E_NOINDEXOBJECT _ASF_HRESULT_TYPEDEF_(0xc00d07fb) +#define ASF_E_NOSTREAMPROPS _ASF_HRESULT_TYPEDEF_(0xc00d07fc) +#define ASF_E_NOFILEPROPS _ASF_HRESULT_TYPEDEF_(0xc00d07fd) +#define ASF_E_NOLANGUAGELIST _ASF_HRESULT_TYPEDEF_(0xc00d07fe) +#define ASF_E_NOINDEXPARAMETERS _ASF_HRESULT_TYPEDEF_(0xc00d07ff) +#define ASF_E_UNSUPPORTEDERRORCONCEALMENT _ASF_HRESULT_TYPEDEF_(0xc00d0800) +#define ASF_E_INVALIDFLAGS _ASF_HRESULT_TYPEDEF_(0xc00d0801) +#define ASF_E_BADDATADESCRIPTOR _ASF_HRESULT_TYPEDEF_(0xc00d0802) +#define ASF_E_BADINDEXINTERVAL _ASF_HRESULT_TYPEDEF_(0xc00d0803) +#define ASF_E_INVALIDTIME _ASF_HRESULT_TYPEDEF_(0xc00d0804) +#define ASF_E_INVALIDINDEX _ASF_HRESULT_TYPEDEF_(0xc00d0805) +#define ASF_E_STREAMNUMBERINUSE _ASF_HRESULT_TYPEDEF_(0xc00d0806) +#define ASF_E_BADMEDIATYPE _ASF_HRESULT_TYPEDEF_(0xc00d0807) +#define ASF_E_WRITEFAILED _ASF_HRESULT_TYPEDEF_(0xc00d0808) +#define ASF_E_NOTENOUGHDESCRIPTORS _ASF_HRESULT_TYPEDEF_(0xc00d0809) +#define ASF_E_INDEXBLOCKUNLOADED _ASF_HRESULT_TYPEDEF_(0xc00d080a) +#define ASF_E_NOTENOUGHBANDWIDTH _ASF_HRESULT_TYPEDEF_(0xc00d080b) +#define ASF_E_EXCEEDEDMAXIMUMOBJECTSIZE _ASF_HRESULT_TYPEDEF_(0xc00d080c) +#define ASF_E_BADDATAUNIT _ASF_HRESULT_TYPEDEF_(0xc00d080d) +#define ASF_E_HEADERSIZE _ASF_HRESULT_TYPEDEF_(0xc00d080e) + +#endif diff --git a/include/wmsdk.h b/include/wmsdk.h index b5528a889b..6d6fd926cc 100644 --- a/include/wmsdk.h +++ b/include/wmsdk.h @@ -20,7 +20,5 @@ /* #include <winapifamily.h> */ #include "wmsdkidl.h" - -/* Currently unimplemented */ -/* #include "asferr.h" */ +#include "asferr.h" #include "nserror.h"

1 0

Zebediah Figura : quartz/tests: Move the test for filter mapper aggregation to filtergraph.c.
by Alexandre Julliard 20 May '20

20 May '20

Module: wine Branch: master Commit: f7718d645363ba5687038dfe977b597e4e1b45af URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7718d645363ba5687038dfe… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 20 00:10:38 2020 -0500 quartz/tests: Move the test for filter mapper aggregation to filtergraph.c. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 25 +++++++++++++++++ dlls/quartz/tests/filtermapper.c | 58 ---------------------------------------- 2 files changed, 25 insertions(+), 58 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index e926b109ec..68b4863442 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -2496,6 +2496,7 @@ static IUnknown test_outer = {&outer_vtbl}; static void test_aggregation(void) { IFilterGraph2 *graph, *graph2; + IFilterMapper2 *mapper; IUnknown *unk, *unk2; HRESULT hr; ULONG ref; @@ -2550,6 +2551,30 @@ static void test_aggregation(void) ref = IUnknown_Release(unk); ok(!ref, "Got unexpected refcount %d.\n", ref); ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + + /* Test the aggregated filter mapper. */ + + graph = create_graph(); + + ref = get_refcount(graph); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + hr = IFilterGraph2_QueryInterface(graph, &IID_IFilterMapper2, (void **)&mapper); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ref = get_refcount(graph); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(mapper); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + + hr = IFilterMapper2_QueryInterface(mapper, &IID_IFilterGraph2, (void **)&graph2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(graph2 == graph, "Got unexpected IFilterGraph2 %p.\n", graph2); + IFilterGraph2_Release(graph2); + + IFilterMapper2_Release(mapper); + ref = IFilterGraph2_Release(graph); + ok(!ref, "Got unexpected refcount %d.\n", ref); } /* Test how methods from "control" interfaces (IBasicAudio, IBasicVideo, diff --git a/dlls/quartz/tests/filtermapper.c b/dlls/quartz/tests/filtermapper.c index b9123ce525..f1a942b1d2 100644 --- a/dlls/quartz/tests/filtermapper.c +++ b/dlls/quartz/tests/filtermapper.c @@ -368,63 +368,6 @@ static void test_legacy_filter_registration(void) IFilterMapper2_Release(mapper2); } -static ULONG getRefcount(IUnknown *iface) -{ - IUnknown_AddRef(iface); - return IUnknown_Release(iface); -} - -static void test_ifiltermapper_from_filtergraph(void) -{ - IFilterGraph2* pgraph2 = NULL; - IFilterMapper2 *pMapper2 = NULL; - IFilterGraph *filtergraph = NULL; - HRESULT hr; - ULONG refcount; - - hr = CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterGraph2, (LPVOID*)&pgraph2); - ok(hr == S_OK, "CoCreateInstance failed with %08x\n", hr); - if (!pgraph2) goto out; - - hr = IFilterGraph2_QueryInterface(pgraph2, &IID_IFilterMapper2, (LPVOID*)&pMapper2); - ok(hr == S_OK, "IFilterGraph2_QueryInterface failed with %08x\n", hr); - if (!pMapper2) goto out; - - refcount = getRefcount((IUnknown*)pgraph2); - ok(refcount == 2, "unexpected reference count: %u\n", refcount); - refcount = getRefcount((IUnknown*)pMapper2); - ok(refcount == 2, "unexpected reference count: %u\n", refcount); - - IFilterMapper2_AddRef(pMapper2); - refcount = getRefcount((IUnknown*)pgraph2); - ok(refcount == 3, "unexpected reference count: %u\n", refcount); - refcount = getRefcount((IUnknown*)pMapper2); - ok(refcount == 3, "unexpected reference count: %u\n", refcount); - IFilterMapper2_Release(pMapper2); - - hr = IFilterMapper2_QueryInterface(pMapper2, &IID_IFilterGraph, (LPVOID*)&filtergraph); - ok(hr == S_OK, "IFilterMapper2_QueryInterface failed with %08x\n", hr); - if (!filtergraph) goto out; - - IFilterMapper2_Release(pMapper2); - pMapper2 = NULL; - IFilterGraph_Release(filtergraph); - filtergraph = NULL; - - hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterMapper2, (LPVOID*)&pMapper2); - ok(hr == S_OK, "CoCreateInstance failed with %08x\n", hr); - if (!pMapper2) goto out; - - hr = IFilterMapper2_QueryInterface(pMapper2, &IID_IFilterGraph, (LPVOID*)&filtergraph); - ok(hr == E_NOINTERFACE, "IFilterMapper2_QueryInterface unexpected result: %08x\n", hr); - - out: - - if (pMapper2) IFilterMapper2_Release(pMapper2); - if (filtergraph) IFilterGraph_Release(filtergraph); - if (pgraph2) IFilterGraph2_Release(pgraph2); -} - static void test_register_filter_with_null_clsMinorType(void) { static WCHAR wszPinName[] = L"Pin"; @@ -721,7 +664,6 @@ START_TEST(filtermapper) test_interfaces(); test_fm2_enummatchingfilters(); test_legacy_filter_registration(); - test_ifiltermapper_from_filtergraph(); test_register_filter_with_null_clsMinorType(); test_parse_filter_data(); test_aggregation();

1 0

Zebediah Figura : quartz: Merge enumregfilters.c into filtermapper.c.
by Alexandre Julliard 20 May '20

20 May '20

Module: wine Branch: master Commit: d42b598399b5fd898471587d46b71c56277e1e46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d42b598399b5fd898471587d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 20 00:10:39 2020 -0500 quartz: Merge enumregfilters.c into filtermapper.c. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/Makefile.in | 1 - dlls/quartz/enumregfilters.c | 224 ------------------------------------------- dlls/quartz/filtermapper.c | 162 ++++++++++++++++++++++++++++++- dlls/quartz/quartz_private.h | 2 - 4 files changed, 160 insertions(+), 229 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d42b598399b5fd898471…

1 0

Zebediah Figura : quartz: Merge enummoniker.c into filtermapper.c.
by Alexandre Julliard 20 May '20

20 May '20

Module: wine Branch: master Commit: 9f72f8c2c37d8944ce140a5790bac1f42a04e41f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f72f8c2c37d8944ce140a57… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 20 00:10:40 2020 -0500 quartz: Merge enummoniker.c into filtermapper.c. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/Makefile.in | 1 - dlls/quartz/enummoniker.c | 208 ------------------------------------------- dlls/quartz/filtermapper.c | 136 +++++++++++++++++++++++++++- dlls/quartz/quartz_private.h | 2 - 4 files changed, 135 insertions(+), 212 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9f72f8c2c37d8944ce14…

1 0

Alexandre Julliard : ntdll: Move configuration paths setup to the Unix library.
by Alexandre Julliard 19 May '20

19 May '20

Module: wine Branch: master Commit: e6194290357343674f75f2fc577da7518e84be6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6194290357343674f75f2fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 19 12:35:54 2020 +0200 ntdll: Move configuration paths setup to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/Makefile.in | 4 +- dlls/ntdll/env.c | 3 + dlls/ntdll/loader.c | 4 + dlls/ntdll/ntdll_misc.h | 2 - dlls/ntdll/server.c | 67 +-------------- dlls/ntdll/unix/loader.c | 208 +++++++++++++++++++++++++++++++++++++++++------ dlls/ntdll/unixlib.h | 4 +- 7 files changed, 199 insertions(+), 93 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e6194290357343674f75…

1 0

Alexandre Julliard : ntdll: Move the wineloader exec support to the Unix library.
by Alexandre Julliard 19 May '20

19 May '20

Module: wine Branch: master Commit: fb310724f6c6ca25d7c77131d0df0e90f0e13575 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb310724f6c6ca25d7c77131… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 19 14:08:16 2020 +0200 ntdll: Move the wineloader exec support to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/Makefile.in | 1 + dlls/ntdll/process.c | 8 ++- dlls/ntdll/server.c | 119 ------------------------------------------- dlls/ntdll/unix/loader.c | 130 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unixlib.h | 4 ++ 5 files changed, 141 insertions(+), 121 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fb310724f6c6ca25d7c7…

1 0

Alexandre Julliard : ntdll: Don't use libwine during the Unix library initialization.
by Alexandre Julliard 19 May '20

19 May '20

Module: wine Branch: master Commit: 67bc4a6d765941d830477f749ab7b0697f1488b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67bc4a6d765941d830477f74… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 19 14:08:30 2020 +0200 ntdll: Don't use libwine during the Unix library initialization. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 427eeaf413..9028b2de81 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -156,6 +156,17 @@ static void fatal_error( const char *err, ... ) exit(1); } +static void set_max_limit( int limit ) +{ + struct rlimit rlimit; + + if (!getrlimit( limit, &rlimit )) + { + rlimit.rlim_cur = rlimit.rlim_max; + setrlimit( limit, &rlimit ); + } +} + /* canonicalize path and return its directory name */ static char *realpath_dirname( const char *name ) { @@ -905,23 +916,11 @@ static void check_vmsplit( void *stack ) } } -static void set_max_limit( int limit ) -{ - struct rlimit rlimit; - - if (!getrlimit( limit, &rlimit )) - { - rlimit.rlim_cur = rlimit.rlim_max; - setrlimit( limit, &rlimit ); - } -} - static int pre_exec(void) { int temp; check_vmsplit( &temp ); - set_max_limit( RLIMIT_AS ); #ifdef __i386__ return 1; /* we have a preloader on x86 */ #else @@ -1004,7 +1003,6 @@ void __wine_main( int argc, char *argv[], char *envp[] ) { HMODULE module; - wine_init_argv0_path( argv[0] ); init_paths( argc, argv, envp ); if (!getenv( "WINELOADERNOEXEC" )) /* first time around */ @@ -1015,11 +1013,20 @@ void __wine_main( int argc, char *argv[], char *envp[] ) check_command_line( argc, argv ); if (pre_exec()) { - wine_exec_wine_binary( NULL, argv, getenv( "WINELOADER" )); + char **new_argv = malloc( (argc + 2) * sizeof(*argv) ); + memcpy( new_argv + 1, argv, (argc + 1) * sizeof(*argv) ); + loader_exec( argv0, new_argv, is_win64 ); fatal_error( "could not exec the wine loader\n" ); } } +#ifdef RLIMIT_NOFILE + set_max_limit( RLIMIT_NOFILE ); +#endif +#ifdef RLIMIT_AS + set_max_limit( RLIMIT_AS ); +#endif + virtual_init(); module = load_ntdll();

1 0