February 2022 - Wine-commits

Zebediah Figura : kernelbase: Parse query strings even without a slash after the host in UrlGetPart().
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: 77ac962dedb920407e0591a3d0a62afdbd839ea7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77ac962dedb920407e0591a3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 15 21:52:10 2022 -0600 kernelbase: Parse query strings even without a slash after the host in UrlGetPart(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 12 +++++------- dlls/shlwapi/tests/url.c | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index d14316f05ee..35cce74ab24 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -4243,15 +4243,13 @@ static LONG parse_url(const WCHAR *url, struct parsed_url *pl) work = parse_url_element( pl->port, L"/\\?#" ); pl->port_len = work - pl->port; } - if (*work == '/') + + if ((pl->query = wcschr( work, '?' ))) { - /* see if query string */ - if ((pl->query = wcschr( work, '?' ))) - { - ++pl->query; - pl->query_len = lstrlenW(pl->query); - } + ++pl->query; + pl->query_len = lstrlenW(pl->query); } + SuccessExit: TRACE("parse successful: scheme=%p(%ld), user=%p(%ld), pass=%p(%ld), host=%p(%ld), port=%p(%ld), query=%p(%ld)\n", pl->scheme, pl->scheme_len, pl->username, pl->username_len, pl->password, pl->password_len, pl->hostname, diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 1b26204a94f..3bfd8961c8f 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -669,7 +669,7 @@ static void test_UrlGetPart(void) {"ftp:\\/localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost", .todo_hr = TRUE}, {"http://host?a:b(a)c:d", URL_PART_HOSTNAME, 0, S_OK, "host"}, - {"http://host?a:b(a)c:d", URL_PART_QUERY, 0, S_OK, "a:b(a)c:d", .todo_hr = TRUE}, + {"http://host?a:b(a)c:d", URL_PART_QUERY, 0, S_OK, "a:b(a)c:d"}, {"http://host#a:b(a)c:d", URL_PART_HOSTNAME, 0, S_OK, "host"}, {"http://host#a:b(a)c:d", URL_PART_QUERY, 0, S_FALSE, ""},

1 0

Zebediah Figura : kernelbase: Return void from parse_url().
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: a3d67465d8976b4a11fc929c7797e653acb6a90e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3d67465d8976b4a11fc929c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 15 21:52:11 2022 -0600 kernelbase: Return void from parse_url(). If we cannot parse a scheme, the entire parsed_url structure will be zero, in which case we will always return S_FALSE from UrlGetPartW(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 35cce74ab24..be487e71a3a 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -4191,16 +4191,16 @@ static const WCHAR *parse_url_element( const WCHAR *url, const WCHAR *separators return url + wcslen( url ); } -static LONG parse_url(const WCHAR *url, struct parsed_url *pl) +static void parse_url( const WCHAR *url, struct parsed_url *pl ) { const WCHAR *work; memset(pl, 0, sizeof(*pl)); pl->scheme = url; work = scan_url(pl->scheme, &pl->scheme_len, SCHEME); - if (!*work || (*work != ':')) goto ErrorExit; + if (!*work || (*work != ':')) return; work++; - if ((*work != '/') || (*(work+1) != '/')) goto SuccessExit; + if ((*work != '/') || (*(work+1) != '/')) return; pl->username = work + 2; work = parse_url_element( pl->username, L":@/\\?#" ); @@ -4249,17 +4249,6 @@ static LONG parse_url(const WCHAR *url, struct parsed_url *pl) ++pl->query; pl->query_len = lstrlenW(pl->query); } - - SuccessExit: - TRACE("parse successful: scheme=%p(%ld), user=%p(%ld), pass=%p(%ld), host=%p(%ld), port=%p(%ld), query=%p(%ld)\n", - pl->scheme, pl->scheme_len, pl->username, pl->username_len, pl->password, pl->password_len, pl->hostname, - pl->hostname_len, pl->port, pl->port_len, pl->query, pl->query_len); - - return S_OK; - - ErrorExit: - FIXME("failed to parse %s\n", debugstr_w(url)); - return E_INVALIDARG; } HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD part, DWORD flags) @@ -4267,7 +4256,6 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p DWORD scheme, size, schsize; LPCWSTR addr, schaddr; struct parsed_url pl; - HRESULT hr; TRACE("%s, %p, %p(%ld), %#lx, %#lx\n", wine_dbgstr_w(url), out, out_len, *out_len, part, flags); @@ -4280,7 +4268,7 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p else scheme = get_scheme_code(url, addr - url); - hr = parse_url(url, &pl); + parse_url(url, &pl); switch (scheme) { @@ -4411,7 +4399,7 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p } TRACE("len=%ld %s\n", *out_len, wine_dbgstr_w(out)); - return hr; + return S_OK; } BOOL WINAPI UrlIsA(const char *url, URLIS Urlis)

1 0

Zebediah Figura : kernelbase: Return E_INVALIDARG when requesting URL_PART_USERNAME and there is no username.
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: 68323afa08056c61c5aa1731c0884c8119b04af5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68323afa08056c61c5aa1731… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 15 21:52:12 2022 -0600 kernelbase: Return E_INVALIDARG when requesting URL_PART_USERNAME and there is no username. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 2 ++ dlls/shlwapi/tests/url.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index be487e71a3a..ad823cae547 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -4321,6 +4321,8 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p break; case URL_PART_USERNAME: + if (!pl.username) + return E_INVALIDARG; if (!pl.username_len) { *out = '\0'; diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 3bfd8961c8f..5d982467cea 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -621,13 +621,13 @@ static void test_UrlGetPart(void) {"http://foo:bar(a)localhost:21/internal.php?query=x&return=y", URL_PART_PORT, URL_PARTFLAG_KEEPSCHEME, S_OK, "http:21"}, {"http://foo:bar(a)localhost:21/internal.php?query=x&return=y", URL_PART_QUERY, URL_PARTFLAG_KEEPSCHEME, S_OK, "query=x&return=y"}, - {"http://localhost/", URL_PART_USERNAME, 0, E_INVALIDARG, .todo_hr = TRUE}, + {"http://localhost/", URL_PART_USERNAME, 0, E_INVALIDARG}, {"http://localhost/", URL_PART_PASSWORD, 0, E_INVALIDARG, .todo_hr = TRUE}, {"http://localhost/", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, {"http://localhost/", URL_PART_PORT, 0, E_INVALIDARG, .todo_hr = TRUE}, {"http://localhost/", URL_PART_QUERY, 0, S_FALSE, ""}, - {"http://localhost:port/", URL_PART_USERNAME, 0, E_INVALIDARG, .todo_hr = TRUE}, + {"http://localhost:port/", URL_PART_USERNAME, 0, E_INVALIDARG}, {"http://localhost:port/", URL_PART_PASSWORD, 0, E_INVALIDARG, .todo_hr = TRUE}, {"http://localhost:port/", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, {"http://localhost:port/", URL_PART_PORT, 0, S_OK, "port"},

1 0

Zebediah Figura : kernelbase: Return E_INVALIDARG when requesting URL_PART_PASSWORD and there is no password.
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: 67ea5ccc6beae655f6379625be2dda4156bffd23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67ea5ccc6beae655f6379625… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 15 21:52:13 2022 -0600 kernelbase: Return E_INVALIDARG when requesting URL_PART_PASSWORD and there is no password. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 2 ++ dlls/shlwapi/tests/url.c | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index ad823cae547..fbb4c5152a9 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -4334,6 +4334,8 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p break; case URL_PART_PASSWORD: + if (!pl.password) + return E_INVALIDARG; if (!pl.password_len) { *out = '\0'; diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 5d982467cea..54342d1e5c2 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -622,24 +622,24 @@ static void test_UrlGetPart(void) {"http://foo:bar(a)localhost:21/internal.php?query=x&return=y", URL_PART_QUERY, URL_PARTFLAG_KEEPSCHEME, S_OK, "query=x&return=y"}, {"http://localhost/", URL_PART_USERNAME, 0, E_INVALIDARG}, - {"http://localhost/", URL_PART_PASSWORD, 0, E_INVALIDARG, .todo_hr = TRUE}, + {"http://localhost/", URL_PART_PASSWORD, 0, E_INVALIDARG}, {"http://localhost/", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, {"http://localhost/", URL_PART_PORT, 0, E_INVALIDARG, .todo_hr = TRUE}, {"http://localhost/", URL_PART_QUERY, 0, S_FALSE, ""}, {"http://localhost:port/", URL_PART_USERNAME, 0, E_INVALIDARG}, - {"http://localhost:port/", URL_PART_PASSWORD, 0, E_INVALIDARG, .todo_hr = TRUE}, + {"http://localhost:port/", URL_PART_PASSWORD, 0, E_INVALIDARG}, {"http://localhost:port/", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, {"http://localhost:port/", URL_PART_PORT, 0, S_OK, "port"}, {"http://:", URL_PART_HOSTNAME, 0, S_FALSE, ""}, {"http://:", URL_PART_PORT, 0, S_FALSE, ""}, {"http://user(a)localhost", URL_PART_USERNAME, 0, S_OK, "user"}, - {"http://user(a)localhost", URL_PART_PASSWORD, 0, E_INVALIDARG, .todo_hr = TRUE}, + {"http://user(a)localhost", URL_PART_PASSWORD, 0, E_INVALIDARG}, {"http://user(a)localhost", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, {"http://user(a)localhost", URL_PART_PORT, 0, E_INVALIDARG, .todo_hr = TRUE}, {"http://@", URL_PART_USERNAME, 0, S_FALSE, ""}, - {"http://@", URL_PART_PASSWORD, 0, E_INVALIDARG, .todo_hr = TRUE}, + {"http://@", URL_PART_PASSWORD, 0, E_INVALIDARG}, {"http://@", URL_PART_HOSTNAME, 0, S_FALSE, ""}, {"http://user:pass(a)localhost", URL_PART_USERNAME, 0, S_OK, "user"},

1 0

Zebediah Figura : kernelbase: Return E_INVALIDARG when requesting URL_PART_PORT and there is no port.
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: 224d07338874fed785517b5c40b3573d645acebd URL: https://source.winehq.org/git/wine.git/?a=commit;h=224d07338874fed785517b5c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 15 21:52:14 2022 -0600 kernelbase: Return E_INVALIDARG when requesting URL_PART_PORT and there is no port. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 2 ++ dlls/shlwapi/tests/url.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index fbb4c5152a9..e29ee585123 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -4347,6 +4347,8 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p break; case URL_PART_PORT: + if (!pl.port) + return E_INVALIDARG; if (!pl.port_len) { *out = '\0'; diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 54342d1e5c2..18af0906e08 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -624,7 +624,7 @@ static void test_UrlGetPart(void) {"http://localhost/", URL_PART_USERNAME, 0, E_INVALIDARG}, {"http://localhost/", URL_PART_PASSWORD, 0, E_INVALIDARG}, {"http://localhost/", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, - {"http://localhost/", URL_PART_PORT, 0, E_INVALIDARG, .todo_hr = TRUE}, + {"http://localhost/", URL_PART_PORT, 0, E_INVALIDARG}, {"http://localhost/", URL_PART_QUERY, 0, S_FALSE, ""}, {"http://localhost:port/", URL_PART_USERNAME, 0, E_INVALIDARG}, @@ -637,7 +637,7 @@ static void test_UrlGetPart(void) {"http://user(a)localhost", URL_PART_USERNAME, 0, S_OK, "user"}, {"http://user(a)localhost", URL_PART_PASSWORD, 0, E_INVALIDARG}, {"http://user(a)localhost", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, - {"http://user(a)localhost", URL_PART_PORT, 0, E_INVALIDARG, .todo_hr = TRUE}, + {"http://user(a)localhost", URL_PART_PORT, 0, E_INVALIDARG}, {"http://@", URL_PART_USERNAME, 0, S_FALSE, ""}, {"http://@", URL_PART_PASSWORD, 0, E_INVALIDARG}, {"http://@", URL_PART_HOSTNAME, 0, S_FALSE, ""}, @@ -645,7 +645,7 @@ static void test_UrlGetPart(void) {"http://user:pass(a)localhost", URL_PART_USERNAME, 0, S_OK, "user"}, {"http://user:pass(a)localhost", URL_PART_PASSWORD, 0, S_OK, "pass"}, {"http://user:pass(a)localhost", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, - {"http://user:pass(a)localhost", URL_PART_PORT, 0, E_INVALIDARG, .todo_hr = TRUE}, + {"http://user:pass(a)localhost", URL_PART_PORT, 0, E_INVALIDARG}, {"http://:@", URL_PART_USERNAME, 0, S_FALSE, ""}, {"http://:@", URL_PART_PASSWORD, 0, S_FALSE, ""}, {"http://:@", URL_PART_HOSTNAME, 0, S_FALSE, ""},

1 0

Eric Pouech : gdiplus/tests: Get rid of some GCC11 warnings (-Warray-bounds).
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: aa9d1bd130fb8d30522e2a5b82d325d00b06d77a URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa9d1bd130fb8d30522e2a5b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 14 10:28:12 2022 +0100 gdiplus/tests: Get rid of some GCC11 warnings (-Warray-bounds). don't pretend using a BITMAPINFO when only a BITMAPINFOHEADER is used Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/graphics.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 690efa8ac1e..c8c31ce258b 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -1313,21 +1313,20 @@ static void test_GdipDrawImagePointsRect(void) GpGraphics *graphics = NULL; GpPointF ptf[4]; GpBitmap *bm = NULL; - BYTE rbmi[sizeof(BITMAPINFOHEADER)]; BYTE buff[400]; - BITMAPINFO *bmi = (BITMAPINFO*)rbmi; + BITMAPINFOHEADER bmihdr; HDC hdc = GetDC( hwnd ); if (!hdc) return; - memset(rbmi, 0, sizeof(rbmi)); - bmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - bmi->bmiHeader.biWidth = 10; - bmi->bmiHeader.biHeight = 10; - bmi->bmiHeader.biPlanes = 1; - bmi->bmiHeader.biBitCount = 32; - bmi->bmiHeader.biCompression = BI_RGB; - status = GdipCreateBitmapFromGdiDib(bmi, buff, &bm); + memset(&bmihdr, 0, sizeof(bmihdr)); + bmihdr.biSize = sizeof(BITMAPINFOHEADER); + bmihdr.biWidth = 10; + bmihdr.biHeight = 10; + bmihdr.biPlanes = 1; + bmihdr.biBitCount = 32; + bmihdr.biCompression = BI_RGB; + status = GdipCreateBitmapFromGdiDib((BITMAPINFO*)&bmihdr, buff, &bm); expect(Ok, status); ok(NULL != bm, "Expected bitmap to be initialized\n"); status = GdipCreateFromHDC(hdc, &graphics);

1 0

Eric Pouech : gdiplus: Get rid of gcc11 warnings (-Warray-bounds).
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: af403bd34f91684aecd6fe06434475ce54a04b08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af403bd34f91684aecd6fe06… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 14 10:28:24 2022 +0100 gdiplus: Get rid of gcc11 warnings (-Warray-bounds). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/image.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 6be6c4ff216..b899619e1d3 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -4107,6 +4107,8 @@ static GpStatus decode_image_tiff(IStream* stream, GpImage **image) return decode_image_wic(stream, &GUID_ContainerFormatTiff, NULL, image); } +C_ASSERT(offsetof(WmfPlaceableFileHeader, Key) == 0); + static GpStatus load_wmf(IStream *stream, GpMetafile **metafile) { WmfPlaceableFileHeader pfh; @@ -4123,7 +4125,8 @@ static GpStatus load_wmf(IStream *stream, GpMetafile **metafile) if (hr != S_OK || size != sizeof(mh)) return GenericError; - if (((WmfPlaceableFileHeader *)&mh)->Key == WMF_PLACEABLE_KEY) + /* detect whether stream starts with a WmfPlaceablefileheader */ + if (*(UINT32 *)&mh == WMF_PLACEABLE_KEY) { seek.QuadPart = 0; hr = IStream_Seek(stream, seek, STREAM_SEEK_SET, NULL);

1 0

Eric Pouech : mscoree: Enable compilation with long types.
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: 27d9ca5ea1a5a97ff88c09bdd07e41c1128dce61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27d9ca5ea1a5a97ff88c09bd… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 15 07:28:59 2022 +0100 mscoree: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/Makefile.in | 1 - dlls/mscoree/config.c | 28 ++++++++++++++-------------- dlls/mscoree/cordebug.c | 22 +++++++++++----------- dlls/mscoree/corruntimehost.c | 26 +++++++++++++------------- dlls/mscoree/metadata.c | 18 +++++++++--------- dlls/mscoree/metahost.c | 22 +++++++++++----------- dlls/mscoree/mscoree_main.c | 32 ++++++++++++++++---------------- 7 files changed, 74 insertions(+), 75 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=27d9ca5ea1a5a97ff88c…

1 0

Eric Pouech : nddeapi: Enable compilation with long types.
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: 11eb69cbe09e66ac522418adc05dfbc1d0f3c101 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11eb69cbe09e66ac522418ad… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 16 08:10:52 2022 +0100 nddeapi: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nddeapi/Makefile.in | 1 - dlls/nddeapi/nddeapi.c | 36 ++++++++++++++++++------------------ 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/nddeapi/Makefile.in b/dlls/nddeapi/Makefile.in index 31c2c4a2cba..6a335119b62 100644 --- a/dlls/nddeapi/Makefile.in +++ b/dlls/nddeapi/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = nddeapi.dll IMPORTLIB = nddeapi diff --git a/dlls/nddeapi/nddeapi.c b/dlls/nddeapi/nddeapi.c index 84c636affb0..263f2fd93be 100644 --- a/dlls/nddeapi/nddeapi.c +++ b/dlls/nddeapi/nddeapi.c @@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(nddeapi); UINT WINAPI NDdeShareAddA(LPSTR lpszServer, UINT nLevel, PSECURITY_DESCRIPTOR pSD, LPBYTE lpBuffer, DWORD cBufSize) { - TRACE("(%s, %u, %p, %p, %u)\n", debugstr_a(lpszServer), nLevel, pSD, lpBuffer, cBufSize); + TRACE("(%s, %u, %p, %p, %lu)\n", debugstr_a(lpszServer), nLevel, pSD, lpBuffer, cBufSize); return NDDE_NOT_IMPLEMENTED; } @@ -61,7 +61,7 @@ UINT WINAPI NDdeShareDelA(LPSTR lpszServer, LPSTR lpszShareName, UINT wReserved) UINT WINAPI NDdeShareEnumA(LPSTR lpszServer, UINT nLevel, LPBYTE lpBuffer, DWORD cBufSize, LPDWORD lpnEntriesRead, LPDWORD lpcbTotalAvailable) { - TRACE("(%s, %u, %p, %u, %p, %p)\n", debugstr_a(lpszServer), nLevel, lpBuffer, cBufSize, + TRACE("(%s, %u, %p, %lu, %p, %p)\n", debugstr_a(lpszServer), nLevel, lpBuffer, cBufSize, lpnEntriesRead, lpcbTotalAvailable); return NDDE_NOT_IMPLEMENTED; @@ -74,7 +74,7 @@ UINT WINAPI NDdeShareEnumA(LPSTR lpszServer, UINT nLevel, LPBYTE lpBuffer, DWORD UINT WINAPI NDdeShareGetInfoA(LPSTR lpszServer, LPSTR lpszShareName, UINT nLevel, LPBYTE lpBuffer, DWORD cBufSize, LPDWORD lpnTotalAvailable, LPWORD lpnItems) { - TRACE("(%s, %s, %u, %p, %u, %p, %p)\n", debugstr_a(lpszServer), debugstr_a(lpszShareName), nLevel, + TRACE("(%s, %s, %u, %p, %lu, %p, %p)\n", debugstr_a(lpszServer), debugstr_a(lpszShareName), nLevel, lpBuffer, cBufSize, lpnTotalAvailable, lpnItems); return NDDE_NOT_IMPLEMENTED; @@ -87,7 +87,7 @@ UINT WINAPI NDdeShareGetInfoA(LPSTR lpszServer, LPSTR lpszShareName, UINT nLevel UINT WINAPI NDdeShareSetInfoA(LPSTR lpszServer, LPSTR lpszShareName, UINT nLevel, LPBYTE lpBuffer, DWORD cBufSize, WORD sParmNum) { - TRACE("(%s, %s, %u, %p, %u, %u)\n", debugstr_a(lpszServer), debugstr_a(lpszShareName), nLevel, + TRACE("(%s, %s, %u, %p, %lu, %u)\n", debugstr_a(lpszServer), debugstr_a(lpszShareName), nLevel, lpBuffer, cBufSize, sParmNum); return NDDE_NOT_IMPLEMENTED; @@ -99,7 +99,7 @@ UINT WINAPI NDdeShareSetInfoA(LPSTR lpszServer, LPSTR lpszShareName, UINT nLevel */ UINT WINAPI NDdeGetErrorStringA(UINT uErrorCode, LPSTR lpszErrorString, DWORD cBufSize) { - TRACE("(%u, %p, %d)\n", uErrorCode, lpszErrorString, cBufSize); + TRACE("(%u, %p, %ld)\n", uErrorCode, lpszErrorString, cBufSize); return NDDE_NOT_IMPLEMENTED; } @@ -133,7 +133,7 @@ BOOL WINAPI NDdeIsValidAppTopicListA(LPSTR targetTopic) UINT WINAPI NDdeGetShareSecurityA(LPSTR lpszServer, LPSTR lpszShareName, SECURITY_INFORMATION si, PSECURITY_DESCRIPTOR pSD, DWORD cbSD, LPDWORD lpcbsdRequired) { - TRACE("(%s, %s, %u, %p, %u, %p)\n", debugstr_a(lpszServer), debugstr_a(lpszShareName), + TRACE("(%s, %s, %lu, %p, %lu, %p)\n", debugstr_a(lpszServer), debugstr_a(lpszShareName), si, pSD, cbSD, lpcbsdRequired); return NDDE_NOT_IMPLEMENTED; @@ -146,7 +146,7 @@ UINT WINAPI NDdeGetShareSecurityA(LPSTR lpszServer, LPSTR lpszShareName, SECURIT UINT WINAPI NDdeSetShareSecurityA(LPSTR lpszServer, LPSTR lpszShareName, SECURITY_INFORMATION si, PSECURITY_DESCRIPTOR pSD) { - TRACE("(%s, %s, %u, %p)\n", debugstr_a(lpszServer), debugstr_a(lpszShareName), si, pSD); + TRACE("(%s, %s, %lu, %p)\n", debugstr_a(lpszServer), debugstr_a(lpszShareName), si, pSD); return NDDE_NOT_IMPLEMENTED; } @@ -170,7 +170,7 @@ UINT WINAPI NDdeGetTrustedShareA(LPSTR lpszServer, LPSTR lpszShareName, LPDWORD */ UINT WINAPI NDdeSetTrustedShareA(LPSTR lpszServer, LPSTR lpszShareName, DWORD dwTrustOptions) { - TRACE("(%s, %s, 0x%08x)\n", debugstr_a(lpszServer), debugstr_a(lpszShareName), dwTrustOptions); + TRACE("(%s, %s, 0x%08lx)\n", debugstr_a(lpszServer), debugstr_a(lpszShareName), dwTrustOptions); return NDDE_NOT_IMPLEMENTED; } @@ -182,7 +182,7 @@ UINT WINAPI NDdeSetTrustedShareA(LPSTR lpszServer, LPSTR lpszShareName, DWORD dw UINT WINAPI NDdeTrustedShareEnumA(LPSTR lpszServer, UINT nLevel, LPBYTE lpBuffer, DWORD cBufSize, LPDWORD lpnEntriesRead, LPDWORD lpcbTotalAvailable) { - TRACE("(%s, %u, %p, %u, %p, %p)\n", debugstr_a(lpszServer), nLevel, lpBuffer, cBufSize, + TRACE("(%s, %u, %p, %lu, %p, %p)\n", debugstr_a(lpszServer), nLevel, lpBuffer, cBufSize, lpnEntriesRead, lpcbTotalAvailable); return NDDE_NOT_IMPLEMENTED; @@ -195,7 +195,7 @@ UINT WINAPI NDdeTrustedShareEnumA(LPSTR lpszServer, UINT nLevel, LPBYTE lpBuffer UINT WINAPI NDdeShareAddW(LPWSTR lpszServer, UINT nLevel, PSECURITY_DESCRIPTOR pSD, LPBYTE lpBuffer, DWORD cBufSize) { - TRACE("(%s, %u, %p, %p, %u)\n", debugstr_w(lpszServer), nLevel, pSD, lpBuffer, cBufSize); + TRACE("(%s, %u, %p, %p, %lu)\n", debugstr_w(lpszServer), nLevel, pSD, lpBuffer, cBufSize); return NDDE_NOT_IMPLEMENTED; } @@ -218,7 +218,7 @@ UINT WINAPI NDdeShareDelW(LPWSTR lpszServer, LPWSTR lpszShareName, UINT wReserve UINT WINAPI NDdeShareEnumW(LPWSTR lpszServer, UINT nLevel, LPBYTE lpBuffer, DWORD cBufSize, LPDWORD lpnEntriesRead, LPDWORD lpcbTotalAvailable) { - TRACE("(%s, %u, %p, %u, %p, %p)\n", debugstr_w(lpszServer), nLevel, lpBuffer, cBufSize, + TRACE("(%s, %u, %p, %lu, %p, %p)\n", debugstr_w(lpszServer), nLevel, lpBuffer, cBufSize, lpnEntriesRead, lpcbTotalAvailable); return NDDE_NOT_IMPLEMENTED; @@ -231,7 +231,7 @@ UINT WINAPI NDdeShareEnumW(LPWSTR lpszServer, UINT nLevel, LPBYTE lpBuffer, DWOR UINT WINAPI NDdeShareGetInfoW(LPWSTR lpszServer, LPWSTR lpszShareName, UINT nLevel, LPBYTE lpBuffer, DWORD cBufSize, LPDWORD lpnTotalAvailable, LPWORD lpnItems) { - TRACE("(%s, %s, %u, %p, %u, %p, %p)\n", debugstr_w(lpszServer), debugstr_w(lpszShareName), nLevel, + TRACE("(%s, %s, %u, %p, %lu, %p, %p)\n", debugstr_w(lpszServer), debugstr_w(lpszShareName), nLevel, lpBuffer, cBufSize, lpnTotalAvailable, lpnItems); return NDDE_NOT_IMPLEMENTED; @@ -244,7 +244,7 @@ UINT WINAPI NDdeShareGetInfoW(LPWSTR lpszServer, LPWSTR lpszShareName, UINT nLev UINT WINAPI NDdeShareSetInfoW(LPWSTR lpszServer, LPWSTR lpszShareName, UINT nLevel, LPBYTE lpBuffer, DWORD cBufSize, WORD sParmNum) { - TRACE("(%s, %s, %u, %p, %u, %u)\n", debugstr_w(lpszServer), debugstr_w(lpszShareName), nLevel, + TRACE("(%s, %s, %u, %p, %lu, %u)\n", debugstr_w(lpszServer), debugstr_w(lpszShareName), nLevel, lpBuffer, cBufSize, sParmNum); return NDDE_NOT_IMPLEMENTED; @@ -256,7 +256,7 @@ UINT WINAPI NDdeShareSetInfoW(LPWSTR lpszServer, LPWSTR lpszShareName, UINT nLev */ UINT WINAPI NDdeGetErrorStringW(UINT uErrorCode, LPWSTR lpszErrorString, DWORD cBufSize) { - FIXME("(%u, %p, %d): stub!\n", uErrorCode, lpszErrorString, cBufSize); + FIXME("(%u, %p, %ld): stub!\n", uErrorCode, lpszErrorString, cBufSize); return NDDE_NOT_IMPLEMENTED; } @@ -290,7 +290,7 @@ BOOL WINAPI NDdeIsValidAppTopicListW(LPWSTR targetTopic) UINT WINAPI NDdeGetShareSecurityW(LPWSTR lpszServer, LPWSTR lpszShareName, SECURITY_INFORMATION si, PSECURITY_DESCRIPTOR pSD, DWORD cbSD, LPDWORD lpcbsdRequired) { - TRACE("(%s, %s, %u, %p, %u, %p)\n", debugstr_w(lpszServer), debugstr_w(lpszShareName), + TRACE("(%s, %s, %lu, %p, %lu, %p)\n", debugstr_w(lpszServer), debugstr_w(lpszShareName), si, pSD, cbSD, lpcbsdRequired); return NDDE_NOT_IMPLEMENTED; @@ -303,7 +303,7 @@ UINT WINAPI NDdeGetShareSecurityW(LPWSTR lpszServer, LPWSTR lpszShareName, SECUR UINT WINAPI NDdeSetShareSecurityW(LPWSTR lpszServer, LPWSTR lpszShareName, SECURITY_INFORMATION si, PSECURITY_DESCRIPTOR pSD) { - TRACE("(%s, %s, %u, %p)\n", debugstr_w(lpszServer), debugstr_w(lpszShareName), si, pSD); + TRACE("(%s, %s, %lu, %p)\n", debugstr_w(lpszServer), debugstr_w(lpszShareName), si, pSD); return NDDE_NOT_IMPLEMENTED; } @@ -327,7 +327,7 @@ UINT WINAPI NDdeGetTrustedShareW(LPWSTR lpszServer, LPWSTR lpszShareName, LPDWOR */ UINT WINAPI NDdeSetTrustedShareW(LPWSTR lpszServer, LPWSTR lpszShareName, DWORD dwTrustOptions) { - TRACE("(%s, %s, 0x%08x)\n", debugstr_w(lpszServer), debugstr_w(lpszShareName), dwTrustOptions); + TRACE("(%s, %s, 0x%08lx)\n", debugstr_w(lpszServer), debugstr_w(lpszShareName), dwTrustOptions); return NDDE_NOT_IMPLEMENTED; } @@ -339,7 +339,7 @@ UINT WINAPI NDdeSetTrustedShareW(LPWSTR lpszServer, LPWSTR lpszShareName, DWORD UINT WINAPI NDdeTrustedShareEnumW(LPWSTR lpszServer, UINT nLevel, LPBYTE lpBuffer, DWORD cBufSize, LPDWORD lpnEntriesRead, LPDWORD lpcbTotalAvailable) { - TRACE("(%s, %u, %p, %u, %p, %p)\n", debugstr_w(lpszServer), nLevel, lpBuffer, cBufSize, + TRACE("(%s, %u, %p, %lu, %p, %p)\n", debugstr_w(lpszServer), nLevel, lpBuffer, cBufSize, lpnEntriesRead, lpcbTotalAvailable); return NDDE_NOT_IMPLEMENTED;

1 0

Eric Pouech : ndis.sys: Enable compilation with long types.
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: 34d365c19049229cf5550551198e7c939b0b79ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=34d365c19049229cf5550551… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 16 08:10:58 2022 +0100 ndis.sys: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ndis.sys/Makefile.in | 1 - dlls/ndis.sys/main.c | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/ndis.sys/Makefile.in b/dlls/ndis.sys/Makefile.in index 5d1d7973155..baeae05d5c4 100644 --- a/dlls/ndis.sys/Makefile.in +++ b/dlls/ndis.sys/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = ndis.sys IMPORTS = advapi32 ntoskrnl iphlpapi diff --git a/dlls/ndis.sys/main.c b/dlls/ndis.sys/main.c index a0d2581aaa9..b5ce2fd8f5b 100644 --- a/dlls/ndis.sys/main.c +++ b/dlls/ndis.sys/main.c @@ -88,7 +88,7 @@ static void query_global_stats(IRP *irp, const MIB_IF_ROW2 *netdev) } default: - FIXME( "Unsupported OID %x\n", oid ); + FIXME( "Unsupported OID %lx\n", oid ); irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; break; } @@ -100,7 +100,7 @@ static NTSTATUS WINAPI ndis_ioctl(DEVICE_OBJECT *device, IRP *irp) MIB_IF_ROW2 *netdev = device->DeviceExtension; NTSTATUS status; - TRACE( "ioctl %x insize %u outsize %u\n", + TRACE( "ioctl %lx insize %lu outsize %lu\n", irpsp->Parameters.DeviceIoControl.IoControlCode, irpsp->Parameters.DeviceIoControl.InputBufferLength, irpsp->Parameters.DeviceIoControl.OutputBufferLength ); @@ -111,7 +111,7 @@ static NTSTATUS WINAPI ndis_ioctl(DEVICE_OBJECT *device, IRP *irp) query_global_stats(irp, netdev); break; default: - FIXME( "ioctl %x not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); + FIXME( "ioctl %lx not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED; break; } @@ -153,7 +153,7 @@ static int add_device(DRIVER_OBJECT *driver, const WCHAR *guidstrW, MIB_IF_ROW2 status = IoCreateSymbolicLink( &link, &name ); if (status) { - FIXME( "failed to create device error %x\n", status ); + FIXME( "failed to create device error %lx\n", status ); return 0; } @@ -200,7 +200,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) NDIS_STATUS WINAPI NdisAllocateMemoryWithTag(void **address, UINT length, ULONG tag) { - FIXME("(%p, %u, %u): stub\n", address, length, tag); + FIXME("(%p, %u, %lu): stub\n", address, length, tag); return NDIS_STATUS_FAILURE; }

1 0