February 2022 - Wine-commits

Eric Pouech : uiautomationcore: Enable compilation with long types.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: 0077d80bd20d1f0ace36387ab0dcc480a3093b44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0077d80bd20d1f0ace36387a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 18 09:17:58 2022 +0100 uiautomationcore: 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/uiautomationcore/Makefile.in | 1 - dlls/uiautomationcore/uia_main.c | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/uiautomationcore/Makefile.in b/dlls/uiautomationcore/Makefile.in index 919314c16d9..f0973fdec4c 100644 --- a/dlls/uiautomationcore/Makefile.in +++ b/dlls/uiautomationcore/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = uiautomationcore.dll IMPORTLIB = uiautomationcore IMPORTS = uuid ole32 oleaut32 user32 diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index f1cf06ed4f5..c250d82a1e6 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -52,7 +52,7 @@ static ULONG WINAPI uia_object_wrapper_AddRef(IUnknown *iface) struct uia_object_wrapper *wrapper = impl_uia_object_wrapper_from_IUnknown(iface); ULONG refcount = InterlockedIncrement(&wrapper->refcount); - TRACE("%p, refcount %d\n", iface, refcount); + TRACE("%p, refcount %ld\n", iface, refcount); return refcount; } @@ -62,7 +62,7 @@ static ULONG WINAPI uia_object_wrapper_Release(IUnknown *iface) struct uia_object_wrapper *wrapper = impl_uia_object_wrapper_from_IUnknown(iface); ULONG refcount = InterlockedDecrement(&wrapper->refcount); - TRACE("%p, refcount %d\n", iface, refcount); + TRACE("%p, refcount %ld\n", iface, refcount); if (!refcount) { IUnknown_Release(wrapper->marshaler); @@ -178,7 +178,7 @@ ULONG WINAPI hwnd_host_provider_AddRef(IRawElementProviderSimple *iface) struct hwnd_host_provider *host_prov = impl_from_hwnd_host_provider(iface); ULONG refcount = InterlockedIncrement(&host_prov->refcount); - TRACE("%p, refcount %d\n", iface, refcount); + TRACE("%p, refcount %ld\n", iface, refcount); return refcount; } @@ -188,7 +188,7 @@ ULONG WINAPI hwnd_host_provider_Release(IRawElementProviderSimple *iface) struct hwnd_host_provider *host_prov = impl_from_hwnd_host_provider(iface); ULONG refcount = InterlockedDecrement(&host_prov->refcount); - TRACE("%p, refcount %d\n", iface, refcount); + TRACE("%p, refcount %ld\n", iface, refcount); if (!refcount) heap_free(host_prov); @@ -311,7 +311,7 @@ int WINAPI UiaLookupId(enum AutomationIdentifierType type, const GUID *guid) LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wParam, LPARAM lParam, IRawElementProviderSimple *elprov) { - FIXME("(%p, %lx, %lx, %p) stub!\n", hwnd, wParam, lParam, elprov); + FIXME("(%p, %Ix, %Ix, %p) stub!\n", hwnd, wParam, lParam, elprov); return 0; }

1 0

Eric Pouech : uiribbon: Enable compilation with long types.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: 189324805c383faaf57918983983cea27067f0e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=189324805c383faaf5791898… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 18 09:18:04 2022 +0100 uiribbon: 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/uiribbon/Makefile.in | 1 - dlls/uiribbon/uiribbon.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/uiribbon/Makefile.in b/dlls/uiribbon/Makefile.in index 19753ea19ed..0b9724d87a9 100644 --- a/dlls/uiribbon/Makefile.in +++ b/dlls/uiribbon/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = uiribbon.dll IMPORTS = uuid ole32 diff --git a/dlls/uiribbon/uiribbon.c b/dlls/uiribbon/uiribbon.c index 18cb4870f9a..38fd60cd533 100644 --- a/dlls/uiribbon/uiribbon.c +++ b/dlls/uiribbon/uiribbon.c @@ -56,7 +56,7 @@ static ULONG WINAPI UIRibbonFrameworkImpl_AddRef(IUIFramework *iface) UIRibbonFrameworkImpl *This = impl_from_IUIFramework(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p/%p)->(): new ref %d\n", iface, This, ref); + TRACE("(%p/%p)->(): new ref %ld\n", iface, This, ref); return ref; } @@ -66,7 +66,7 @@ static ULONG WINAPI UIRibbonFrameworkImpl_Release(IUIFramework *iface) UIRibbonFrameworkImpl *This = impl_from_IUIFramework(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p/%p)->(): new ref %d\n", iface, This, ref); + TRACE("(%p/%p)->(): new ref %ld\n", iface, This, ref); if (!ref) HeapFree(GetProcessHeap(), 0, This);

1 0

Eric Pouech : url: Enable compilation with long types.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: 156afe3044222200dec619dc765fb5814959b962 URL: https://source.winehq.org/git/wine.git/?a=commit;h=156afe3044222200dec619dc… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 18 09:18:10 2022 +0100 url: 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/url/Makefile.in | 1 - dlls/url/url_main.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/url/Makefile.in b/dlls/url/Makefile.in index 44798189827..141d0c65655 100644 --- a/dlls/url/Makefile.in +++ b/dlls/url/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = url.dll IMPORTLIB = url IMPORTS = shell32 shlwapi diff --git a/dlls/url/url_main.c b/dlls/url/url_main.c index 697ce0e05df..f4f70cd7491 100644 --- a/dlls/url/url_main.c +++ b/dlls/url/url_main.c @@ -56,7 +56,7 @@ DWORD WINAPI AddMIMEFileTypesPS(VOID * unknown1, LPPROPSHEETHEADERA lppsh) */ BOOL WINAPI InetIsOffline(DWORD flags) { - FIXME("(%08x): stub!\n", flags); + FIXME("(%08lx): stub!\n", flags); return FALSE; }

1 0

Eric Pouech : urlmon: Enable compilation with long types.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: 5d09d6d437758ff75fad21d950edc531a8c84ddb URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d09d6d437758ff75fad21d9… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 18 09:18:16 2022 +0100 urlmon: 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/urlmon/Makefile.in | 2 +- dlls/urlmon/axinstall.c | 10 +- dlls/urlmon/bindctx.c | 36 ++++---- dlls/urlmon/binding.c | 90 +++++++++--------- dlls/urlmon/bindprot.c | 52 +++++------ dlls/urlmon/download.c | 22 ++--- dlls/urlmon/file.c | 24 ++--- dlls/urlmon/format.c | 10 +- dlls/urlmon/ftp.c | 30 +++--- dlls/urlmon/gopher.c | 22 ++--- dlls/urlmon/http.c | 72 +++++++-------- dlls/urlmon/internet.c | 44 ++++----- dlls/urlmon/mimefilter.c | 28 +++--- dlls/urlmon/mk.c | 26 +++--- dlls/urlmon/protocol.c | 24 ++--- dlls/urlmon/sec_mgr.c | 110 +++++++++++----------- dlls/urlmon/session.c | 36 ++++---- dlls/urlmon/umon.c | 22 ++--- dlls/urlmon/umstream.c | 10 +- dlls/urlmon/uri.c | 226 +++++++++++++++++++++++----------------------- dlls/urlmon/urlmon_main.c | 26 +++--- dlls/urlmon/usrmarshal.c | 18 ++-- 22 files changed, 470 insertions(+), 470 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5d09d6d437758ff75fad…

1 0

Alexandre Julliard : kernel32: Move some more console functions to kernelbase.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: 4a5a3ba7028f24dde11bbf92df3bd26afcb5668e URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a5a3ba7028f24dde11bbf92… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 18 10:56:57 2022 +0100 kernel32: Move some more console functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-console-l3-2-0.spec | 46 +-- dlls/kernel32/console.c | 330 ------------------ dlls/kernel32/kernel32.spec | 48 +-- dlls/kernelbase/console.c | 387 +++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 28 ++ tools/make_specfiles | 2 +- 6 files changed, 463 insertions(+), 378 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4a5a3ba7028f24dde11b…

1 0

Alexandre Julliard : winedump: Add dumping of the .apiset PE section.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: 6f1fd16f92ccbc41999878fce1dc16c9d4d4e283 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f1fd16f92ccbc41999878fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 18 10:00:55 2022 +0100 winedump: Add dumping of the .apiset PE section. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/main.c | 19 ++++---- tools/winedump/pe.c | 107 +++++++++++++++++++++++++++++++++++++++++ tools/winedump/winedump.man.in | 12 ++--- 3 files changed, 123 insertions(+), 15 deletions(-) diff --git a/tools/winedump/main.c b/tools/winedump/main.c index fd5b44d637d..f9557983465 100644 --- a/tools/winedump/main.c +++ b/tools/winedump/main.c @@ -207,7 +207,8 @@ static const struct my_option option_table[] = { {"-C", DUMP, 0, do_symdmngl, "-C Turn on symbol demangling"}, {"-f", DUMP, 0, do_dumphead, "-f Dump file header information"}, {"-G", DUMP, 0, do_rawdebug, "-G Dump raw debug information"}, - {"-j", DUMP, 1, do_dumpsect, "-j <sect_name> Dump only the content of section 'sect_name' (import, export, debug, resource, tls, loadcfg, clr, reloc, except)"}, + {"-j", DUMP, 1, do_dumpsect, "-j <sect_name> Dump only the content of section 'sect_name'\n" + " (import, export, debug, resource, tls, loadcfg, clr, reloc, except, apiset)"}, {"-t", DUMP, 0, do_symtable, "-t Dump symbol table"}, {"-x", DUMP, 0, do_dumpall, "-x Dump everything"}, {"sym", DMGL, 0, do_demangle, "sym <sym> Demangle C++ symbol <sym> and exit"}, @@ -232,22 +233,22 @@ void do_usage (const char *arg) const struct my_option *opt; printf ("Usage: winedump [-h | sym <sym> | spec <dll> | dump <file>]\n"); printf ("Mode options (can be put as the mode (sym/spec/dump...) is declared):\n"); - printf ("\tWhen used in --help mode\n"); + printf (" When used in --help mode\n"); for (opt = option_table; opt->name; opt++) if (opt->mode == NONE) - printf ("\t %s\n", opt->usage); - printf ("\tWhen used in sym mode\n"); + printf (" %s\n", opt->usage); + printf (" When used in sym mode\n"); for (opt = option_table; opt->name; opt++) if (opt->mode == DMGL) - printf ("\t %s\n", opt->usage); - printf ("\tWhen used in spec mode\n"); + printf (" %s\n", opt->usage); + printf (" When used in spec mode\n"); for (opt = option_table; opt->name; opt++) if (opt->mode == SPEC) - printf ("\t %s\n", opt->usage); - printf ("\tWhen used in dump mode\n"); + printf (" %s\n", opt->usage); + printf (" When used in dump mode\n"); for (opt = option_table; opt->name; opt++) if (opt->mode == DUMP) - printf ("\t %s\n", opt->usage); + printf (" %s\n", opt->usage); puts (""); exit (1); diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 6ff14f95791..2207ed9accc 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -491,6 +491,111 @@ static void dump_sections(const void *base, const void* addr, unsigned num_sect) } } +static char *get_str( char *buffer, unsigned int rva, unsigned int len ) +{ + const WCHAR *wstr = PRD( rva, len ); + char *ret = buffer; + + len /= sizeof(WCHAR); + while (len--) *buffer++ = *wstr++; + *buffer = 0; + return ret; +} + +static void dump_section_apiset(void) +{ + const IMAGE_SECTION_HEADER *sect = IMAGE_FIRST_SECTION(PE_nt_headers); + const UINT *ptr, *entry, *value, *hash; + unsigned int i, j, count, val_count, rva; + char buffer[128]; + + for (i = 0; i < PE_nt_headers->FileHeader.NumberOfSections; i++, sect++) + { + if (strncmp( (const char *)sect->Name, ".apiset", 8 )) continue; + rva = sect->PointerToRawData; + ptr = PRD( rva, sizeof(*ptr) ); + printf( "ApiSet section:\n" ); + switch (ptr[0]) /* version */ + { + case 2: + printf( " Version: %u\n", ptr[0] ); + printf( " Count: %08x\n", ptr[1] ); + count = ptr[1]; + if (!(entry = PRD( rva + 2 * sizeof(*ptr), count * 3 * sizeof(*entry) ))) break; + for (i = 0; i < count; i++, entry += 3) + { + printf( " %s ->", get_str( buffer, rva + entry[0], entry[1] )); + if (!(value = PRD( rva + entry[2], sizeof(*value) ))) break; + val_count = *value++; + for (j = 0; j < val_count; j++, value += 4) + { + putchar( ' ' ); + if (value[1]) printf( "%s:", get_str( buffer, rva + value[0], value[1] )); + printf( "%s", get_str( buffer, rva + value[2], value[3] )); + } + printf( "\n"); + } + break; + case 4: + printf( " Version: %u\n", ptr[0] ); + printf( " Size: %08x\n", ptr[1] ); + printf( " Flags: %08x\n", ptr[2] ); + printf( " Count: %08x\n", ptr[3] ); + count = ptr[3]; + if (!(entry = PRD( rva + 4 * sizeof(*ptr), count * 6 * sizeof(*entry) ))) break; + for (i = 0; i < count; i++, entry += 6) + { + printf( " %08x %s ->", entry[0], get_str( buffer, rva + entry[1], entry[2] )); + if (!(value = PRD( rva + entry[5], sizeof(*value) ))) break; + value++; /* flags */ + val_count = *value++; + for (j = 0; j < val_count; j++, value += 5) + { + putchar( ' ' ); + if (value[1]) printf( "%s:", get_str( buffer, rva + value[1], value[2] )); + printf( "%s", get_str( buffer, rva + value[3], value[4] )); + } + printf( "\n"); + } + break; + case 6: + printf( " Version: %u\n", ptr[0] ); + printf( " Size: %08x\n", ptr[1] ); + printf( " Flags: %08x\n", ptr[2] ); + printf( " Count: %08x\n", ptr[3] ); + printf( " EntryOffset: %08x\n", ptr[4] ); + printf( " HashOffset: %08x\n", ptr[5] ); + printf( " HashFactor: %08x\n", ptr[6] ); + count = ptr[3]; + if (!(entry = PRD( rva + ptr[4], count * 6 * sizeof(*entry) ))) break; + for (i = 0; i < count; i++, entry += 6) + { + printf( " %08x %s ->", entry[0], get_str( buffer, rva + entry[1], entry[2] )); + if (!(value = PRD( rva + entry[4], entry[5] * 5 * sizeof(*value) ))) break; + for (j = 0; j < entry[5]; j++, value += 5) + { + putchar( ' ' ); + if (value[1]) printf( "%s:", get_str( buffer, rva + value[1], value[2] )); + printf( "%s", get_str( buffer, rva + value[3], value[4] )); + } + printf( "\n" ); + } + printf( " Hash table:\n" ); + if (!(hash = PRD( rva + ptr[5], count * 2 * sizeof(*hash) ))) break; + for (i = 0; i < count; i++, hash += 2) + { + entry = PRD( rva + ptr[4] + hash[1] * 6 * sizeof(*entry), 6 * sizeof(*entry) ); + printf( " %08x -> %s\n", hash[0], get_str( buffer, rva + entry[1], entry[3] )); + } + break; + default: + printf( "*** Unknown version %u\n", ptr[0] ); + break; + } + break; + } +} + static void dump_dir_exported_functions(void) { unsigned int size = 0; @@ -2336,6 +2441,8 @@ void pe_dump(void) dump_dir_reloc(); if (all || !strcmp(globals.dumpsect, "except")) dump_dir_exceptions(); + if (all || !strcmp(globals.dumpsect, "apiset")) + dump_section_apiset(); } if (globals.do_symbol_table) dump_symbol_table(); diff --git a/tools/winedump/winedump.man.in b/tools/winedump/winedump.man.in index a915ff49225..56460f26e7c 100644 --- a/tools/winedump/winedump.man.in +++ b/tools/winedump/winedump.man.in @@ -70,12 +70,12 @@ Dumps file header information. This option dumps only the standard PE header structures, along with the COFF sections available in the file. .IP "\fB-j \fIdir_name\fR" -Dumps only the content of directory \fIdir_name\fR, for files -which header points to directories. -For PE files, currently the import, export, debug, resource, -tls and clr directories are implemented. -For NE files, currently the export and resource directories are -implemented. +Dumps only the content of directory \fIdir_name\fR, for files which +header points to directories. For PE files, the \fBimport\fR, +\fBexport\fR, \fBdebug\fR, \fBresource\fR, \fBtls\fR, \fBloadcfg\fR, +\fBclr\fR, \fBreloc\fR and \fBexcept\fR directories, as well as the +\fBapiset\fR section, are implemented. For NE files, the \fBexport\fR +and \fBresource\fR directories are implemented. .IP \fB-x\fR Dumps everything. This command prints all available information (including all

1 0

Alexandre Julliard : winebuild: Add support for building apiset data.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: 8a3064899a94b801ac765d592f338a66d1356058 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a3064899a94b801ac765d59… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 18 10:13:58 2022 +0100 winebuild: Add support for building apiset data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 30 +++++++++ tools/winebuild/parser.c | 139 +++++++++++++++++++++++++++++++++++++-- tools/winebuild/spec32.c | 113 +++++++++++++++++++++++++++++++ tools/winebuild/winebuild.man.in | 19 ++++++ 4 files changed, 296 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8a3064899a94b801ac76…

1 0

Alexandre Julliard : apisetschema: Add dll.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: d40ecdd248b9d26aea1165f54b9b1a0b9d832644 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d40ecdd248b9d26aea1165f5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 18 10:14:17 2022 +0100 apisetschema: Add dll. Apiset data generated from the existing api-ms-* modules. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/apisetschema/Makefile.in | 3 + dlls/apisetschema/apisetschema.spec | 225 ++++++++++++++++++++++++++++++++++++ 4 files changed, 231 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d40ecdd248b9d26aea11…

1 0

Alexandre Julliard : kernel32/tests: Add tests for apiset query functions.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: ac5ebb6192ce81fd10ecd7f3c6fac60f74d62207 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac5ebb6192ce81fd10ecd7f3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 18 18:25:39 2022 +0100 kernel32/tests: Add tests for apiset query functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/module.c | 88 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 91e1aba31e0..dcf3b8b3765 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -37,6 +37,8 @@ static BOOL (WINAPI *pSetDefaultDllDirectories)(DWORD); static BOOL (WINAPI *pK32GetModuleInformation)(HANDLE process, HMODULE module, MODULEINFO *modinfo, DWORD cb); +static NTSTATUS (WINAPI *pApiSetQueryApiSetPresence)(const UNICODE_STRING*,BOOLEAN*); +static NTSTATUS (WINAPI *pApiSetQueryApiSetPresenceEx)(const UNICODE_STRING*,BOOLEAN*,BOOLEAN*); static NTSTATUS (WINAPI *pLdrGetDllDirectory)(UNICODE_STRING*); static NTSTATUS (WINAPI *pLdrSetDllDirectory)(UNICODE_STRING*); static NTSTATUS (WINAPI *pLdrGetDllHandle)( LPCWSTR load_path, ULONG flags, const UNICODE_STRING *name, HMODULE *base ); @@ -44,6 +46,8 @@ static NTSTATUS (WINAPI *pLdrGetDllHandleEx)( ULONG flags, LPCWSTR load_path, UL const UNICODE_STRING *name, HMODULE *base ); static NTSTATUS (WINAPI *pLdrGetDllFullName)( HMODULE module, UNICODE_STRING *name ); +static BOOL (WINAPI *pIsApiSetImplemented)(LPCSTR); + static BOOL is_unicode_enabled = TRUE; static BOOL cmpStrAW(const char* a, const WCHAR* b, DWORD lenA, DWORD lenB) @@ -930,11 +934,15 @@ static void init_pointers(void) MAKEFUNC(SetDefaultDllDirectories); MAKEFUNC(K32GetModuleInformation); mod = GetModuleHandleA( "ntdll.dll" ); + MAKEFUNC(ApiSetQueryApiSetPresence); + MAKEFUNC(ApiSetQueryApiSetPresenceEx); MAKEFUNC(LdrGetDllDirectory); MAKEFUNC(LdrSetDllDirectory); MAKEFUNC(LdrGetDllHandle); MAKEFUNC(LdrGetDllHandleEx); MAKEFUNC(LdrGetDllFullName); + mod = GetModuleHandleA( "kernelbase.dll" ); + MAKEFUNC(IsApiSetImplemented); #undef MAKEFUNC /* before Windows 7 this was not exported in kernel32 */ @@ -1426,6 +1434,85 @@ static void test_LdrGetDllFullName(void) wine_dbgstr_w(expected_path), wine_dbgstr_w(path_buffer) ); } +static void test_apisets(void) +{ + static const struct + { + const char *name; + BOOLEAN present; + NTSTATUS status; + BOOLEAN present_ex, in_schema, broken; + } + tests[] = + { + { "api-ms-win-core-console-l1-1-0", TRUE, STATUS_SUCCESS, TRUE, TRUE }, + { "api-ms-win-core-console-l1-1-0.dll", TRUE, STATUS_INVALID_PARAMETER }, + { "api-ms-win-core-console-l1-1-9", TRUE, STATUS_SUCCESS, FALSE, FALSE, TRUE }, + { "api-ms-win-core-console-l1-1-9.dll", TRUE, STATUS_INVALID_PARAMETER, FALSE, FALSE, TRUE }, + { "api-ms-win-core-console-l1-1", FALSE, STATUS_SUCCESS }, + { "api-ms-win-core-console-l1-1-0.fake", TRUE, STATUS_INVALID_PARAMETER, FALSE, FALSE, TRUE }, + { "api-ms-win-foo-bar-l1-1-0", FALSE, STATUS_SUCCESS }, + { "api-ms-win-foo-bar-l1-1-0.dll", FALSE, STATUS_INVALID_PARAMETER }, + { "ext-ms-win-gdi-draw-l1-1-1", TRUE, STATUS_SUCCESS, TRUE, TRUE }, + { "ext-ms-win-gdi-draw-l1-1-1.dll", TRUE, STATUS_INVALID_PARAMETER }, + { "api-ms-win-deprecated-apis-advapi-l1-1-0", FALSE, STATUS_SUCCESS, FALSE, TRUE }, + { "foo", FALSE, STATUS_INVALID_PARAMETER }, + { "foo.dll", FALSE, STATUS_INVALID_PARAMETER }, + { "", FALSE, STATUS_INVALID_PARAMETER }, + }; + unsigned int i; + NTSTATUS status; + BOOLEAN present, in_schema; + UNICODE_STRING name; + + if (!pApiSetQueryApiSetPresence) + { + win_skip( "ApiSetQueryApiSetPresence not implemented\n" ); + return; + } + todo_wine + if (!pApiSetQueryApiSetPresenceEx) win_skip( "ApiSetQueryApiSetPresenceEx not implemented\n" ); + todo_wine + if (!pIsApiSetImplemented) win_skip( "IsApiSetImplemented not implemented\n" ); + + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + RtlCreateUnicodeStringFromAsciiz( &name, tests[i].name ); + name.Buffer[name.Length / sizeof(WCHAR)] = 0xcccc; /* test without null termination */ + winetest_push_context( "%u:%s", i, tests[i].name ); + present = 0xff; + status = pApiSetQueryApiSetPresence( &name, &present ); + todo_wine + ok( status == STATUS_SUCCESS, "wrong ret %x\n", status ); + todo_wine_if( !tests[i].present ) + ok( present == tests[i].present || broken(!present && tests[i].broken) /* win8 */, + "wrong present %u\n", present ); + if (pApiSetQueryApiSetPresenceEx) + { + present = in_schema = 0xff; + status = pApiSetQueryApiSetPresenceEx( &name, &in_schema, &present ); + ok( status == tests[i].status, "wrong ret %x\n", status ); + if (!status) + { + ok( in_schema == tests[i].in_schema, "wrong in_schema %u\n", in_schema ); + ok( present == tests[i].present_ex, "wrong present %u\n", present ); + } + else + { + ok( in_schema == 0xff, "wrong in_schema %u\n", in_schema ); + ok( present == 0xff, "wrong present %u\n", present ); + } + } + if (pIsApiSetImplemented) + { + BOOL ret = pIsApiSetImplemented( tests[i].name ); + ok( ret == (!tests[i].status && tests[i].present_ex), "wrong result %u\n", ret ); + } + winetest_pop_context(); + RtlFreeUnicodeString( &name ); + } +} + static void test_ddag_node(void) { static const struct @@ -1562,5 +1649,6 @@ START_TEST(module) test_SetDefaultDllDirectories(); test_LdrGetDllHandleEx(); test_LdrGetDllFullName(); + test_apisets(); test_ddag_node(); }

1 0

Zebediah Figura : wined3d: Move the "pin sysmem" flag to struct wined3d_resource.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: c724df3b8eb4ce186240bb1a8531ee6c2a35e6e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c724df3b8eb4ce186240bb1a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 17 23:01:35 2022 -0600 wined3d: Move the "pin sysmem" flag to struct wined3d_resource. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 13 ++++++------- dlls/wined3d/texture.c | 18 +++++++++++------- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 7c3537e466e..3ecaa9017d0 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -30,7 +30,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); #define WINED3D_BUFFER_HASDESC 0x01 /* A vertex description has been found. */ #define WINED3D_BUFFER_USE_BO 0x02 /* Use a buffer object for this buffer. */ -#define WINED3D_BUFFER_PIN_SYSMEM 0x04 /* Keep a system memory copy for this buffer. */ #define VB_MAXDECLCHANGES 100 /* After that number of decl changes we stop converting */ #define VB_RESETDECLCHANGE 1000 /* Reset the decl changecount after that number of draws */ @@ -47,7 +46,7 @@ struct wined3d_buffer_ops static void wined3d_buffer_evict_sysmem(struct wined3d_buffer *buffer) { - if (buffer->flags & WINED3D_BUFFER_PIN_SYSMEM) + if (buffer->resource.pin_sysmem) { TRACE("Not evicting system memory for buffer %p.\n", buffer); return; @@ -513,7 +512,7 @@ static void buffer_conversion_upload(struct wined3d_buffer *buffer, struct wined ERR("Failed to load system memory.\n"); return; } - buffer->flags |= WINED3D_BUFFER_PIN_SYSMEM; + buffer->resource.pin_sysmem = 1; /* Now for each vertex in the buffer that needs conversion. */ vertex_count = buffer->resource.size / buffer->stride; @@ -666,7 +665,7 @@ BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, BYTE *wined3d_buffer_load_sysmem(struct wined3d_buffer *buffer, struct wined3d_context *context) { if (wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM)) - buffer->flags |= WINED3D_BUFFER_PIN_SYSMEM; + buffer->resource.pin_sysmem = 1; return buffer->resource.heap_memory; } @@ -966,7 +965,7 @@ static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resourc if (((flags & WINED3D_MAP_WRITE) && !(flags & (WINED3D_MAP_NOOVERWRITE | WINED3D_MAP_DISCARD))) || (!(flags & WINED3D_MAP_WRITE) && (buffer->locations & WINED3D_LOCATION_SYSMEM)) - || buffer->flags & WINED3D_BUFFER_PIN_SYSMEM + || buffer->resource.pin_sysmem || !(buffer->flags & WINED3D_BUFFER_USE_BO)) { if (!(buffer->locations & WINED3D_LOCATION_SYSMEM)) @@ -1036,7 +1035,7 @@ static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resourc { TRACE("Falling back to doublebuffered operation.\n"); wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); - buffer->flags |= WINED3D_BUFFER_PIN_SYSMEM; + buffer->resource.pin_sysmem = 1; } TRACE("New pointer is %p.\n", resource->heap_memory); } @@ -1302,7 +1301,7 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d * maps and retain data in DISCARD maps. Keep a system memory copy of * the buffer to provide the same behavior to the application. */ TRACE("Pinning system memory.\n"); - buffer->flags |= WINED3D_BUFFER_PIN_SYSMEM; + buffer->resource.pin_sysmem = 1; buffer->locations = WINED3D_LOCATION_SYSMEM; } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index b1fd1e7bde2..1323d533eff 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -48,8 +48,8 @@ struct wined3d_rect_f BOOL wined3d_texture_can_use_pbo(const struct wined3d_texture *texture, const struct wined3d_d3d_info *d3d_info) { - if (!d3d_info->pbo || texture->resource.format->conv_byte_count - || (texture->flags & (WINED3D_TEXTURE_PIN_SYSMEM | WINED3D_TEXTURE_COND_NP2_EMULATED))) + if (!d3d_info->pbo || texture->resource.format->conv_byte_count || texture->resource.pin_sysmem + || (texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED)) return FALSE; return TRUE; @@ -666,7 +666,8 @@ static void wined3d_texture_evict_sysmem(struct wined3d_texture *texture) struct wined3d_texture_sub_resource *sub_resource; unsigned int i, sub_count; - if (texture->flags & (WINED3D_TEXTURE_CONVERTED | WINED3D_TEXTURE_PIN_SYSMEM) + if ((texture->flags & WINED3D_TEXTURE_CONVERTED) + || texture->resource.pin_sysmem || texture->download_count > WINED3D_TEXTURE_DYNAMIC_MAP_THRESHOLD) { TRACE("Not evicting system memory for texture %p.\n", texture); @@ -2462,8 +2463,8 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, if (dst_texture->sub_resources[dst_sub_resource_idx].map_count) { - WARN("Uploading a texture that is currently mapped, setting WINED3D_TEXTURE_PIN_SYSMEM.\n"); - dst_texture->flags |= WINED3D_TEXTURE_PIN_SYSMEM; + WARN("Uploading a texture that is currently mapped, pinning sysmem.\n"); + dst_texture->resource.pin_sysmem = 1; } if (src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_HEIGHT_SCALE) @@ -3825,7 +3826,10 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc texture->flags |= WINED3D_TEXTURE_POW2_MAT_IDENT | WINED3D_TEXTURE_NORMALIZED_COORDS | WINED3D_TEXTURE_DOWNLOADABLE; if (flags & WINED3D_TEXTURE_CREATE_GET_DC_LENIENT) - texture->flags |= WINED3D_TEXTURE_PIN_SYSMEM | WINED3D_TEXTURE_GET_DC_LENIENT; + { + texture->flags |= WINED3D_TEXTURE_GET_DC_LENIENT; + texture->resource.pin_sysmem = 1; + } if (flags & (WINED3D_TEXTURE_CREATE_GET_DC | WINED3D_TEXTURE_CREATE_GET_DC_LENIENT)) texture->flags |= WINED3D_TEXTURE_GET_DC; if (flags & WINED3D_TEXTURE_CREATE_DISCARD) @@ -5744,7 +5748,7 @@ static bool blitter_use_cpu_clear(struct wined3d_rendertarget_view *view) locations = texture->sub_resources[view->sub_resource_idx].locations; if (locations & (resource->map_binding | WINED3D_LOCATION_DISCARDED)) return !(resource->access & WINED3D_RESOURCE_ACCESS_GPU) - || (texture->flags & WINED3D_TEXTURE_PIN_SYSMEM); + || texture->resource.pin_sysmem; return !(resource->access & WINED3D_RESOURCE_ACCESS_GPU) && !(texture->flags & WINED3D_TEXTURE_CONVERTED); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c8c9bb7c8c6..e190fc4285e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4332,6 +4332,8 @@ struct wined3d_resource DWORD priority; void *heap_memory; + uint32_t pin_sysmem : 1; + struct wined3d_client_resource client; void *parent; @@ -4450,7 +4452,6 @@ struct wined3d_texture_ops #define WINED3D_TEXTURE_SRGB_ALLOCATED 0x00000040 #define WINED3D_TEXTURE_SRGB_VALID 0x00000080 #define WINED3D_TEXTURE_CONVERTED 0x00000100 -#define WINED3D_TEXTURE_PIN_SYSMEM 0x00000200 #define WINED3D_TEXTURE_NORMALIZED_COORDS 0x00000400 #define WINED3D_TEXTURE_GET_DC_LENIENT 0x00000800 #define WINED3D_TEXTURE_DC_IN_USE 0x00001000

1 0