wine-commits February 2022

wine-commits@winehq.org

2 participants
1495 discussions

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 : 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 : 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 : 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

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

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 : 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 : 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 : uianimation: Enable compilation with long types.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: 62877d4d97c8a2c63e1e35b85bab890380db27ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=62877d4d97c8a2c63e1e35b8… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 18 09:17:52 2022 +0100 uianimation: 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/uianimation/Makefile.in | 1 - dlls/uianimation/main.c | 24 ++++++++++++------------ 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/uianimation/Makefile.in b/dlls/uianimation/Makefile.in index cac37bf3c79..e632e19bd7c 100644 --- a/dlls/uianimation/Makefile.in +++ b/dlls/uianimation/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = uianimation.dll IMPORTS = uuid diff --git a/dlls/uianimation/main.c b/dlls/uianimation/main.c index be09256d2fa..c338d836978 100644 --- a/dlls/uianimation/main.c +++ b/dlls/uianimation/main.c @@ -139,7 +139,7 @@ static ULONG WINAPI animation_storyboard_AddRef( IUIAnimationStoryboard *iface ) struct animation_storyboard *This = impl_from_IUIAnimationStoryboard( iface ); ULONG ref = InterlockedIncrement( &This->ref ); - TRACE( "(%p) ref = %u\n", This, ref ); + TRACE( "(%p) ref = %lu\n", This, ref ); return ref; } @@ -148,7 +148,7 @@ static ULONG WINAPI animation_storyboard_Release( IUIAnimationStoryboard *iface struct animation_storyboard *This = impl_from_IUIAnimationStoryboard( iface ); ULONG ref = InterlockedDecrement(&This->ref); - TRACE( "(%p) ref = %u\n", This, ref ); + TRACE( "(%p) ref = %lu\n", This, ref ); if (!ref) heap_free( This ); @@ -359,7 +359,7 @@ static ULONG WINAPI animation_var_AddRef( IUIAnimationVariable *iface ) struct animation_var *This = impl_from_IUIAnimationVariable( iface ); ULONG ref = InterlockedIncrement( &This->ref ); - TRACE( "(%p) ref = %u\n", This, ref ); + TRACE( "(%p) ref = %lu\n", This, ref ); return ref; } @@ -368,7 +368,7 @@ static ULONG WINAPI animation_var_Release( IUIAnimationVariable *iface ) struct animation_var *This = impl_from_IUIAnimationVariable( iface ); ULONG ref = InterlockedDecrement(&This->ref); - TRACE( "(%p) ref = %u\n", This, ref ); + TRACE( "(%p) ref = %lu\n", This, ref ); if (!ref) heap_free( This ); @@ -548,7 +548,7 @@ static ULONG WINAPI manager_AddRef( IUIAnimationManager *iface ) struct manager *This = impl_from_IUIAnimationManager( iface ); ULONG ref = InterlockedIncrement( &This->ref ); - TRACE( "(%p) ref = %u\n", This, ref ); + TRACE( "(%p) ref = %lu\n", This, ref ); return ref; } @@ -557,7 +557,7 @@ static ULONG WINAPI manager_Release( IUIAnimationManager *iface ) struct manager *This = impl_from_IUIAnimationManager( iface ); ULONG ref = InterlockedDecrement(&This->ref); - TRACE( "(%p) ref = %u\n", This, ref ); + TRACE( "(%p) ref = %lu\n", This, ref ); if (!ref) { @@ -781,7 +781,7 @@ static ULONG WINAPI timer_AddRef( IUIAnimationTimer *iface ) struct timer *This = impl_from_IUIAnimationTimer( iface ); ULONG ref = InterlockedIncrement( &This->ref ); - TRACE( "(%p) ref = %u\n", This, ref ); + TRACE( "(%p) ref = %lu\n", This, ref ); return ref; } @@ -790,7 +790,7 @@ static ULONG WINAPI timer_Release( IUIAnimationTimer *iface ) struct timer *This = impl_from_IUIAnimationTimer( iface ); ULONG ref = InterlockedDecrement(&This->ref); - TRACE( "(%p) ref = %u\n", This, ref ); + TRACE( "(%p) ref = %lu\n", This, ref ); if (!ref) heap_free( This ); @@ -918,7 +918,7 @@ static ULONG WINAPI tr_factory_AddRef( IUIAnimationTransitionFactory *iface ) struct tr_factory *This = impl_from_IUIAnimationTransitionFactory( iface ); ULONG ref = InterlockedIncrement( &This->ref ); - TRACE( "(%p) ref = %u\n", This, ref ); + TRACE( "(%p) ref = %lu\n", This, ref ); return ref; } @@ -927,7 +927,7 @@ static ULONG WINAPI tr_factory_Release( IUIAnimationTransitionFactory *iface ) struct tr_factory *This = impl_from_IUIAnimationTransitionFactory( iface ); ULONG ref = InterlockedDecrement(&This->ref); - TRACE( "(%p) ref = %u\n", This, ref ); + TRACE( "(%p) ref = %lu\n", This, ref ); if (!ref) heap_free( This ); @@ -1005,7 +1005,7 @@ static ULONG WINAPI tr_library_AddRef( IUIAnimationTransitionLibrary *iface ) struct tr_library *This = impl_from_IUIAnimationTransitionLibrary( iface ); ULONG ref = InterlockedIncrement( &This->ref ); - TRACE( "(%p) ref = %u\n", This, ref ); + TRACE( "(%p) ref = %lu\n", This, ref ); return ref; } @@ -1014,7 +1014,7 @@ static ULONG WINAPI tr_library_Release( IUIAnimationTransitionLibrary *iface ) struct tr_library *This = impl_from_IUIAnimationTransitionLibrary( iface ); ULONG ref = InterlockedDecrement(&This->ref); - TRACE( "(%p) ref = %u\n", This, ref ); + TRACE( "(%p) ref = %lu\n", This, ref ); if (!ref) heap_free( This );

1 0

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

18 Feb '22

Module: wine Branch: master Commit: ca4cc5723af03baae0c98b38dbcf4694dec2a27a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca4cc5723af03baae0c98b38… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 18 09:17:46 2022 +0100 typelib.dll16: 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/typelib.dll16/Makefile.in | 1 - dlls/typelib.dll16/typelib.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/typelib.dll16/Makefile.in b/dlls/typelib.dll16/Makefile.in index 06adb35b296..b4d39ee6601 100644 --- a/dlls/typelib.dll16/Makefile.in +++ b/dlls/typelib.dll16/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = typelib.dll16 IMPORTS = oleaut32 advapi32 EXTRADLLFLAGS = -m16 -Wb,--main-module,oleaut32.dll diff --git a/dlls/typelib.dll16/typelib.c b/dlls/typelib.dll16/typelib.c index 4787010354c..41a4790a253 100644 --- a/dlls/typelib.dll16/typelib.c +++ b/dlls/typelib.dll16/typelib.c @@ -82,14 +82,14 @@ QueryPathOfRegTypeLib16( TRACE("\n"); if (HIWORD(guid)) { - sprintf( typelibkey, "SOFTWARE\\Classes\\Typelib\\{%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\\%d.%d\\%x\\win16", + sprintf( typelibkey, "SOFTWARE\\Classes\\Typelib\\{%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\\%d.%d\\%lx\\win16", guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7], wMaj,wMin,lcid); } else { - sprintf(xguid,"<guid 0x%08x>",(DWORD)guid); - FIXME("(%s,%d,%d,0x%04x,%p),can't handle non-string guids.\n",xguid,wMaj,wMin,lcid,path); + sprintf(xguid,"<guid 0x%08lx>",(DWORD)guid); + FIXME("(%s,%d,%d,0x%04lx,%p),can't handle non-string guids.\n",xguid,wMaj,wMin,lcid,path); return E_FAIL; } plen = sizeof(pathname);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2022