February 2022 - Wine-commits

Zebediah Figura : kernelbase: Allow schemes to contain uppercase characters in UrlGetPart().
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: 91ae5ffe08fcb4166b422ad0404b7cf680d77eb5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91ae5ffe08fcb4166b422ad0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 16 20:31:42 2022 -0600 kernelbase: Allow schemes to contain uppercase characters in UrlGetPart(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 15 +++++++++++++-- dlls/shlwapi/tests/url.c | 2 +- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 3fdc752938c..0dba2098391 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -4155,7 +4155,7 @@ HRESULT WINAPI UrlGetPartA(const char *url, char *out, DWORD *out_len, DWORD par static const WCHAR *parse_scheme( const WCHAR *p ) { - while ((*p >= 'a' && *p <= 'z') || (*p >= '0' && *p <= '9') || *p == '+' || *p == '-' || *p == '.') + while (isalnum( *p ) || *p == '+' || *p == '-' || *p == '.') ++p; return p; } @@ -4384,7 +4384,18 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p *out_len = size + 1; return E_POINTER; } - memcpy(out, addr, size*sizeof(WCHAR)); + + if (part == URL_PART_SCHEME) + { + unsigned int i; + + for (i = 0; i < size; ++i) + out[i] = tolower( addr[i] ); + } + else + { + memcpy( out, addr, size * sizeof(WCHAR) ); + } out[size] = 0; *out_len = size; } diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index ae0d0738195..5c28142bc42 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -709,7 +709,7 @@ static void test_UrlGetPart(void) {"file://c:\\index.htm", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_FALSE, ""}, {"file:some text", URL_PART_HOSTNAME, 0, S_FALSE, ""}, {"index.htm", URL_PART_HOSTNAME, 0, E_FAIL}, - {"sChEmE-.+:", URL_PART_SCHEME, 0, S_OK, "scheme-.+", .todo_hr = TRUE}, + {"sChEmE-.+:", URL_PART_SCHEME, 0, S_OK, "scheme-.+"}, {"scheme_:", URL_PART_SCHEME, 0, S_FALSE, ""}, {"scheme :", URL_PART_SCHEME, 0, S_FALSE, ""}, {"sch eme:", URL_PART_SCHEME, 0, S_FALSE, ""},

1 0

Zebediah Figura : kernelbase: Prepend the scheme even if the requested URL part is empty.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: 439600d5ce276d8d42c6ea2b2cd69d5117938b63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=439600d5ce276d8d42c6ea2b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 16 20:31:43 2022 -0600 kernelbase: Prepend the scheme even if the requested URL part is empty. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 47 ++++++----------------------------------------- dlls/shlwapi/tests/url.c | 2 +- 2 files changed, 7 insertions(+), 42 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 0dba2098391..f83c68e14f5 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -4277,12 +4277,6 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p { case URL_PART_SCHEME: flags &= ~URL_PARTFLAG_KEEPSCHEME; - if (!pl.scheme_len) - { - *out = '\0'; - *out_len = 0; - return S_FALSE; - } addr = pl.scheme; size = pl.scheme_len; break; @@ -4290,30 +4284,19 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p case URL_PART_HOSTNAME: if (scheme == URL_SCHEME_FILE && (!pl.hostname_len || (pl.hostname_len == 1 && *(pl.hostname + 1) == ':'))) { - *out = '\0'; - *out_len = 0; - return S_FALSE; + addr = NULL; + size = 0; } - - if (!pl.hostname_len) + else { - *out = '\0'; - *out_len = 0; - return S_FALSE; + addr = pl.hostname; + size = pl.hostname_len; } - addr = pl.hostname; - size = pl.hostname_len; break; case URL_PART_USERNAME: if (!pl.username) return E_INVALIDARG; - if (!pl.username_len) - { - *out = '\0'; - *out_len = 0; - return S_FALSE; - } addr = pl.username; size = pl.username_len; break; @@ -4321,12 +4304,6 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p case URL_PART_PASSWORD: if (!pl.password) return E_INVALIDARG; - if (!pl.password_len) - { - *out = '\0'; - *out_len = 0; - return S_FALSE; - } addr = pl.password; size = pl.password_len; break; @@ -4334,24 +4311,12 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p case URL_PART_PORT: if (!pl.port) return E_INVALIDARG; - if (!pl.port_len) - { - *out = '\0'; - *out_len = 0; - return S_FALSE; - } addr = pl.port; size = pl.port_len; break; case URL_PART_QUERY: flags &= ~URL_PARTFLAG_KEEPSCHEME; - if (!pl.query_len) - { - *out = '\0'; - *out_len = 0; - return S_FALSE; - } addr = pl.query; size = pl.query_len; break; @@ -4401,7 +4366,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 S_OK; + return *out_len ? S_OK : S_FALSE; } BOOL WINAPI UrlIsA(const char *url, URLIS Urlis) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 5c28142bc42..c6c7e26cec6 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -681,7 +681,7 @@ static void test_UrlGetPart(void) {"http://host: !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff", URL_PART_PORT, 0, S_OK, " !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff"}, {"http:///index.html", URL_PART_HOSTNAME, 0, S_FALSE, ""}, - {"http:///index.html", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "http:", .todo_hr = TRUE}, + {"http:///index.html", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "http:"}, {"file://h o s t/c:/windows/file", URL_PART_HOSTNAME, 0, S_OK, "h o s t"}, {"file://h o s t/c:/windows/file", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "h o s t"}, {"file://foo:bar(a)localhost:21/file?query=x", URL_PART_USERNAME, 0, E_FAIL, .todo_hr = TRUE},

1 0

Eric Pouech : cmd: Enable compilation with long types.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: 7f9b9df04fdb8481d9c55ed7aa08d49623f095ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f9b9df04fdb8481d9c55ed7… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 07:10:24 2022 +0100 cmd: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/Makefile.in | 1 - programs/cmd/builtins.c | 20 ++++++++++---------- programs/cmd/directory.c | 4 ++-- programs/cmd/wcmdmain.c | 14 +++++++------- 4 files changed, 19 insertions(+), 20 deletions(-) diff --git a/programs/cmd/Makefile.in b/programs/cmd/Makefile.in index 8c8489af727..b3b33aa1413 100644 --- a/programs/cmd/Makefile.in +++ b/programs/cmd/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = cmd.exe IMPORTS = shell32 user32 advapi32 diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 2fc7e07f7aa..963a9eaf361 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -344,7 +344,7 @@ void WCMD_choice (const WCHAR * args) { } if (opt_timeout) - WINE_FIXME("timeout not supported: %c,%d\n", opt_default, opt_timeout); + WINE_FIXME("timeout not supported: %c,%ld\n", opt_default, opt_timeout); if (have_console) SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), 0); @@ -396,7 +396,7 @@ void WCMD_choice (const WCHAR * args) { SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), oldmode); errorlevel = (ptr - opt_c) + 1; - WINE_TRACE("answer: %d\n", errorlevel); + WINE_TRACE("answer: %ld\n", errorlevel); heap_free(my_command); return; } @@ -427,12 +427,12 @@ static BOOL WCMD_AppendEOF(WCHAR *filename) OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (h == INVALID_HANDLE_VALUE) { - WINE_ERR("Failed to open %s (%d)\n", wine_dbgstr_w(filename), GetLastError()); + WINE_ERR("Failed to open %s (%ld)\n", wine_dbgstr_w(filename), GetLastError()); return FALSE; } else { SetFilePointer (h, 0, NULL, FILE_END); if (!WriteFile(h, &eof, 1, &bytes_written, NULL)) { - WINE_ERR("Failed to append EOF to %s (%d)\n", wine_dbgstr_w(filename), GetLastError()); + WINE_ERR("Failed to append EOF to %s (%ld)\n", wine_dbgstr_w(filename), GetLastError()); CloseHandle(h); return FALSE; } @@ -491,7 +491,7 @@ static BOOL WCMD_ManualCopy(WCHAR *srcname, WCHAR *dstname, BOOL ascii, BOOL app in = CreateFileW(srcname, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (in == INVALID_HANDLE_VALUE) { - WINE_ERR("Failed to open %s (%d)\n", wine_dbgstr_w(srcname), GetLastError()); + WINE_ERR("Failed to open %s (%ld)\n", wine_dbgstr_w(srcname), GetLastError()); return FALSE; } @@ -499,7 +499,7 @@ static BOOL WCMD_ManualCopy(WCHAR *srcname, WCHAR *dstname, BOOL ascii, BOOL app out = CreateFileW(dstname, GENERIC_WRITE, 0, NULL, append?OPEN_EXISTING:CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); if (out == INVALID_HANDLE_VALUE) { - WINE_ERR("Failed to open %s (%d)\n", wine_dbgstr_w(dstname), GetLastError()); + WINE_ERR("Failed to open %s (%ld)\n", wine_dbgstr_w(dstname), GetLastError()); CloseHandle(in); return FALSE; } @@ -526,12 +526,12 @@ static BOOL WCMD_ManualCopy(WCHAR *srcname, WCHAR *dstname, BOOL ascii, BOOL app if (bytesread) { ok = WriteFile(out, buffer, bytesread, &byteswritten, NULL); if (!ok || byteswritten != bytesread) { - WINE_ERR("Unexpected failure writing to %s, rc=%d\n", + WINE_ERR("Unexpected failure writing to %s, rc=%ld\n", wine_dbgstr_w(dstname), GetLastError()); } } } else { - WINE_ERR("Unexpected failure reading from %s, rc=%d\n", + WINE_ERR("Unexpected failure reading from %s, rc=%ld\n", wine_dbgstr_w(srcname), GetLastError()); } } while (ok && bytesread > 0); @@ -2442,7 +2442,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { if (useNumbers) { WCHAR thisNum[20]; - WINE_TRACE("FOR /L provided range from %d to %d step %d\n", + WINE_TRACE("FOR /L provided range from %ld to %ld step %ld\n", numbers[0], numbers[2], numbers[1]); for (i=numbers[0]; (numbers[1]<0)? i>=numbers[2] : i<=numbers[2]; @@ -4775,7 +4775,7 @@ void WCMD_assoc (const WCHAR *args, BOOL assoc) { /* Open a key to HKEY_CLASSES_ROOT for enumerating */ if (RegOpenKeyExW(HKEY_CLASSES_ROOT, L"", 0, accessOptions, &key) != ERROR_SUCCESS) { - WINE_FIXME("Unexpected failure opening HKCR key: %d\n", GetLastError()); + WINE_FIXME("Unexpected failure opening HKCR key: %ld\n", GetLastError()); return; } diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 807f7b386b1..8417687939a 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -536,7 +536,7 @@ static void WCMD_dir_trailer(WCHAR drive) { driveName[0] = drive; status = GetDiskFreeSpaceExW(driveName, &avail, &total, &freebytes); - WINE_TRACE("Writing trailer for '%s' gave %d(%d)\n", wine_dbgstr_w(driveName), + WINE_TRACE("Writing trailer for '%s' gave %ld(%ld)\n", wine_dbgstr_w(driveName), status, GetLastError()); if (errorlevel==0 && !bare) { @@ -727,7 +727,7 @@ void WCMD_directory (WCHAR *args) p++; } p = p - 1; /* So when step on, move to '/' */ - WINE_TRACE("Result: showattrs %x, bits %x\n", showattrs, attrsbits); + WINE_TRACE("Result: showattrs %lx, bits %lx\n", showattrs, attrsbits); break; default: SetLastError(ERROR_INVALID_PARAMETER); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 65601348b05..af54b209d83 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -132,7 +132,7 @@ void WINAPIV WCMD_output (const WCHAR *format, ...) { format, 0, 0, (LPWSTR)&string, 0, &ap); va_end(ap); if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE) - WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(format)); + WINE_FIXME("Could not format string: le=%lu, fmt=%s\n", GetLastError(), wine_dbgstr_w(format)); else { WCMD_output_asis_len(string, len, GetStdHandle(STD_OUTPUT_HANDLE)); @@ -157,7 +157,7 @@ void WINAPIV WCMD_output_stderr (const WCHAR *format, ...) { format, 0, 0, (LPWSTR)&string, 0, &ap); va_end(ap); if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE) - WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(format)); + WINE_FIXME("Could not format string: le=%lu, fmt=%s\n", GetLastError(), wine_dbgstr_w(format)); else { WCMD_output_asis_len(string, len, GetStdHandle(STD_ERROR_HANDLE)); @@ -181,7 +181,7 @@ WCHAR* WINAPIV WCMD_format_string (const WCHAR *format, ...) format, 0, 0, (LPWSTR)&string, 0, &ap); va_end(ap); if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE) { - WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(format)); + WINE_FIXME("Could not format string: le=%lu, fmt=%s\n", GetLastError(), wine_dbgstr_w(format)); string = (WCHAR*)LocalAlloc(LMEM_FIXED, 2); *string = 0; } @@ -303,7 +303,7 @@ void WCMD_print_error (void) { status = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, error_code, 0, (LPWSTR) &lpMsgBuf, 0, NULL); if (!status) { - WINE_FIXME ("Cannot display message for error %d, status %d\n", + WINE_FIXME ("Cannot display message for error %ld, status %ld\n", error_code, GetLastError()); return; } @@ -1462,7 +1462,7 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, GetCurrentProcess(), &h, 0, TRUE, DUPLICATE_SAME_ACCESS) == 0) { - WINE_FIXME("Duplicating handle failed with gle %d\n", GetLastError()); + WINE_FIXME("Duplicating handle failed with gle %ld\n", GetLastError()); } WINE_TRACE("Redirect %d (%p) to %d (%p)\n", handle, GetStdHandle(idx_stdhandles[idx]), idx, h); @@ -1664,7 +1664,7 @@ WCHAR *WCMD_LoadMessage(UINT id) { static WCHAR msg[2048]; if (!LoadStringW(GetModuleHandleW(NULL), id, msg, ARRAY_SIZE(msg))) { - WINE_FIXME("LoadString failed with %d\n", GetLastError()); + WINE_FIXME("LoadString failed with %ld\n", GetLastError()); lstrcpyW(msg, L"Failed!"); } return msg; @@ -2442,7 +2442,7 @@ int __cdecl wmain (int argc, WCHAR *argvW[]) /* Pre initialize some messages */ lstrcpyW(anykey, WCMD_LoadMessage(WCMD_ANYKEY)); - sprintf(osver, "%d.%d.%d", osv.dwMajorVersion, osv.dwMinorVersion, osv.dwBuildNumber); + sprintf(osver, "%ld.%ld.%ld", osv.dwMajorVersion, osv.dwMinorVersion, osv.dwBuildNumber); cmd = WCMD_format_string(WCMD_LoadMessage(WCMD_VERSION), osver); lstrcpyW(version_string, cmd); LocalFree(cmd);

1 0

Eric Pouech : cmd/tests: Enable compilation with long types.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: ec0e9b3b94eb57d3d0c17c4be5498787e2cfe046 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec0e9b3b94eb57d3d0c17c4b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 07:10:31 2022 +0100 cmd/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/tests/Makefile.in | 1 - programs/cmd/tests/batch.c | 24 ++++++++++++------------ 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/programs/cmd/tests/Makefile.in b/programs/cmd/tests/Makefile.in index 78d92f7c778..87942fedcf9 100644 --- a/programs/cmd/tests/Makefile.in +++ b/programs/cmd/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = cmd.exe C_SRCS = \ diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index 162e9cfa151..3846693ef2e 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -92,7 +92,7 @@ static BOOL run_cmd(const char *cmd_data, DWORD cmd_size) bres = WriteFile(file, cmd_data, cmd_size, &size, NULL); CloseHandle(file); - ok(bres, "Could not write to file: %u\n", GetLastError()); + ok(bres, "Could not write to file: %lu\n", GetLastError()); if(!bres) return FALSE; @@ -112,7 +112,7 @@ static BOOL run_cmd(const char *cmd_data, DWORD cmd_size) si.hStdOutput = file; si.hStdError = fileerr; bres = CreateProcessA(NULL, command, NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi); - ok(bres, "CreateProcess failed: %u\n", GetLastError()); + ok(bres, "CreateProcess failed: %lu\n", GetLastError()); if(!bres) { DeleteFileA("test.out"); return FALSE; @@ -133,7 +133,7 @@ static DWORD map_file(const char *file_name, const char **ret) DWORD size; file = CreateFileA(file_name, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_READONLY, NULL); - ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %08x\n", GetLastError()); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %08lx\n", GetLastError()); if(file == INVALID_HANDLE_VALUE) return 0; @@ -141,12 +141,12 @@ static DWORD map_file(const char *file_name, const char **ret) map = CreateFileMappingA(file, NULL, PAGE_READONLY, 0, 0, NULL); CloseHandle(file); - ok(map != NULL, "CreateFileMappingA(%s) failed: %u\n", file_name, GetLastError()); + ok(map != NULL, "CreateFileMappingA(%s) failed: %lu\n", file_name, GetLastError()); if(!map) return 0; *ret = MapViewOfFile(map, FILE_MAP_READ, 0, 0, 0); - ok(*ret != NULL, "MapViewOfFile failed: %u\n", GetLastError()); + ok(*ret != NULL, "MapViewOfFile failed: %lu\n", GetLastError()); CloseHandle(map); if(!*ret) return 0; @@ -307,10 +307,10 @@ static void test_output(const char *out_data, DWORD out_size, const char *exp_da err = compare_line(out_ptr, out_nl, exp_ptr, exp_nl); if(err == out_nl) - ok(0, "unexpected end of line %d (got '%.*s', wanted '%.*s')\n", + ok(0, "unexpected end of line %ld (got '%.*s', wanted '%.*s')\n", line, (int)(out_nl-out_ptr), out_ptr, (int)(exp_nl-exp_ptr), exp_ptr); else if(err == exp_nl) - ok(0, "excess characters on line %d (got '%.*s', wanted '%.*s')\n", + ok(0, "excess characters on line %ld (got '%.*s', wanted '%.*s')\n", line, (int)(out_nl-out_ptr), out_ptr, (int)(exp_nl-exp_ptr), exp_ptr); else if (!err && is_todo_wine && is_out_resync && is_exp_resync) /* Consider that the todo_wine was to deal with extra lines, @@ -318,7 +318,7 @@ static void test_output(const char *out_data, DWORD out_size, const char *exp_da */ err = NULL; else - ok(!err, "unexpected char 0x%x position %d in line %d (got '%.*s', wanted '%.*s')\n", + ok(!err, "unexpected char 0x%x position %d in line %ld (got '%.*s', wanted '%.*s')\n", (err ? *err : 0), (err ? (int)(err-out_ptr) : -1), line, (int)(out_nl-out_ptr), out_ptr, (int)(exp_nl-exp_ptr), exp_ptr); } @@ -344,7 +344,7 @@ static void test_output(const char *out_data, DWORD out_size, const char *exp_da } } - ok(exp_ptr >= exp_data+exp_size, "unexpected end of output in line %d, missing %s\n", line, exp_ptr); + ok(exp_ptr >= exp_data+exp_size, "unexpected end of output in line %ld, missing %s\n", line, exp_ptr); ok(out_ptr >= out_data+out_size, "too long output, got additional %s\n", out_ptr); } @@ -380,14 +380,14 @@ static void run_from_file(const char *file_name) test_size = map_file(file_name, &test_data); if(!test_size) { - ok(0, "Could not map file %s: %u\n", file_name, GetLastError()); + ok(0, "Could not map file %s: %lu\n", file_name, GetLastError()); return; } sprintf(out_name, "%s.exp", file_name); out_size = map_file(out_name, &out_data); if(!out_size) { - ok(0, "Could not map file %s: %u\n", out_name, GetLastError()); + ok(0, "Could not map file %s: %lu\n", out_name, GetLastError()); UnmapViewOfFile(test_data); return; } @@ -405,7 +405,7 @@ static DWORD load_resource(const char *name, const char *type, const char **ret) DWORD size; src = FindResourceA(NULL, name, type); - ok(src != NULL, "Could not find resource %s: %u\n", name, GetLastError()); + ok(src != NULL, "Could not find resource %s: %lu\n", name, GetLastError()); if(!src) return 0;

1 0

Eric Pouech : packager: Enable compilation with long types.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: 29a668a62583e992d5b68b40eba20459d8f40c4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=29a668a62583e992d5b68b40… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 07:10:37 2022 +0100 packager: 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/packager/Makefile.in | 1 - dlls/packager/packager_main.c | 36 ++++++++++++++++++------------------ 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/packager/Makefile.in b/dlls/packager/Makefile.in index f539cb6f095..a2b2daa0cea 100644 --- a/dlls/packager/Makefile.in +++ b/dlls/packager/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = packager.dll IMPORTS = uuid shell32 shlwapi user32 diff --git a/dlls/packager/packager_main.c b/dlls/packager/packager_main.c index 591664371a1..c08bc30da6e 100644 --- a/dlls/packager/packager_main.c +++ b/dlls/packager/packager_main.c @@ -80,7 +80,7 @@ static ULONG WINAPI OleObject_AddRef(IOleObject *iface) struct Package *This = impl_from_IOleObject(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -90,7 +90,7 @@ static ULONG WINAPI OleObject_Release(IOleObject *iface) struct Package *This = impl_from_IOleObject(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if(!ref){ if(This->clientsite) @@ -139,7 +139,7 @@ static HRESULT WINAPI OleObject_Close(IOleObject *iface, DWORD dwSaveOption) { struct Package *This = impl_from_IOleObject(iface); - TRACE("(%p)->(0x%x)\n", This, dwSaveOption); + TRACE("(%p)->(0x%lx)\n", This, dwSaveOption); if(dwSaveOption == OLECLOSE_SAVEIFDIRTY || dwSaveOption == OLECLOSE_PROMPTSAVE) @@ -151,14 +151,14 @@ static HRESULT WINAPI OleObject_Close(IOleObject *iface, DWORD dwSaveOption) static HRESULT WINAPI OleObject_SetMoniker(IOleObject *iface, DWORD dwWhichMoniker, IMoniker *pmk) { struct Package *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%d, %p)\n", This, dwWhichMoniker, pmk); + FIXME("(%p)->(%ld, %p)\n", This, dwWhichMoniker, pmk); return E_NOTIMPL; } static HRESULT WINAPI OleObject_GetMoniker(IOleObject *iface, DWORD dwAssign, DWORD dwWhichMoniker, IMoniker **ppmk) { struct Package *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%d, %d, %p)\n", This, dwAssign, dwWhichMoniker, ppmk); + FIXME("(%p)->(%ld, %ld, %p)\n", This, dwAssign, dwWhichMoniker, ppmk); return E_NOTIMPL; } @@ -166,14 +166,14 @@ static HRESULT WINAPI OleObject_InitFromData(IOleObject *iface, IDataObject *pDa DWORD dwReserved) { struct Package *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%p, 0x%x, %d)\n", This, pDataObject, fCreation, dwReserved); + FIXME("(%p)->(%p, 0x%x, %ld)\n", This, pDataObject, fCreation, dwReserved); return E_NOTIMPL; } static HRESULT WINAPI OleObject_GetClipboardData(IOleObject *iface, DWORD dwReserved, IDataObject **ppDataObject) { struct Package *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%d, %p)\n", This, dwReserved, ppDataObject); + FIXME("(%p)->(%ld, %p)\n", This, dwReserved, ppDataObject); return E_NOTIMPL; } @@ -188,7 +188,7 @@ static HRESULT WINAPI OleObject_DoVerb(IOleObject *iface, LONG iVerb, LPMSG lpms { struct Package *This = impl_from_IOleObject(iface); - TRACE("(%p)->(%d)\n", This, iVerb); + TRACE("(%p)->(%ld)\n", This, iVerb); switch(iVerb){ case 0: @@ -229,21 +229,21 @@ static HRESULT WINAPI OleObject_GetUserClassID(IOleObject *iface, CLSID *pClsid) static HRESULT WINAPI OleObject_GetUserType(IOleObject *iface, DWORD dwFormOfType, LPOLESTR *pszUserType) { struct Package *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%d, %p)\n", This, dwFormOfType, pszUserType); + FIXME("(%p)->(%ld, %p)\n", This, dwFormOfType, pszUserType); return E_NOTIMPL; } static HRESULT WINAPI OleObject_SetExtent(IOleObject *iface, DWORD dwDrawAspect, SIZEL *psizel) { struct Package *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%d, %p)\n", This, dwDrawAspect, psizel); + FIXME("(%p)->(%ld, %p)\n", This, dwDrawAspect, psizel); return E_NOTIMPL; } static HRESULT WINAPI OleObject_GetExtent(IOleObject *iface, DWORD dwDrawAspect, SIZEL *psizel) { struct Package *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%d, %p)\n", This, dwDrawAspect, psizel); + FIXME("(%p)->(%ld, %p)\n", This, dwDrawAspect, psizel); return E_NOTIMPL; } @@ -257,7 +257,7 @@ static HRESULT WINAPI OleObject_Advise(IOleObject *iface, IAdviseSink *pAdvSink, static HRESULT WINAPI OleObject_Unadvise(IOleObject *iface, DWORD dwConnection) { struct Package *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%d)\n", This, dwConnection); + FIXME("(%p)->(%ld)\n", This, dwConnection); return E_NOTIMPL; } @@ -272,7 +272,7 @@ static HRESULT WINAPI OleObject_GetMiscStatus(IOleObject *iface, DWORD dwAspect, { struct Package *This = impl_from_IOleObject(iface); - TRACE("(%p)->(%d, %p)\n", This, dwAspect, pdwStatus); + TRACE("(%p)->(%ld, %p)\n", This, dwAspect, pdwStatus); if(!pdwStatus) return E_INVALIDARG; @@ -370,7 +370,7 @@ static HRESULT discard_string(struct Package *This, IStream *stream) do{ hr = IStream_Read(stream, &chr, 1, &nbytes); if(FAILED(hr) || !nbytes){ - TRACE("Unexpected end of stream or Read failed with %08x\n", hr); + TRACE("Unexpected end of stream or Read failed with %08lx\n", hr); return (hr == S_OK || hr == S_FALSE) ? E_FAIL : hr; } }while(chr); @@ -398,7 +398,7 @@ static HRESULT WINAPI PersistStorage_Load(IPersistStorage* iface, hr = IStorage_OpenStream(pStg, L"\1Ole10Native", NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stream); if(FAILED(hr)){ - TRACE("OpenStream gave: %08x\n", hr); + TRACE("OpenStream gave: %08lx\n", hr); return hr; } @@ -485,7 +485,7 @@ static HRESULT WINAPI PersistStorage_Load(IPersistStorage* iface, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); while(file == INVALID_HANDLE_VALUE){ if(GetLastError() != ERROR_FILE_EXISTS){ - WARN("CreateFile failed: %u\n", GetLastError()); + WARN("CreateFile failed: %lu\n", GetLastError()); hr = E_FAIL; goto exit; } @@ -507,7 +507,7 @@ static HRESULT WINAPI PersistStorage_Load(IPersistStorage* iface, hr = IStream_Read(stream, data, min(sizeof(data), payload_size), &nbytes); if(FAILED(hr) || nbytes == 0){ - TRACE("Unexpected end of file, or Read failed with %08x\n", hr); + TRACE("Unexpected end of file, or Read failed with %08lx\n", hr); if(hr == S_OK || hr == S_FALSE) hr = E_FAIL; goto exit; @@ -528,7 +528,7 @@ exit: } IStream_Release(stream); - TRACE("Returning: %08x\n", hr); + TRACE("Returning: %08lx\n", hr); return hr; }

1 0

Eric Pouech : pdh: Enable compilation with long types.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: 7ad38e3b809d94e846bf23488c6a36451c66ea5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ad38e3b809d94e846bf2348… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 07:10:43 2022 +0100 pdh: 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/pdh/Makefile.in | 1 - dlls/pdh/pdh_main.c | 40 ++++++++++++++++++++-------------------- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/dlls/pdh/Makefile.in b/dlls/pdh/Makefile.in index f98fb916646..a56b9d6e4fc 100644 --- a/dlls/pdh/Makefile.in +++ b/dlls/pdh/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = pdh.dll IMPORTLIB = pdh diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index 3840b9d0288..3fc3f7bc6b8 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -213,7 +213,7 @@ PDH_STATUS WINAPI PdhAddCounterA( PDH_HQUERY query, LPCSTR path, PDH_STATUS ret; WCHAR *pathW; - TRACE("%p %s %lx %p\n", query, debugstr_a(path), userdata, counter); + TRACE("%p %s %Ix %p\n", query, debugstr_a(path), userdata, counter); if (!path) return PDH_INVALID_ARGUMENT; @@ -236,7 +236,7 @@ PDH_STATUS WINAPI PdhAddCounterW( PDH_HQUERY hquery, LPCWSTR path, struct counter *counter; unsigned int i; - TRACE("%p %s %lx %p\n", hquery, debugstr_w(path), userdata, hcounter); + TRACE("%p %s %Ix %p\n", hquery, debugstr_w(path), userdata, hcounter); if (!path || !hcounter) return PDH_INVALID_ARGUMENT; @@ -282,7 +282,7 @@ PDH_STATUS WINAPI PdhAddCounterW( PDH_HQUERY hquery, LPCWSTR path, PDH_STATUS WINAPI PdhAddEnglishCounterA( PDH_HQUERY query, LPCSTR path, DWORD_PTR userdata, PDH_HCOUNTER *counter ) { - TRACE("%p %s %lx %p\n", query, debugstr_a(path), userdata, counter); + TRACE("%p %s %Ix %p\n", query, debugstr_a(path), userdata, counter); if (!counter) return PDH_INVALID_ARGUMENT; if (!query) return PDH_INVALID_HANDLE; @@ -295,7 +295,7 @@ PDH_STATUS WINAPI PdhAddEnglishCounterA( PDH_HQUERY query, LPCSTR path, PDH_STATUS WINAPI PdhAddEnglishCounterW( PDH_HQUERY query, LPCWSTR path, DWORD_PTR userdata, PDH_HCOUNTER *counter ) { - TRACE("%p %s %lx %p\n", query, debugstr_w(path), userdata, counter); + TRACE("%p %s %Ix %p\n", query, debugstr_w(path), userdata, counter); if (!counter) return PDH_INVALID_ARGUMENT; if (!query) return PDH_INVALID_HANDLE; @@ -326,7 +326,7 @@ static PDH_STATUS format_value( struct counter *counter, DWORD format, union val } else { - WARN("unknown format %x\n", format); + WARN("unknown format %lx\n", format); return PDH_INVALID_ARGUMENT; } return ERROR_SUCCESS; @@ -342,7 +342,7 @@ PDH_STATUS WINAPI PdhCalculateCounterFromRawValue( PDH_HCOUNTER handle, DWORD fo PDH_STATUS ret; struct counter *counter = handle; - TRACE("%p 0x%08x %p %p %p\n", handle, format, raw1, raw2, value); + TRACE("%p 0x%08lx %p %p %p\n", handle, format, raw1, raw2, value); if (!value) return PDH_INVALID_ARGUMENT; @@ -492,7 +492,7 @@ PDH_STATUS WINAPI PdhCollectQueryDataEx( PDH_HQUERY handle, DWORD interval, HAND PDH_STATUS ret; struct query *query = handle; - TRACE("%p %d %p\n", handle, interval, event); + TRACE("%p %ld %p\n", handle, interval, event); EnterCriticalSection( &pdh_handle_cs ); if (!query || query->magic != PDH_MAGIC_QUERY) @@ -584,7 +584,7 @@ PDH_STATUS WINAPI PdhCollectQueryDataWithTime( PDH_HQUERY handle, LONGLONG *time */ PDH_STATUS WINAPI PdhExpandWildCardPathA( LPCSTR szDataSource, LPCSTR szWildCardPath, LPSTR mszExpandedPathList, LPDWORD pcchPathListLength, DWORD dwFlags ) { - FIXME("%s, %s, %p, %p, 0x%x: stub\n", debugstr_a(szDataSource), debugstr_a(szWildCardPath), mszExpandedPathList, pcchPathListLength, dwFlags); + FIXME("%s, %s, %p, %p, 0x%lx: stub\n", debugstr_a(szDataSource), debugstr_a(szWildCardPath), mszExpandedPathList, pcchPathListLength, dwFlags); return PDH_NOT_IMPLEMENTED; } @@ -593,7 +593,7 @@ PDH_STATUS WINAPI PdhExpandWildCardPathA( LPCSTR szDataSource, LPCSTR szWildCard */ PDH_STATUS WINAPI PdhExpandWildCardPathW( LPCWSTR szDataSource, LPCWSTR szWildCardPath, LPWSTR mszExpandedPathList, LPDWORD pcchPathListLength, DWORD dwFlags ) { - FIXME("%s, %s, %p, %p, 0x%x: stub\n", debugstr_w(szDataSource), debugstr_w(szWildCardPath), mszExpandedPathList, pcchPathListLength, dwFlags); + FIXME("%s, %s, %p, %p, 0x%lx: stub\n", debugstr_w(szDataSource), debugstr_w(szWildCardPath), mszExpandedPathList, pcchPathListLength, dwFlags); return PDH_NOT_IMPLEMENTED; } @@ -745,7 +745,7 @@ PDH_STATUS WINAPI PdhGetFormattedCounterValue( PDH_HCOUNTER handle, DWORD format PDH_STATUS ret; struct counter *counter = handle; - TRACE("%p %x %p %p\n", handle, format, type, value); + TRACE("%p %lx %p %p\n", handle, format, type, value); if (!value) return PDH_INVALID_ARGUMENT; @@ -864,7 +864,7 @@ PDH_STATUS WINAPI PdhLookupPerfNameByIndexA( LPCSTR machine, DWORD index, LPSTR WCHAR bufferW[PDH_MAX_COUNTER_NAME]; DWORD sizeW = ARRAY_SIZE(bufferW); - TRACE("%s %d %p %p\n", debugstr_a(machine), index, buffer, size); + TRACE("%s %ld %p %p\n", debugstr_a(machine), index, buffer, size); if (!buffer || !size) return PDH_INVALID_ARGUMENT; @@ -890,7 +890,7 @@ PDH_STATUS WINAPI PdhLookupPerfNameByIndexW( LPCWSTR machine, DWORD index, LPWST PDH_STATUS ret; unsigned int i; - TRACE("%s %d %p %p\n", debugstr_w(machine), index, buffer, size); + TRACE("%s %ld %p %p\n", debugstr_w(machine), index, buffer, size); if (machine) { @@ -929,7 +929,7 @@ PDH_STATUS WINAPI PdhOpenQueryA( LPCSTR source, DWORD_PTR userdata, PDH_HQUERY * PDH_STATUS ret; WCHAR *sourceW = NULL; - TRACE("%s %lx %p\n", debugstr_a(source), userdata, query); + TRACE("%s %Ix %p\n", debugstr_a(source), userdata, query); if (source && !(sourceW = pdh_strdup_aw( source ))) return PDH_MEMORY_ALLOCATION_FAILURE; @@ -946,7 +946,7 @@ PDH_STATUS WINAPI PdhOpenQueryW( LPCWSTR source, DWORD_PTR userdata, PDH_HQUERY { struct query *query; - TRACE("%s %lx %p\n", debugstr_w(source), userdata, handle); + TRACE("%s %Ix %p\n", debugstr_w(source), userdata, handle); if (!handle) return PDH_INVALID_ARGUMENT; @@ -1112,7 +1112,7 @@ PDH_STATUS WINAPI PdhMakeCounterPathA( PDH_COUNTER_PATH_ELEMENTS_A *e, LPSTR buf WCHAR *bufferW; DWORD buflenW; - TRACE("%p %p %p 0x%08x\n", e, buffer, buflen, flags); + TRACE("%p %p %p 0x%08lx\n", e, buffer, buflen, flags); if (!e || !buflen) return PDH_INVALID_ARGUMENT; @@ -1162,9 +1162,9 @@ PDH_STATUS WINAPI PdhMakeCounterPathW( PDH_COUNTER_PATH_ELEMENTS_W *e, LPWSTR bu PDH_STATUS ret = ERROR_SUCCESS; DWORD len; - TRACE("%p %p %p 0x%08x\n", e, buffer, buflen, flags); + TRACE("%p %p %p 0x%08lx\n", e, buffer, buflen, flags); - if (flags) FIXME("unimplemented flags 0x%08x\n", flags); + if (flags) FIXME("unimplemented flags 0x%08lx\n", flags); if (!e || !e->szCounterName || !e->szObjectName || !buflen) return PDH_INVALID_ARGUMENT; @@ -1207,7 +1207,7 @@ PDH_STATUS WINAPI PdhEnumObjectItemsA(LPCSTR szDataSource, LPCSTR szMachineName, LPSTR mszCounterList, LPDWORD pcchCounterListLength, LPSTR mszInstanceList, LPDWORD pcchInstanceListLength, DWORD dwDetailLevel, DWORD dwFlags) { - FIXME("%s, %s, %s, %p, %p, %p, %p, %d, 0x%x: stub\n", debugstr_a(szDataSource), debugstr_a(szMachineName), + FIXME("%s, %s, %s, %p, %p, %p, %p, %ld, 0x%lx: stub\n", debugstr_a(szDataSource), debugstr_a(szMachineName), debugstr_a(szObjectName), mszCounterList, pcchCounterListLength, mszInstanceList, pcchInstanceListLength, dwDetailLevel, dwFlags); @@ -1221,7 +1221,7 @@ PDH_STATUS WINAPI PdhEnumObjectItemsW(LPCWSTR szDataSource, LPCWSTR szMachineNam LPWSTR mszCounterList, LPDWORD pcchCounterListLength, LPWSTR mszInstanceList, LPDWORD pcchInstanceListLength, DWORD dwDetailLevel, DWORD dwFlags) { - FIXME("%s, %s, %s, %p, %p, %p, %p, %d, 0x%x: stub\n", debugstr_w(szDataSource), debugstr_w(szMachineName), + FIXME("%s, %s, %s, %p, %p, %p, %p, %ld, 0x%lx: stub\n", debugstr_w(szDataSource), debugstr_w(szMachineName), debugstr_w(szObjectName), mszCounterList, pcchCounterListLength, mszInstanceList, pcchInstanceListLength, dwDetailLevel, dwFlags); @@ -1233,7 +1233,7 @@ PDH_STATUS WINAPI PdhEnumObjectItemsW(LPCWSTR szDataSource, LPCWSTR szMachineNam */ PDH_STATUS WINAPI PdhSetDefaultRealTimeDataSource( DWORD source ) { - FIXME("%u\n", source); + FIXME("%lu\n", source); return ERROR_SUCCESS; }

1 0

Eric Pouech : powrprof: Enable compilation with long types.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: 790b09406670358b023b86a7117e48e6ee308c64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=790b09406670358b023b86a7… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 07:10:49 2022 +0100 powrprof: 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/powrprof/Makefile.in | 1 - dlls/powrprof/powrprof.c | 18 +++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/powrprof/Makefile.in b/dlls/powrprof/Makefile.in index b2e59f6032f..e51fc62e7c0 100644 --- a/dlls/powrprof/Makefile.in +++ b/dlls/powrprof/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = powrprof.dll IMPORTLIB = powrprof IMPORTS = advapi32 diff --git a/dlls/powrprof/powrprof.c b/dlls/powrprof/powrprof.c index 0fd20b9f29b..c4af8ab9ce1 100644 --- a/dlls/powrprof/powrprof.c +++ b/dlls/powrprof/powrprof.c @@ -68,7 +68,7 @@ BOOLEAN WINAPI CanUserWritePwrScheme(VOID) r = RegOpenKeyExW(HKEY_LOCAL_MACHINE, szPowerCfgSubKey, 0, KEY_READ | KEY_WRITE, &hKey); if (r != ERROR_SUCCESS) { - TRACE("RegOpenKeyEx failed: %d\n", r); + TRACE("RegOpenKeyEx failed: %ld\n", r); bSuccess = FALSE; } @@ -89,7 +89,7 @@ BOOLEAN WINAPI EnumPwrSchemes(PWRSCHEMESENUMPROC lpfnPwrSchemesEnumProc, LPARAM lParam) { /* FIXME: See note #1 */ - FIXME("(%p, %ld) stub!\n", lpfnPwrSchemesEnumProc, lParam); + FIXME("(%p, %Id) stub!\n", lpfnPwrSchemesEnumProc, lParam); SetLastError(ERROR_FILE_NOT_FOUND); return FALSE; } @@ -151,7 +151,7 @@ BOOLEAN WINAPI GetPwrDiskSpindownRange(PUINT RangeMax, PUINT RangeMin) r = RegOpenKeyExW(HKEY_LOCAL_MACHINE, szPowerCfgSubKey, 0, KEY_READ, &hKey); if (r != ERROR_SUCCESS) { - TRACE("RegOpenKeyEx failed: %d\n", r); + TRACE("RegOpenKeyEx failed: %ld\n", r); TRACE("Using defaults: 3600, 3\n"); *RangeMax = 3600; *RangeMin = 3; @@ -161,7 +161,7 @@ BOOLEAN WINAPI GetPwrDiskSpindownRange(PUINT RangeMax, PUINT RangeMin) r = RegQueryValueExW(hKey, L"DiskSpindownMax", 0, 0, lpValue, &cbValue); if (r != ERROR_SUCCESS) { - TRACE("Couldn't open DiskSpinDownMax: %d\n", r); + TRACE("Couldn't open DiskSpinDownMax: %ld\n", r); TRACE("Using default: 3600\n"); *RangeMax = 3600; } else { @@ -172,7 +172,7 @@ BOOLEAN WINAPI GetPwrDiskSpindownRange(PUINT RangeMax, PUINT RangeMin) r = RegQueryValueExW(hKey, L"DiskSpindownMin", 0, 0, lpValue, &cbValue); if (r != ERROR_SUCCESS) { - TRACE("Couldn't open DiskSpinDownMin: %d\n", r); + TRACE("Couldn't open DiskSpinDownMin: %ld\n", r); TRACE("Using default: 3\n"); *RangeMin = 3; } else { @@ -318,21 +318,21 @@ POWER_PLATFORM_ROLE WINAPI PowerDeterminePlatformRole(void) POWER_PLATFORM_ROLE WINAPI PowerDeterminePlatformRoleEx(ULONG version) { - FIXME("%u stub.\n", version); + FIXME("%lu stub.\n", version); return PlatformRoleDesktop; } DWORD WINAPI PowerEnumerate(HKEY key, const GUID *scheme, const GUID *subgroup, POWER_DATA_ACCESSOR flags, ULONG index, UCHAR *buffer, DWORD *buffer_size) { - FIXME("(%p,%s,%s,%d,%d,%p,%p) stub!\n", key, debugstr_guid(scheme), debugstr_guid(subgroup), + FIXME("(%p,%s,%s,%d,%ld,%p,%p) stub!\n", key, debugstr_guid(scheme), debugstr_guid(subgroup), flags, index, buffer, buffer_size); return ERROR_CALL_NOT_IMPLEMENTED; } DWORD WINAPI PowerRegisterSuspendResumeNotification(DWORD flags, HANDLE recipient, PHPOWERNOTIFY handle) { - FIXME("(0x%08x,%p,%p) stub!\n", flags, recipient, handle); + FIXME("(0x%08lx,%p,%p) stub!\n", flags, recipient, handle); return ERROR_SUCCESS; } @@ -362,7 +362,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) PPRegSemaphore = CreateSemaphoreW(NULL, 1, 1, L"PowerProfileRegistrySemaphore"); if (PPRegSemaphore == NULL) { - ERR("Couldn't create Semaphore: %d\n", GetLastError()); + ERR("Couldn't create Semaphore: %ld\n", GetLastError()); return FALSE; } break;

1 0

Eric Pouech : printui: Enable compilation with long types.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: 55f0f125f20877f55bf9e6cae65332295bf92f67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55f0f125f20877f55bf9e6ca… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 07:10:55 2022 +0100 printui: 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/printui/Makefile.in | 1 - dlls/printui/printui.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/printui/Makefile.in b/dlls/printui/Makefile.in index eb1dbf899dc..c504f190b2f 100644 --- a/dlls/printui/Makefile.in +++ b/dlls/printui/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = printui.dll IMPORTS = shell32 diff --git a/dlls/printui/printui.c b/dlls/printui/printui.c index 09f527bfb0a..8f65ed27e87 100644 --- a/dlls/printui/printui.c +++ b/dlls/printui/printui.c @@ -220,7 +220,7 @@ void WINAPI PrintUIEntryW(HWND hWnd, HINSTANCE hInst, LPCWSTR pCommand, DWORD nC context_t cx; BOOL res = FALSE; - TRACE("(%p, %p, %s, 0x%x)\n", hWnd, hInst, debugstr_w(pCommand), nCmdShow); + TRACE("(%p, %p, %s, 0x%lx)\n", hWnd, hInst, debugstr_w(pCommand), nCmdShow); memset(&cx, 0, sizeof(context_t)); cx.hWnd = hWnd;

1 0

Eric Pouech : prntvpt: Enable compilation with long types.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: 08332f4d3da4c7897872c4f552ea33116fd3440a URL: https://source.winehq.org/git/wine.git/?a=commit;h=08332f4d3da4c7897872c4f5… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 07:11:01 2022 +0100 prntvpt: 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/prntvpt/Makefile.in | 1 - dlls/prntvpt/main.c | 4 ++-- dlls/prntvpt/ticket.c | 14 +++++++------- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/prntvpt/Makefile.in b/dlls/prntvpt/Makefile.in index 7c581662357..77eaf354224 100644 --- a/dlls/prntvpt/Makefile.in +++ b/dlls/prntvpt/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = prntvpt.dll IMPORTLIB = prntvpt IMPORTS = winspool ole32 oleaut32 diff --git a/dlls/prntvpt/main.c b/dlls/prntvpt/main.c index d6ad0cff46a..e046c6cbaed 100644 --- a/dlls/prntvpt/main.c +++ b/dlls/prntvpt/main.c @@ -76,7 +76,7 @@ HRESULT WINAPI PTOpenProvider(PCWSTR printer, DWORD version, HPTPROVIDER *provid { DWORD used_version; - TRACE("%s, %d, %p\n", debugstr_w(printer), version, provider); + TRACE("%s, %ld, %p\n", debugstr_w(printer), version, provider); if (version != 1) return E_INVALIDARG; @@ -87,7 +87,7 @@ HRESULT WINAPI PTOpenProviderEx(const WCHAR *printer, DWORD max_version, DWORD p { struct prn_provider *prov; - TRACE("%s, %d, %d, %p, %p\n", debugstr_w(printer), max_version, pref_version, provider, used_version); + TRACE("%s, %ld, %ld, %p, %p\n", debugstr_w(printer), max_version, pref_version, provider, used_version); if (!max_version || !provider || !used_version) return E_INVALIDARG; diff --git a/dlls/prntvpt/ticket.c b/dlls/prntvpt/ticket.c index 13aaf80423f..e43cda8be6b 100644 --- a/dlls/prntvpt/ticket.c +++ b/dlls/prntvpt/ticket.c @@ -574,7 +574,7 @@ static void set_SelectionNamespaces(IXMLDOMDocument2 *doc) { if (!wcscmp(str, L"xmlns") || !wcsncmp(str, L"xmlns:", 6)) { - TRACE("ns[%d]: %s=%s\n", i, wine_dbgstr_w(str), wine_dbgstr_w(V_BSTR(&var))); + TRACE("ns[%ld]: %s=%s\n", i, wine_dbgstr_w(str), wine_dbgstr_w(V_BSTR(&var))); IStream_Write(stream, str, wcslen(str) * sizeof(WCHAR), NULL); IStream_Write(stream, L"=\"", 2 * sizeof(WCHAR), NULL); IStream_Write(stream, V_BSTR(&var), wcslen(V_BSTR(&var)) * sizeof(WCHAR), NULL); @@ -1174,7 +1174,7 @@ while (0) CHECK_FIELD(DM_DITHERTYPE); CHECK_FIELD(DM_PANNINGWIDTH); CHECK_FIELD(DM_PANNINGHEIGHT); - if (fields) TRACE(" %#x", fields); + if (fields) TRACE(" %#lx", fields); TRACE("\n"); #undef CHECK_FIELD } @@ -1192,7 +1192,7 @@ static void dump_devmode(const DEVMODEW *dm) TRACE("dmDriverVersion: 0x%04x\n", dm->dmDriverVersion); TRACE("dmSize: 0x%04x\n", dm->dmSize); TRACE("dmDriverExtra: 0x%04x\n", dm->dmDriverExtra); - TRACE("dmFields: 0x%04x\n", dm->dmFields); + TRACE("dmFields: 0x%04lx\n", dm->dmFields); dump_fields(dm->dmFields); TRACE("dmOrientation: %d\n", dm->u1.s1.dmOrientation); TRACE("dmPaperSize: %d\n", dm->u1.s1.dmPaperSize); @@ -1209,9 +1209,9 @@ static void dump_devmode(const DEVMODEW *dm) TRACE("dmCollate: %d\n", dm->dmCollate); TRACE("dmFormName: %s\n", debugstr_w(dm->dmFormName)); TRACE("dmLogPixels %u\n", dm->dmLogPixels); - TRACE("dmBitsPerPel %u\n", dm->dmBitsPerPel); - TRACE("dmPelsWidth %u\n", dm->dmPelsWidth); - TRACE("dmPelsHeight %u\n", dm->dmPelsHeight); + TRACE("dmBitsPerPel %lu\n", dm->dmBitsPerPel); + TRACE("dmPelsWidth %lu\n", dm->dmPelsWidth); + TRACE("dmPelsHeight %lu\n", dm->dmPelsHeight); } HRESULT WINAPI PTConvertDevModeToPrintTicket(HPTPROVIDER provider, ULONG size, PDEVMODEW dm, @@ -1221,7 +1221,7 @@ HRESULT WINAPI PTConvertDevModeToPrintTicket(HPTPROVIDER provider, ULONG size, P struct ticket ticket; HRESULT hr; - TRACE("%p,%u,%p,%d,%p\n", provider, size, dm, scope, stream); + TRACE("%p,%lu,%p,%d,%p\n", provider, size, dm, scope, stream); if (!is_valid_provider(provider) || !dm || !stream) return E_INVALIDARG;

1 0

Eric Pouech : propsys: Enable compilation with long types.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: a9c797e4538a37716e62bb81c3fed3de39561b41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9c797e4538a37716e62bb81… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 07:11:06 2022 +0100 propsys: 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/propsys/Makefile.in | 1 - dlls/propsys/propstore.c | 8 ++++---- dlls/propsys/propsys_main.c | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/propsys/Makefile.in b/dlls/propsys/Makefile.in index 71fd29a0dfe..166b7751d6e 100644 --- a/dlls/propsys/Makefile.in +++ b/dlls/propsys/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = propsys.dll IMPORTLIB = propsys IMPORTS = ole32 oleaut32 uuid diff --git a/dlls/propsys/propstore.c b/dlls/propsys/propstore.c index 6e0d49057d9..9906df83f6f 100644 --- a/dlls/propsys/propstore.c +++ b/dlls/propsys/propstore.c @@ -92,7 +92,7 @@ static ULONG WINAPI PropertyStore_AddRef(IPropertyStoreCache *iface) PropertyStore *This = impl_from_IPropertyStoreCache(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); return ref; } @@ -113,7 +113,7 @@ static ULONG WINAPI PropertyStore_Release(IPropertyStoreCache *iface) PropertyStore *This = impl_from_IPropertyStoreCache(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) { @@ -159,7 +159,7 @@ static HRESULT WINAPI PropertyStore_GetAt(IPropertyStoreCache *iface, propstore_value *value; HRESULT hr; - TRACE("%p,%d,%p\n", iface, iProp, pkey); + TRACE("%p,%ld,%p\n", iface, iProp, pkey); if (!pkey) return E_POINTER; @@ -478,7 +478,7 @@ HRESULT WINAPI PSCreatePropertyStoreFromObject(IUnknown *obj, DWORD access, REFI { HRESULT hr; - TRACE("(%p, %d, %s, %p)\n", obj, access, debugstr_guid(riid), ret); + TRACE("(%p, %ld, %s, %p)\n", obj, access, debugstr_guid(riid), ret); if (!obj || !ret) return E_POINTER; diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index 06150dfad12..6e87b3d3579 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -157,7 +157,7 @@ static HRESULT WINAPI propsys_FormatForDisplay(IPropertySystem *iface, REFPROPERTYKEY key, REFPROPVARIANT propvar, PROPDESC_FORMAT_FLAGS flags, LPWSTR dest, DWORD destlen) { - FIXME("%p %p %x %p %d: stub\n", key, propvar, flags, dest, destlen); + FIXME("%p %p %x %p %ld: stub\n", key, propvar, flags, dest, destlen); return E_NOTIMPL; }

1 0