September 2021 - Wine-devel

[PATCH] configure.ac: don't use -Wmisleading-indentation compiler option (GCC11)
by Eric Pouech 28 Sep '21

28 Sep '21

in tests, there's a lot of constructs like: bla1; bla2; todo_wine ok(tst, "..."); bla3; or bla1; bla2; todo_wine ok(tst, "..."); bla3; GCC11 complains about those (and some more complex) about bla3 not being properly indented wrt the todo_wine. I'm not 100% sure about the right fix: - disable the warning altogether (that's what this patch does), but we won't report other *real* indentation errors. To be frank, I haven't looked at the hundred of lines of warnings to check if one pops up. - reformat the code in tests. note that todo_wine { ok(tst, "..."); } or todo_wine ok(tst, "..."); or todo_wine ok(tst, "..."); don't generate warnings. but first one defeats the one liner, and the second and third ones don't preserve the line of the test unchanged when the todo is resolved I'd favor disabling the compiler option (it's the less intrusive in the code and in dev:s habits). A+ Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- configure.ac | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure.ac b/configure.ac index a019b4ac2d6..6cd3e915aae 100644 --- a/configure.ac +++ b/configure.ac @@ -1002,6 +1002,7 @@ then CFLAGS="$CFLAGS $llvm_cflags"]) fi WINE_TRY_CROSSCFLAGS([-fno-strict-aliasing]) + WINE_TRY_CROSSCFLAGS([-Wno-misleading-indentation]) dnl clang needs to be told to fail on unknown options WINE_TRY_CROSSCFLAGS([-Werror=unknown-warning-option],[CFLAGS="$CFLAGS -Werror=unknown-warning-option"]) WINE_TRY_CROSSCFLAGS([-Werror=ignored-optimization-argument],[CFLAGS="$CFLAGS -Werror=ignored-optimization-argument"]) @@ -1992,6 +1993,7 @@ then WINE_TRY_CFLAGS([-Wunused-but-set-parameter]) WINE_TRY_CFLAGS([-Wvla]) WINE_TRY_CFLAGS([-Wwrite-strings]) + WINE_TRY_CFLAGS([-Wno-misleading-indentation]) if test -z "$CROSSTARGET" then

4 4

[PATCH v2] wininet: Reset context length for http status 304
by Alistair Leslie-Hughes 28 Sep '21

28 Sep '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wininet/http.c | 4 +++- dlls/wininet/tests/http.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index e9363208471..4bfd93aa3be 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2918,7 +2918,9 @@ static DWORD set_content_length(http_request_t *request) WCHAR encoding[20]; DWORD size; - if(request->status_code == HTTP_STATUS_NO_CONTENT || !wcscmp(request->verb, L"HEAD")) { + if(request->status_code == HTTP_STATUS_NO_CONTENT || request->status_code == HTTP_STATUS_NOT_MODIFIED || + !wcscmp(request->verb, L"HEAD")) + { request->contentLength = request->netconn_stream.content_length = 0; return ERROR_SUCCESS; } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index bf4dce80bef..1a4b1a15a4e 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2381,6 +2381,13 @@ static DWORD CALLBACK server_thread(LPVOID param) static const char nocontentmsg[] = "HTTP/1.1 204 No Content\r\nConnection: close\r\n\r\n"; send(c, nocontentmsg, sizeof(nocontentmsg)-1, 0); } + if (strstr(buffer, "GET /test_not_modified")) + { + static const char notmodifiedmsg[] = "HTTP/1.1 304 Not Modified\r\nConnection: close\r\n" + "Content-Length: 10\r\n" + "\r\n"; + send(c, notmodifiedmsg, sizeof(notmodifiedmsg)-1, 0); + } if (strstr(buffer, "GET /test_conn_close")) { static const char conn_close_response[] = "HTTP/1.1 200 OK\r\nConnection: close\r\n\r\nsome content"; @@ -3487,6 +3494,36 @@ static void test_no_content(int port) CHECK_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); } +static void test_not_modified(int port) +{ + DWORD avail; + HINTERNET ses, con, req; + BOOL ret; + + ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL, "InternetOpen failed\n"); + + con = InternetConnectA(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnect failed\n"); + + req = HttpOpenRequestA(con, NULL, "/test_not_modified", NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + SetLastError(0xdeadbeef); + ret = HttpSendRequestW(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + test_status_code(req, 304); + + avail = 0; + ret = InternetQueryDataAvailable(req, &avail, 0, 0); + ok(ret, "InternetQueryDataAvailable failed: %u\n", GetLastError()); + ok(avail == 0, "got %d\n", avail); + + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); +} + static void test_conn_close(int port) { HINTERNET session, connection, req; @@ -6060,6 +6097,7 @@ static void test_http_connection(void) test_HttpSendRequestW(si.port); test_options(si.port); test_no_content(si.port); + test_not_modified(si.port); test_conn_close(si.port); test_no_cache(si.port); test_cache_read_gzipped(si.port); -- 2.33.0

3 2

[PATCH 9/9] gdi32: Use single get_cptable implementation.
by Jacek Caban 28 Sep '21

28 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 2 +- dlls/gdi32/freetype.c | 15 --------------- dlls/gdi32/ntgdi_private.h | 1 + 3 files changed, 2 insertions(+), 16 deletions(-)

1 0

[PATCH 8/9] gdi32: Move ntgdi functions to Unix library.
by Jacek Caban 28 Sep '21

28 Sep '21

1 0

[PATCH 7/9] gdi32: Avoid using CRT wide char functions in ntgdi functions.
by Jacek Caban 28 Sep '21

28 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/win32u_private.h | 90 +++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+)

1 0

[PATCH 5/9] gdi32: Don't use WideCharToMultiByte in font.c.
by Jacek Caban 28 Sep '21

28 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- get_cptable is duplicated from freetype.c. It's de-duplicated later in the series. dlls/gdi32/font.c | 56 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 48 insertions(+), 8 deletions(-)

1 0

[PATCH 4/9] gdi32: Use NtGdiOpenDCW for CreateDCW.
by Jacek Caban 28 Sep '21

28 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Passing function getter to NtGdiOpenDCW is hackish, but it's meant to unblock the transition for now. This is used for printer drivers. Since DC driver interface is meant to be Unix-side-only, we will need to change it. While making wineps.drv a Unix lib would be possible, I think it would be better to mimic Windows behaviour closer. For that, we'd need to expose printer processor functionality from wineps.drv that would convert EMFs to PostScript. The existing wineps code seems to be a good base for that. We'd need to factor out driver-specific bits and call conversion functions from EMF replay. With that in place: - gdi32 would setup EMF recording for printer DCs (on PE side) - it would submit EMF records to winspool when appropriate - winspool would detect EMFs and use print processor to convert it to PS - winspool would submit PS document to the printer With that in place, hopefully only small bits of wineps.drv will still need to live in DC driver part. I hope that we will be able to move those bits directly to win32u, so no actual library loading would need to be performed by gdi32 nor ntgdi. dlls/gdi32/dc.c | 62 +++++------ dlls/gdi32/driver.c | 188 +++----------------------------- dlls/gdi32/emfdrv.c | 2 +- dlls/gdi32/gdidc.c | 215 +++++++++++++++++++++++++++++++++++++ dlls/gdi32/ntgdi_private.h | 3 +- 5 files changed, 260 insertions(+), 210 deletions(-)

1 0

[PATCH 3/9] gdi32: Remove unused argument from CreateDC driver entry point.
by Jacek Caban 28 Sep '21

28 Sep '21

1 0

[PATCH 2/9] gdi32: Get codepages and OS version directly from PEB.
by Jacek Caban 28 Sep '21

28 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/clipping.c | 2 +- dlls/gdi32/font.c | 30 ++++++++++++++++++++---------- dlls/gdi32/gdiobj.c | 2 +- dlls/gdi32/ntgdi_private.h | 1 + 4 files changed, 23 insertions(+), 12 deletions(-)

1 0

[PATCH 1/9] gdi32: Don't use wide string literals in ntgdi functions.
by Jacek Caban 28 Sep '21

28 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 111 +++++++++++++++++----------- dlls/gdi32/gdiobj.c | 176 +++++++++++++++++++++++++++++--------------- 2 files changed, 186 insertions(+), 101 deletions(-)

1 0