November 2022 - Wine-commits

Eric Pouech : msvcrt: Rename modifier into qualifier.
by Alexandre Julliard 21 Nov '22

21 Nov '22

Module: wine Branch: master Commit: 56b973cdb9c0323b98d11fc53e9d1663486619c8 URL: https://gitlab.winehq.org/wine/wine/-/commit/56b973cdb9c0323b98d11fc53e9d16… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 21 11:30:11 2022 +0100 msvcrt: Rename modifier into qualifier. That's how they are defined in C/C++ standard. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msvcrt/undname.c | 106 +++++++++++++++++++++++++------------------------- 1 file changed, 53 insertions(+), 53 deletions(-)

1 0

Eric Pouech : ucrtbase: Handle undecoration of function's reference qualifiers (C++11).
by Alexandre Julliard 21 Nov '22

21 Nov '22

Module: wine Branch: master Commit: d1eb78a75deb49cea3b273742b05362f227c8d22 URL: https://gitlab.winehq.org/wine/wine/-/commit/d1eb78a75deb49cea3b273742b0536… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 21 11:30:13 2022 +0100 ucrtbase: Handle undecoration of function's reference qualifiers (C++11). Introducing get_function_qualifier(). Feature is not available in msvcrt. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msvcrt/undname.c | 59 +++++++++++++++++++++++++++++------------------ dlls/ucrtbase/tests/cpp.c | 1 - 2 files changed, 37 insertions(+), 23 deletions(-) diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 8db8e8f01b9..5a7283caac7 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -80,6 +80,7 @@ struct parsed_symbol enum datatype_e { DT_NO_LEADING_WS = 0x01, + DT_NO_LRSEP_WS = 0x02, }; /* Type for parsing mangled types */ @@ -407,28 +408,35 @@ static char* get_args(struct parsed_symbol* sym, struct array* pmt_ref, BOOL z_t return args_str; } -static void append_extended_qualifier(struct parsed_symbol *sym, const char **where, const char *str) +static void append_extended_qualifier(struct parsed_symbol *sym, const char **where, + const char *str, BOOL is_ms_keyword) { - if (!(sym->flags & UNDNAME_NO_MS_KEYWORDS)) + if (!is_ms_keyword || !(sym->flags & UNDNAME_NO_MS_KEYWORDS)) { - if (sym->flags & UNDNAME_NO_LEADING_UNDERSCORES) + if (is_ms_keyword && (sym->flags & UNDNAME_NO_LEADING_UNDERSCORES)) str += 2; - *where = *where ? str_printf(sym, "%s %s", *where, str) : str; + *where = *where ? str_printf(sym, "%s%s%s%s", *where, is_ms_keyword ? " " : "", str, is_ms_keyword ? "" : " ") : + str_printf(sym, "%s%s", str, is_ms_keyword ? "" : " "); } } static void get_extended_qualifier(struct parsed_symbol *sym, struct datatype_t *xdt) { + unsigned fl = 0; xdt->left = xdt->right = NULL; xdt->flags = 0; for (;;) { switch (*sym->current) { - case 'E': append_extended_qualifier(sym, &xdt->right, "__ptr64"); break; - case 'F': append_extended_qualifier(sym, &xdt->left, "__unaligned"); break; - case 'I': append_extended_qualifier(sym, &xdt->right, "__restrict"); break; - default: return; + case 'E': append_extended_qualifier(sym, &xdt->right, "__ptr64", TRUE); fl |= 2; break; + case 'F': append_extended_qualifier(sym, &xdt->left, "__unaligned", TRUE); fl |= 2; break; +#ifdef _UCRT + case 'G': append_extended_qualifier(sym, &xdt->right, "&", FALSE); fl |= 1; break; + case 'H': append_extended_qualifier(sym, &xdt->right, "&&", FALSE); fl |= 1; break; +#endif + case 'I': append_extended_qualifier(sym, &xdt->right, "__restrict", TRUE); fl |= 2; break; + default: if (fl == 1 || (fl == 3 && (sym->flags & UNDNAME_NO_MS_KEYWORDS))) xdt->flags = DT_NO_LRSEP_WS; return; } sym->current++; } @@ -457,7 +465,10 @@ static BOOL get_qualifier(struct parsed_symbol *sym, struct datatype_t *xdt, con default: return FALSE; } if (qualif) + { + xdt->flags &= ~DT_NO_LRSEP_WS; xdt->left = xdt->left ? str_printf(sym, "%s %s", qualif, xdt->left) : qualif; + } if (ch >= 'Q' && ch <= 'T') /* pointer to member, fetch class */ { const char* class = get_class_name(sym); @@ -473,6 +484,16 @@ static BOOL get_qualifier(struct parsed_symbol *sym, struct datatype_t *xdt, con return TRUE; } +static BOOL get_function_qualifier(struct parsed_symbol *sym, const char** qualif) +{ + struct datatype_t xdt; + + if (!get_qualifier(sym, &xdt, NULL)) return FALSE; + *qualif = (xdt.left || xdt.right) ? + str_printf(sym, "%s%s%s", xdt.left, (xdt.flags & DT_NO_LRSEP_WS) ? "" : " ", xdt.right) : NULL; + return TRUE; +} + static BOOL get_qualified_type(struct datatype_t *ct, struct parsed_symbol* sym, struct array *pmt_ref, char qualif, enum datatype_flags flags) { @@ -949,24 +970,20 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, { struct function_signature fs; const char* class; - struct datatype_t xdt; + const char* function_qualifier; sym->current++; if (!(class = get_class_name(sym))) goto done; - if (!get_qualifier(sym, &xdt, NULL)) + if (!get_function_qualifier(sym, &function_qualifier)) goto done; if (!get_function_signature(sym, pmt_ref, &fs)) goto done; - if (xdt.left) - xdt.left = str_printf(sym, "%s %s", xdt.left, xdt.right); - else if (xdt.right) - xdt.left = str_printf(sym, " %s", xdt.right); ct->left = str_printf(sym, "%s%s (%s %s::*", fs.return_ct.left, fs.return_ct.right, fs.call_conv, class); - ct->right = str_printf(sym, ")%s%s", fs.arguments, xdt.left); + ct->right = str_printf(sym, ")%s%s", fs.arguments, function_qualifier); } else if (*sym->current == '6') { @@ -1233,7 +1250,7 @@ static BOOL handle_method(struct parsed_symbol* sym, BOOL cast_op) const char* member_type = NULL; struct datatype_t ct_ret; const char* call_conv; - struct datatype_t xdt = {NULL}; + const char* function_qualifier = NULL; const char* exported; const char* args_str = NULL; const char* name = NULL; @@ -1362,9 +1379,7 @@ static BOOL handle_method(struct parsed_symbol* sym, BOOL cast_op) (accmem <= 'X' && (accmem - 'A') % 8 != 2 && (accmem - 'A') % 8 != 3))) { /* Implicit 'this' pointer */ - /* If there is an implicit this pointer, const qualifier follows */ - if (!get_qualifier(sym, &xdt, NULL)) goto done; - if (xdt.left || xdt.right) xdt.left = str_printf(sym, "%s %s", xdt.left, xdt.right); + if (!get_function_qualifier(sym, &function_qualifier)) goto done; } if (!get_calling_convention(*sym->current++, &call_conv, &exported, @@ -1395,8 +1410,8 @@ static BOOL handle_method(struct parsed_symbol* sym, BOOL cast_op) mark = sym->stack.num; if (has_args && !(args_str = get_args(sym, &array_pmt, TRUE, '(', ')'))) goto done; - if (sym->flags & UNDNAME_NAME_ONLY) args_str = xdt.left = NULL; - if (sym->flags & UNDNAME_NO_THISTYPE) xdt.left = NULL; + if (sym->flags & UNDNAME_NAME_ONLY) args_str = function_qualifier = NULL; + if (sym->flags & UNDNAME_NO_THISTYPE) function_qualifier = NULL; sym->stack.num = mark; /* Note: '()' after 'Z' means 'throws', but we don't care here @@ -1406,7 +1421,7 @@ static BOOL handle_method(struct parsed_symbol* sym, BOOL cast_op) access, member_type, ct_ret.left, (ct_ret.left && !ct_ret.right) ? " " : NULL, call_conv, call_conv ? " " : NULL, exported, - name, args_str, xdt.left, ct_ret.right); + name, args_str, function_qualifier, ct_ret.right); ret = TRUE; done: return ret; diff --git a/dlls/ucrtbase/tests/cpp.c b/dlls/ucrtbase/tests/cpp.c index b9b36a1e740..9a66d66d814 100644 --- a/dlls/ucrtbase/tests/cpp.c +++ b/dlls/ucrtbase/tests/cpp.c @@ -219,7 +219,6 @@ static void test___unDName(void) for (i = 0; i < ARRAY_SIZE(und_tests); i++) { char *name = p___unDName(0, und_tests[i].in, 0, malloc, free, und_tests[i].flags); - todo_wine_if(i >= 3) ok(!strcmp(name, und_tests[i].out) || broken(und_tests[i].broken && !strcmp(und_tests[i].broken, name)), "unDName returned %s for #%u\n", wine_dbgstr_a(name), i);

1 0

Eric Pouech : dbghelp: Convert of couple more of string literals.
by Alexandre Julliard 21 Nov '22

21 Nov '22

Module: wine Branch: master Commit: 69108af65496021157daa4bcaaaa53ab15e8901a URL: https://gitlab.winehq.org/wine/wine/-/commit/69108af65496021157daa4bcaaaa53… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 21 16:42:21 2022 +0100 dbghelp: Convert of couple more of string literals. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/path.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index 2320c9da5c3..d23a4b5733e 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -741,17 +741,14 @@ BOOL search_dll_path(const struct process *process, const WCHAR *name, BOOL (*ma if ((env = process_getenv(process, L"WINEBUILDDIR"))) { - const WCHAR dllsW[] = { '\\','d','l','l','s','\\' }; - const WCHAR programsW[] = { '\\','p','r','o','g','r','a','m','s','\\' }; - len = lstrlenW(env); - if (!(buf = heap_alloc((len + ARRAY_SIZE(programsW) + machine_dir_len + + if (!(buf = heap_alloc((len + wcslen(L"\\programs\\") + machine_dir_len + 2 * lstrlenW(name) + 1) * sizeof(WCHAR)))) return FALSE; wcscpy(buf, env); end = buf + len; - memcpy(end, dllsW, sizeof(dllsW)); - lstrcpyW(end + ARRAY_SIZE(dllsW), name); + wcscpy(end, L"\\dlls\\"); + wcscat(end, name); if ((p = wcsrchr(end, '.')) && !lstrcmpW(p, L".so")) *p = 0; if ((p = wcsrchr(end, '.')) && !lstrcmpW(p, L".dll")) *p = 0; p = end + lstrlenW(end); @@ -764,9 +761,9 @@ BOOL search_dll_path(const struct process *process, const WCHAR *name, BOOL (*ma lstrcpyW(p, name); if (try_match_file(buf, match, param)) goto found; - memcpy(end, programsW, sizeof(programsW)); - end += ARRAY_SIZE(programsW); - lstrcpyW(end, name); + wcscpy(end, L"\\programs\\"); + end += wcslen(end); + wcscpy(end, name); if ((p = wcsrchr(end, '.')) && !lstrcmpW(p, L".so")) *p = 0; if ((p = wcsrchr(end, '.')) && !lstrcmpW(p, L".exe")) *p = 0; p = end + lstrlenW(end);

1 0

Eric Pouech : dbghelp: Search debug info files into local cache of debuginfod.
by Alexandre Julliard 21 Nov '22

21 Nov '22

Module: wine Branch: master Commit: b718fbc31fb4e28bf05e939652553d4fc6b73c8b URL: https://gitlab.winehq.org/wine/wine/-/commit/b718fbc31fb4e28bf05e939652553d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 21 16:42:23 2022 +0100 dbghelp: Search debug info files into local cache of debuginfod. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/module.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 4840a44f5de..27ed915389a 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -745,6 +745,7 @@ struct image_file_map* image_load_debugaltlink(struct image_file_map* fmap, stru static BOOL image_locate_build_id_target(struct image_file_map* fmap, const BYTE* id, unsigned idlen) { struct image_file_map* fmap_link = NULL; + DWORD sz; WCHAR* p; WCHAR* z; @@ -764,7 +765,7 @@ static BOOL image_locate_build_id_target(struct image_file_map* fmap, const BYTE z = append_hex(z, id + 1, id + idlen); } } - memcpy(z, L".debug", sizeof(L".debug")); + wcscpy(z, L".debug"); TRACE("checking %s\n", wine_dbgstr_w(p)); if (image_check_debug_link_gnu_id(p, fmap_link, id, idlen)) @@ -774,6 +775,27 @@ static BOOL image_locate_build_id_target(struct image_file_map* fmap, const BYTE return TRUE; } + sz = GetEnvironmentVariableW(L"WINEHOMEDIR", NULL, 0); + if (sz) + { + p = realloc(p, sz * sizeof(WCHAR) + + sizeof(L"\\.cache\\debuginfod_client\\") + + idlen * 2 * sizeof(WCHAR) + sizeof(L"\\debuginfo") + 500); + GetEnvironmentVariableW(L"WINEHOMEDIR", p, sz); + z = p + sz - 1; + wcscpy(z, L"\\.cache\\debuginfod_client\\"); + z += wcslen(z); + z = append_hex(z, id, id + idlen); + wcscpy(z, L"\\debuginfo"); + TRACE("checking %ls\n", p); + if (image_check_debug_link_gnu_id(p, fmap_link, id, idlen)) + { + free(p); + fmap->alternate = fmap_link; + return TRUE; + } + } + TRACE("not found\n"); free(p); HeapFree(GetProcessHeap(), 0, fmap_link);

1 0

Eric Pouech : dbghelp: Locate alternate debug info files by their build id.
by Alexandre Julliard 21 Nov '22

21 Nov '22

Module: wine Branch: master Commit: 4119430e57a8e713cb5143f6e1bac44150145527 URL: https://gitlab.winehq.org/wine/wine/-/commit/4119430e57a8e713cb5143f6e1bac4… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 21 16:42:24 2022 +0100 dbghelp: Locate alternate debug info files by their build id. (including debuginfo client cache) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/module.c | 146 ++++++++++++++++++++++++++------------------------ 1 file changed, 77 insertions(+), 69 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 27ed915389a..d590877497d 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -643,6 +643,71 @@ static WCHAR* append_hex(WCHAR* dst, const BYTE* id, const BYTE* end) return dst; } +/****************************************************************** + * image_locate_build_id_target + * + * Try to find the .so file containing the debug info out of the build-id note information + */ +static BOOL image_locate_build_id_target(struct image_file_map* fmap, const BYTE* id, unsigned idlen) +{ + struct image_file_map* fmap_link = NULL; + DWORD sz; + WCHAR* p; + WCHAR* z; + + fmap_link = HeapAlloc(GetProcessHeap(), 0, sizeof(*fmap_link)); + if (!fmap_link) return FALSE; + + p = malloc(sizeof(L"/usr/lib/debug/.build-id/") + + (idlen * 2 + 1) * sizeof(WCHAR) + sizeof(L".debug")); + wcscpy(p, L"/usr/lib/debug/.build-id/"); + z = p + wcslen(p); + if (idlen) + { + z = append_hex(z, id, id + 1); + if (idlen > 1) + { + *z++ = L'/'; + z = append_hex(z, id + 1, id + idlen); + } + } + wcscpy(z, L".debug"); + TRACE("checking %s\n", wine_dbgstr_w(p)); + + if (image_check_debug_link_gnu_id(p, fmap_link, id, idlen)) + { + free(p); + fmap->alternate = fmap_link; + return TRUE; + } + + sz = GetEnvironmentVariableW(L"WINEHOMEDIR", NULL, 0); + if (sz) + { + p = realloc(p, sz * sizeof(WCHAR) + + sizeof(L"\\.cache\\debuginfod_client\\") + + idlen * 2 * sizeof(WCHAR) + sizeof(L"\\debuginfo") + 500); + GetEnvironmentVariableW(L"WINEHOMEDIR", p, sz); + z = p + sz - 1; + wcscpy(z, L"\\.cache\\debuginfod_client\\"); + z += wcslen(z); + z = append_hex(z, id, id + idlen); + wcscpy(z, L"\\debuginfo"); + TRACE("checking %ls\n", p); + if (image_check_debug_link_gnu_id(p, fmap_link, id, idlen)) + { + free(p); + fmap->alternate = fmap_link; + return TRUE; + } + } + + TRACE("not found\n"); + free(p); + HeapFree(GetProcessHeap(), 0, fmap_link); + return FALSE; +} + /****************************************************************** * image_load_debugaltlink * @@ -674,9 +739,12 @@ struct image_file_map* image_load_debugaltlink(struct image_file_map* fmap, stru unsigned sect_len; const BYTE* id; /* The content of the section is: - * + a \0 terminated string + * + a \0 terminated string (filename) * + followed by the build-id - * We try loading the dwz_alternate, either as absolute path, or relative to the embedded build-id + * We try loading the dwz_alternate: + * - from the filename: either as absolute path, or relative to the embedded build-id + * - from the build-id + * In both cases, checking that found .so file matches the requested build-id */ sect_len = image_get_map_size(&debugaltlink_sect); id = memchr(data, '\0', sect_len); @@ -726,8 +794,13 @@ struct image_file_map* image_load_debugaltlink(struct image_file_map* fmap, stru if (!ret) { HeapFree(GetProcessHeap(), 0, fmap_link); - WARN("Couldn't find a match for .gnu_debugaltlink section %s for %s\n", data, debugstr_w(module->modulename)); - fmap_link = NULL; + /* didn't work out with filename, try file lookup based on build-id */ + ret = image_locate_build_id_target(fmap, id, idlen); + if (!ret) + { + WARN("Couldn't find a match for .gnu_debugaltlink section %s for %s\n", data, debugstr_w(module->modulename)); + fmap_link = NULL; + } } } } @@ -737,71 +810,6 @@ struct image_file_map* image_load_debugaltlink(struct image_file_map* fmap, stru return fmap_link; } -/****************************************************************** - * image_locate_build_id_target - * - * Try to find the .so file containing the debug info out of the build-id note information - */ -static BOOL image_locate_build_id_target(struct image_file_map* fmap, const BYTE* id, unsigned idlen) -{ - struct image_file_map* fmap_link = NULL; - DWORD sz; - WCHAR* p; - WCHAR* z; - - fmap_link = HeapAlloc(GetProcessHeap(), 0, sizeof(*fmap_link)); - if (!fmap_link) return FALSE; - - p = malloc(sizeof(L"/usr/lib/debug/.build-id/") + - (idlen * 2 + 1) * sizeof(WCHAR) + sizeof(L".debug")); - wcscpy(p, L"/usr/lib/debug/.build-id/"); - z = p + wcslen(p); - if (idlen) - { - z = append_hex(z, id, id + 1); - if (idlen > 1) - { - *z++ = L'/'; - z = append_hex(z, id + 1, id + idlen); - } - } - wcscpy(z, L".debug"); - TRACE("checking %s\n", wine_dbgstr_w(p)); - - if (image_check_debug_link_gnu_id(p, fmap_link, id, idlen)) - { - free(p); - fmap->alternate = fmap_link; - return TRUE; - } - - sz = GetEnvironmentVariableW(L"WINEHOMEDIR", NULL, 0); - if (sz) - { - p = realloc(p, sz * sizeof(WCHAR) + - sizeof(L"\\.cache\\debuginfod_client\\") + - idlen * 2 * sizeof(WCHAR) + sizeof(L"\\debuginfo") + 500); - GetEnvironmentVariableW(L"WINEHOMEDIR", p, sz); - z = p + sz - 1; - wcscpy(z, L"\\.cache\\debuginfod_client\\"); - z += wcslen(z); - z = append_hex(z, id, id + idlen); - wcscpy(z, L"\\debuginfo"); - TRACE("checking %ls\n", p); - if (image_check_debug_link_gnu_id(p, fmap_link, id, idlen)) - { - free(p); - fmap->alternate = fmap_link; - return TRUE; - } - } - - TRACE("not found\n"); - free(p); - HeapFree(GetProcessHeap(), 0, fmap_link); - return FALSE; -} - /****************************************************************** * image_check_alternate *

1 0

Alex Henrie : dinput/tests: Avoid using GCC's typeof extension.
by Alexandre Julliard 21 Nov '22

21 Nov '22

Module: wine Branch: master Commit: f0605758e0b6762d5c2ad173a2026fe8a256a702 URL: https://gitlab.winehq.org/wine/wine/-/commit/f0605758e0b6762d5c2ad173a2026f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 21 08:07:22 2022 -0700 dinput/tests: Avoid using GCC's typeof extension. typeof is not available in MSVC. --- dlls/dinput/tests/force_feedback.c | 12 +++++------- dlls/dinput/tests/hotplug.c | 10 ++++------ dlls/dinput/tests/joystick8.c | 12 +++++------- 3 files changed, 14 insertions(+), 20 deletions(-) diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index 8fb15e38f13..ba37320e9f0 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -48,13 +48,11 @@ #include "windows.gaming.input.forcefeedback.h" #undef Size -#define MAKE_FUNC(f) static typeof(f) *p ## f -MAKE_FUNC( RoGetActivationFactory ); -MAKE_FUNC( RoInitialize ); -MAKE_FUNC( WindowsCreateString ); -MAKE_FUNC( WindowsDeleteString ); -MAKE_FUNC( WindowsGetStringRawBuffer ); -#undef MAKE_FUNC +static HRESULT WINAPI (*pRoGetActivationFactory)( HSTRING, REFIID, void** ); +static HRESULT WINAPI (*pRoInitialize)( RO_INIT_TYPE ); +static HRESULT WINAPI (*pWindowsCreateString)( const WCHAR*, UINT32, HSTRING* ); +static HRESULT WINAPI (*pWindowsDeleteString)( HSTRING str ); +static const WCHAR* WINAPI (*pWindowsGetStringRawBuffer)( HSTRING, UINT32* ); static BOOL load_combase_functions(void) { diff --git a/dlls/dinput/tests/hotplug.c b/dlls/dinput/tests/hotplug.c index 9896e7b480e..e915d04745a 100644 --- a/dlls/dinput/tests/hotplug.c +++ b/dlls/dinput/tests/hotplug.c @@ -50,12 +50,10 @@ #include "windows.gaming.input.custom.h" #undef Size -#define MAKE_FUNC(f) static typeof(f) *p ## f -MAKE_FUNC( RoGetActivationFactory ); -MAKE_FUNC( RoInitialize ); -MAKE_FUNC( WindowsCreateString ); -MAKE_FUNC( WindowsDeleteString ); -#undef MAKE_FUNC +static HRESULT WINAPI (*pRoGetActivationFactory)( HSTRING, REFIID, void** ); +static HRESULT WINAPI (*pRoInitialize)( RO_INIT_TYPE ); +static HRESULT WINAPI (*pWindowsCreateString)( const WCHAR*, UINT32, HSTRING* ); +static HRESULT WINAPI (*pWindowsDeleteString)( HSTRING str ); static BOOL load_combase_functions(void) { diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index 0981d917b2a..f568c9298c6 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -47,13 +47,11 @@ #include "windows.gaming.input.h" #undef Size -#define MAKE_FUNC(f) static typeof(f) *p ## f -MAKE_FUNC( RoGetActivationFactory ); -MAKE_FUNC( RoInitialize ); -MAKE_FUNC( WindowsCreateString ); -MAKE_FUNC( WindowsDeleteString ); -MAKE_FUNC( WindowsGetStringRawBuffer ); -#undef MAKE_FUNC +static HRESULT WINAPI (*pRoGetActivationFactory)( HSTRING, REFIID, void** ); +static HRESULT WINAPI (*pRoInitialize)( RO_INIT_TYPE ); +static HRESULT WINAPI (*pWindowsCreateString)( const WCHAR*, UINT32, HSTRING* ); +static HRESULT WINAPI (*pWindowsDeleteString)( HSTRING str ); +static const WCHAR* WINAPI (*pWindowsGetStringRawBuffer)( HSTRING, UINT32* ); static BOOL load_combase_functions(void) {

1 0

Piotr Caban : winprint: Add stub dll.
by Alexandre Julliard 21 Nov '22

21 Nov '22

Module: wine Branch: master Commit: b7d7b23a617bdbb4177830c074cc0c8807ec9bce URL: https://gitlab.winehq.org/wine/wine/-/commit/b7d7b23a617bdbb4177830c074cc0c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 26 13:12:27 2022 +0200 winprint: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/winprint/Makefile.in | 4 +++ dlls/winprint/printproc.c | 64 +++++++++++++++++++++++++++++++++++++++++++++ dlls/winprint/winprint.spec | 6 +++++ loader/wine.inf.in | 2 ++ 6 files changed, 79 insertions(+) diff --git a/configure b/configure index 99fefd2c172..e17b71555f2 100755 --- a/configure +++ b/configure @@ -1472,6 +1472,7 @@ enable_winhttp enable_wininet enable_winmm enable_winnls32 +enable_winprint enable_winscard enable_winspool_drv enable_winsta @@ -21918,6 +21919,7 @@ wine_fn_config_makefile dlls/winmm enable_winmm wine_fn_config_makefile dlls/winmm/tests enable_tests wine_fn_config_makefile dlls/winnls.dll16 enable_win16 wine_fn_config_makefile dlls/winnls32 enable_winnls32 +wine_fn_config_makefile dlls/winprint enable_winprint wine_fn_config_makefile dlls/winscard enable_winscard wine_fn_config_makefile dlls/winsock.dll16 enable_win16 wine_fn_config_makefile dlls/winspool.drv enable_winspool_drv diff --git a/configure.ac b/configure.ac index abf03f41b09..b7d443c1182 100644 --- a/configure.ac +++ b/configure.ac @@ -3203,6 +3203,7 @@ WINE_CONFIG_MAKEFILE(dlls/winmm) WINE_CONFIG_MAKEFILE(dlls/winmm/tests) WINE_CONFIG_MAKEFILE(dlls/winnls.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/winnls32) +WINE_CONFIG_MAKEFILE(dlls/winprint) WINE_CONFIG_MAKEFILE(dlls/winscard) WINE_CONFIG_MAKEFILE(dlls/winsock.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/winspool.drv) diff --git a/dlls/winprint/Makefile.in b/dlls/winprint/Makefile.in new file mode 100644 index 00000000000..002004b1d0d --- /dev/null +++ b/dlls/winprint/Makefile.in @@ -0,0 +1,4 @@ +MODULE = winprint.dll + +C_SRCS = \ + printproc.c diff --git a/dlls/winprint/printproc.c b/dlls/winprint/printproc.c new file mode 100644 index 00000000000..7cc8759d801 --- /dev/null +++ b/dlls/winprint/printproc.c @@ -0,0 +1,64 @@ +/* + * Print processor implementation. + * + * Copyright 2022 Piotr Caban 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 + */ + +#include "windows.h" +#include "winspool.h" +#include "ddk/winsplp.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(winprint); + +BOOL WINAPI EnumPrintProcessorDatatypesW(WCHAR *server, WCHAR *name, DWORD level, + BYTE *datatypes, DWORD size, DWORD *needed, DWORD *no) +{ + FIXME("%s, %s, %ld, %p, %ld, %p, %p\n", debugstr_w(server), debugstr_w(name), + level, datatypes, size, needed, no); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +HANDLE WINAPI OpenPrintProcessor(WCHAR *port, PRINTPROCESSOROPENDATA *open_data) +{ + FIXME("%s, %p\n", debugstr_w(port), open_data); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return NULL; +} + +BOOL WINAPI ClosePrintProcessor(HANDLE pp) +{ + FIXME("%p\n", pp); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +BOOL WINAPI PrintDocumentOnPrintProcessor(HANDLE pp, WCHAR *doc_name) +{ + FIXME("%p, %s\n", pp, debugstr_w(doc_name)); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +BOOL WINAPI ControlPrintProcessor(HANDLE pp, DWORD cmd) +{ + FIXME("%p, %ld\n", pp, cmd); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/winprint/winprint.spec b/dlls/winprint/winprint.spec new file mode 100644 index 00000000000..b7b4642b695 --- /dev/null +++ b/dlls/winprint/winprint.spec @@ -0,0 +1,6 @@ +@ stdcall ClosePrintProcessor(ptr) +@ stdcall ControlPrintProcessor(ptr long) +@ stdcall EnumPrintProcessorDatatypesW(ptr ptr long ptr long ptr ptr) +@ stub GetPrintProcessorCapabilities +@ stdcall OpenPrintProcessor(ptr ptr) +@ stdcall PrintDocumentOnPrintProcessor(ptr ptr) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index e7b435ed0f0..127d1f9ad6a 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2149,6 +2149,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 16427,System\OLE DB,msdasql.dll 16427,System\ADO,msado15.dll 66000,3,wineps.drv +55,,winprint.dll 12,,*.sys,- 11,,*.msstyles,- 11,,* @@ -2211,6 +2212,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 16427,System\OLE DB,msdasql.dll 16427,System\ADO,msado15.dll 66000,3,wineps.drv +55,,winprint.dll 12,,*.sys 11,,*

1 0

Piotr Caban : winprint: Implement RAW print processor.
by Alexandre Julliard 21 Nov '22

21 Nov '22

Module: wine Branch: master Commit: f63a9b592ce29bb5cd081d441ab4dbdc1b373478 URL: https://gitlab.winehq.org/wine/wine/-/commit/f63a9b592ce29bb5cd081d441ab4db… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 26 13:33:37 2022 +0200 winprint: Implement RAW print processor. --- dlls/winprint/Makefile.in | 1 + dlls/winprint/printproc.c | 161 +++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 147 insertions(+), 15 deletions(-) diff --git a/dlls/winprint/Makefile.in b/dlls/winprint/Makefile.in index 002004b1d0d..57851fc5b04 100644 --- a/dlls/winprint/Makefile.in +++ b/dlls/winprint/Makefile.in @@ -1,4 +1,5 @@ MODULE = winprint.dll +IMPORTS = winspool C_SRCS = \ printproc.c diff --git a/dlls/winprint/printproc.c b/dlls/winprint/printproc.c index 7cc8759d801..d7d9cce9d93 100644 --- a/dlls/winprint/printproc.c +++ b/dlls/winprint/printproc.c @@ -18,6 +18,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* Missing datatypes support: + * RAW [FF appended] + * RAW [FF auto] + * NT EMF 1.003 + * NT EMF 1.006 + * NT EMF 1.007 + * NT EMF 1.008 + * TEXT + * XPS2GDI + * + * Implement print processor features like e.g. printing multiple copies. */ + +#include <stdlib.h> + #include "windows.h" #include "winspool.h" #include "ddk/winsplp.h" @@ -26,34 +40,133 @@ WINE_DEFAULT_DEBUG_CHANNEL(winprint); +#define PP_MAGIC 0x952173fd + +struct pp_data +{ + DWORD magic; + HANDLE hport; + WCHAR *doc_name; + WCHAR *out_file; +}; + +static struct pp_data* get_handle_data(HANDLE pp) +{ + struct pp_data *ret = (struct pp_data *)pp; + + if (!ret || ret->magic != PP_MAGIC) + { + SetLastError(ERROR_INVALID_HANDLE); + return NULL; + } + return ret; +} + BOOL WINAPI EnumPrintProcessorDatatypesW(WCHAR *server, WCHAR *name, DWORD level, BYTE *datatypes, DWORD size, DWORD *needed, DWORD *no) { - FIXME("%s, %s, %ld, %p, %ld, %p, %p\n", debugstr_w(server), debugstr_w(name), + static const WCHAR raw[] = L"RAW"; + + DATATYPES_INFO_1W *info = (DATATYPES_INFO_1W *)datatypes; + + TRACE("%s, %s, %ld, %p, %ld, %p, %p\n", debugstr_w(server), debugstr_w(name), level, datatypes, size, needed, no); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + + if (!needed || !no) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + *no = 0; + *needed = sizeof(*info) + sizeof(raw); + + if (level != 1 || !datatypes) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (size < *needed) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } + + *no = 1; + info->pName = (WCHAR*)(info + 1); + memcpy(info + 1, raw, sizeof(raw)); + return TRUE; } HANDLE WINAPI OpenPrintProcessor(WCHAR *port, PRINTPROCESSOROPENDATA *open_data) { - FIXME("%s, %p\n", debugstr_w(port), open_data); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return NULL; -} + struct pp_data *data; + HANDLE hport; -BOOL WINAPI ClosePrintProcessor(HANDLE pp) -{ - FIXME("%p\n", pp); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + TRACE("%s, %p\n", debugstr_w(port), open_data); + + if (!port || !open_data || !open_data->pDatatype) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + if (!wcscmp(open_data->pDatatype, L"RAW")) + { + SetLastError(ERROR_INVALID_DATATYPE); + return NULL; + } + + if (!OpenPrinterW(port, &hport, NULL)) + return NULL; + + data = LocalAlloc(LMEM_FIXED | LMEM_ZEROINIT, sizeof(*data)); + if (!data) + return NULL; + data->magic = PP_MAGIC; + data->hport = hport; + data->doc_name = wcsdup(open_data->pDocumentName); + data->out_file = wcsdup(open_data->pOutputFile); + return (HANDLE)data; } BOOL WINAPI PrintDocumentOnPrintProcessor(HANDLE pp, WCHAR *doc_name) { - FIXME("%p, %s\n", pp, debugstr_w(doc_name)); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + struct pp_data *data = get_handle_data(pp); + HANDLE spool_data; + DOC_INFO_1W info; + BYTE buf[0x1000]; + DWORD r, w; + + TRACE("%p, %s\n", pp, debugstr_w(doc_name)); + + if (!data) + return FALSE; + + if (!OpenPrinterW(doc_name, &spool_data, NULL)) + return FALSE; + + info.pDocName = data->doc_name; + info.pOutputFile = data->out_file; + info.pDatatype = (WCHAR *)L"RAW"; + if (!StartDocPrinterW(data->hport, 1, (BYTE *)&info)) + { + ClosePrinter(spool_data); + return FALSE; + } + + while (ReadPrinter(spool_data, buf, sizeof(buf), &r) && r) + { + if (!WritePrinter(data->hport, buf, r, &w) || r != w) + { + ClosePrinter(spool_data); + EndDocPrinter(data->hport); + return FALSE; + } + } + ClosePrinter(spool_data); + + return EndDocPrinter(data->hport); } BOOL WINAPI ControlPrintProcessor(HANDLE pp, DWORD cmd) @@ -62,3 +175,21 @@ BOOL WINAPI ControlPrintProcessor(HANDLE pp, DWORD cmd) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +BOOL WINAPI ClosePrintProcessor(HANDLE pp) +{ + struct pp_data *data = get_handle_data(pp); + + TRACE("%p\n", pp); + + if (!data) + return FALSE; + + ClosePrinter(data->hport); + free(data->doc_name); + free(data->out_file); + + memset(data, 0, sizeof(*data)); + LocalFree(data); + return TRUE; +}

1 0

Alexandre Julliard : ntdll: Fix int/long type mismatches.
by Alexandre Julliard 21 Nov '22

21 Nov '22

Module: wine Branch: master Commit: d5e2ab1a9858135ba778ee642a5b91325d33e928 URL: https://gitlab.winehq.org/wine/wine/-/commit/d5e2ab1a9858135ba778ee642a5b91… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 21 16:18:44 2022 +0100 ntdll: Fix int/long type mismatches. --- dlls/ntdll/unix/server.c | 5 +++-- dlls/ntdll/unix/socket.c | 4 ++-- dlls/ntdll/unix/sync.c | 12 ++++++------ dlls/ntdll/unix/system.c | 19 ++++++++++--------- dlls/ntdll/unix/thread.c | 2 +- 5 files changed, 22 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 07d9c8d3acd..3daaf95d8ee 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -474,11 +474,12 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result, BOO size = call->virtual_protect.size; if ((ULONG_PTR)addr == call->virtual_protect.addr && size == call->virtual_protect.size) { + ULONG prot; result->virtual_protect.status = NtProtectVirtualMemory( NtCurrentProcess(), &addr, &size, - call->virtual_protect.prot, - &result->virtual_protect.prot ); + call->virtual_protect.prot, &prot ); result->virtual_protect.addr = wine_server_client_ptr( addr ); result->virtual_protect.size = size; + result->virtual_protect.prot = prot; } else result->virtual_protect.status = STATUS_INVALID_PARAMETER; break; diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 7dbf03365bb..beb8382687a 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -113,7 +113,7 @@ struct async_recv_ioctl void *control; struct WS_sockaddr *addr; int *addr_len; - DWORD *ret_flags; + unsigned int *ret_flags; int unix_flags; unsigned int count; BOOL icmp_over_dgram; @@ -907,7 +907,7 @@ static NTSTATUS sock_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi static NTSTATUS sock_ioctl_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, int fd, const void *buffers_ptr, unsigned int count, WSABUF *control, - struct WS_sockaddr *addr, int *addr_len, DWORD *ret_flags, int unix_flags, int force_async ) + struct WS_sockaddr *addr, int *addr_len, unsigned int *ret_flags, int unix_flags, int force_async ) { struct async_recv_ioctl *async; DWORD async_size; diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 9112572c67d..c085bffe34d 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -109,7 +109,7 @@ static inline ULONGLONG monotonic_counter(void) static int futex_private = 128; -static inline int futex_wait( const int *addr, int val, struct timespec *timeout ) +static inline int futex_wait( const LONG *addr, int val, struct timespec *timeout ) { #if (defined(__i386__) || defined(__arm__)) && _TIME_BITS==64 if (timeout && sizeof(*timeout) != 8) @@ -125,14 +125,14 @@ static inline int futex_wait( const int *addr, int val, struct timespec *timeout return syscall( __NR_futex, addr, FUTEX_WAIT | futex_private, val, timeout, 0, 0 ); } -static inline int futex_wake( const int *addr, int val ) +static inline int futex_wake( const LONG *addr, int val ) { return syscall( __NR_futex, addr, FUTEX_WAKE | futex_private, val, NULL, 0, 0 ); } static inline int use_futexes(void) { - static int supported = -1; + static LONG supported = -1; if (supported == -1) { @@ -2309,7 +2309,7 @@ union tid_alert_entry #else HANDLE event; #ifdef __linux__ - int futex; + LONG futex; #endif #endif }; @@ -2395,7 +2395,7 @@ NTSTATUS WINAPI NtAlertThreadByThreadId( HANDLE tid ) #ifdef __linux__ if (use_futexes()) { - int *futex = &entry->futex; + LONG *futex = &entry->futex; if (!InterlockedExchange( futex, 1 )) futex_wake( futex, 1 ); return STATUS_SUCCESS; @@ -2496,7 +2496,7 @@ NTSTATUS WINAPI NtWaitForAlertByThreadId( const void *address, const LARGE_INTEG #ifdef __linux__ if (use_futexes()) { - int *futex = &entry->futex; + LONG *futex = &entry->futex; ULONGLONG end; int ret; diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index ba2051da65e..4551c9603a3 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -777,7 +777,7 @@ static BOOL logical_proc_info_add_group( DWORD num_cpus, ULONG_PTR mask ) static BOOL sysfs_parse_bitmap(const char *filename, ULONG_PTR *mask) { FILE *f; - DWORD r; + unsigned int r; f = fopen(filename, "r"); if (!f) return FALSE; @@ -802,7 +802,7 @@ static BOOL sysfs_parse_bitmap(const char *filename, ULONG_PTR *mask) * - /sys/devices/system/cpu/cpu0/cache/index0/shared_cpu_list * - /sys/devices/system/cpu/cpu0/topology/thread_siblings_list. */ -static BOOL sysfs_count_list_elements(const char *filename, DWORD *result) +static BOOL sysfs_count_list_elements(const char *filename, unsigned int *result) { FILE *f; @@ -812,7 +812,7 @@ static BOOL sysfs_count_list_elements(const char *filename, DWORD *result) while (!feof(f)) { char op; - DWORD beg, end; + unsigned int beg, end; if (!fscanf(f, "%u%c ", &beg, &op)) break; if(op == '-') @@ -834,7 +834,7 @@ static NTSTATUS create_logical_proc_info(void) static const char numa_info[] = "/sys/devices/system/node/node%u/cpumap"; FILE *fcpu_list, *fnuma_list, *f; - DWORD beg, end, i, j, r, num_cpus = 0, max_cpus = 0; + unsigned int beg, end, i, j, r, num_cpus = 0, max_cpus = 0; char op, name[MAX_PATH]; ULONG_PTR all_cpus_mask = 0; @@ -863,7 +863,7 @@ static NTSTATUS create_logical_proc_info(void) for(i = beg; i <= end; i++) { - DWORD phys_core = 0; + unsigned int phys_core = 0; ULONG_PTR thread_mask = 0; if (i > 8 * sizeof(ULONG_PTR)) @@ -3682,14 +3682,15 @@ NTSTATUS WINAPI NtPowerInformation( POWER_INFORMATION_LEVEL level, void *input, if ((out_size / sizeof(PROCESSOR_POWER_INFORMATION)) < out_cpus) return STATUS_BUFFER_TOO_SMALL; #if defined(linux) { + unsigned int val; char filename[128]; FILE* f; for(i = 0; i < out_cpus; i++) { sprintf(filename, "/sys/devices/system/cpu/cpu%d/cpufreq/cpuinfo_max_freq", i); f = fopen(filename, "r"); - if (f && (fscanf(f, "%d", &cpu_power[i].MaxMhz) == 1)) { - cpu_power[i].MaxMhz /= 1000; + if (f && (fscanf(f, "%u", &val) == 1)) { + cpu_power[i].MaxMhz = val / 1000; fclose(f); cpu_power[i].CurrentMhz = cpu_power[i].MaxMhz; } @@ -3707,8 +3708,8 @@ NTSTATUS WINAPI NtPowerInformation( POWER_INFORMATION_LEVEL level, void *input, sprintf(filename, "/sys/devices/system/cpu/cpu%d/cpufreq/scaling_max_freq", i); f = fopen(filename, "r"); - if(f && (fscanf(f, "%d", &cpu_power[i].MhzLimit) == 1)) { - cpu_power[i].MhzLimit /= 1000; + if(f && (fscanf(f, "%u", &val) == 1)) { + cpu_power[i].MhzLimit = val / 1000; fclose(f); } else diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 711cb4cb13c..5d140c90c42 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -79,7 +79,7 @@ WINE_DECLARE_DEBUG_CHANNEL(threadname); pthread_key_t teb_key = 0; -static int nb_threads = 1; +static LONG nb_threads = 1; static inline int get_unix_exit_code( NTSTATUS status ) {

1 0

Alexandre Julliard : ntdll: Use UINT instead of ULONG in ioctl helpers.
by Alexandre Julliard 21 Nov '22

21 Nov '22

Module: wine Branch: master Commit: 7afd11232eeb9fd019f7ea3cc5a65d7811a028fb URL: https://gitlab.winehq.org/wine/wine/-/commit/7afd11232eeb9fd019f7ea3cc5a65d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 21 16:19:31 2022 +0100 ntdll: Use UINT instead of ULONG in ioctl helpers. To avoid typecasts in debug traces. --- dlls/ntdll/unix/cdrom.c | 4 ++-- dlls/ntdll/unix/file.c | 6 +++--- dlls/ntdll/unix/serial.c | 10 +++++----- dlls/ntdll/unix/socket.c | 2 +- dlls/ntdll/unix/tape.c | 6 +++--- dlls/ntdll/unix/unix_private.h | 14 +++++++------- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/unix/cdrom.c b/dlls/ntdll/unix/cdrom.c index a4a9400a518..a9acdf7a645 100644 --- a/dlls/ntdll/unix/cdrom.c +++ b/dlls/ntdll/unix/cdrom.c @@ -2814,8 +2814,8 @@ static NTSTATUS GetInquiryData(int fd, PSCSI_ADAPTER_BUS_INFO BufferOut, DWORD O * cdrom_DeviceIoControl */ NTSTATUS cdrom_DeviceIoControl( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, - IO_STATUS_BLOCK *io, ULONG code, void *in_buffer, - ULONG in_size, void *out_buffer, ULONG out_size ) + IO_STATUS_BLOCK *io, UINT code, void *in_buffer, + UINT in_size, void *out_buffer, UINT out_size ) { DWORD sz = 0; NTSTATUS status = STATUS_SUCCESS; diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index e80eb368e8a..95ca5fa9b51 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -5095,9 +5095,9 @@ static NTSTATUS server_write_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE /* do an ioctl call through the server */ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, PVOID apc_context, - IO_STATUS_BLOCK *io, ULONG code, - const void *in_buffer, ULONG in_size, - PVOID out_buffer, ULONG out_size ) + IO_STATUS_BLOCK *io, UINT code, + const void *in_buffer, UINT in_size, + PVOID out_buffer, UINT out_size ) { struct async_irp *async; NTSTATUS status; diff --git a/dlls/ntdll/unix/serial.c b/dlls/ntdll/unix/serial.c index 16c5964b77b..fce09500c91 100644 --- a/dlls/ntdll/unix/serial.c +++ b/dlls/ntdll/unix/serial.c @@ -71,7 +71,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(comm); -static const char* iocode2str(DWORD ioc) +static const char* iocode2str(UINT ioc) { switch (ioc) { @@ -1096,8 +1096,8 @@ static NTSTATUS xmit_immediate(HANDLE hDevice, int fd, const char* ptr) } static NTSTATUS io_control( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, - IO_STATUS_BLOCK *io, ULONG code, void *in_buffer, - ULONG in_size, void *out_buffer, ULONG out_size ) + IO_STATUS_BLOCK *io, UINT code, void *in_buffer, + UINT in_size, void *out_buffer, UINT out_size ) { DWORD sz = 0, access = FILE_READ_DATA; NTSTATUS status = STATUS_SUCCESS; @@ -1320,8 +1320,8 @@ static NTSTATUS io_control( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc, vo * serial_DeviceIoControl */ NTSTATUS serial_DeviceIoControl( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, - IO_STATUS_BLOCK *io, ULONG code, void *in_buffer, - ULONG in_size, void *out_buffer, ULONG out_size ) + IO_STATUS_BLOCK *io, UINT code, void *in_buffer, + UINT in_size, void *out_buffer, UINT out_size ) { NTSTATUS status; diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index beb8382687a..779cc46fe32 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1487,7 +1487,7 @@ static int get_sock_type( HANDLE handle ) NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, - ULONG code, void *in_buffer, ULONG in_size, void *out_buffer, ULONG out_size ) + UINT code, void *in_buffer, UINT in_size, void *out_buffer, UINT out_size ) { int fd, needs_close = FALSE; NTSTATUS status; diff --git a/dlls/ntdll/unix/tape.c b/dlls/ntdll/unix/tape.c index 40ac307a632..a7ca04badb0 100644 --- a/dlls/ntdll/unix/tape.c +++ b/dlls/ntdll/unix/tape.c @@ -66,7 +66,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(tape); -static const char *io2str( DWORD io ) +static const char *io2str( unsigned int io ) { switch (io) { @@ -519,8 +519,8 @@ static NTSTATUS TAPE_WriteMarks( int fd, const TAPE_WRITE_MARKS *data ) * tape_DeviceIoControl */ NTSTATUS tape_DeviceIoControl( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, - IO_STATUS_BLOCK *io, ULONG code, - void *in_buffer, ULONG in_size, void *out_buffer, ULONG out_size ) + IO_STATUS_BLOCK *io, UINT code, + void *in_buffer, UINT in_size, void *out_buffer, UINT out_size ) { DWORD sz = 0; NTSTATUS status = STATUS_INVALID_PARAMETER; diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 9cf8989fb0d..afdb8397415 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -252,21 +252,21 @@ extern void fill_vm_counters( VM_COUNTERS_EX *pvmi, int unix_pid ) DECLSPEC_HIDD extern NTSTATUS open_hkcu_key( const char *path, HANDLE *key ) DECLSPEC_HIDDEN; extern NTSTATUS cdrom_DeviceIoControl( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, - IO_STATUS_BLOCK *io, ULONG code, void *in_buffer, - ULONG in_size, void *out_buffer, ULONG out_size ) DECLSPEC_HIDDEN; + IO_STATUS_BLOCK *io, UINT code, void *in_buffer, + UINT in_size, void *out_buffer, UINT out_size ) DECLSPEC_HIDDEN; extern NTSTATUS serial_DeviceIoControl( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, - IO_STATUS_BLOCK *io, ULONG code, void *in_buffer, - ULONG in_size, void *out_buffer, ULONG out_size ) DECLSPEC_HIDDEN; + IO_STATUS_BLOCK *io, UINT code, void *in_buffer, + UINT in_size, void *out_buffer, UINT out_size ) DECLSPEC_HIDDEN; extern NTSTATUS serial_FlushBuffersFile( int fd ) DECLSPEC_HIDDEN; extern NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, - ULONG code, void *in_buffer, ULONG in_size, void *out_buffer, ULONG out_size ) DECLSPEC_HIDDEN; + UINT code, void *in_buffer, UINT in_size, void *out_buffer, UINT out_size ) DECLSPEC_HIDDEN; extern NTSTATUS sock_read( HANDLE handle, int fd, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, void *buffer, ULONG length ) DECLSPEC_HIDDEN; extern NTSTATUS sock_write( HANDLE handle, int fd, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, const void *buffer, ULONG length ) DECLSPEC_HIDDEN; extern NTSTATUS tape_DeviceIoControl( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, - IO_STATUS_BLOCK *io, ULONG code, void *in_buffer, - ULONG in_size, void *out_buffer, ULONG out_size ) DECLSPEC_HIDDEN; + IO_STATUS_BLOCK *io, UINT code, void *in_buffer, + UINT in_size, void *out_buffer, UINT out_size ) DECLSPEC_HIDDEN; extern struct async_fileio *alloc_fileio( DWORD size, async_callback_t callback, HANDLE handle ) DECLSPEC_HIDDEN; extern void release_fileio( struct async_fileio *io ) DECLSPEC_HIDDEN;

1 0