wine-devel

wine-devel@winehq.org

6 participants
84404 discussions

[PATCH 7/7] ieframe: Enable visual styles.
by Zhiyi Zhang 13 Apr '22

13 Apr '22

ieframe.dll uses manifest at ID 123. However, IEWinMain() is not called from rundll32.exe or Control_RunDLL() so the manifest needs to be activated in DllMain(). This allows iexplore.exe to enable theming. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/ieframe/ieframe.manifest | 16 ++++++++++++++++ dlls/ieframe/ieframe.rc | 3 +++ dlls/ieframe/ieframe_main.c | 28 ++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 dlls/ieframe/ieframe.manifest diff --git a/dlls/ieframe/ieframe.manifest b/dlls/ieframe/ieframe.manifest new file mode 100644 index 00000000000..c8fd3eb4dce --- /dev/null +++ b/dlls/ieframe/ieframe.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Ieframe" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/dlls/ieframe/ieframe.rc b/dlls/ieframe/ieframe.rc index aed8483e4ce..eb05a98dbc4 100644 --- a/dlls/ieframe/ieframe.rc +++ b/dlls/ieframe/ieframe.rc @@ -108,6 +108,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "wine/wine_common_ver.rc" +/* @makedep: ieframe.manifest */ +123 RT_MANIFEST ieframe.manifest + /* @makedep: ietoolbar.bmp */ IDB_IETOOLBAR BITMAP ietoolbar.bmp diff --git a/dlls/ieframe/ieframe_main.c b/dlls/ieframe/ieframe_main.c index 8775e244d1c..2ef1c3784c0 100644 --- a/dlls/ieframe/ieframe_main.c +++ b/dlls/ieframe/ieframe_main.c @@ -17,6 +17,7 @@ */ #include "ieframe.h" +#include <commctrl.h> #include "initguid.h" #include "rpcproxy.h" @@ -30,6 +31,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(ieframe); LONG module_ref = 0; HINSTANCE ieframe_instance; +static HANDLE context = INVALID_HANDLE_VALUE; +static ULONG_PTR context_cookie; +static BOOL context_activated; static ITypeLib *typelib; static ITypeInfo *typeinfos[LAST_tid]; @@ -178,6 +182,27 @@ static const IClassFactoryVtbl CUrlHistoryFactoryVtbl = { static IClassFactory CUrlHistoryFactory = { &CUrlHistoryFactoryVtbl }; +static void activate_context(void) +{ + ACTCTXW actctx; + + memset(&actctx, 0, sizeof(actctx)); + actctx.cbSize = sizeof(actctx); + actctx.hModule = ieframe_instance; + actctx.lpResourceName = MAKEINTRESOURCEW(123); + actctx.dwFlags = ACTCTX_FLAG_HMODULE_VALID | ACTCTX_FLAG_RESOURCE_NAME_VALID; + context = CreateActCtxW(&actctx); + if (context != INVALID_HANDLE_VALUE) + context_activated = ActivateActCtx(context, &context_cookie); +} + +static void deactivate_context(void) +{ + if (context_activated) + DeactivateActCtx(0, context_cookie); + ReleaseActCtx(context); +} + /****************************************************************** * DllMain (ieframe.@) */ @@ -189,6 +214,8 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { case DLL_PROCESS_ATTACH: ieframe_instance = hInstDLL; + activate_context(); + InitCommonControls(); register_iewindow_class(); DisableThreadLibraryCalls(ieframe_instance); break; @@ -196,6 +223,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) if (lpv) break; unregister_iewindow_class(); release_typelib(); + deactivate_context(); } return TRUE; -- 2.32.0

1 0

[PATCH 6/7] joy.cpl: Enable visual styles.
by Zhiyi Zhang 13 Apr '22

13 Apr '22

joy.cpl uses manifest at ID 124. According to tests, manifest at ID 124 is not loaded automatically by rundll32.exe or Control_RunDLL(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/joy.cpl/joy.manifest | 16 ++++++++++++++++ dlls/joy.cpl/joy.rc | 3 +++ dlls/joy.cpl/main.c | 17 +++++++++++++++++ 3 files changed, 36 insertions(+) create mode 100644 dlls/joy.cpl/joy.manifest diff --git a/dlls/joy.cpl/joy.manifest b/dlls/joy.cpl/joy.manifest new file mode 100644 index 00000000000..877860e3d68 --- /dev/null +++ b/dlls/joy.cpl/joy.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Joy" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/dlls/joy.cpl/joy.rc b/dlls/joy.cpl/joy.rc index 77f121c5b1c..c1d8380af37 100644 --- a/dlls/joy.cpl/joy.rc +++ b/dlls/joy.cpl/joy.rc @@ -77,6 +77,9 @@ FONT 8, "Ms Shell Dlg" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +/* @makedep: joy.manifest */ +124 RT_MANIFEST joy.manifest + /* @makedep: joy.ico */ ICO_MAIN ICON "joy.ico" diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index 3ecef2d9aa8..c1f41fb0e56 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -992,10 +992,24 @@ static void display_cpl_sheets(HWND parent, struct JoystickData *data) { INITCOMMONCONTROLSEX icex; PROPSHEETPAGEW psp[NUM_PROPERTY_PAGES]; + BOOL activated = FALSE; PROPSHEETHEADERW psh; + ULONG_PTR cookie; + ACTCTXW actctx; + HANDLE context; DWORD id = 0; OleInitialize(NULL); + /* Activate context */ + memset(&actctx, 0, sizeof(actctx)); + actctx.cbSize = sizeof(actctx); + actctx.hModule = hcpl; + actctx.lpResourceName = MAKEINTRESOURCEW(124); + actctx.dwFlags = ACTCTX_FLAG_HMODULE_VALID | ACTCTX_FLAG_RESOURCE_NAME_VALID; + context = CreateActCtxW(&actctx); + if (context != INVALID_HANDLE_VALUE) + activated = ActivateActCtx(context, &cookie); + /* Initialize common controls */ icex.dwSize = sizeof(INITCOMMONCONTROLSEX); icex.dwICC = ICC_LISTVIEW_CLASSES | ICC_BAR_CLASSES; @@ -1039,6 +1053,9 @@ static void display_cpl_sheets(HWND parent, struct JoystickData *data) /* display the dialog */ PropertySheetW(&psh); + if (activated) + DeactivateActCtx(0, cookie); + ReleaseActCtx(context); OleUninitialize(); } -- 2.32.0

1 0

[PATCH 5/7] inetcpl.cpl: Enable visual styles.
by Zhiyi Zhang 13 Apr '22

13 Apr '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/inetcpl.cpl/inetcpl.manifest | 16 ++++++++++++++++ dlls/inetcpl.cpl/inetcpl.rc | 5 ++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 dlls/inetcpl.cpl/inetcpl.manifest diff --git a/dlls/inetcpl.cpl/inetcpl.manifest b/dlls/inetcpl.cpl/inetcpl.manifest new file mode 100644 index 00000000000..81a32e4879c --- /dev/null +++ b/dlls/inetcpl.cpl/inetcpl.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Inetcpl" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/dlls/inetcpl.cpl/inetcpl.rc b/dlls/inetcpl.cpl/inetcpl.rc index 0c997da59ff..7ae2a53efdf 100644 --- a/dlls/inetcpl.cpl/inetcpl.rc +++ b/dlls/inetcpl.cpl/inetcpl.rc @@ -147,7 +147,10 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define WINE_PRODUCTVERSION_STR "8.00.6001.18939" #include "wine/wine_common_ver.rc" - + +/* @makedep: inetcpl.manifest */ +123 RT_MANIFEST inetcpl.manifest + /* @makedep: inetcpl.ico */ ICO_MAIN ICON "inetcpl.ico" ICO_INTERNET ICON "inetcpl.ico" -- 2.32.0

1 0

[PATCH 4/7] appwiz.cpl: Enable visual styles.
by Zhiyi Zhang 13 Apr '22

13 Apr '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/appwiz.cpl/appwiz.manifest | 16 ++++++++++++++++ dlls/appwiz.cpl/appwiz.rc | 3 +++ 2 files changed, 19 insertions(+) create mode 100644 dlls/appwiz.cpl/appwiz.manifest diff --git a/dlls/appwiz.cpl/appwiz.manifest b/dlls/appwiz.cpl/appwiz.manifest new file mode 100644 index 00000000000..8ec99d550a3 --- /dev/null +++ b/dlls/appwiz.cpl/appwiz.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Appwiz" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/dlls/appwiz.cpl/appwiz.rc b/dlls/appwiz.cpl/appwiz.rc index 589f27548f9..c2e93a426c0 100644 --- a/dlls/appwiz.cpl/appwiz.rc +++ b/dlls/appwiz.cpl/appwiz.rc @@ -126,5 +126,8 @@ FONT 8, "MS Shell Dlg" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +/* @makedep: appwiz.manifest */ +123 RT_MANIFEST appwiz.manifest + /* @makedep: appwiz.ico */ ICO_MAIN ICON "appwiz.ico" -- 2.32.0

1 0

[PATCH 3/7] rundll32: Activate context at ID 123 before calling library functions.
by Zhiyi Zhang 13 Apr '22

13 Apr '22

This is required to enable common control v6 for library functions called by rundll32.exe. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/rundll32/rundll32.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/programs/rundll32/rundll32.c b/programs/rundll32/rundll32.c index fe9d17f0f48..deae5d664c3 100644 --- a/programs/rundll32/rundll32.c +++ b/programs/rundll32/rundll32.c @@ -276,9 +276,12 @@ int WINAPI wWinMain(HINSTANCE instance, HINSTANCE hOldInstance, LPWSTR szCmdLine HWND hWnd; LPWSTR szDllName,szEntryPoint; void *entry_point = NULL; - BOOL unicode = FALSE, win16 = FALSE; + BOOL unicode = FALSE, win16 = FALSE, activated = FALSE; + HMODULE hDll, hCtx = INVALID_HANDLE_VALUE; + WCHAR path[MAX_PATH]; STARTUPINFOW info; - HMODULE hDll; + ULONG_PTR cookie; + ACTCTXW ctx; hWnd=NULL; hDll=NULL; @@ -301,6 +304,21 @@ int WINAPI wWinMain(HINSTANCE instance, HINSTANCE hOldInstance, LPWSTR szCmdLine szEntryPoint = get_next_arg(&szCmdLine); WINE_TRACE("EntryPoint=%s\n",wine_dbgstr_w(szEntryPoint)); + /* Activate context before DllMain() is called */ + if (SearchPathW(NULL, szDllName, NULL, ARRAY_SIZE(path), path, NULL)) + { + memset(&ctx, 0, sizeof(ctx)); + ctx.cbSize = sizeof(ctx); + ctx.lpSource = path; + ctx.lpResourceName = MAKEINTRESOURCEW(123); + ctx.dwFlags = ACTCTX_FLAG_RESOURCE_NAME_VALID; + hCtx = CreateActCtxW(&ctx); + if (hCtx != INVALID_HANDLE_VALUE) + activated = ActivateActCtx(hCtx, &cookie); + else + WINE_TRACE("No manifest at ID 123 in %s\n", wine_dbgstr_w(path)); + } + /* Load the library */ hDll=LoadLibraryW(szDllName); if (hDll) entry_point = get_entry_point32( hDll, szEntryPoint, &unicode ); @@ -363,6 +381,9 @@ int WINAPI wWinMain(HINSTANCE instance, HINSTANCE hOldInstance, LPWSTR szCmdLine } CLEANUP: + if (activated) + DeactivateActCtx(0, cookie); + ReleaseActCtx(hCtx); if (hWnd) DestroyWindow(hWnd); if (hDll) -- 2.32.0

1 0

[PATCH 1/7] kernel32/tests: Add more CreateActCtx() tests.
by Zhiyi Zhang 13 Apr '22

13 Apr '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/kernel32/tests/actctx.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index ebe1bb86470..71337c0f38e 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -2688,9 +2688,12 @@ static void extract_resource(const char *name, const char *type, const char *pat static void test_CreateActCtx(void) { + static const DWORD flags[] = {LOAD_LIBRARY_AS_DATAFILE, LOAD_LIBRARY_AS_IMAGE_RESOURCE, + LOAD_LIBRARY_AS_IMAGE_RESOURCE | LOAD_LIBRARY_AS_DATAFILE}; CHAR path[MAX_PATH], dir[MAX_PATH], dll[MAX_PATH]; ACTCTXA actctx; HANDLE handle; + int i; GetTempPathA(ARRAY_SIZE(path), path); strcat(path, "main_wndcls.manifest"); @@ -2827,6 +2830,34 @@ todo_wine { delete_manifest_file("testdir.manifest"); delete_manifest_file("assembly_dir\\testdir.manifest"); RemoveDirectoryA(dir); + + /* create using lpSource with a DLL relative name */ + memset(&actctx, 0, sizeof(actctx)); + actctx.cbSize = sizeof(actctx); + actctx.lpSource = "shell32.dll"; + actctx.lpResourceName = MAKEINTRESOURCEA(124); + actctx.dwFlags = ACTCTX_FLAG_RESOURCE_NAME_VALID; + handle = CreateActCtxA(&actctx); + ok(handle == INVALID_HANDLE_VALUE, "CreateActCtxA succeeded\n"); + + /* create from module loaded as data file */ + memset(&actctx, 0, sizeof(actctx)); + actctx.cbSize = sizeof(actctx); + actctx.lpResourceName = MAKEINTRESOURCEA(1); + actctx.dwFlags = ACTCTX_FLAG_HMODULE_VALID | ACTCTX_FLAG_RESOURCE_NAME_VALID; + for (i = 0; i < ARRAY_SIZE(flags); ++i) + { + winetest_push_context("%lu", flags[i]); + + /* use explorer.exe because using modules already loaded has a different behavior */ + actctx.hModule = LoadLibraryExA("C:\\windows\\explorer.exe", NULL, flags[i]); + ok(actctx.hModule != NULL, "LoadLibraryExA failed, error %lu\n", GetLastError()); + handle = CreateActCtxA(&actctx); + ok(handle == INVALID_HANDLE_VALUE, "CreateActCtxA succeeded\n"); + FreeLibrary(actctx.hModule); + + winetest_pop_context(); + } } static BOOL init_funcs(void) -- 2.32.0

1 0

[PATCH 1/2] win32u: Do not enumerate the "Keyboard Layouts" key in NtUserGetKeyboardLayoutList().
by Zebediah Figura 13 Apr '22

13 Apr '22

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> This function returns only those keyboards currently configured by the user, whereas the "Keyboard Layouts" key contains all keyboards that can be configured. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/win32u/input.c | 44 +++----------------------------------------- 1 file changed, 3 insertions(+), 41 deletions(-) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index addff0e5fb3..70b4d7e4fb5 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -929,54 +929,16 @@ HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags ) */ UINT WINAPI NtUserGetKeyboardLayoutList( INT size, HKL *layouts ) { - char buffer[4096]; - KEY_NODE_INFORMATION *key_info = (KEY_NODE_INFORMATION *)buffer; - KEY_VALUE_PARTIAL_INFORMATION *value_info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer; - DWORD count, tmp, i = 0; - HKEY hkey, subkey; - HKL layout; + DWORD count; TRACE_(keyboard)( "size %d, layouts %p.\n", size, layouts ); if ((count = user_driver->pGetKeyboardLayoutList( size, layouts )) != ~0) return count; - layout = get_locale_kbd_layout(); - count = 0; - - count++; if (size && layouts) - { - layouts[count - 1] = layout; - if (count == size) return count; - } + layouts[0] = get_locale_kbd_layout(); - if ((hkey = reg_open_key( NULL, keyboard_layouts_keyW, sizeof(keyboard_layouts_keyW) ))) - { - while (!NtEnumerateKey( hkey, i++, KeyNodeInformation, key_info, - sizeof(buffer) - sizeof(WCHAR), &tmp )) - { - if (!(subkey = reg_open_key( hkey, key_info->Name, key_info->NameLength ))) continue; - key_info->Name[key_info->NameLength / sizeof(WCHAR)] = 0; - tmp = wcstoul( key_info->Name, NULL, 16 ); - if (query_reg_ascii_value( subkey, "Layout Id", value_info, sizeof(buffer) ) && - value_info->Type == REG_SZ) - tmp = MAKELONG( LOWORD( tmp ), - 0xf000 | (wcstoul( (const WCHAR *)value_info->Data, NULL, 16 ) & 0xfff) ); - NtClose( subkey ); - - if (layout == UlongToHandle( tmp )) continue; - - count++; - if (size && layouts) - { - layouts[count - 1] = UlongToHandle( tmp ); - if (count == size) break; - } - } - NtClose( hkey ); - } - - return count; + return 1; } /**************************************************************************** -- 2.34.1

1 1

[PATCH 1/4] ntdll: Return the required length from NtQueryDirectoryObject().
by Zebediah Figura 13 Apr '22

13 Apr '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/tests/om.c | 2 +- dlls/ntdll/unix/sync.c | 6 +++--- server/directory.c | 6 ++++-- server/protocol.def | 1 + 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 91eb2919cb6..7d7b4b09e73 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -2638,7 +2638,7 @@ static void test_query_directory(void) memset( buffer, 0xcc, sizeof(buffer) ); status = NtQueryDirectoryObject( dir, info, needed_size - 1, TRUE, TRUE, &context, &size ); ok( status == STATUS_BUFFER_TOO_SMALL, "got %#lx\n", status ); - todo_wine ok( size == needed_size, "expected size %lu, got %lu\n", needed_size, size ); + ok( size == needed_size, "expected size %lu, got %lu\n", needed_size, size ); status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, TRUE, &context, NULL ); ok( !status, "got %#lx\n", status ); diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index e1cc2d818b4..46facdd2b0e 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -1125,10 +1125,10 @@ NTSTATUS WINAPI NtQueryDirectoryObject( HANDLE handle, DIRECTORY_BASIC_INFORMATI buffer->ObjectName.Buffer[buffer->ObjectName.Length/sizeof(WCHAR)] = 0; buffer->ObjectTypeName.Buffer[buffer->ObjectTypeName.Length/sizeof(WCHAR)] = 0; *context = index + 1; - - if (ret_size) - *ret_size = buffer->ObjectName.MaximumLength + buffer->ObjectTypeName.MaximumLength + sizeof(*buffer); } + + if (ret_size && (!ret || ret == STATUS_BUFFER_TOO_SMALL)) + *ret_size = sizeof(*buffer) + reply->total_len + 2 * sizeof(WCHAR); } SERVER_END_REQ; } diff --git a/server/directory.c b/server/directory.c index caaf8c43d33..23d7eb0a2b7 100644 --- a/server/directory.c +++ b/server/directory.c @@ -546,9 +546,11 @@ DECL_HANDLER(get_directory_entry) const struct unicode_str *type_name = &obj->ops->type->name; const WCHAR *name = get_object_name( obj, &name_len ); - if (name_len + type_name->len <= get_reply_max_size()) + reply->total_len = name_len + type_name->len; + + if (reply->total_len <= get_reply_max_size()) { - void *ptr = set_reply_data_size( name_len + type_name->len ); + void *ptr = set_reply_data_size( reply->total_len ); if (ptr) { reply->name_len = name_len; diff --git a/server/protocol.def b/server/protocol.def index d9bed6855e9..9b7b99ae86a 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3275,6 +3275,7 @@ struct handle_info obj_handle_t handle; /* handle to the directory */ unsigned int index; /* entry index */ @REPLY + data_size_t total_len; /* total length needed for strings */ data_size_t name_len; /* length of the entry name in bytes */ VARARG(name,unicode_str,name_len); /* entry name */ VARARG(type,unicode_str); /* entry type */ -- 2.34.1

2 5

[PATCH] kernelbase: Set user_lcid to the user locale, not the system locale.
by Zebediah Figura 12 Apr '22

12 Apr '22

Fixes: fffbe3fcaef9c2b0e3814305b212a95188c1b0c2 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/kernelbase/locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 358aa8c123c..95d7d77ecd7 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -1767,7 +1767,7 @@ void init_locale( HMODULE module ) load_locale_nls(); NtQueryDefaultLocale( FALSE, &system_lcid ); - NtQueryDefaultLocale( FALSE, &user_lcid ); + NtQueryDefaultLocale( TRUE, &user_lcid ); if (!(system_locale = NlsValidateLocale( &system_lcid, 0 ))) { if (GetEnvironmentVariableW( L"WINELOCALE", bufferW, ARRAY_SIZE(bufferW) )) -- 2.34.1

1 0

[PATCH v2 1/3] d3dxof: Build without -DWINE_NO_LONG_TYPES.
by Matteo Bruni 12 Apr '22

12 Apr '22

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: Tweak style / formatting a bit more while at it. dlls/d3dxof/Makefile.in | 1 - dlls/d3dxof/d3dxof.c | 561 ++++++++++++++++++++-------------------- dlls/d3dxof/parsing.c | 76 +++--- 3 files changed, 322 insertions(+), 316 deletions(-) diff --git a/dlls/d3dxof/Makefile.in b/dlls/d3dxof/Makefile.in index 8171b57421d..93032adbb3f 100644 --- a/dlls/d3dxof/Makefile.in +++ b/dlls/d3dxof/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = d3dxof.dll IMPORTLIB = d3dxof IMPORTS = dxguid uuid ole32 advapi32 diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index e16b0d802f3..41614d117fe 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -81,46 +81,49 @@ static inline IDirectXFileImpl *impl_from_IDirectXFile(IDirectXFile *iface) return CONTAINING_RECORD(iface, IDirectXFileImpl, IDirectXFile_iface); } -/*** IUnknown methods ***/ -static HRESULT WINAPI IDirectXFileImpl_QueryInterface(IDirectXFile* iface, REFIID riid, void** ppvObject) +static HRESULT WINAPI IDirectXFileImpl_QueryInterface(IDirectXFile *iface, REFIID riid, void **out) { - IDirectXFileImpl *This = impl_from_IDirectXFile(iface); + IDirectXFileImpl *object = impl_from_IDirectXFile(iface); - TRACE("(%p/%p)->(%s,%p)\n", iface, This, debugstr_guid(riid), ppvObject); + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirectXFile)) - { - IUnknown_AddRef(iface); - *ppvObject = &This->IDirectXFile_iface; - return S_OK; - } + if (IsEqualGUID(riid, &IID_IUnknown) + || IsEqualGUID(riid, &IID_IDirectXFile)) + { + *out = &object->IDirectXFile_iface; + } + else + { + *out = NULL; + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } - ERR("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppvObject); - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown *)*out); + return S_OK; } -static ULONG WINAPI IDirectXFileImpl_AddRef(IDirectXFile* iface) +static ULONG WINAPI IDirectXFileImpl_AddRef(IDirectXFile *iface) { - IDirectXFileImpl *This = impl_from_IDirectXFile(iface); - ULONG ref = InterlockedIncrement(&This->ref); + IDirectXFileImpl *object = impl_from_IDirectXFile(iface); + ULONG refcount = InterlockedIncrement(&object->ref); - TRACE("(%p/%p)->(): new ref %d\n", iface, This, ref); + TRACE("%p increasing refcount to %lu.\n", iface, refcount); - return ref; + return refcount; } -static ULONG WINAPI IDirectXFileImpl_Release(IDirectXFile* iface) +static ULONG WINAPI IDirectXFileImpl_Release(IDirectXFile *iface) { - IDirectXFileImpl *This = impl_from_IDirectXFile(iface); - ULONG ref = InterlockedDecrement(&This->ref); + IDirectXFileImpl *object = impl_from_IDirectXFile(iface); + ULONG refcount = InterlockedDecrement(&object->ref); - TRACE("(%p/%p)->(): new ref %d\n", iface, This, ref); + TRACE("%p decreasing refcount to %lu.\n", iface, refcount); - if (!ref) - HeapFree(GetProcessHeap(), 0, This); + if (!refcount) + HeapFree(GetProcessHeap(), 0, object); - return ref; + return refcount; } /*** IDirectXFile methods ***/ @@ -133,7 +136,7 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV DWORD file_size; DWORD bytes_written; - TRACE("(%p/%p)->(%p,%x,%p)\n", This, iface, pvSource, dwLoadOptions, ppEnumObj); + TRACE("iface %p, source %p, load_options %#lx, out %p.\n", iface, pvSource, dwLoadOptions, ppEnumObj); if (!ppEnumObj) return DXFILEERR_BADVALUE; @@ -212,19 +215,19 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV { LPDXFILELOADMEMORY lpdxflm = pvSource; - TRACE("Source in memory at %p with size %d\n", lpdxflm->lpMemory, lpdxflm->dSize); + TRACE("Source in memory at %p with size %ld.\n", lpdxflm->lpMemory, lpdxflm->dSize); file_buffer = lpdxflm->lpMemory; file_size = lpdxflm->dSize; } else { - FIXME("Source type %d is not handled yet\n", dwLoadOptions); + FIXME("Source type %ld not handled yet.\n", dwLoadOptions); hr = DXFILEERR_NOTDONEYET; goto error; } - TRACE("File size is %d bytes\n", file_size); + TRACE("File size is %lu bytes.\n", file_size); if (TRACE_ON(d3dxof_dump)) { @@ -261,7 +264,7 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV if (TRACE_ON(d3dxof)) { ULONG i; - TRACE("Registered templates (%d):\n", This->nb_xtemplates); + TRACE("Registered templates (%lu):\n", This->nb_xtemplates); for (i = 1; i < This->nb_xtemplates; i++) TRACE("%s - %s\n", This->xtemplates[i].name, debugstr_guid(&This->xtemplates[i].class_id)); } @@ -277,21 +280,22 @@ error: return hr; } -static HRESULT WINAPI IDirectXFileImpl_CreateSaveObject(IDirectXFile* iface, LPCSTR szFileName, DXFILEFORMAT dwFileFormat, LPDIRECTXFILESAVEOBJECT* ppSaveObj) +static HRESULT WINAPI IDirectXFileImpl_CreateSaveObject(IDirectXFile *iface, const char *filename, + DXFILEFORMAT format, LPDIRECTXFILESAVEOBJECT *out) { - IDirectXFileImpl *This = impl_from_IDirectXFile(iface); - IDirectXFileSaveObjectImpl *object; - HRESULT hr; + IDirectXFileSaveObjectImpl *object; + HRESULT hr; - FIXME("(%p/%p)->(%s,%x,%p) partial stub!\n", This, iface, szFileName, dwFileFormat, ppSaveObj); + FIXME("iface %p, filename %s, format %lu, out %p partial stub!\n", iface, debugstr_a(filename), + format, out); - if (!szFileName || !ppSaveObj) - return E_POINTER; + if (!filename || !out) + return E_POINTER; - hr = IDirectXFileSaveObjectImpl_Create(&object); - if (SUCCEEDED(hr)) - *ppSaveObj = &object->IDirectXFileSaveObject_iface; - return hr; + hr = IDirectXFileSaveObjectImpl_Create(&object); + if (SUCCEEDED(hr)) + *out = &object->IDirectXFileSaveObject_iface; + return hr; } static HRESULT WINAPI IDirectXFileImpl_RegisterTemplates(IDirectXFile* iface, LPVOID pvData, DWORD cbSize) @@ -307,7 +311,7 @@ static HRESULT WINAPI IDirectXFileImpl_RegisterTemplates(IDirectXFile* iface, LP buf.rem_bytes = cbSize; buf.pdxf = This; - TRACE("(%p/%p)->(%p,%d)\n", This, iface, pvData, cbSize); + TRACE("iface %p, data %p, size %lu.\n", iface, pvData, cbSize); if (!pvData) return DXFILEERR_BADVALUE; @@ -339,10 +343,11 @@ static HRESULT WINAPI IDirectXFileImpl_RegisterTemplates(IDirectXFile* iface, LP if (TRACE_ON(d3dxof)) { - ULONG i; - TRACE("Registered templates (%d):\n", This->nb_xtemplates); - for (i = 1; i < This->nb_xtemplates; i++) - TRACE("%s - %s\n", This->xtemplates[i].name, debugstr_guid(&This->xtemplates[i].class_id)); + unsigned int i; + + TRACE("Registered templates (%lu):\n", This->nb_xtemplates); + for (i = 1; i < This->nb_xtemplates; ++i) + TRACE("%s - %s\n", This->xtemplates[i].name, debugstr_guid(&This->xtemplates[i].class_id)); } hr = DXFILE_OK; @@ -384,99 +389,91 @@ static inline IDirectXFileBinaryImpl *impl_from_IDirectXFileBinary(IDirectXFileB return CONTAINING_RECORD(iface, IDirectXFileBinaryImpl, IDirectXFileBinary_iface); } -/*** IUnknown methods ***/ -static HRESULT WINAPI IDirectXFileBinaryImpl_QueryInterface(IDirectXFileBinary* iface, REFIID riid, void** ppvObject) +static HRESULT WINAPI IDirectXFileBinaryImpl_QueryInterface(IDirectXFileBinary *iface, + REFIID riid, void **out) { - IDirectXFileBinaryImpl *This = impl_from_IDirectXFileBinary(iface); + IDirectXFileBinaryImpl *object = impl_from_IDirectXFileBinary(iface); - TRACE("(%p/%p)->(%s,%p)\n", iface, This, debugstr_guid(riid), ppvObject); + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirectXFileObject) - || IsEqualGUID(riid, &IID_IDirectXFileBinary)) - { - IUnknown_AddRef(iface); - *ppvObject = &This->IDirectXFileBinary_iface; - return S_OK; - } - - /* Do not print an error for interfaces that can be queried to retrieve the type of the object */ - if (!IsEqualGUID(riid, &IID_IDirectXFileData) - && !IsEqualGUID(riid, &IID_IDirectXFileDataReference)) - ERR("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppvObject); + if (IsEqualGUID(riid, &IID_IUnknown) + || IsEqualGUID(riid, &IID_IDirectXFileObject) + || IsEqualGUID(riid, &IID_IDirectXFileBinary)) + { + *out = &object->IDirectXFileBinary_iface; + } + else + { + *out = NULL; + /* Do not print an error for interfaces that can be queried to + * retrieve the type of the object */ + if (!IsEqualGUID(riid, &IID_IDirectXFileData) && !IsEqualGUID(riid, &IID_IDirectXFileDataReference)) + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown *)*out); + return S_OK; } -static ULONG WINAPI IDirectXFileBinaryImpl_AddRef(IDirectXFileBinary* iface) +static ULONG WINAPI IDirectXFileBinaryImpl_AddRef(IDirectXFileBinary *iface) { - IDirectXFileBinaryImpl *This = impl_from_IDirectXFileBinary(iface); - ULONG ref = InterlockedIncrement(&This->ref); + IDirectXFileBinaryImpl *object = impl_from_IDirectXFileBinary(iface); + ULONG refcount = InterlockedIncrement(&object->ref); - TRACE("(%p/%p)->(): new ref %d\n", iface, This, ref); + TRACE("%p increasing refcount to %lu.\n", iface, refcount); - return ref; + return refcount; } -static ULONG WINAPI IDirectXFileBinaryImpl_Release(IDirectXFileBinary* iface) +static ULONG WINAPI IDirectXFileBinaryImpl_Release(IDirectXFileBinary *iface) { - IDirectXFileBinaryImpl *This = impl_from_IDirectXFileBinary(iface); - ULONG ref = InterlockedDecrement(&This->ref); + IDirectXFileBinaryImpl *object = impl_from_IDirectXFileBinary(iface); + ULONG refcount = InterlockedDecrement(&object->ref); - TRACE("(%p/%p)->(): new ref %d\n", iface, This, ref); + TRACE("%p decreasing refcount to %lu.\n", iface, refcount); - if (!ref) - HeapFree(GetProcessHeap(), 0, This); + if (!refcount) + HeapFree(GetProcessHeap(), 0, object); - return ref; + return refcount; } -/*** IDirectXFileObject methods ***/ -static HRESULT WINAPI IDirectXFileBinaryImpl_GetName(IDirectXFileBinary* iface, LPSTR pstrNameBuf, LPDWORD pdwBufLen) - +static HRESULT WINAPI IDirectXFileBinaryImpl_GetName(IDirectXFileBinary *iface, char *name, + DWORD *length) { - IDirectXFileBinaryImpl *This = impl_from_IDirectXFileBinary(iface); - - FIXME("(%p/%p)->(%p,%p) stub!\n", This, iface, pstrNameBuf, pdwBufLen); + FIXME("iface %p, name %p, length %p stub!\n", iface, name, length); - return DXFILEERR_BADVALUE; + return DXFILEERR_BADVALUE; } -static HRESULT WINAPI IDirectXFileBinaryImpl_GetId(IDirectXFileBinary* iface, LPGUID pGuid) +static HRESULT WINAPI IDirectXFileBinaryImpl_GetId(IDirectXFileBinary *iface, GUID *guid) { - IDirectXFileBinaryImpl *This = impl_from_IDirectXFileBinary(iface); - - FIXME("(%p/%p)->(%p) stub!\n", This, iface, pGuid); + FIXME("iface %p, guid %p stub!\n", iface, guid); - return DXFILEERR_BADVALUE; + return DXFILEERR_BADVALUE; } -/*** IDirectXFileBinary methods ***/ -static HRESULT WINAPI IDirectXFileBinaryImpl_GetSize(IDirectXFileBinary* iface, DWORD* pcbSize) +static HRESULT WINAPI IDirectXFileBinaryImpl_GetSize(IDirectXFileBinary *iface, DWORD *size) { - IDirectXFileBinaryImpl *This = impl_from_IDirectXFileBinary(iface); - - FIXME("(%p/%p)->(%p) stub!\n", This, iface, pcbSize); + FIXME("iface %p, size %p stub!\n", iface, size); - return DXFILEERR_BADVALUE; + return DXFILEERR_BADVALUE; } -static HRESULT WINAPI IDirectXFileBinaryImpl_GetMimeType(IDirectXFileBinary* iface, LPCSTR* pszMimeType) +static HRESULT WINAPI IDirectXFileBinaryImpl_GetMimeType(IDirectXFileBinary *iface, LPCSTR *mimetype) { - IDirectXFileBinaryImpl *This = impl_from_IDirectXFileBinary(iface); - - FIXME("(%p/%p)->(%p) stub!\n", This, iface, pszMimeType); + FIXME("iface %p, mimetype %p stub!\n", iface, mimetype); - return DXFILEERR_BADVALUE; + return DXFILEERR_BADVALUE; } -static HRESULT WINAPI IDirectXFileBinaryImpl_Read(IDirectXFileBinary* iface, LPVOID pvData, DWORD cbSize, LPDWORD pcbRead) +static HRESULT WINAPI IDirectXFileBinaryImpl_Read(IDirectXFileBinary *iface, void *data, + DWORD size, DWORD *count) { - IDirectXFileBinaryImpl *This = impl_from_IDirectXFileBinary(iface); - - FIXME("(%p/%p)->(%p, %d, %p) stub!\n", This, iface, pvData, cbSize, pcbRead); + FIXME("iface %p, data %p, size %lu, count %p stub!\n", iface, data, size, count); - return DXFILEERR_BADVALUE; + return DXFILEERR_BADVALUE; } static const IDirectXFileBinaryVtbl IDirectXFileBinary_Vtbl = @@ -514,62 +511,65 @@ static inline IDirectXFileDataImpl *impl_from_IDirectXFileData(IDirectXFileData return CONTAINING_RECORD(iface, IDirectXFileDataImpl, IDirectXFileData_iface); } -/*** IUnknown methods ***/ -static HRESULT WINAPI IDirectXFileDataImpl_QueryInterface(IDirectXFileData* iface, REFIID riid, void** ppvObject) +static HRESULT WINAPI IDirectXFileDataImpl_QueryInterface(IDirectXFileData *iface, REFIID riid, + void **out) { - IDirectXFileDataImpl *This = impl_from_IDirectXFileData(iface); + IDirectXFileDataImpl *data = impl_from_IDirectXFileData(iface); - TRACE("(%p/%p)->(%s,%p)\n", iface, This, debugstr_guid(riid), ppvObject); - - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirectXFileObject) - || IsEqualGUID(riid, &IID_IDirectXFileData)) - { - IUnknown_AddRef(iface); - *ppvObject = &This->IDirectXFileData_iface; - return S_OK; - } + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); - /* Do not print an error for interfaces that can be queried to retrieve the type of the object */ - if (!IsEqualGUID(riid, &IID_IDirectXFileBinary) - && !IsEqualGUID(riid, &IID_IDirectXFileDataReference)) - ERR("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppvObject); + if (IsEqualGUID(riid, &IID_IUnknown) + || IsEqualGUID(riid, &IID_IDirectXFileObject) + || IsEqualGUID(riid, &IID_IDirectXFileData)) + { + *out = &data->IDirectXFileData_iface; + } + else + { + *out = NULL; + /* Do not print an error for interfaces that can be queried to + * retrieve the type of the object */ + if (!IsEqualGUID(riid, &IID_IDirectXFileBinary) && !IsEqualGUID(riid, &IID_IDirectXFileDataReference)) + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown *)*out); + return S_OK; } -static ULONG WINAPI IDirectXFileDataImpl_AddRef(IDirectXFileData* iface) +static ULONG WINAPI IDirectXFileDataImpl_AddRef(IDirectXFileData *iface) { - IDirectXFileDataImpl *This = impl_from_IDirectXFileData(iface); - ULONG ref = InterlockedIncrement(&This->ref); + IDirectXFileDataImpl *data = impl_from_IDirectXFileData(iface); + ULONG refcount = InterlockedIncrement(&data->ref); - TRACE("(%p/%p)->(): new ref %d\n", iface, This, ref); + TRACE("%p increasing refcount to %lu.\n", iface, refcount); - return ref; + return refcount; } -static ULONG WINAPI IDirectXFileDataImpl_Release(IDirectXFileData* iface) +static ULONG WINAPI IDirectXFileDataImpl_Release(IDirectXFileData *iface) { - IDirectXFileDataImpl *This = impl_from_IDirectXFileData(iface); - ULONG ref = InterlockedDecrement(&This->ref); + IDirectXFileDataImpl *data = impl_from_IDirectXFileData(iface); + ULONG refcount = InterlockedDecrement(&data->ref); - TRACE("(%p/%p)->(): new ref %d\n", iface, This, ref); + TRACE("%p decreasing refcount to %lu.\n", iface, refcount); - if (!ref) - { - if (!This->level && !This->from_ref) + if (!refcount) { - HeapFree(GetProcessHeap(), 0, This->pstrings); - if (This->pobj) - { - HeapFree(GetProcessHeap(), 0, This->pobj->pdata); - HeapFree(GetProcessHeap(), 0, This->pobj); - } + if (!data->level && !data->from_ref) + { + HeapFree(GetProcessHeap(), 0, data->pstrings); + if (data->pobj) + { + HeapFree(GetProcessHeap(), 0, data->pobj->pdata); + HeapFree(GetProcessHeap(), 0, data->pobj); + } + } + HeapFree(GetProcessHeap(), 0, data); } - HeapFree(GetProcessHeap(), 0, This); - } - return ref; + return refcount; } /*** IDirectXFileObject methods ***/ @@ -724,31 +724,29 @@ static HRESULT WINAPI IDirectXFileDataImpl_GetNextObject(IDirectXFileData* iface return DXFILE_OK; } -static HRESULT WINAPI IDirectXFileDataImpl_AddDataObject(IDirectXFileData* iface, LPDIRECTXFILEDATA pDataObj) +static HRESULT WINAPI IDirectXFileDataImpl_AddDataObject(IDirectXFileData *iface, LPDIRECTXFILEDATA data) { - IDirectXFileDataImpl *This = impl_from_IDirectXFileData(iface); - - FIXME("(%p/%p)->(%p) stub!\n", This, iface, pDataObj); + FIXME("iface %p, data %p stub!\n", iface, data); - return DXFILEERR_BADVALUE; + return DXFILEERR_BADVALUE; } -static HRESULT WINAPI IDirectXFileDataImpl_AddDataReference(IDirectXFileData* iface, LPCSTR szRef, const GUID* pguidRef) +static HRESULT WINAPI IDirectXFileDataImpl_AddDataReference(IDirectXFileData *iface, + const char *reference, const GUID *guidref) { - IDirectXFileDataImpl *This = impl_from_IDirectXFileData(iface); - - FIXME("(%p/%p)->(%s,%p) stub!\n", This, iface, szRef, pguidRef); + FIXME("iface %p, reference %s, guid reference %s stub!\n", iface, debugstr_a(reference), + debugstr_guid(guidref)); - return DXFILEERR_BADVALUE; + return DXFILEERR_BADVALUE; } -static HRESULT WINAPI IDirectXFileDataImpl_AddBinaryObject(IDirectXFileData* iface, LPCSTR szName, const GUID* pguid, LPCSTR szMimeType, LPVOID pvData, DWORD cbSize) +static HRESULT WINAPI IDirectXFileDataImpl_AddBinaryObject(IDirectXFileData *iface, const char *name, + const GUID *guid, const char *mimetype, void *data, DWORD size) { - IDirectXFileDataImpl *This = impl_from_IDirectXFileData(iface); + FIXME("iface %p, name %s, guid %s, mimetype %s, data %p, size %lu stub!\n", iface, debugstr_a(name), + debugstr_guid(guid), debugstr_a(mimetype), data, size); - FIXME("(%p/%p)->(%s,%p,%s,%p,%d) stub!\n", This, iface, szName, pguid, szMimeType, pvData, cbSize); - - return DXFILEERR_BADVALUE; + return DXFILEERR_BADVALUE; } static const IDirectXFileDataVtbl IDirectXFileData_Vtbl = @@ -789,51 +787,54 @@ static inline IDirectXFileDataReferenceImpl *impl_from_IDirectXFileDataReference return CONTAINING_RECORD(iface, IDirectXFileDataReferenceImpl, IDirectXFileDataReference_iface); } -/*** IUnknown methods ***/ -static HRESULT WINAPI IDirectXFileDataReferenceImpl_QueryInterface(IDirectXFileDataReference* iface, REFIID riid, void** ppvObject) +static HRESULT WINAPI IDirectXFileDataReferenceImpl_QueryInterface(IDirectXFileDataReference *iface, + REFIID riid, void **out) { - IDirectXFileDataReferenceImpl *This = impl_from_IDirectXFileDataReference(iface); + IDirectXFileDataReferenceImpl *object = impl_from_IDirectXFileDataReference(iface); - TRACE("(%p/%p)->(%s,%p)\n", iface, This, debugstr_guid(riid), ppvObject); + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirectXFileObject) - || IsEqualGUID(riid, &IID_IDirectXFileDataReference)) - { - IUnknown_AddRef(iface); - *ppvObject = &This->IDirectXFileDataReference_iface; - return S_OK; - } - - /* Do not print an error for interfaces that can be queried to retrieve the type of the object */ - if (!IsEqualGUID(riid, &IID_IDirectXFileData) - && !IsEqualGUID(riid, &IID_IDirectXFileBinary)) - ERR("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppvObject); + if (IsEqualGUID(riid, &IID_IUnknown) + || IsEqualGUID(riid, &IID_IDirectXFileObject) + || IsEqualGUID(riid, &IID_IDirectXFileDataReference)) + { + *out = &object->IDirectXFileDataReference_iface; + } + else + { + /* Do not print an error for interfaces that can be queried to + * retrieve the type of the object */ + *out = NULL; + if (!IsEqualGUID(riid, &IID_IDirectXFileData) && !IsEqualGUID(riid, &IID_IDirectXFileBinary)) + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown *)*out); + return S_OK; } -static ULONG WINAPI IDirectXFileDataReferenceImpl_AddRef(IDirectXFileDataReference* iface) +static ULONG WINAPI IDirectXFileDataReferenceImpl_AddRef(IDirectXFileDataReference *iface) { - IDirectXFileDataReferenceImpl *This = impl_from_IDirectXFileDataReference(iface); - ULONG ref = InterlockedIncrement(&This->ref); + IDirectXFileDataReferenceImpl *object = impl_from_IDirectXFileDataReference(iface); + ULONG refcount = InterlockedIncrement(&object->ref); - TRACE("(%p/%p)->(): new ref %d\n", iface, This, ref); + TRACE("%p increasing refcount to %lu.\n", iface, refcount); - return ref; + return refcount; } -static ULONG WINAPI IDirectXFileDataReferenceImpl_Release(IDirectXFileDataReference* iface) +static ULONG WINAPI IDirectXFileDataReferenceImpl_Release(IDirectXFileDataReference *iface) { - IDirectXFileDataReferenceImpl *This = impl_from_IDirectXFileDataReference(iface); - ULONG ref = InterlockedDecrement(&This->ref); + IDirectXFileDataReferenceImpl *object = impl_from_IDirectXFileDataReference(iface); + ULONG refcount = InterlockedDecrement(&object->ref); - TRACE("(%p/%p)->(): new ref %d\n", iface, This, ref); + TRACE("%p decreasing refcount to %lu.\n", iface, refcount); - if (!ref) - HeapFree(GetProcessHeap(), 0, This); + if (!refcount) + HeapFree(GetProcessHeap(), 0, object); - return ref; + return refcount; } /*** IDirectXFileObject methods ***/ @@ -864,18 +865,19 @@ static HRESULT WINAPI IDirectXFileDataReferenceImpl_GetName(IDirectXFileDataRefe return DXFILE_OK; } -static HRESULT WINAPI IDirectXFileDataReferenceImpl_GetId(IDirectXFileDataReference* iface, LPGUID pGuid) +static HRESULT WINAPI IDirectXFileDataReferenceImpl_GetId(IDirectXFileDataReference *iface, + GUID *guid) { - IDirectXFileDataReferenceImpl *This = impl_from_IDirectXFileDataReference(iface); + IDirectXFileDataReferenceImpl *object = impl_from_IDirectXFileDataReference(iface); - TRACE("(%p/%p)->(%p)\n", This, iface, pGuid); + TRACE("iface %p, guid %p.\n", iface, guid); - if (!pGuid) - return DXFILEERR_BADVALUE; + if (!guid) + return DXFILEERR_BADVALUE; - *pGuid = This->ptarget->class_id; + *guid = object->ptarget->class_id; - return DXFILE_OK; + return DXFILE_OK; } /*** IDirectXFileDataReference ***/ @@ -937,54 +939,59 @@ static inline IDirectXFileEnumObjectImpl *impl_from_IDirectXFileEnumObject(IDire return CONTAINING_RECORD(iface, IDirectXFileEnumObjectImpl, IDirectXFileEnumObject_iface); } -/*** IUnknown methods ***/ -static HRESULT WINAPI IDirectXFileEnumObjectImpl_QueryInterface(IDirectXFileEnumObject* iface, REFIID riid, void** ppvObject) +static HRESULT WINAPI IDirectXFileEnumObjectImpl_QueryInterface(IDirectXFileEnumObject *iface, + REFIID riid, void **out) { - IDirectXFileEnumObjectImpl *This = impl_from_IDirectXFileEnumObject(iface); + IDirectXFileEnumObjectImpl *object = impl_from_IDirectXFileEnumObject(iface); - TRACE("(%p/%p)->(%s,%p)\n", iface, This, debugstr_guid(riid), ppvObject); + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirectXFileEnumObject)) - { - IUnknown_AddRef(iface); - *ppvObject = &This->IDirectXFileEnumObject_iface; - return S_OK; - } + if (IsEqualGUID(riid, &IID_IUnknown) + || IsEqualGUID(riid, &IID_IDirectXFileEnumObject)) + { + *out = &object->IDirectXFileEnumObject_iface; + } + else + { + *out = NULL; + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } - ERR("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppvObject); - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown *)*out); + return S_OK; } -static ULONG WINAPI IDirectXFileEnumObjectImpl_AddRef(IDirectXFileEnumObject* iface) +static ULONG WINAPI IDirectXFileEnumObjectImpl_AddRef(IDirectXFileEnumObject *iface) { - IDirectXFileEnumObjectImpl *This = impl_from_IDirectXFileEnumObject(iface); - ULONG ref = InterlockedIncrement(&This->ref); + IDirectXFileEnumObjectImpl *object = impl_from_IDirectXFileEnumObject(iface); + ULONG refcount = InterlockedIncrement(&object->ref); - TRACE("(%p/%p)->(): new ref %d\n", iface, This, ref); + TRACE("%p increasing refcount to %lu.\n", iface, refcount); - return ref; + return refcount; } -static ULONG WINAPI IDirectXFileEnumObjectImpl_Release(IDirectXFileEnumObject* iface) +static ULONG WINAPI IDirectXFileEnumObjectImpl_Release(IDirectXFileEnumObject *iface) { - IDirectXFileEnumObjectImpl *This = impl_from_IDirectXFileEnumObject(iface); - ULONG ref = InterlockedDecrement(&This->ref); + IDirectXFileEnumObjectImpl *object = impl_from_IDirectXFileEnumObject(iface); + ULONG refcount = InterlockedDecrement(&object->ref); - TRACE("(%p/%p)->(): new ref %d\n", iface, This, ref); + TRACE("%p decreasing refcount to %lu.\n", iface, refcount); - if (!ref) - { - ULONG i; - for (i = 0; i < This->nb_xobjects; i++) - IDirectXFileData_Release(This->pRefObjects[i]); - if (This->mapped_memory) - UnmapViewOfFile(This->mapped_memory); - HeapFree(GetProcessHeap(), 0, This->decomp_buffer); - HeapFree(GetProcessHeap(), 0, This); - } + if (!refcount) + { + unsigned int i; + + for (i = 0; i < object->nb_xobjects; ++i) + IDirectXFileData_Release(object->pRefObjects[i]); + if (object->mapped_memory) + UnmapViewOfFile(object->mapped_memory); + HeapFree(GetProcessHeap(), 0, object->decomp_buffer); + HeapFree(GetProcessHeap(), 0, object); + } - return ref; + return refcount; } /*** IDirectXFileEnumObject methods ***/ @@ -1071,22 +1078,20 @@ error: return hr; } -static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetDataObjectById(IDirectXFileEnumObject* iface, REFGUID rguid, LPDIRECTXFILEDATA* ppDataObj) +static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetDataObjectById(IDirectXFileEnumObject *iface, + REFGUID guid, LPDIRECTXFILEDATA *data) { - IDirectXFileEnumObjectImpl *This = impl_from_IDirectXFileEnumObject(iface); - - FIXME("(%p/%p)->(%p,%p) stub!\n", This, iface, rguid, ppDataObj); + FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); - return DXFILEERR_BADVALUE; + return DXFILEERR_BADVALUE; } -static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetDataObjectByName(IDirectXFileEnumObject* iface, LPCSTR szName, LPDIRECTXFILEDATA* ppDataObj) +static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetDataObjectByName(IDirectXFileEnumObject *iface, + const char *name, LPDIRECTXFILEDATA *data) { - IDirectXFileEnumObjectImpl *This = impl_from_IDirectXFileEnumObject(iface); + FIXME("iface %p, name %s, data %p stub!\n", iface, debugstr_a(name), data); - FIXME("(%p/%p)->(%s,%p) stub!\n", This, iface, szName, ppDataObj); - - return DXFILEERR_BADVALUE; + return DXFILEERR_BADVALUE; } static const IDirectXFileEnumObjectVtbl IDirectXFileEnumObject_Vtbl = @@ -1122,73 +1127,73 @@ static inline IDirectXFileSaveObjectImpl *impl_from_IDirectXFileSaveObject(IDire return CONTAINING_RECORD(iface, IDirectXFileSaveObjectImpl, IDirectXFileSaveObject_iface); } -/*** IUnknown methods ***/ -static HRESULT WINAPI IDirectXFileSaveObjectImpl_QueryInterface(IDirectXFileSaveObject* iface, REFIID riid, void** ppvObject) +static HRESULT WINAPI IDirectXFileSaveObjectImpl_QueryInterface(IDirectXFileSaveObject *iface, + REFIID riid, void **out) { - IDirectXFileSaveObjectImpl *This = impl_from_IDirectXFileSaveObject(iface); + IDirectXFileSaveObjectImpl *object = impl_from_IDirectXFileSaveObject(iface); - TRACE("(%p/%p)->(%s,%p)\n", iface, This, debugstr_guid(riid), ppvObject); + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirectXFileSaveObject)) - { - IUnknown_AddRef(iface); - *ppvObject = &This->IDirectXFileSaveObject_iface; - return S_OK; - } + if (IsEqualGUID(riid, &IID_IUnknown) + || IsEqualGUID(riid, &IID_IDirectXFileSaveObject)) + { + *out = &object->IDirectXFileSaveObject_iface; + } + else + { + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } - ERR("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppvObject); - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown *)*out); + return S_OK; } -static ULONG WINAPI IDirectXFileSaveObjectImpl_AddRef(IDirectXFileSaveObject* iface) +static ULONG WINAPI IDirectXFileSaveObjectImpl_AddRef(IDirectXFileSaveObject *iface) { - IDirectXFileSaveObjectImpl *This = impl_from_IDirectXFileSaveObject(iface); - ULONG ref = InterlockedIncrement(&This->ref); + IDirectXFileSaveObjectImpl *object = impl_from_IDirectXFileSaveObject(iface); + ULONG refcount = InterlockedIncrement(&object->ref); - TRACE("(%p/%p)->(): new ref %d\n", iface, This, ref); + TRACE("%p increasing refcount to %lu.\n", iface, refcount); - return ref; + return refcount; } -static ULONG WINAPI IDirectXFileSaveObjectImpl_Release(IDirectXFileSaveObject* iface) +static ULONG WINAPI IDirectXFileSaveObjectImpl_Release(IDirectXFileSaveObject *iface) { - IDirectXFileSaveObjectImpl *This = impl_from_IDirectXFileSaveObject(iface); - ULONG ref = InterlockedDecrement(&This->ref); + IDirectXFileSaveObjectImpl *object = impl_from_IDirectXFileSaveObject(iface); + ULONG refcount = InterlockedDecrement(&object->ref); - TRACE("(%p/%p)->(): new ref %d\n", iface, This, ref); + TRACE("%p decreasing refcount to %lu.\n", iface, refcount); - if (!ref) - HeapFree(GetProcessHeap(), 0, This); + if (!refcount) + HeapFree(GetProcessHeap(), 0, object); - return ref; + return refcount; } -static HRESULT WINAPI IDirectXFileSaveObjectImpl_SaveTemplates(IDirectXFileSaveObject* iface, DWORD cTemplates, const GUID** ppguidTemplates) +static HRESULT WINAPI IDirectXFileSaveObjectImpl_SaveTemplates(IDirectXFileSaveObject *iface, + DWORD count, const GUID **templates) { - IDirectXFileSaveObjectImpl *This = impl_from_IDirectXFileSaveObject(iface); + FIXME("iface %p, count %lu, templates %p stub!\n", iface, count, templates); - FIXME("(%p/%p)->(%d,%p) stub!\n", This, iface, cTemplates, ppguidTemplates); - - return DXFILE_OK; + return DXFILE_OK; } -static HRESULT WINAPI IDirectXFileSaveObjectImpl_CreateDataObject(IDirectXFileSaveObject* iface, REFGUID rguidTemplate, LPCSTR szName, const GUID* pguid, DWORD cbSize, LPVOID pvData, LPDIRECTXFILEDATA* ppDataObj) +static HRESULT WINAPI IDirectXFileSaveObjectImpl_CreateDataObject(IDirectXFileSaveObject *iface, REFGUID template, + const char *name, const GUID *guid, DWORD size, void *data, LPDIRECTXFILEDATA *dataobj) { - IDirectXFileSaveObjectImpl *This = impl_from_IDirectXFileSaveObject(iface); - - FIXME("(%p/%p)->(%p,%s,%p,%d,%p,%p) stub!\n", This, iface, rguidTemplate, szName, pguid, cbSize, pvData, ppDataObj); + FIXME("iface %p, template %s, name %s, guid %s, size %lu, data %p, dataobj %p stub!\n", + iface, debugstr_guid(template), debugstr_a(name), debugstr_guid(guid), size, data, dataobj); - return DXFILEERR_BADVALUE; + return DXFILEERR_BADVALUE; } -static HRESULT WINAPI IDirectXFileSaveObjectImpl_SaveData(IDirectXFileSaveObject* iface, LPDIRECTXFILEDATA ppDataObj) +static HRESULT WINAPI IDirectXFileSaveObjectImpl_SaveData(IDirectXFileSaveObject *iface, LPDIRECTXFILEDATA data) { - IDirectXFileSaveObjectImpl *This = impl_from_IDirectXFileSaveObject(iface); - - FIXME("(%p/%p)->(%p) stub!\n", This, iface, ppDataObj); + FIXME("iface %p, data %p stub!\n", iface, data); - return DXFILEERR_BADVALUE; + return DXFILEERR_BADVALUE; } static const IDirectXFileSaveObjectVtbl IDirectXFileSaveObject_Vtbl = diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 8431078949f..5446124234e 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -147,7 +147,7 @@ static void dump_template(xtemplate* templates_array, xtemplate* ptemplate) for (k = 0; k < ptemplate->members[j].nb_dims; k++) { if (ptemplate->members[j].dim_fixed[k]) - wine_dbg_printf("[%d]", ptemplate->members[j].dim_value[k]); + wine_dbg_printf("[%ld]", ptemplate->members[j].dim_value[k]); else wine_dbg_printf("[%s]", ptemplate->members[ptemplate->members[j].dim_value[k]].name); } @@ -237,8 +237,8 @@ HRESULT parse_header(parse_buffer * buf, BYTE ** decomp_buffer_ptr) if (!read_bytes(buf, &decomp_file_size, sizeof(decomp_file_size))) return DXFILEERR_BADFILETYPE; - TRACE("Compressed format %s detected: decompressed file size with xof header = %d\n", - debugstr_fourcc(header[2]), decomp_file_size); + TRACE("Compressed format %s detected: decompressed file size with xof header = %lu.\n", + debugstr_fourcc(header[2]), decomp_file_size); /* Does not take xof header into account */ decomp_file_size -= 16; @@ -274,8 +274,8 @@ HRESULT parse_header(parse_buffer * buf, BYTE ** decomp_buffer_ptr) } if ((decomp_buffer - *decomp_buffer_ptr) != decomp_file_size) - ERR("Size of all decompressed chunks (%u) does not match decompressed file size (%u)\n", - (DWORD)(decomp_buffer - *decomp_buffer_ptr), decomp_file_size); + ERR("Size of all decompressed chunks (%lu) does not match decompressed file size (%lu).\n", + (DWORD)(decomp_buffer - *decomp_buffer_ptr), decomp_file_size); /* Use decompressed data */ buf->buffer = *decomp_buffer_ptr; @@ -475,19 +475,20 @@ static BOOL is_guid(parse_buffer* buf) tmp[pos] = 0; if (pos != 38 /* <+36+> */) { - TRACE("Wrong guid %s (%d)\n", tmp, pos); - return FALSE; + TRACE("Wrong guid %s (%lu).\n", tmp, pos); + return FALSE; } buf->buffer += pos; buf->rem_bytes -= pos; - ret = sscanf(tmp, CLSIDFMT, &class_id.Data1, tab, tab+1, tab+2, tab+3, tab+4, tab+5, tab+6, tab+7, tab+8, tab+9); + ret = sscanf(tmp, "<%08lx-%04lx-%04lx-%02lx%02lx-%02lx%02lx%02lx%02lx%02lx%02lx>", + &class_id.Data1, tab, tab+1, tab+2, tab+3, tab+4, tab+5, tab+6, tab+7, tab+8, tab+9); if (ret != 11) { - TRACE("Wrong guid %s (%d)\n", tmp, pos); - return FALSE; + TRACE("Wrong guid %s (%lu).\n", tmp, pos); + return FALSE; } - TRACE("Found guid %s (%d)\n", tmp, pos); + TRACE("Found guid %s (%lu).\n", tmp, pos); class_id.Data2 = tab[0]; class_id.Data3 = tab[1]; @@ -588,9 +589,9 @@ static BOOL is_integer(parse_buffer* buf) buf->buffer += pos; buf->rem_bytes -= pos; - sscanf(tmp, "%d", &integer); + sscanf(tmp, "%ld", &integer); - TRACE("Found integer %s - %d\n", tmp, integer); + TRACE("Found integer %s - %ld.\n", tmp, integer); *(DWORD*)buf->value = integer; @@ -725,19 +726,19 @@ static WORD parse_TOKEN(parse_buffer * buf) /* Convert integer and float list into separate elements */ if (token == TOKEN_INTEGER_LIST) { - if (!read_bytes(buf, &buf->list_nb_elements, 4)) - return TOKEN_ERROR; - token = TOKEN_INTEGER; - buf->list_type_float = FALSE; - TRACE("Integer list (TOKEN_INTEGER_LIST) of size %d\n", buf->list_nb_elements); + if (!read_bytes(buf, &buf->list_nb_elements, 4)) + return TOKEN_ERROR; + token = TOKEN_INTEGER; + buf->list_type_float = FALSE; + TRACE("Integer list (TOKEN_INTEGER_LIST) of size %lu.\n", buf->list_nb_elements); } else if (token == TOKEN_FLOAT_LIST) { - if (!read_bytes(buf, &buf->list_nb_elements, 4)) - return TOKEN_ERROR; - token = TOKEN_FLOAT; - buf->list_type_float = TRUE; - TRACE("Float list (TOKEN_FLOAT_LIST) of size %d\n", buf->list_nb_elements); + if (!read_bytes(buf, &buf->list_nb_elements, 4)) + return TOKEN_ERROR; + token = TOKEN_FLOAT; + buf->list_type_float = TRUE; + TRACE("Float list (TOKEN_FLOAT_LIST) of size %lu.\n", buf->list_nb_elements); } } @@ -783,16 +784,16 @@ static WORD parse_TOKEN(parse_buffer * buf) } break; case TOKEN_INTEGER: - { + { DWORD integer; if (!read_bytes(buf, &integer, 4)) - return TOKEN_ERROR; - TRACE("integer = %u\n", integer); + return TOKEN_ERROR; + TRACE("integer = %lu.\n", integer); - *(DWORD*)buf->value = integer; - } - break; + *(DWORD *)buf->value = integer; + break; + } case TOKEN_GUID: { char strguid[39]; @@ -1089,7 +1090,8 @@ static BOOL parse_template(parse_buffer * buf) if (get_TOKEN(buf) != TOKEN_CBRACE) return FALSE; - TRACE("%d - %s - %s\n", buf->pdxf->nb_xtemplates, buf->pdxf->xtemplates[buf->pdxf->nb_xtemplates].name, debugstr_guid(&buf->pdxf->xtemplates[buf->pdxf->nb_xtemplates].class_id)); + TRACE("%lu - %s - %s\n", buf->pdxf->nb_xtemplates, buf->pdxf->xtemplates[buf->pdxf->nb_xtemplates].name, + debugstr_guid(&buf->pdxf->xtemplates[buf->pdxf->nb_xtemplates].class_id)); buf->pdxf->nb_xtemplates++; return TRUE; @@ -1161,7 +1163,7 @@ static BOOL parse_object_members_list(parse_buffer * buf) nb_elems *= *(DWORD*)(buf->pxo->root->pdata + buf->pxo->members[pt->members[i].dim_value[k]].start); } - TRACE("Elements to consider: %u\n", nb_elems); + TRACE("Elements to consider: %lu.\n", nb_elems); for (k = 0; k < nb_elems; k++) { @@ -1201,7 +1203,7 @@ static BOOL parse_object_members_list(parse_buffer * buf) if (token == TOKEN_INTEGER) { get_TOKEN(buf); - TRACE("%s = %d\n", pt->members[i].name, *(DWORD*)buf->value); + TRACE("%s = %ld.\n", pt->members[i].name, *(DWORD *)buf->value); /* Assume larger size */ if (!check_buffer(buf, 4)) return FALSE; @@ -1217,7 +1219,7 @@ static BOOL parse_object_members_list(parse_buffer * buf) } else { - FIXME("Token %d not supported\n", pt->members[i].type); + FIXME("Token %ld not supported.\n", pt->members[i].type); return FALSE; } } @@ -1234,7 +1236,7 @@ static BOOL parse_object_members_list(parse_buffer * buf) } else { - FIXME("Token %d not supported\n", pt->members[i].type); + FIXME("Token %ld not supported.\n", pt->members[i].type); return FALSE; } } @@ -1259,13 +1261,13 @@ static BOOL parse_object_members_list(parse_buffer * buf) } else { - FIXME("Token %d not supported\n", pt->members[i].type); + FIXME("Token %ld not supported.\n", pt->members[i].type); return FALSE; } } else { - WARN("Unexpected token %d\n", token); + WARN("Unexpected token %ld.\n", token); return FALSE; } } @@ -1369,7 +1371,7 @@ _exit: if (buf->pxo->nb_children > MAX_CHILDREN) { - FIXME("Too many children %d\n", buf->pxo->nb_children); + FIXME("Too many children: %lu.\n", buf->pxo->nb_children); return FALSE; } -- 2.34.1

1 2

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