April 2022 - Wine-Devel - list.winehq.org

[PATCH 7/7] ieframe: Enable visual styles.
by Zhiyi Zhang April 13, 2022

April 13, 2022

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 April 13, 2022

April 13, 2022

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 April 13, 2022

April 13, 2022

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 April 13, 2022

April 13, 2022

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 April 13, 2022

April 13, 2022

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 April 13, 2022

April 13, 2022

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 April 13, 2022

April 13, 2022

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 April 13, 2022

April 13, 2022

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 April 12, 2022

April 12, 2022

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 April 12, 2022

April 12, 2022

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

[PATCH] dlls/windowscodecs/tests: simplify printf for 64 bit integers
by Eric Pouech April 12, 2022

April 12, 2022

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/windowscodecs/tests/metadata.c | 14 +++++++------- dlls/windowscodecs/tests/pngformat.c | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 2ec9eb645e80..41f20efa9cd9 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -698,27 +698,27 @@ static void compare_metadata(IWICMetadataReader *reader, const struct test_data case VT_UI1: ok(td[i].count == U(value).caub.cElems, "%lu: expected cElems %d, got %ld\n", i, td[i].count, U(value).caub.cElems); for (j = 0; j < U(value).caub.cElems; j++) - ok(td[i].value[j] == U(value).caub.pElems[j], "%lu: expected value[%ld] %#lx/%#lx, got %#x\n", i, j, (ULONG)td[i].value[j], (ULONG)(td[i].value[j] >> 32), U(value).caub.pElems[j]); + ok(td[i].value[j] == U(value).caub.pElems[j], "%lu: expected value[%ld] %#I64x, got %#x\n", i, j, td[i].value[j], U(value).caub.pElems[j]); break; case VT_I2: case VT_UI2: ok(td[i].count == U(value).caui.cElems, "%lu: expected cElems %d, got %ld\n", i, td[i].count, U(value).caui.cElems); for (j = 0; j < U(value).caui.cElems; j++) - ok(td[i].value[j] == U(value).caui.pElems[j], "%lu: expected value[%ld] %#lx/%#lx, got %#x\n", i, j, (ULONG)td[i].value[j], (ULONG)(td[i].value[j] >> 32), U(value).caui.pElems[j]); + ok(td[i].value[j] == U(value).caui.pElems[j], "%lu: expected value[%ld] %#I64x, got %#x\n", i, j, td[i].value[j], U(value).caui.pElems[j]); break; case VT_I4: case VT_UI4: case VT_R4: ok(td[i].count == U(value).caul.cElems, "%lu: expected cElems %d, got %ld\n", i, td[i].count, U(value).caul.cElems); for (j = 0; j < U(value).caul.cElems; j++) - ok(td[i].value[j] == U(value).caul.pElems[j], "%lu: expected value[%ld] %#lx/%#lx, got %#lx\n", i, j, (ULONG)td[i].value[j], (ULONG)(td[i].value[j] >> 32), U(value).caul.pElems[j]); + ok(td[i].value[j] == U(value).caul.pElems[j], "%lu: expected value[%ld] %#I64x, got %#lx\n", i, j, td[i].value[j], U(value).caul.pElems[j]); break; case VT_I8: case VT_UI8: case VT_R8: ok(td[i].count == U(value).cauh.cElems, "%lu: expected cElems %d, got %ld\n", i, td[i].count, U(value).cauh.cElems); for (j = 0; j < U(value).cauh.cElems; j++) - ok(td[i].value[j] == U(value).cauh.pElems[j].QuadPart, "%lu: expected value[%ld] %08lx/%08lx, got %08lx/%08lx\n", i, j, (ULONG)td[i].value[j], (ULONG)(td[i].value[j] >> 32), U(value).cauh.pElems[j].u.LowPart, U(value).cauh.pElems[j].u.HighPart); + ok(td[i].value[j] == U(value).cauh.pElems[j].QuadPart, "%lu: expected value[%ld] %I64x, got %08lx/%08lx\n", i, j, td[i].value[j], U(value).cauh.pElems[j].u.LowPart, U(value).cauh.pElems[j].u.HighPart); break; case VT_LPSTR: ok(td[i].count == U(value).calpstr.cElems, "%lu: expected cElems %d, got %ld\n", i, td[i].count, U(value).caub.cElems); @@ -745,8 +745,8 @@ static void compare_metadata(IWICMetadataReader *reader, const struct test_data ok(!memcmp(td[i].string, U(value).blob.pBlobData, td[i].count), "%lu: expected %s, got %s\n", i, td[i].string, U(value).blob.pBlobData); } else - ok(U(value).uhVal.QuadPart == td[i].value[0], "%lu: expected value %#x/%#x got %#lx/%#lx\n", - i, (UINT)td[i].value[0], (UINT)(td[i].value[0] >> 32), U(value).uhVal.u.LowPart, U(value).uhVal.u.HighPart); + ok(U(value).uhVal.QuadPart == td[i].value[0], "%lu: expected value %#I64x got %#lx/%#lx\n", + i, td[i].value[0], U(value).uhVal.u.LowPart, U(value).uhVal.u.HighPart); PropVariantClear(&schema); PropVariantClear(&id); @@ -2067,7 +2067,7 @@ static void test_metadata_APE(void) ok(value.vt == (VT_UI1|VT_VECTOR), "unexpected vt: %i\n", id.vt); ok(td[1].count == U(value).caub.cElems, "expected cElems %d, got %ld\n", td[1].count, U(value).caub.cElems); for (i = 0; i < U(value).caub.cElems; i++) - ok(td[1].value[i] == U(value).caub.pElems[i], "%u: expected value %#lx/%#lx, got %#x\n", i, (ULONG)td[1].value[i], (ULONG)(td[1].value[i] >> 32), U(value).caub.pElems[i]); + ok(td[1].value[i] == U(value).caub.pElems[i], "%u: expected value %#I64x, got %#x\n", i, td[1].value[i], U(value).caub.pElems[i]); PropVariantClear(&value); hr = IWICMetadataReader_GetMetadataHandlerInfo(reader, &info); diff --git a/dlls/windowscodecs/tests/pngformat.c b/dlls/windowscodecs/tests/pngformat.c index 1181ebbe3690..ca5a220d40d6 100644 --- a/dlls/windowscodecs/tests/pngformat.c +++ b/dlls/windowscodecs/tests/pngformat.c @@ -300,8 +300,8 @@ static HRESULT create_decoder(const void *image_data, UINT image_size, IWICBitma zero.QuadPart = 0; IStream_Seek (stream, zero, STREAM_SEEK_CUR, &pos); - ok(pos.QuadPart < image_size, "seek beyond the end of stream: %x%08x >= %x\n", - (UINT)(pos.QuadPart >> 32), (UINT)pos.QuadPart, image_size); + ok(pos.QuadPart < image_size, "seek beyond the end of stream: %I64x >= %x\n", + pos.QuadPart, image_size); refcount = IStream_Release(stream); ok(refcount > 0, "expected stream refcount > 0\n");

2 1

[PATCH v4 0/4] Console support & create process
by Eric Pouech April 12, 2022

April 12, 2022

The following series is the result of work from - Torge Matties, Jacek Caban and myself - and went through various convergence, merges, rewrite and improvements (especially patch #2 for various authors) it provides: - support for CREATE_NO_WINDOW flag in CreateProcess - a solution for regression introduced in f034084d49b354811096524d472ae5172ac1cebf (when a Wine initial process isn't attached to a unix console, it can generates lots new console window creation, with unwanted side effects, like not using parents std streams for output) - with the correspondings non regression tests v3 -> v4: - using negative handle values for console pseudo handles - don't report FIXME to users - removed Wine only tests Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- Supersedes: 231894-231897 Eric Pouech (4): dlls/kernel32/tests: Add more CreateProcess console management tests. dlls/{ntdll, kernel*}: Add support for CREATE_NO_WINDOW flag in CreateProcess. include/condrv.h, server: using negative values for console pseudo handles dlls/{ntdll,kernel*}: provide a pseudo console environment for initial CUI processes not tied to an Unix tty dlls/kernel32/tests/console.c | 86 +++++++++++++++++++++++++++++------ dlls/kernelbase/console.c | 39 ++++++++++++---- dlls/kernelbase/process.c | 11 +++-- dlls/ntdll/unix/env.c | 2 + dlls/ntdll/unix/process.c | 2 + include/wine/condrv.h | 6 ++- programs/conhost/conhost.c | 11 +++-- programs/conhost/conhost.h | 1 + server/process.c | 4 +- 9 files changed, 128 insertions(+), 34 deletions(-)

2 8

[PATCH] evr: Add IAMFilterMiscFlags interface.
by Nikolay Sivov April 12, 2022

April 12, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/evr.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 21 ++++++++++++++++++++- 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c index 5e6ca03ea3d..e64151b650c 100644 --- a/dlls/evr/evr.c +++ b/dlls/evr/evr.c @@ -34,6 +34,7 @@ struct evr { struct strmbase_renderer renderer; IEVRFilterConfig IEVRFilterConfig_iface; + IAMFilterMiscFlags IAMFilterMiscFlags_iface; }; static struct evr *impl_from_strmbase_renderer(struct strmbase_renderer *iface) @@ -47,6 +48,8 @@ static HRESULT evr_query_interface(struct strmbase_renderer *iface, REFIID iid, if (IsEqualGUID(iid, &IID_IEVRFilterConfig)) *out = &filter->IEVRFilterConfig_iface; + else if (IsEqualGUID(iid, &IID_IAMFilterMiscFlags)) + *out = &filter->IAMFilterMiscFlags_iface; else return E_NOINTERFACE; @@ -132,6 +135,44 @@ static const IEVRFilterConfigVtbl filter_config_vtbl = filter_config_GetNumberOfStreams, }; +static struct evr *impl_from_IAMFilterMiscFlags(IAMFilterMiscFlags *iface) +{ + return CONTAINING_RECORD(iface, struct evr, IAMFilterMiscFlags_iface); +} + +static HRESULT WINAPI filter_misc_flags_QueryInterface(IAMFilterMiscFlags *iface, REFIID iid, void **out) +{ + struct evr *filter = impl_from_IAMFilterMiscFlags(iface); + return IUnknown_QueryInterface(filter->renderer.filter.outer_unk, iid, out); +} + +static ULONG WINAPI filter_misc_flags_AddRef(IAMFilterMiscFlags *iface) +{ + struct evr *filter = impl_from_IAMFilterMiscFlags(iface); + return IUnknown_AddRef(filter->renderer.filter.outer_unk); +} + +static ULONG WINAPI filter_misc_flags_Release(IAMFilterMiscFlags *iface) +{ + struct evr *filter = impl_from_IAMFilterMiscFlags(iface); + return IUnknown_Release(filter->renderer.filter.outer_unk); +} + +static ULONG WINAPI filter_misc_flags_GetMiscFlags(IAMFilterMiscFlags *iface) +{ + TRACE("%p.\n", iface); + + return AM_FILTER_MISC_FLAGS_IS_RENDERER; +} + +static const IAMFilterMiscFlagsVtbl filter_misc_flags_vtbl = +{ + filter_misc_flags_QueryInterface, + filter_misc_flags_AddRef, + filter_misc_flags_Release, + filter_misc_flags_GetMiscFlags, +}; + HRESULT evr_filter_create(IUnknown *outer, void **out) { struct evr *object; @@ -142,6 +183,7 @@ HRESULT evr_filter_create(IUnknown *outer, void **out) strmbase_renderer_init(&object->renderer, outer, &CLSID_EnhancedVideoRenderer, L"EVR Input0", &renderer_ops); object->IEVRFilterConfig_iface.lpVtbl = &filter_config_vtbl; + object->IAMFilterMiscFlags_iface.lpVtbl = &filter_misc_flags_vtbl; TRACE("Created EVR %p.\n", object); *out = &object->renderer.filter.IUnknown_inner; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 93e262e52a3..fa9ad2a0b35 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -276,7 +276,7 @@ static void test_interfaces(void) IBaseFilter *filter = create_evr(); ULONG ref; - todo_wine check_interface(filter, &IID_IAMFilterMiscFlags, TRUE); + check_interface(filter, &IID_IAMFilterMiscFlags, TRUE); check_interface(filter, &IID_IBaseFilter, TRUE); check_interface(filter, &IID_IEVRFilterConfig, TRUE); check_interface(filter, &IID_IMediaFilter, TRUE); @@ -551,6 +551,24 @@ static void test_unconnected_eos(void) ok(!ref, "Got outstanding refcount %ld.\n", ref); } +static void test_misc_flags(void) +{ + IBaseFilter *filter = create_evr(); + IAMFilterMiscFlags *misc_flags; + ULONG ref, flags; + HRESULT hr; + + hr = IBaseFilter_QueryInterface(filter, &IID_IAMFilterMiscFlags, (void **)&misc_flags); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + flags = IAMFilterMiscFlags_GetMiscFlags(misc_flags); + ok(flags == AM_FILTER_MISC_FLAGS_IS_RENDERER, "Unexpected flags %#lx.\n", flags); + IAMFilterMiscFlags_Release(misc_flags); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %ld.\n", ref); +} + static IMFMediaType * create_video_type(const GUID *subtype) { IMFMediaType *video_type; @@ -3207,6 +3225,7 @@ START_TEST(evr) test_find_pin(); test_pin_info(); test_unconnected_eos(); + test_misc_flags(); test_default_mixer(); test_default_mixer_type_negotiation(); -- 2.35.1

2 1

[PATCH 6/6] wineoss: Move create_stream and release_stream to the unixlib.
by Huw Davies April 12, 2022

April 12, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmdevdrv.c | 300 ++++-------------------------------- dlls/wineoss.drv/oss.c | 139 +++++++++++++++++ dlls/wineoss.drv/unixlib.h | 21 +++ 3 files changed, 191 insertions(+), 269 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 56b188424fb..2ea3c80f3ca 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -260,6 +260,16 @@ int WINAPI AUDDRV_GetPriority(void) return params.priority; } +static HRESULT stream_release(struct oss_stream *stream) +{ + struct release_stream_params params; + + params.stream = stream; + OSS_CALL(release_stream, &params); + + return params.result; +} + static void oss_lock(struct oss_stream *stream) { pthread_mutex_lock(&stream->lock); @@ -342,13 +352,6 @@ static void get_device_guid(EDataFlow flow, const char *device, GUID *guid) RegCloseKey(key); } -static int open_device(const char *device, EDataFlow flow) -{ - int flags = ((flow == eRender) ? O_WRONLY : O_RDONLY) | O_NONBLOCK; - - return open(device, flags, 0); -} - static void set_stream_volumes(ACImpl *This) { struct oss_stream *stream = This->stream; @@ -524,7 +527,6 @@ static ULONG WINAPI AudioClient_AddRef(IAudioClient3 *iface) static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) { ACImpl *This = impl_from_IAudioClient3(iface); - struct oss_stream *stream = This->stream; ULONG ref; ref = InterlockedDecrement(&This->ref); @@ -550,21 +552,8 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) LeaveCriticalSection(&g_sessions_lock); } HeapFree(GetProcessHeap(), 0, This->vols); - if(stream){ - SIZE_T size; - close(stream->fd); - if(stream->local_buffer){ - size = 0; - NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, &size, MEM_RELEASE); - } - if(stream->tmp_buffer){ - size = 0; - NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, &size, MEM_RELEASE); - } - CoTaskMemFree(stream->fmt); - pthread_mutex_destroy(&stream->lock); - HeapFree(GetProcessHeap(), 0, stream); - } + if(This->stream) + stream_release(This->stream); HeapFree(GetProcessHeap(), 0, This); } return ref; @@ -604,177 +593,6 @@ static void dump_fmt(const WAVEFORMATEX *fmt) } } -static DWORD get_channel_mask(unsigned int channels) -{ - switch(channels){ - case 0: - return 0; - case 1: - return KSAUDIO_SPEAKER_MONO; - case 2: - return KSAUDIO_SPEAKER_STEREO; - case 3: - return KSAUDIO_SPEAKER_STEREO | SPEAKER_LOW_FREQUENCY; - case 4: - return KSAUDIO_SPEAKER_QUAD; /* not _SURROUND */ - case 5: - return KSAUDIO_SPEAKER_QUAD | SPEAKER_LOW_FREQUENCY; - case 6: - return KSAUDIO_SPEAKER_5POINT1; /* not 5POINT1_SURROUND */ - case 7: - return KSAUDIO_SPEAKER_5POINT1 | SPEAKER_BACK_CENTER; - case 8: - return KSAUDIO_SPEAKER_7POINT1_SURROUND; /* Vista deprecates 7POINT1 */ - } - FIXME("Unknown speaker configuration: %u\n", channels); - return 0; -} - -static int get_oss_format(const WAVEFORMATEX *fmt) -{ - WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)fmt; - - if(fmt->wFormatTag == WAVE_FORMAT_PCM || - (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))){ - switch(fmt->wBitsPerSample){ - case 8: - return AFMT_U8; - case 16: - return AFMT_S16_LE; - case 24: - return AFMT_S24_LE; - case 32: - return AFMT_S32_LE; - } - return -1; - } - -#ifdef AFMT_FLOAT - if(fmt->wFormatTag == WAVE_FORMAT_IEEE_FLOAT || - (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT))){ - if(fmt->wBitsPerSample != 32) - return -1; - - return AFMT_FLOAT; - } -#endif - - return -1; -} - -static WAVEFORMATEX *clone_format(const WAVEFORMATEX *fmt) -{ - WAVEFORMATEX *ret; - size_t size; - - if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE) - size = sizeof(WAVEFORMATEXTENSIBLE); - else - size = sizeof(WAVEFORMATEX); - - ret = CoTaskMemAlloc(size); - if(!ret) - return NULL; - - memcpy(ret, fmt, size); - - ret->cbSize = size - sizeof(WAVEFORMATEX); - - return ret; -} - -static HRESULT setup_oss_device(AUDCLNT_SHAREMODE mode, int fd, - const WAVEFORMATEX *fmt, WAVEFORMATEX **out) -{ - int tmp, oss_format; - double tenth; - HRESULT ret = S_OK; - WAVEFORMATEX *closest = NULL; - - tmp = oss_format = get_oss_format(fmt); - if(oss_format < 0) - return AUDCLNT_E_UNSUPPORTED_FORMAT; - if(ioctl(fd, SNDCTL_DSP_SETFMT, &tmp) < 0){ - WARN("SETFMT failed: %d (%s)\n", errno, strerror(errno)); - return E_FAIL; - } - if(tmp != oss_format){ - TRACE("Format unsupported by this OSS version: %x\n", oss_format); - return AUDCLNT_E_UNSUPPORTED_FORMAT; - } - - if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - (fmt->nAvgBytesPerSec == 0 || - fmt->nBlockAlign == 0 || - ((WAVEFORMATEXTENSIBLE*)fmt)->Samples.wValidBitsPerSample > fmt->wBitsPerSample)) - return E_INVALIDARG; - - if(fmt->nChannels == 0) - return AUDCLNT_E_UNSUPPORTED_FORMAT; - - closest = clone_format(fmt); - if(!closest) - return E_OUTOFMEMORY; - - tmp = fmt->nSamplesPerSec; - if(ioctl(fd, SNDCTL_DSP_SPEED, &tmp) < 0){ - WARN("SPEED failed: %d (%s)\n", errno, strerror(errno)); - CoTaskMemFree(closest); - return E_FAIL; - } - tenth = fmt->nSamplesPerSec * 0.1; - if(tmp > fmt->nSamplesPerSec + tenth || tmp < fmt->nSamplesPerSec - tenth){ - ret = S_FALSE; - closest->nSamplesPerSec = tmp; - } - - tmp = fmt->nChannels; - if(ioctl(fd, SNDCTL_DSP_CHANNELS, &tmp) < 0){ - WARN("CHANNELS failed: %d (%s)\n", errno, strerror(errno)); - CoTaskMemFree(closest); - return E_FAIL; - } - if(tmp != fmt->nChannels){ - ret = S_FALSE; - closest->nChannels = tmp; - } - - if(closest->wFormatTag == WAVE_FORMAT_EXTENSIBLE) - ((WAVEFORMATEXTENSIBLE*)closest)->dwChannelMask = get_channel_mask(closest->nChannels); - - if(fmt->nBlockAlign != fmt->nChannels * fmt->wBitsPerSample / 8 || - fmt->nAvgBytesPerSec != fmt->nBlockAlign * fmt->nSamplesPerSec || - (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - ((WAVEFORMATEXTENSIBLE*)fmt)->Samples.wValidBitsPerSample < fmt->wBitsPerSample)) - ret = S_FALSE; - - if(mode == AUDCLNT_SHAREMODE_EXCLUSIVE && - fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ - if(((WAVEFORMATEXTENSIBLE*)fmt)->dwChannelMask == 0 || - ((WAVEFORMATEXTENSIBLE*)fmt)->dwChannelMask & SPEAKER_RESERVED) - ret = S_FALSE; - } - - if(ret == S_FALSE && !out) - ret = AUDCLNT_E_UNSUPPORTED_FORMAT; - - if(ret == S_FALSE && out){ - closest->nBlockAlign = - closest->nChannels * closest->wBitsPerSample / 8; - closest->nAvgBytesPerSec = - closest->nBlockAlign * closest->nSamplesPerSec; - if(closest->wFormatTag == WAVE_FORMAT_EXTENSIBLE) - ((WAVEFORMATEXTENSIBLE*)closest)->Samples.wValidBitsPerSample = closest->wBitsPerSample; - *out = closest; - } else - CoTaskMemFree(closest); - - TRACE("returning: %08x\n", ret); - return ret; -} - static void session_init_vols(AudioSession *session, UINT channels) { if(session->channel_count < channels){ @@ -860,11 +678,9 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, const GUID *sessionguid) { ACImpl *This = impl_from_IAudioClient3(iface); + struct create_stream_params params; struct oss_stream *stream; - oss_audioinfo ai; - SIZE_T size; - int i; - HRESULT hr; + unsigned int i; TRACE("(%p)->(%x, %x, %s, %s, %p, %s)\n", This, mode, flags, wine_dbgstr_longlong(duration), wine_dbgstr_longlong(period), fmt, debugstr_guid(sessionguid)); @@ -920,92 +736,38 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, return AUDCLNT_E_ALREADY_INITIALIZED; } - stream = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This->stream)); - if(!stream){ - LeaveCriticalSection(&g_sessions_lock); - return E_OUTOFMEMORY; - } - stream->flow = This->dataflow; - pthread_mutex_init(&stream->lock, NULL); - - stream->fd = open_device(This->devnode, This->dataflow); - if(stream->fd < 0){ - WARN("Unable to open device %s: %d (%s)\n", This->devnode, errno, strerror(errno)); - hr = AUDCLNT_E_DEVICE_INVALIDATED; - goto exit; - } - - ai.dev = -1; - if(ioctl(stream->fd, SNDCTL_ENGINEINFO, &ai) < 0){ - WARN("Unable to get audio info for device %s: %d (%s)\n", This->devnode, errno, strerror(errno)); - hr = E_FAIL; - goto exit; - } - - TRACE("OSS audioinfo:\n"); - TRACE("devnode: %s\n", ai.devnode); - TRACE("name: %s\n", ai.name); - TRACE("busy: %x\n", ai.busy); - TRACE("caps: %x\n", ai.caps); - TRACE("iformats: %x\n", ai.iformats); - TRACE("oformats: %x\n", ai.oformats); - TRACE("enabled: %d\n", ai.enabled); - TRACE("min_rate: %d\n", ai.min_rate); - TRACE("max_rate: %d\n", ai.max_rate); - TRACE("min_channels: %d\n", ai.min_channels); - TRACE("max_channels: %d\n", ai.max_channels); - - hr = setup_oss_device(mode, stream->fd, fmt, NULL); - if(FAILED(hr)) - goto exit; - - stream->fmt = clone_format(fmt); - if(!stream->fmt){ - hr = E_OUTOFMEMORY; - goto exit; - } - - stream->period_us = period / 10; - stream->period_frames = MulDiv(fmt->nSamplesPerSec, period, 10000000); + params.device = This->devnode; + params.flow = This->dataflow; + params.share = mode; + params.flags = flags; + params.duration = duration; + params.period = period; + params.fmt = fmt; + params.stream = &stream; - stream->bufsize_frames = MulDiv(duration, fmt->nSamplesPerSec, 10000000); - if(mode == AUDCLNT_SHAREMODE_EXCLUSIVE) - stream->bufsize_frames -= stream->bufsize_frames % stream->period_frames; - size = stream->bufsize_frames * fmt->nBlockAlign; - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, 0, &size, - MEM_COMMIT, PAGE_READWRITE)){ - hr = E_OUTOFMEMORY; - goto exit; + OSS_CALL(create_stream, &params); + if(FAILED(params.result)){ + LeaveCriticalSection(&g_sessions_lock); + return params.result; } This->channel_count = fmt->nChannels; This->vols = HeapAlloc(GetProcessHeap(), 0, This->channel_count * sizeof(float)); if(!This->vols){ - hr = E_OUTOFMEMORY; + params.result = E_OUTOFMEMORY; goto exit; } for(i = 0; i < This->channel_count; ++i) This->vols[i] = 1.f; - stream->share = mode; - stream->flags = flags; - stream->oss_bufsize_bytes = 0; - - hr = get_audio_session(sessionguid, This->parent, This->channel_count, + params.result = get_audio_session(sessionguid, This->parent, This->channel_count, &This->session); exit: - if(FAILED(hr)){ + if(FAILED(params.result)){ + stream_release(stream); HeapFree(GetProcessHeap(), 0, This->vols); This->vols = NULL; - CoTaskMemFree(stream->fmt); - if(stream->fd >= 0) close(stream->fd); - if(stream->local_buffer){ - size = 0; - NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, &size, MEM_RELEASE); - } - pthread_mutex_destroy(&stream->lock); - HeapFree(GetProcessHeap(), 0, stream); } else { list_add_tail(&This->session->clients, &This->entry); This->stream = stream; @@ -1014,7 +776,7 @@ exit: LeaveCriticalSection(&g_sessions_lock); - return hr; + return params.result; } static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient3 *iface, diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 389ec73ee10..628d0c5818a 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -31,6 +31,7 @@ #include <unistd.h> #include <errno.h> #include <sys/soundcard.h> +#include <pthread.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -45,6 +46,30 @@ WINE_DEFAULT_DEBUG_CHANNEL(oss); +/* copied from kernelbase */ +static int muldiv( int a, int b, int c ) +{ + LONGLONG ret; + + if (!c) return -1; + + /* We want to deal with a positive divisor to simplify the logic. */ + if (c < 0) + { + a = -a; + c = -c; + } + + /* If the result is positive, we "add" to round. else, we subtract to round. */ + if ((a < 0 && b < 0) || (a >= 0 && b >= 0)) + ret = (((LONGLONG)a * b) + (c / 2)) / c; + else + ret = (((LONGLONG)a * b) - (c / 2)) / c; + + if (ret > 2147483647 || ret < -2147483647) return -1; + return ret; +} + static NTSTATUS test_connect(void *args) { struct test_connect_params *params = args; @@ -466,6 +491,118 @@ static HRESULT setup_oss_device(AUDCLNT_SHAREMODE share, int fd, return ret; } +static NTSTATUS create_stream(void *args) +{ + struct create_stream_params *params = args; + WAVEFORMATEXTENSIBLE *fmtex; + struct oss_stream *stream; + oss_audioinfo ai; + SIZE_T size; + + stream = calloc(1, sizeof(*stream)); + if(!stream){ + params->result = E_OUTOFMEMORY; + return STATUS_SUCCESS; + } + + stream->flow = params->flow; + pthread_mutex_init(&stream->lock, NULL); + + stream->fd = open_device(params->device, params->flow); + if(stream->fd < 0){ + WARN("Unable to open device %s: %d (%s)\n", params->device, errno, strerror(errno)); + params->result = AUDCLNT_E_DEVICE_INVALIDATED; + goto exit; + } + + ai.dev = -1; + if(ioctl(stream->fd, SNDCTL_ENGINEINFO, &ai) < 0){ + WARN("Unable to get audio info for device %s: %d (%s)\n", params->device, errno, strerror(errno)); + params->result = E_FAIL; + goto exit; + } + + TRACE("OSS audioinfo:\n"); + TRACE("devnode: %s\n", ai.devnode); + TRACE("name: %s\n", ai.name); + TRACE("busy: %x\n", ai.busy); + TRACE("caps: %x\n", ai.caps); + TRACE("iformats: %x\n", ai.iformats); + TRACE("oformats: %x\n", ai.oformats); + TRACE("enabled: %d\n", ai.enabled); + TRACE("min_rate: %d\n", ai.min_rate); + TRACE("max_rate: %d\n", ai.max_rate); + TRACE("min_channels: %d\n", ai.min_channels); + TRACE("max_channels: %d\n", ai.max_channels); + + params->result = setup_oss_device(params->share, stream->fd, params->fmt, NULL); + if(FAILED(params->result)) + goto exit; + + fmtex = clone_format(params->fmt); + if(!fmtex){ + params->result = E_OUTOFMEMORY; + goto exit; + } + stream->fmt = &fmtex->Format; + + stream->period_us = params->period / 10; + stream->period_frames = muldiv(params->fmt->nSamplesPerSec, params->period, 10000000); + + stream->bufsize_frames = muldiv(params->duration, params->fmt->nSamplesPerSec, 10000000); + if(params->share == AUDCLNT_SHAREMODE_EXCLUSIVE) + stream->bufsize_frames -= stream->bufsize_frames % stream->period_frames; + size = stream->bufsize_frames * params->fmt->nBlockAlign; + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, 0, &size, + MEM_COMMIT, PAGE_READWRITE)){ + params->result = E_OUTOFMEMORY; + goto exit; + } + + stream->share = params->share; + stream->flags = params->flags; + stream->oss_bufsize_bytes = 0; + +exit: + if(FAILED(params->result)){ + if(stream->fd >= 0) close(stream->fd); + if(stream->local_buffer){ + size = 0; + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, &size, MEM_RELEASE); + } + pthread_mutex_destroy(&stream->lock); + free(stream->fmt); + free(stream); + }else{ + *params->stream = stream; + } + + return STATUS_SUCCESS; +} + +static NTSTATUS release_stream(void *args) +{ + struct release_stream_params *params = args; + struct oss_stream *stream = params->stream; + SIZE_T size; + + close(stream->fd); + if(stream->local_buffer){ + size = 0; + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, &size, MEM_RELEASE); + } + if(stream->tmp_buffer){ + size = 0; + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, &size, MEM_RELEASE); + } + free(stream->fmt); + pthread_mutex_destroy(&stream->lock); + free(stream); + + params->result = S_OK; + return STATUS_SUCCESS; +} + static NTSTATUS is_format_supported(void *args) { struct is_format_supported_params *params = args; @@ -599,6 +736,8 @@ unixlib_entry_t __wine_unix_call_funcs[] = { test_connect, get_endpoint_ids, + create_stream, + release_stream, is_format_supported, get_mix_format, }; diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 8f82518b10e..c0a0b25c374 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -69,6 +69,25 @@ struct get_endpoint_ids_params unsigned int default_idx; }; +struct create_stream_params +{ + const char *device; + EDataFlow flow; + AUDCLNT_SHAREMODE share; + UINT flags; + REFERENCE_TIME duration; + REFERENCE_TIME period; + const WAVEFORMATEX *fmt; + HRESULT result; + struct oss_stream **stream; +}; + +struct release_stream_params +{ + struct oss_stream *stream; + HRESULT result; +}; + struct is_format_supported_params { const char *device; @@ -91,6 +110,8 @@ enum oss_funcs { oss_test_connect, oss_get_endpoint_ids, + oss_create_stream, + oss_release_stream, oss_is_format_supported, oss_get_mix_format, }; -- 2.25.1

2 1

[PATCH 5/6] wineoss: Use NtAllocateVirtualMemory() to alloc the buffers returned to the user.
by Huw Davies April 12, 2022

April 12, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmdevdrv.c | 51 +++++++++++++++++++++++++++---------- 1 file changed, 37 insertions(+), 14 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 2fd2e3c08ad..56b188424fb 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -551,9 +551,16 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) } HeapFree(GetProcessHeap(), 0, This->vols); if(stream){ + SIZE_T size; close(stream->fd); - HeapFree(GetProcessHeap(), 0, stream->local_buffer); - HeapFree(GetProcessHeap(), 0, stream->tmp_buffer); + if(stream->local_buffer){ + size = 0; + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, &size, MEM_RELEASE); + } + if(stream->tmp_buffer){ + size = 0; + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, &size, MEM_RELEASE); + } CoTaskMemFree(stream->fmt); pthread_mutex_destroy(&stream->lock); HeapFree(GetProcessHeap(), 0, stream); @@ -855,6 +862,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, ACImpl *This = impl_from_IAudioClient3(iface); struct oss_stream *stream; oss_audioinfo ai; + SIZE_T size; int i; HRESULT hr; @@ -963,9 +971,9 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, stream->bufsize_frames = MulDiv(duration, fmt->nSamplesPerSec, 10000000); if(mode == AUDCLNT_SHAREMODE_EXCLUSIVE) stream->bufsize_frames -= stream->bufsize_frames % stream->period_frames; - stream->local_buffer = HeapAlloc(GetProcessHeap(), 0, - stream->bufsize_frames * fmt->nBlockAlign); - if(!stream->local_buffer){ + size = stream->bufsize_frames * fmt->nBlockAlign; + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, 0, &size, + MEM_COMMIT, PAGE_READWRITE)){ hr = E_OUTOFMEMORY; goto exit; } @@ -992,7 +1000,10 @@ exit: This->vols = NULL; CoTaskMemFree(stream->fmt); if(stream->fd >= 0) close(stream->fd); - HeapFree(GetProcessHeap(), 0, stream->local_buffer); + if(stream->local_buffer){ + size = 0; + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, &size, MEM_RELEASE); + } pthread_mutex_destroy(&stream->lock); HeapFree(GetProcessHeap(), 0, stream); } else { @@ -1707,6 +1718,7 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, ACImpl *This = impl_from_IAudioRenderClient(iface); struct oss_stream *stream = This->stream; UINT32 write_pos; + SIZE_T size; TRACE("(%p)->(%u, %p)\n", This, frames, data); @@ -1736,10 +1748,15 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, (stream->lcl_offs_frames + stream->held_frames) % stream->bufsize_frames; if(write_pos + frames > stream->bufsize_frames){ if(stream->tmp_buffer_frames < frames){ - HeapFree(GetProcessHeap(), 0, stream->tmp_buffer); - stream->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, - frames * stream->fmt->nBlockAlign); - if(!stream->tmp_buffer){ + if(stream->tmp_buffer){ + size = 0; + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, &size, MEM_RELEASE); + stream->tmp_buffer = NULL; + } + size = frames * stream->fmt->nBlockAlign; + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, &size, + MEM_COMMIT, PAGE_READWRITE)){ + stream->tmp_buffer_frames = 0; oss_unlock(stream); return E_OUTOFMEMORY; } @@ -1875,6 +1892,7 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, { ACImpl *This = impl_from_IAudioCaptureClient(iface); struct oss_stream *stream = This->stream; + SIZE_T size; TRACE("(%p)->(%p, %p, %p, %p, %p)\n", This, data, frames, flags, devpos, qpcpos); @@ -1907,10 +1925,15 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, if(stream->lcl_offs_frames + *frames > stream->bufsize_frames){ UINT32 chunk_bytes, offs_bytes, frames_bytes; if(stream->tmp_buffer_frames < *frames){ - HeapFree(GetProcessHeap(), 0, stream->tmp_buffer); - stream->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, - *frames * stream->fmt->nBlockAlign); - if(!stream->tmp_buffer){ + if(stream->tmp_buffer){ + size = 0; + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, &size, MEM_RELEASE); + stream->tmp_buffer = NULL; + } + size = *frames * stream->fmt->nBlockAlign; + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, &size, + MEM_COMMIT, PAGE_READWRITE)){ + stream->tmp_buffer_frames = 0; oss_unlock(stream); return E_OUTOFMEMORY; } -- 2.25.1

3 3

[PATCH 4/6] wineoss: Use a pthread mutex for the stream lock.
by Huw Davies April 12, 2022

April 12, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmdevdrv.c | 167 +++++++++++++++++------------------- dlls/wineoss.drv/unixlib.h | 2 + 2 files changed, 83 insertions(+), 86 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 13037e07821..2fd2e3c08ad 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -33,6 +33,7 @@ #include <unistd.h> #include <math.h> #include <sys/soundcard.h> +#include <pthread.h> #include "windef.h" #include "winbase.h" @@ -115,8 +116,6 @@ struct ACImpl { HANDLE timer; - CRITICAL_SECTION lock; - AudioSession *session; AudioSessionWrapper *session_wrapper; @@ -261,6 +260,16 @@ int WINAPI AUDDRV_GetPriority(void) return params.priority; } +static void oss_lock(struct oss_stream *stream) +{ + pthread_mutex_lock(&stream->lock); +} + +static void oss_unlock(struct oss_stream *stream) +{ + pthread_mutex_unlock(&stream->lock); +} + static void set_device_guid(EDataFlow flow, HKEY drv_key, const WCHAR *key_name, GUID *guid) { @@ -344,9 +353,9 @@ static void set_stream_volumes(ACImpl *This) { struct oss_stream *stream = This->stream; - EnterCriticalSection(&This->lock); + oss_lock(stream); stream->mute = This->session->mute; - LeaveCriticalSection(&This->lock); + oss_unlock(stream); } static const OSSDevice *get_ossdevice_from_guid(const GUID *guid) @@ -470,9 +479,6 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, This->IAudioClock2_iface.lpVtbl = &AudioClock2_Vtbl; This->IAudioStreamVolume_iface.lpVtbl = &AudioStreamVolume_Vtbl; - InitializeCriticalSection(&This->lock); - This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ACImpl.lock"); - This->parent = dev; IMMDevice_AddRef(This->parent); @@ -538,8 +544,6 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) IAudioClient3_Stop(iface); IMMDevice_Release(This->parent); IUnknown_Release(This->pUnkFTMarshal); - This->lock.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&This->lock); if(This->session){ EnterCriticalSection(&g_sessions_lock); list_remove(&This->entry); @@ -551,6 +555,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) HeapFree(GetProcessHeap(), 0, stream->local_buffer); HeapFree(GetProcessHeap(), 0, stream->tmp_buffer); CoTaskMemFree(stream->fmt); + pthread_mutex_destroy(&stream->lock); HeapFree(GetProcessHeap(), 0, stream); } HeapFree(GetProcessHeap(), 0, This); @@ -913,6 +918,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, return E_OUTOFMEMORY; } stream->flow = This->dataflow; + pthread_mutex_init(&stream->lock, NULL); stream->fd = open_device(This->devnode, This->dataflow); if(stream->fd < 0){ @@ -987,6 +993,7 @@ exit: CoTaskMemFree(stream->fmt); if(stream->fd >= 0) close(stream->fd); HeapFree(GetProcessHeap(), 0, stream->local_buffer); + pthread_mutex_destroy(&stream->lock); HeapFree(GetProcessHeap(), 0, stream); } else { list_add_tail(&This->session->clients, &This->entry); @@ -1010,18 +1017,16 @@ static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient3 *iface, if(!frames) return E_POINTER; - EnterCriticalSection(&This->lock); - - if(!This->stream){ - LeaveCriticalSection(&This->lock); + if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - } + + oss_lock(stream); *frames = stream->bufsize_frames; TRACE("buffer size: %u\n", *frames); - LeaveCriticalSection(&This->lock); + oss_unlock(stream); return S_OK; } @@ -1037,18 +1042,16 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, if(!latency) return E_POINTER; - EnterCriticalSection(&This->lock); - - if(!This->stream){ - LeaveCriticalSection(&This->lock); + if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - } + + oss_lock(stream); /* pretend we process audio in Period chunks, so max latency includes * the period time. Some native machines add .6666ms in shared mode. */ *latency = (REFERENCE_TIME)stream->period_us * 10 + 6666; - LeaveCriticalSection(&This->lock); + oss_unlock(stream); return S_OK; } @@ -1064,18 +1067,16 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface, if(!numpad) return E_POINTER; - EnterCriticalSection(&This->lock); - - if(!This->stream){ - LeaveCriticalSection(&This->lock); + if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - } + + oss_lock(stream); *numpad = stream->held_frames; TRACE("padding: %u\n", *numpad); - LeaveCriticalSection(&This->lock); + oss_unlock(stream); return S_OK; } @@ -1310,7 +1311,7 @@ static void CALLBACK oss_period_callback(void *user, BOOLEAN timer) ACImpl *This = user; struct oss_stream *stream = This->stream; - EnterCriticalSection(&This->lock); + oss_lock(stream); if(stream->playing){ if(stream->flow == eRender && stream->held_frames) @@ -1319,10 +1320,10 @@ static void CALLBACK oss_period_callback(void *user, BOOLEAN timer) oss_read_data(stream); } - LeaveCriticalSection(&This->lock); - if(stream->event) SetEvent(stream->event); + + oss_unlock(stream); } static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) @@ -1333,22 +1334,22 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) TRACE("(%p)\n", This); EnterCriticalSection(&g_sessions_lock); - EnterCriticalSection(&This->lock); if(!This->stream){ - LeaveCriticalSection(&This->lock); LeaveCriticalSection(&g_sessions_lock); return AUDCLNT_E_NOT_INITIALIZED; } + oss_lock(stream); + if((stream->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK) && !stream->event){ - LeaveCriticalSection(&This->lock); + oss_unlock(stream); LeaveCriticalSection(&g_sessions_lock); return AUDCLNT_E_EVENTHANDLE_NOT_SET; } if(stream->playing){ - LeaveCriticalSection(&This->lock); + oss_unlock(stream); LeaveCriticalSection(&g_sessions_lock); return AUDCLNT_E_NOT_STOPPED; } @@ -1362,7 +1363,7 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) stream->playing = TRUE; - LeaveCriticalSection(&This->lock); + oss_unlock(stream); LeaveCriticalSection(&g_sessions_lock); return S_OK; @@ -1375,22 +1376,20 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface) TRACE("(%p)\n", This); - EnterCriticalSection(&This->lock); - - if(!This->stream){ - LeaveCriticalSection(&This->lock); + if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - } + + oss_lock(stream); if(!stream->playing){ - LeaveCriticalSection(&This->lock); + oss_unlock(stream); return S_FALSE; } stream->playing = FALSE; stream->in_oss_frames = 0; - LeaveCriticalSection(&This->lock); + oss_unlock(stream); return S_OK; } @@ -1402,20 +1401,18 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient3 *iface) TRACE("(%p)\n", This); - EnterCriticalSection(&This->lock); - - if(!This->stream){ - LeaveCriticalSection(&This->lock); + if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - } + + oss_lock(stream); if(stream->playing){ - LeaveCriticalSection(&This->lock); + oss_unlock(stream); return AUDCLNT_E_NOT_STOPPED; } if(stream->getbuf_last){ - LeaveCriticalSection(&This->lock); + oss_unlock(stream); return AUDCLNT_E_BUFFER_OPERATION_PENDING; } @@ -1429,7 +1426,7 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient3 *iface) stream->lcl_offs_frames = 0; stream->in_oss_frames = 0; - LeaveCriticalSection(&This->lock); + oss_unlock(stream); return S_OK; } @@ -1445,27 +1442,25 @@ static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface, if(!event) return E_INVALIDARG; - EnterCriticalSection(&This->lock); - - if(!This->stream){ - LeaveCriticalSection(&This->lock); + if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - } + + oss_lock(stream); if(!(stream->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK)){ - LeaveCriticalSection(&This->lock); + oss_unlock(stream); return AUDCLNT_E_EVENTHANDLE_NOT_EXPECTED; } if (stream->event){ - LeaveCriticalSection(&This->lock); + oss_unlock(stream); FIXME("called twice\n"); return HRESULT_FROM_WIN32(ERROR_INVALID_NAME); } stream->event = event; - LeaveCriticalSection(&This->lock); + oss_unlock(stream); return S_OK; } @@ -1720,20 +1715,20 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, *data = NULL; - EnterCriticalSection(&This->lock); + oss_lock(stream); if(stream->getbuf_last){ - LeaveCriticalSection(&This->lock); + oss_unlock(stream); return AUDCLNT_E_OUT_OF_ORDER; } if(!frames){ - LeaveCriticalSection(&This->lock); + oss_unlock(stream); return S_OK; } if(stream->held_frames + frames > stream->bufsize_frames){ - LeaveCriticalSection(&This->lock); + oss_unlock(stream); return AUDCLNT_E_BUFFER_TOO_LARGE; } @@ -1745,7 +1740,7 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, stream->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, frames * stream->fmt->nBlockAlign); if(!stream->tmp_buffer){ - LeaveCriticalSection(&This->lock); + oss_unlock(stream); return E_OUTOFMEMORY; } stream->tmp_buffer_frames = frames; @@ -1759,7 +1754,7 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, silence_buffer(stream, *data, frames); - LeaveCriticalSection(&This->lock); + oss_unlock(stream); return S_OK; } @@ -1791,21 +1786,21 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( TRACE("(%p)->(%u, %x)\n", This, written_frames, flags); - EnterCriticalSection(&This->lock); + oss_lock(stream); if(!written_frames){ stream->getbuf_last = 0; - LeaveCriticalSection(&This->lock); + oss_unlock(stream); return S_OK; } if(!stream->getbuf_last){ - LeaveCriticalSection(&This->lock); + oss_unlock(stream); return AUDCLNT_E_OUT_OF_ORDER; } if(written_frames > (stream->getbuf_last >= 0 ? stream->getbuf_last : -stream->getbuf_last)){ - LeaveCriticalSection(&This->lock); + oss_unlock(stream); return AUDCLNT_E_INVALID_SIZE; } @@ -1825,7 +1820,7 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( stream->written_frames += written_frames; stream->getbuf_last = 0; - LeaveCriticalSection(&This->lock); + oss_unlock(stream); return S_OK; } @@ -1892,16 +1887,16 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, if(!frames || !flags) return E_POINTER; - EnterCriticalSection(&This->lock); + oss_lock(stream); if(stream->getbuf_last){ - LeaveCriticalSection(&This->lock); + oss_unlock(stream); return AUDCLNT_E_OUT_OF_ORDER; } if(stream->held_frames < stream->period_frames){ *frames = 0; - LeaveCriticalSection(&This->lock); + oss_unlock(stream); return AUDCLNT_S_BUFFER_EMPTY; } @@ -1916,7 +1911,7 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, stream->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, *frames * stream->fmt->nBlockAlign); if(!stream->tmp_buffer){ - LeaveCriticalSection(&This->lock); + oss_unlock(stream); return E_OUTOFMEMORY; } stream->tmp_buffer_frames = *frames; @@ -1945,7 +1940,7 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, *qpcpos = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; } - LeaveCriticalSection(&This->lock); + oss_unlock(stream); return *frames ? S_OK : AUDCLNT_S_BUFFER_EMPTY; } @@ -1958,21 +1953,21 @@ static HRESULT WINAPI AudioCaptureClient_ReleaseBuffer( TRACE("(%p)->(%u)\n", This, done); - EnterCriticalSection(&This->lock); + oss_lock(stream); if(!done){ stream->getbuf_last = 0; - LeaveCriticalSection(&This->lock); + oss_unlock(stream); return S_OK; } if(!stream->getbuf_last){ - LeaveCriticalSection(&This->lock); + oss_unlock(stream); return AUDCLNT_E_OUT_OF_ORDER; } if(stream->getbuf_last != done){ - LeaveCriticalSection(&This->lock); + oss_unlock(stream); return AUDCLNT_E_INVALID_SIZE; } @@ -1982,7 +1977,7 @@ static HRESULT WINAPI AudioCaptureClient_ReleaseBuffer( stream->lcl_offs_frames %= stream->bufsize_frames; stream->getbuf_last = 0; - LeaveCriticalSection(&This->lock); + oss_unlock(stream); return S_OK; } @@ -1998,11 +1993,11 @@ static HRESULT WINAPI AudioCaptureClient_GetNextPacketSize( if(!frames) return E_POINTER; - EnterCriticalSection(&This->lock); + oss_lock(stream); *frames = stream->held_frames < stream->period_frames ? 0 : stream->period_frames; - LeaveCriticalSection(&This->lock); + oss_unlock(stream); return S_OK; } @@ -2079,7 +2074,7 @@ static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, if(!pos) return E_POINTER; - EnterCriticalSection(&This->lock); + oss_lock(stream); if(stream->flow == eRender){ *pos = stream->written_frames - stream->held_frames; @@ -2108,7 +2103,7 @@ static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, if(stream->share == AUDCLNT_SHAREMODE_SHARED) *pos *= stream->fmt->nBlockAlign; - LeaveCriticalSection(&This->lock); + oss_unlock(stream); if(qpctime){ LARGE_INTEGER stamp, freq; @@ -2275,14 +2270,14 @@ static HRESULT WINAPI AudioSessionControl_GetState(IAudioSessionControl2 *iface, } LIST_FOR_EACH_ENTRY(client, &This->session->clients, ACImpl, entry){ - EnterCriticalSection(&client->lock); + oss_lock(client->stream); if(client->stream->playing){ *state = AudioSessionStateActive; - LeaveCriticalSection(&client->lock); + oss_unlock(client->stream); LeaveCriticalSection(&g_sessions_lock); return S_OK; } - LeaveCriticalSection(&client->lock); + oss_unlock(client->stream); } LeaveCriticalSection(&g_sessions_lock); diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 26fd6d08e7e..8f82518b10e 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -35,6 +35,8 @@ struct oss_stream BYTE *local_buffer, *tmp_buffer; INT32 getbuf_last; /* <0 when using tmp_buffer */ + + pthread_mutex_t lock; }; /* From <dlls/mmdevapi/mmdevapi.h> */ -- 2.25.1

2 1

[PATCH 3/6] wineoss: Use the sessions lock to lock the client's data.
by Huw Davies April 12, 2022

April 12, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmdevdrv.c | 44 ++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 2b490482df0..13037e07821 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -901,17 +901,14 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, } EnterCriticalSection(&g_sessions_lock); - EnterCriticalSection(&This->lock); if(This->stream){ - LeaveCriticalSection(&This->lock); LeaveCriticalSection(&g_sessions_lock); return AUDCLNT_E_ALREADY_INITIALIZED; } stream = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This->stream)); if(!stream){ - LeaveCriticalSection(&This->lock); LeaveCriticalSection(&g_sessions_lock); return E_OUTOFMEMORY; } @@ -991,11 +988,9 @@ exit: if(stream->fd >= 0) close(stream->fd); HeapFree(GetProcessHeap(), 0, stream->local_buffer); HeapFree(GetProcessHeap(), 0, stream); - LeaveCriticalSection(&This->lock); } else { list_add_tail(&This->session->clients, &This->entry); This->stream = stream; - LeaveCriticalSection(&This->lock); set_stream_volumes(This); } @@ -1337,20 +1332,24 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) TRACE("(%p)\n", This); + EnterCriticalSection(&g_sessions_lock); EnterCriticalSection(&This->lock); if(!This->stream){ LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return AUDCLNT_E_NOT_INITIALIZED; } if((stream->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK) && !stream->event){ LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return AUDCLNT_E_EVENTHANDLE_NOT_SET; } if(stream->playing){ LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return AUDCLNT_E_NOT_STOPPED; } @@ -1364,6 +1363,7 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) stream->playing = TRUE; LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return S_OK; } @@ -1481,23 +1481,23 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, return E_POINTER; *ppv = NULL; - EnterCriticalSection(&This->lock); + EnterCriticalSection(&g_sessions_lock); if(!This->stream){ - LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return AUDCLNT_E_NOT_INITIALIZED; } if(IsEqualIID(riid, &IID_IAudioRenderClient)){ if(This->dataflow != eRender){ - LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return AUDCLNT_E_WRONG_ENDPOINT_TYPE; } IAudioRenderClient_AddRef(&This->IAudioRenderClient_iface); *ppv = &This->IAudioRenderClient_iface; }else if(IsEqualIID(riid, &IID_IAudioCaptureClient)){ if(This->dataflow != eCapture){ - LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return AUDCLNT_E_WRONG_ENDPOINT_TYPE; } IAudioCaptureClient_AddRef(&This->IAudioCaptureClient_iface); @@ -1512,7 +1512,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, if(!This->session_wrapper){ This->session_wrapper = AudioSessionWrapper_Create(This); if(!This->session_wrapper){ - LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return E_OUTOFMEMORY; } }else @@ -1523,7 +1523,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, if(!This->session_wrapper){ This->session_wrapper = AudioSessionWrapper_Create(This); if(!This->session_wrapper){ - LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return E_OUTOFMEMORY; } }else @@ -1534,7 +1534,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, if(!This->session_wrapper){ This->session_wrapper = AudioSessionWrapper_Create(This); if(!This->session_wrapper){ - LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return E_OUTOFMEMORY; } }else @@ -1544,11 +1544,11 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, } if(*ppv){ - LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return S_OK; } - LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); FIXME("stub %s\n", debugstr_guid(riid)); return E_NOINTERFACE; @@ -2245,9 +2245,9 @@ static ULONG WINAPI AudioSessionControl_Release(IAudioSessionControl2 *iface) TRACE("(%p) Refcount now %u\n", This, ref); if(!ref){ if(This->client){ - EnterCriticalSection(&This->client->lock); + EnterCriticalSection(&g_sessions_lock); This->client->session_wrapper = NULL; - LeaveCriticalSection(&This->client->lock); + LeaveCriticalSection(&g_sessions_lock); AudioClient_Release(&This->client->IAudioClient3_iface); } HeapFree(GetProcessHeap(), 0, This); @@ -2635,14 +2635,14 @@ static HRESULT WINAPI AudioStreamVolume_SetChannelVolume( if(index >= This->channel_count) return E_INVALIDARG; - EnterCriticalSection(&This->lock); + EnterCriticalSection(&g_sessions_lock); This->vols[index] = level; TRACE("OSS doesn't support setting volume\n"); set_stream_volumes(This); - LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return S_OK; } @@ -2679,7 +2679,7 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( if(count != This->channel_count) return E_INVALIDARG; - EnterCriticalSection(&This->lock); + EnterCriticalSection(&g_sessions_lock); for(i = 0; i < count; ++i) This->vols[i] = levels[i]; @@ -2687,7 +2687,7 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( TRACE("OSS doesn't support setting volume\n"); set_stream_volumes(This); - LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return S_OK; } @@ -2706,12 +2706,12 @@ static HRESULT WINAPI AudioStreamVolume_GetAllVolumes( if(count != This->channel_count) return E_INVALIDARG; - EnterCriticalSection(&This->lock); + EnterCriticalSection(&g_sessions_lock); for(i = 0; i < count; ++i) levels[i] = This->vols[i]; - LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return S_OK; } -- 2.25.1

2 1

[PATCH 2/6] wineoss: Store the mute state in the stream.
by Huw Davies April 12, 2022

April 12, 2022

Despite only mute being supported in this driver, set_stream_volumes() is called whenever the volume info is changed to match the other drivers and to allow a more complete volume implementation in the future. The implementation will eventually move to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmdevdrv.c | 36 +++++++++++++++++++++++++++++++----- dlls/wineoss.drv/unixlib.h | 2 +- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 238ed5af0ba..2b490482df0 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -340,6 +340,15 @@ static int open_device(const char *device, EDataFlow flow) return open(device, flags, 0); } +static void set_stream_volumes(ACImpl *This) +{ + struct oss_stream *stream = This->stream; + + EnterCriticalSection(&This->lock); + stream->mute = This->session->mute; + LeaveCriticalSection(&This->lock); +} + static const OSSDevice *get_ossdevice_from_guid(const GUID *guid) { OSSDevice *dev_item; @@ -982,12 +991,14 @@ exit: if(stream->fd >= 0) close(stream->fd); HeapFree(GetProcessHeap(), 0, stream->local_buffer); HeapFree(GetProcessHeap(), 0, stream); + LeaveCriticalSection(&This->lock); } else { list_add_tail(&This->session->clients, &This->entry); This->stream = stream; + LeaveCriticalSection(&This->lock); + set_stream_volumes(This); } - LeaveCriticalSection(&This->lock); LeaveCriticalSection(&g_sessions_lock); return hr; @@ -1164,7 +1175,7 @@ static void silence_buffer(struct oss_stream *stream, BYTE *buffer, UINT32 frame memset(buffer, 0, frames * stream->fmt->nBlockAlign); } -static void oss_write_data(struct oss_stream *stream, BOOL mute) +static void oss_write_data(struct oss_stream *stream) { ssize_t written_bytes; UINT32 written_frames, in_oss_frames, write_limit, max_period, write_offs_frames, new_frames; @@ -1235,7 +1246,7 @@ static void oss_write_data(struct oss_stream *stream, BOOL mute) buf = stream->local_buffer + write_offs_frames * stream->fmt->nBlockAlign; - if(mute) + if(stream->mute) silence_buffer(stream, buf, to_write_frames); written_bytes = write(stream->fd, buf, to_write_bytes); @@ -1259,7 +1270,7 @@ static void oss_write_data(struct oss_stream *stream, BOOL mute) to_write_frames = min(write_limit - written_frames, new_frames - written_frames); to_write_bytes = to_write_frames * stream->fmt->nBlockAlign; - if(mute) + if(stream->mute) silence_buffer(stream, stream->local_buffer, to_write_frames); TRACE("wrapping to write %lu frames from beginning\n", to_write_frames); @@ -1308,7 +1319,7 @@ static void CALLBACK oss_period_callback(void *user, BOOLEAN timer) if(stream->playing){ if(stream->flow == eRender && stream->held_frames) - oss_write_data(stream, This->session->mute); + oss_write_data(stream); else if(stream->flow == eCapture) oss_read_data(stream); } @@ -2476,6 +2487,7 @@ static HRESULT WINAPI SimpleAudioVolume_SetMasterVolume( { AudioSessionWrapper *This = impl_from_ISimpleAudioVolume(iface); AudioSession *session = This->session; + ACImpl *client; TRACE("(%p)->(%f, %s)\n", session, level, wine_dbgstr_guid(context)); @@ -2490,6 +2502,8 @@ static HRESULT WINAPI SimpleAudioVolume_SetMasterVolume( session->master_vol = level; TRACE("OSS doesn't support setting volume\n"); + LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry) + set_stream_volumes(client); LeaveCriticalSection(&g_sessions_lock); @@ -2517,6 +2531,7 @@ static HRESULT WINAPI SimpleAudioVolume_SetMute(ISimpleAudioVolume *iface, { AudioSessionWrapper *This = impl_from_ISimpleAudioVolume(iface); AudioSession *session = This->session; + ACImpl *client; TRACE("(%p)->(%u, %s)\n", session, mute, debugstr_guid(context)); @@ -2524,6 +2539,9 @@ static HRESULT WINAPI SimpleAudioVolume_SetMute(ISimpleAudioVolume *iface, session->mute = mute; + LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry) + set_stream_volumes(client); + LeaveCriticalSection(&g_sessions_lock); return S_OK; @@ -2622,6 +2640,7 @@ static HRESULT WINAPI AudioStreamVolume_SetChannelVolume( This->vols[index] = level; TRACE("OSS doesn't support setting volume\n"); + set_stream_volumes(This); LeaveCriticalSection(&This->lock); @@ -2666,6 +2685,7 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( This->vols[i] = levels[i]; TRACE("OSS doesn't support setting volume\n"); + set_stream_volumes(This); LeaveCriticalSection(&This->lock); @@ -2763,6 +2783,7 @@ static HRESULT WINAPI ChannelAudioVolume_SetChannelVolume( { AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); AudioSession *session = This->session; + ACImpl *client; TRACE("(%p)->(%d, %f, %s)\n", session, index, level, wine_dbgstr_guid(context)); @@ -2781,6 +2802,8 @@ static HRESULT WINAPI ChannelAudioVolume_SetChannelVolume( session->channel_vols[index] = level; TRACE("OSS doesn't support setting volume\n"); + LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry) + set_stream_volumes(client); LeaveCriticalSection(&g_sessions_lock); @@ -2812,6 +2835,7 @@ static HRESULT WINAPI ChannelAudioVolume_SetAllVolumes( { AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); AudioSession *session = This->session; + ACImpl *client; int i; TRACE("(%p)->(%d, %p, %s)\n", session, count, levels, @@ -2832,6 +2856,8 @@ static HRESULT WINAPI ChannelAudioVolume_SetAllVolumes( session->channel_vols[i] = levels[i]; TRACE("OSS doesn't support setting volume\n"); + LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry) + set_stream_volumes(client); LeaveCriticalSection(&g_sessions_lock); diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index e0817cbc9c1..26fd6d08e7e 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -28,7 +28,7 @@ struct oss_stream int fd; - BOOL playing; + BOOL playing, mute; UINT64 written_frames, last_pos_frames; UINT32 period_us, period_frames, bufsize_frames, held_frames, tmp_buffer_frames, in_oss_frames; UINT32 oss_bufsize_bytes, lcl_offs_frames; /* offs into local_buffer where valid data starts */ -- 2.25.1

2 1

[PATCH 1/6] wineoss: Use the stream ptr to indicate the init state.
by Huw Davies April 12, 2022

April 12, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmdevdrv.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index f7c7864e2af..238ed5af0ba 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -113,7 +113,6 @@ struct ACImpl { UINT32 channel_count; struct oss_stream *stream; - BOOL initted; HANDLE timer; CRITICAL_SECTION lock; @@ -532,7 +531,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) IUnknown_Release(This->pUnkFTMarshal); This->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->lock); - if(This->initted){ + if(This->session){ EnterCriticalSection(&g_sessions_lock); list_remove(&This->entry); LeaveCriticalSection(&g_sessions_lock); @@ -895,7 +894,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, EnterCriticalSection(&g_sessions_lock); EnterCriticalSection(&This->lock); - if(This->initted){ + if(This->stream){ LeaveCriticalSection(&This->lock); LeaveCriticalSection(&g_sessions_lock); return AUDCLNT_E_ALREADY_INITIALIZED; @@ -986,7 +985,6 @@ exit: } else { list_add_tail(&This->session->clients, &This->entry); This->stream = stream; - This->initted = TRUE; } LeaveCriticalSection(&This->lock); @@ -1008,7 +1006,7 @@ static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient3 *iface, EnterCriticalSection(&This->lock); - if(!This->initted){ + if(!This->stream){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_NOT_INITIALIZED; } @@ -1035,7 +1033,7 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, EnterCriticalSection(&This->lock); - if(!This->initted){ + if(!This->stream){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_NOT_INITIALIZED; } @@ -1062,7 +1060,7 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface, EnterCriticalSection(&This->lock); - if(!This->initted){ + if(!This->stream){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_NOT_INITIALIZED; } @@ -1330,7 +1328,7 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) EnterCriticalSection(&This->lock); - if(!This->initted){ + if(!This->stream){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_NOT_INITIALIZED; } @@ -1368,7 +1366,7 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface) EnterCriticalSection(&This->lock); - if(!This->initted){ + if(!This->stream){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_NOT_INITIALIZED; } @@ -1395,7 +1393,7 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient3 *iface) EnterCriticalSection(&This->lock); - if(!This->initted){ + if(!This->stream){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_NOT_INITIALIZED; } @@ -1438,7 +1436,7 @@ static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface, EnterCriticalSection(&This->lock); - if(!This->initted){ + if(!This->stream){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_NOT_INITIALIZED; } @@ -1474,7 +1472,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, EnterCriticalSection(&This->lock); - if(!This->initted){ + if(!This->stream){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_NOT_INITIALIZED; } -- 2.25.1

2 1

[PATCH v2 1/2] d2d1/tests: Add tests for GetImageLocalBounds().
by Ziqing Hui April 12, 2022

April 12, 2022

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v2: Test changing context dpi and unit mode. dlls/d2d1/tests/d2d1.c | 94 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 826526d9d38..cd068f78bfa 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -10764,6 +10764,99 @@ static void test_stroke_contains_point(BOOL d3d11) ID2D1Factory_Release(factory); } +static void test_image_bounds(BOOL d3d11) +{ + D2D1_BITMAP_PROPERTIES bitmap_desc; + struct d2d1_test_context ctx; + ID2D1DeviceContext *context; + D2D1_UNIT_MODE unit_mode; + ID2D1Factory1 *factory; + ID2D1Bitmap *bitmap; + float dpi_x, dpi_y; + D2D_RECT_F bounds; + D2D1_SIZE_F size; + unsigned int i; + HRESULT hr; + + const struct bitmap_bounds_test + { + float dpi_x; + float dpi_y; + D2D_SIZE_U pixel_size; + } + bitmap_bounds_tests[] = + { + {96.0f, 96.0f, {100, 100}}, + {48.0f, 48.0f, {100, 100}}, + {192.0f, 192.0f, {100, 100}}, + {96.0f, 10.0f, {100, 100}}, + {50.0f, 100.0f, {100, 100}}, + {150.0f, 150.0f, {100, 100}}, + {48.0f, 48.0f, {1, 1}}, + {192.0f, 192.0f, {1, 1}}, + }; + + if (!init_test_context(&ctx, d3d11)) + return; + + if (FAILED(D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory1, NULL, (void **)&factory))) + { + win_skip("ID2D1Factory1 is not supported.\n"); + release_test_context(&ctx); + return; + } + + hr = ID2D1RenderTarget_QueryInterface(ctx.rt, &IID_ID2D1DeviceContext, (void **)&context); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + for (i = 0; i < ARRAY_SIZE(bitmap_bounds_tests); ++i) + { + const struct bitmap_bounds_test *test = &bitmap_bounds_tests[i]; + winetest_push_context("Test %u", i); + + bitmap_desc.dpiX = test->dpi_x; + bitmap_desc.dpiY = test->dpi_y; + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + hr = ID2D1RenderTarget_CreateBitmap(ctx.rt, test->pixel_size, NULL, 0, &bitmap_desc, &bitmap); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + set_rect(&bounds, 0.0f, 0.0f, 0.0f, 0.0f); + size = ID2D1Bitmap_GetSize(bitmap); + ID2D1DeviceContext_GetImageLocalBounds(context, (ID2D1Image *)bitmap, &bounds); + todo_wine ok(compare_rect(&bounds, 0.0f, 0.0f, size.width, size.height, 0), + "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", + bounds.left, bounds.top, bounds.right, bounds.bottom, 0.0f, 0.0f, size.width, size.height); + + /* Test bitmap local bounds after changing context dpi */ + ID2D1DeviceContext_GetDpi(context, &dpi_x, &dpi_y); + ID2D1DeviceContext_SetDpi(context, dpi_x * 2.0f, dpi_y * 2.0f); + ID2D1DeviceContext_GetImageLocalBounds(context, (ID2D1Image *)bitmap, &bounds); + todo_wine ok(compare_rect(&bounds, 0.0f, 0.0f, size.width, size.height, 0), + "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", + bounds.left, bounds.top, bounds.right, bounds.bottom, 0.0f, 0.0f, size.width, size.height); + ID2D1DeviceContext_SetDpi(context, dpi_x, dpi_y); + + /* Test bitmap local bounds after changing context unit mode */ + unit_mode = ID2D1DeviceContext_GetUnitMode(context); + ok(unit_mode == D2D1_UNIT_MODE_DIPS, "Got unexpected unit mode %#x.\n", unit_mode); + ID2D1DeviceContext_SetUnitMode(context, D2D1_UNIT_MODE_PIXELS); + ID2D1DeviceContext_GetImageLocalBounds(context, (ID2D1Image *)bitmap, &bounds); + todo_wine ok(compare_rect(&bounds, 0.0f, 0.0f, test->pixel_size.width, test->pixel_size.height, 0), + "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", + bounds.left, bounds.top, bounds.right, bounds.bottom, 0.0f, 0.0f, + (float)test->pixel_size.width, (float)test->pixel_size.height); + ID2D1DeviceContext_SetUnitMode(context, unit_mode); + + ID2D1Bitmap_Release(bitmap); + winetest_pop_context(); + } + + ID2D1DeviceContext_Release(context); + ID2D1Factory1_Release(factory); + release_test_context(&ctx); +} + START_TEST(d2d1) { HMODULE d2d1_dll = GetModuleHandleA("d2d1.dll"); @@ -10835,6 +10928,7 @@ START_TEST(d2d1) queue_test(test_effect_crop); queue_test(test_effect_grayscale); queue_d3d10_test(test_stroke_contains_point); + queue_test(test_image_bounds); run_queued_tests(); } -- 2.25.1

3 4

[PATCH 8/8] winex11: Directly use win32u for GDI functions in more places.
by Jacek Caban April 12, 2022

April 12, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/brush.c | 6 +++--- dlls/winex11.drv/event.c | 4 ++-- dlls/winex11.drv/init.c | 15 +++++++++------ dlls/winex11.drv/mouse.c | 40 ++++++++++++++++++++------------------- dlls/winex11.drv/opengl.c | 17 ++++++++++------- dlls/winex11.drv/pen.c | 10 +++++----- 6 files changed, 50 insertions(+), 42 deletions(-)

2 1

[PATCH 7/8] winex11: Directly use win32u for GDI functions in xrender.c.
by Jacek Caban April 12, 2022

April 12, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/xrender.c | 60 +++++++++++++++++++++++--------------- 1 file changed, 37 insertions(+), 23 deletions(-)

2 1

[PATCH 6/8] winex11: Directly use win32u for GDI functions in palette.c.
by Jacek Caban April 12, 2022

April 12, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/palette.c | 39 +++++++++++++++++++------------------- dlls/winex11.drv/x11drv.h | 5 +++++ 2 files changed, 25 insertions(+), 19 deletions(-)

2 1

[PATCH 5/8] winex11: Directly use win32u for GDI functions in graphics.c.
by Jacek Caban April 12, 2022

April 12, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/graphics.c | 122 +++++++++++++++++++++--------------- dlls/winex11.drv/x11drv.h | 7 +++ 2 files changed, 80 insertions(+), 49 deletions(-)

2 1

[PATCH 4/8] winex11: Directly use win32u for GDI functions in window.c.
by Jacek Caban April 12, 2022

April 12, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/window.c | 111 ++++++++++++++++++++------------------ 1 file changed, 59 insertions(+), 52 deletions(-)

2 1

[PATCH 3/8] winex11: Directly use win32u for GDI functions in bitblt.c.
by Jacek Caban April 12, 2022

April 12, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/bitblt.c | 50 +++++++++++++++++++++++---------------- dlls/winex11.drv/x11drv.h | 3 +-- 2 files changed, 31 insertions(+), 22 deletions(-)

2 1

[PATCH 2/8] win32u: Implement NtGdiGetDCPoint.
by Jacek Caban April 12, 2022

April 12, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/dc.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/gdi.c | 9 +++++++++ dlls/wow64win/syscall.h | 1 + include/ntgdi.h | 8 ++++++++ 6 files changed, 56 insertions(+), 1 deletion(-)

3 2

[PATCH 1/8] win32u: Implement NtGdiGetDCDword.
by Jacek Caban April 12, 2022

April 12, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/dc.c | 67 +++++++++++++++++++++++++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/gdi.c | 9 ++++++ dlls/wow64win/syscall.h | 1 + include/ntgdi.h | 16 ++++++++++ 6 files changed, 95 insertions(+), 1 deletion(-)

2 1

[PATCH] kernel32/tests: Check against INVALID_HANDLE_VALUE for CreateActCtxW() return values.
by Zhiyi Zhang April 12, 2022

April 12, 2022

CreateActCtxW() returns INVALID_HANDLE_VALUE on error. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/kernel32/tests/actctx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index a91c46ddf89..ebe1bb86470 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -3650,7 +3650,7 @@ static void test_manifest_in_module(void) ctx.lpResourceName = (LPWSTR)124; ctx.hModule = GetModuleHandleW(NULL); handle = CreateActCtxW(&ctx); - ok(handle != 0, "CreateActCtx error %lu\n", GetLastError()); + ok(handle != INVALID_HANDLE_VALUE, "CreateActCtx error %lu\n", GetLastError()); test_basic_info(handle, __LINE__); test_detailed_info(handle, &detailed_info3, __LINE__); -- 2.32.0

1 0

[PATCH 1/2] dlls/oleaut32/tests: simplify test by using long long constants
by Eric Pouech April 12, 2022

April 12, 2022

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/oleaut32/tests/tmarshal.c | 25 ++++++++++--------------- dlls/oleaut32/tests/typelib.c | 4 ++-- dlls/oleaut32/tests/vartest.c | 12 ++++++------ 3 files changed, 18 insertions(+), 23 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index a61b1637c5e7..53861870e78b 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -39,21 +39,18 @@ static inline void release_iface_(unsigned int line, void *iface) } #define release_iface(a) release_iface_(__LINE__, a) -/* ULL suffix is not portable */ -#define ULL_CONST(dw1, dw2) ((((ULONGLONG)dw1) << 32) | (ULONGLONG)dw2) - static const WCHAR test_bstr1[] = {'f','o','o',0,'b','a','r'}; static const WCHAR test_bstr2[] = {'t','e','s','t',0}; static const WCHAR test_bstr3[] = {'q','u','x',0}; static const WCHAR test_bstr4[] = {'a','b','c',0}; -static const MYSTRUCT test_mystruct1 = {0x12345678, ULL_CONST(0xdeadbeef, 0x98765432), {0,1,2,3,4,5,6,7}}; -static const MYSTRUCT test_mystruct2 = {0x91827364, ULL_CONST(0x88776655, 0x44332211), {3,6,1,4,0,1,3,0}}; -static const MYSTRUCT test_mystruct3 = {0x1a1b1c1d, ULL_CONST(0x1e1f1011, 0x12131415), {9,2,4,5,6,5,1,3}}; -static const MYSTRUCT test_mystruct4 = {0x2a2b2c2d, ULL_CONST(0x2e2f2021, 0x22232425), {0,4,6,7,3,6,7,4}}; -static const MYSTRUCT test_mystruct5 = {0x3a3b3c3d, ULL_CONST(0x3e3f3031, 0x32333435), {1,6,7,3,8,4,6,5}}; -static const MYSTRUCT test_mystruct6 = {0x4a4b4c4d, ULL_CONST(0x4e4f4041, 0x42434445), {3,6,5,3,4,8,0,9}}; -static const MYSTRUCT test_mystruct7 = {0x5a5b5c5d, ULL_CONST(0x5e5f5051, 0x52535455), {1,8,4,4,4,2,3,1}}; +static const MYSTRUCT test_mystruct1 = {0x12345678, 0xdeadbeef98765432ull, {0,1,2,3,4,5,6,7}}; +static const MYSTRUCT test_mystruct2 = {0x91827364, 0x8877665544332211ull, {3,6,1,4,0,1,3,0}}; +static const MYSTRUCT test_mystruct3 = {0x1a1b1c1d, 0x1e1f101112131415ull, {9,2,4,5,6,5,1,3}}; +static const MYSTRUCT test_mystruct4 = {0x2a2b2c2d, 0x2e2f202122232425ull, {0,4,6,7,3,6,7,4}}; +static const MYSTRUCT test_mystruct5 = {0x3a3b3c3d, 0x3e3f303132333435ull, {1,6,7,3,8,4,6,5}}; +static const MYSTRUCT test_mystruct6 = {0x4a4b4c4d, 0x4e4f404142434445ull, {3,6,5,3,4,8,0,9}}; +static const MYSTRUCT test_mystruct7 = {0x5a5b5c5d, 0x5e5f505152535455ull, {1,8,4,4,4,2,3,1}}; static const struct thin test_thin_struct = {-456, 78}; @@ -1134,7 +1131,7 @@ static HRESULT WINAPI Widget_basetypes_out(IWidget *iface, signed char *c, short *uc = 254; *us = 256; *ul = 0xf00dfade; - *uh = (((ULONGLONG)0xabcdef01) << 32) | (ULONGLONG)0x23456789; + *uh = 0xabcdef0123456789ull; *f = M_LN2; *d = M_LN10; *st = STATE_UNWIDGETIFIED; @@ -2033,8 +2030,7 @@ static void test_marshal_basetypes(IWidget *widget, IDispatch *disp) ok(uc == 254, "Got unsigned char %u.\n", uc); ok(us == 256, "Got unsigned short %u.\n", us); ok(ul == 0xf00dfade, "Got unsigned int %li.\n", ul); - ok(uh == ((((ULONGLONG)0xabcdef01) << 32) | (ULONGLONG)0x23456789), - "Got unsigned hyper %s.\n", wine_dbgstr_longlong(uh)); + ok(uh == 0xabcdef0123456789ull, "Got unsigned hyper %s.\n", wine_dbgstr_longlong(uh)); ok(f == (float)M_LN2, "Got float %f.\n", f); ok(d == M_LN10, "Got double %f.\n", d); ok(st == STATE_UNWIDGETIFIED, "Got state %u.\n", st); @@ -2050,8 +2046,7 @@ static void test_marshal_basetypes(IWidget *widget, IDispatch *disp) ok(uc == 254, "Got unsigned char %u.\n", uc); ok(us == 256, "Got unsigned short %u.\n", us); ok(ul == 0xf00dfade, "Got unsigned int %li.\n", ul); - ok(uh == ((((ULONGLONG)0xabcdef01) << 32) | (ULONGLONG)0x23456789), - "Got unsigned hyper %s.\n", wine_dbgstr_longlong(uh)); + ok(uh == 0xabcdef0123456789ull, "Got unsigned hyper %s.\n", wine_dbgstr_longlong(uh)); ok(f == (float)M_LN2, "Got float %f.\n", f); ok(d == M_LN10, "Got double %f.\n", d); ok(st == STATE_UNWIDGETIFIED, "Got state %u.\n", st); diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 44d5b26cbc40..b273f72ac8d0 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1194,7 +1194,7 @@ static double WINAPI double_func( double a0, float a1, double a2, int a3 ) static LONGLONG WINAPI longlong_func( LONGLONG a0, CY a1 ) { - ok( a0 == (((ULONGLONG)0xdead << 32) | 0xbeef), "wrong arg0 %08lx%08lx\n", (DWORD)(a0 >> 32), (DWORD)a0); + ok( a0 == 0xdead00000000beefll, "wrong arg0 %08lx%08lx\n", (DWORD)(a0 >> 32), (DWORD)a0); ok( a1.int64 == ((ULONGLONG)10000 * 12345678), "wrong arg1 %08lx%08lx\n", (DWORD)(a1.int64 >> 32), (DWORD)a1.int64 ); return ((ULONGLONG)4321 << 32) | 8765; @@ -1379,7 +1379,7 @@ static void test_DispCallFunc(void) memset( args, 0x55, sizeof(args) ); types[0] = VT_I8; - V_I8(&args[0]) = ((ULONGLONG)0xdead << 32) | 0xbeef; + V_I8(&args[0]) = 0xdead00000000beefll; types[1] = VT_CY; V_CY(&args[1]).int64 = (ULONGLONG)10000 * 12345678; memset( &result, 0xcc, sizeof(result) ); diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index db0562e2d037..b6ccc083ad42 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -2514,9 +2514,9 @@ static const char *szFailOk = "Call failed, hres = %08x\n"; ok(V_I4(&vOut) == val, "Expected i4 = %ld, got %ld\n", (LONG)val, V_I4(&vOut)); } #define EXPECT_UI4(val) EXPECT_OK { EXPECT_TYPE(VT_UI4); \ ok(V_UI4(&vOut) == val, "Expected ui4 = %d, got %d\n", (ULONG)val, V_UI4(&vOut)); } -#define EXPECT_I8(high,low) EXPECT_OK { EXPECT_TYPE(VT_I8); \ - ok(V_I8(&vOut) == ((((ULONG64)(high))<<32)|(low)), "Expected i8 = %lx%08lx, got %lx%08lx\n", \ - (LONG)(high), (LONG)(low), (LONG)(V_I8(&vOut)>>32), (LONG)V_I8(&vOut) ); } +#define EXPECT_I8(val) EXPECT_OK { EXPECT_TYPE(VT_I8); \ + ok(V_I8(&vOut) == val, "Expected i8 = %lx%08lx, got %lx%08lx\n", \ + (LONG)(val >> 32), (LONG)(val), (LONG)(V_I8(&vOut)>>32), (LONG)V_I8(&vOut) ); } #define EXPECT_UI8(val) EXPECT_OK { EXPECT_TYPE(VT_UI8); \ ok(V_UI8(&vOut) == val, "Expected ui8 = 0x%x%08x, got 0x%x%08x\n", \ (DWORD)((ULONG64)val >> 32), (DWORD)(ULONG64)val, (DWORD)(V_UI8(&vOut) >> 32), (DWORD)V_UI8(&vOut)); } @@ -2615,7 +2615,7 @@ static void test_VarNumFromParseNum(void) /* We cannot use INTEGER_VTBITS as WinXP and Win2003 are broken(?). They truncate the number to the smallest integer size requested: CONVERT(16,0,0,16,4,0, INTEGER_VTBITS); EXPECT_I1((signed char)0xff); */ - CONVERT(16,0,0,16,4,0, VTBIT_I8); EXPECT_I8(0x7fffffff,0xffffffff); + CONVERT(16,0,0,16,4,0, VTBIT_I8); EXPECT_I8(0x7fffffffffffffffull); } /* Assume the above pattern holds for numbers without hi-bit set, test (preservation of) hi-bit */ @@ -2642,7 +2642,7 @@ static void test_VarNumFromParseNum(void) truncate the number to the smallest integer size requested: CONVERT(16,0,0,16,4,0, INTEGER_VTBITS & ~VTBIT_I1); EXPECT_I2((signed short)0x0002); */ - CONVERT(16,0,0,16,4,0, VTBIT_I8); EXPECT_I8(0x80000000,0x00000002); + CONVERT(16,0,0,16,4,0, VTBIT_I8); EXPECT_I8(0x8000000000000002ull); } /* Test (preservation of) hi-bit with STRICT type requesting */ @@ -2665,7 +2665,7 @@ static void test_VarNumFromParseNum(void) SETRGB(12, 0); SETRGB(13, 0); SETRGB(14, 0); SETRGB(15, 2); if (has_i8) { - CONVERT(16,0,0,16,4,0, VTBIT_I8); EXPECT_I8(0x80000000,0x00000002); + CONVERT(16,0,0,16,4,0, VTBIT_I8); EXPECT_I8(0x8000000000000002ull); } /* Assume the above pattern holds for numbers with hi-bit set */

1 1

[PATCH v4 1/3] winex11: Prevent the call sequence change between xim preedit callback and key event handlers.
by Byeongsik Jeon April 12, 2022

April 12, 2022

Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- v2: rework. update merge_events(). v3: remove the wrong explanatory paragraph. v4: reorder enum event_merge_action for more clean patch. "xim preedit callback" is called from within the XFilterEvent(). ### xim server sended event sequence ### preedit start:: preedit draw:: caret 1 chg_first 0 chg_length 0 string 'ㄱ' preedit draw:: caret 1 chg_first 0 chg_length 1 string '가' preedit draw:: caret 1 chg_first 0 chg_length 1 string '간' preedit draw:: caret 0 chg_first 0 chg_length 1 NULL preedit done:: lookup chars:: keycode 0 string 3 '가' <== HERE preedit start:: preedit draw:: caret 1 chg_first 0 chg_length 0 string '나' <== HERE ### Wine process_events() simulated event sequence ### preedit start:: preedit draw:: caret 1 chg_first 0 chg_length 0 string 'ㄱ' preedit draw:: caret 1 chg_first 0 chg_length 1 string '가' preedit draw:: caret 1 chg_first 0 chg_length 1 string '간' preedit draw:: caret 0 chg_first 0 chg_length 1 NULL preedit done:: preedit start:: preedit draw:: caret 1 chg_first 0 chg_length 0 string '나' <== HERE lookup chars:: keycode 0 string 3 '가' <== HERE dlls/winex11.drv/event.c | 44 +++++++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 12 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index c20ceeacca1..a744ce7e4e5 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -263,6 +263,7 @@ enum event_merge_action { MERGE_DISCARD, /* discard the old event */ MERGE_HANDLE, /* handle the old event */ + MERGE_FLUSH, /* handle all the events */ MERGE_KEEP, /* keep the old event for future merging */ MERGE_IGNORE /* ignore the new event, keep the old one */ }; @@ -316,6 +317,19 @@ static enum event_merge_action merge_events( XEvent *prev, XEvent *next ) { switch (prev->type) { + case 0: + switch (next->type) + { + case ConfigureNotify: + case MotionNotify: +#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H + case GenericEvent: +#endif + return MERGE_DISCARD; + default: + return MERGE_KEEP; + } + break; case ConfigureNotify: switch (next->type) { @@ -325,7 +339,7 @@ static enum event_merge_action merge_events( XEvent *prev, XEvent *next ) TRACE( "discarding duplicate ConfigureNotify for window %lx\n", prev->xany.window ); return MERGE_DISCARD; } - break; + return MERGE_HANDLE; case Expose: case PropertyNotify: return MERGE_KEEP; @@ -340,30 +354,30 @@ static enum event_merge_action merge_events( XEvent *prev, XEvent *next ) TRACE( "discarding duplicate MotionNotify for window %lx\n", prev->xany.window ); return MERGE_DISCARD; } - break; + return MERGE_HANDLE; #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H case GenericEvent: - if (next->xcookie.extension != xinput2_opcode) break; - if (next->xcookie.evtype != XI_RawMotion) break; - if (x11drv_thread_data()->warp_serial) break; + if (next->xcookie.extension != xinput2_opcode) return MERGE_HANDLE; + if (next->xcookie.evtype != XI_RawMotion) return MERGE_HANDLE; + if (x11drv_thread_data()->warp_serial) return MERGE_HANDLE; return MERGE_KEEP; } break; case GenericEvent: - if (prev->xcookie.extension != xinput2_opcode) break; - if (prev->xcookie.evtype != XI_RawMotion) break; + if (prev->xcookie.extension != xinput2_opcode) return MERGE_HANDLE; + if (prev->xcookie.evtype != XI_RawMotion) return MERGE_HANDLE; switch (next->type) { case GenericEvent: - if (next->xcookie.extension != xinput2_opcode) break; - if (next->xcookie.evtype != XI_RawMotion) break; - if (x11drv_thread_data()->warp_serial) break; + if (next->xcookie.extension != xinput2_opcode) return MERGE_HANDLE; + if (next->xcookie.evtype != XI_RawMotion) return MERGE_HANDLE; + if (x11drv_thread_data()->warp_serial) return MERGE_HANDLE; return merge_raw_motion_events( prev->xcookie.data, next->xcookie.data ); #endif } break; } - return MERGE_HANDLE; + return MERGE_FLUSH; } @@ -445,8 +459,9 @@ static BOOL process_events( Display *display, Bool (*filter)(Display*, XEvent*,X else continue; /* filtered, ignore it */ } + get_event_data( &event ); - if (prev_event.type) action = merge_events( &prev_event, &event ); + action = merge_events( &prev_event, &event ); switch( action ) { case MERGE_HANDLE: /* handle prev, keep new */ @@ -456,6 +471,11 @@ static BOOL process_events( Display *display, Bool (*filter)(Display*, XEvent*,X free_event_data( &prev_event ); prev_event = event; break; + case MERGE_FLUSH: /* handle all the events */ + queued |= call_event_handler( display, &prev_event ); + free_event_data( &prev_event ); + prev_event.type = 0; + /* fall through */ case MERGE_KEEP: /* handle new, keep prev for future merging */ queued |= call_event_handler( display, &event ); /* fall through */ -- 2.35.1

3 8

[PATCH] crypt32/tests: Get rid of workarounds for old Windows versions.
by Hans Leidekker April 12, 2022

April 12, 2022

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/crypt32/tests/cert.c | 418 +++------- dlls/crypt32/tests/chain.c | 166 ++-- dlls/crypt32/tests/crl.c | 197 ++--- dlls/crypt32/tests/ctl.c | 52 +- dlls/crypt32/tests/encode.c | 1235 ++++++++++++------------------ dlls/crypt32/tests/message.c | 117 +-- dlls/crypt32/tests/msg.c | 758 +++++++----------- dlls/crypt32/tests/object.c | 37 +- dlls/crypt32/tests/oid.c | 155 ++-- dlls/crypt32/tests/protectdata.c | 76 +- dlls/crypt32/tests/sip.c | 37 +- dlls/crypt32/tests/store.c | 15 +- dlls/crypt32/tests/str.c | 210 ++--- 13 files changed, 1268 insertions(+), 2205 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index e781045b2c4..3cdb5e5ceea 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -32,32 +32,6 @@ #include "wine/test.h" -static PCCERT_CONTEXT (WINAPI *pCertCreateSelfSignCertificate)(HCRYPTPROV_OR_NCRYPT_KEY_HANDLE,PCERT_NAME_BLOB,DWORD,PCRYPT_KEY_PROV_INFO,PCRYPT_ALGORITHM_IDENTIFIER,PSYSTEMTIME,PSYSTEMTIME,PCERT_EXTENSIONS); -static BOOL (WINAPI *pCertGetValidUsages)(DWORD,PCCERT_CONTEXT*,int*,LPSTR*,DWORD*); -static BOOL (WINAPI *pCryptAcquireCertificatePrivateKey)(PCCERT_CONTEXT,DWORD,void*,HCRYPTPROV_OR_NCRYPT_KEY_HANDLE*,DWORD*,BOOL*); -static BOOL (WINAPI *pCryptEncodeObjectEx)(DWORD,LPCSTR,const void*,DWORD,PCRYPT_ENCODE_PARA,void*,DWORD*); -static BOOL (WINAPI *pCryptHashCertificate2)(LPCWSTR, DWORD, void*, const BYTE*, DWORD, BYTE*, DWORD*); -static BOOL (WINAPI * pCryptVerifyCertificateSignatureEx) - (HCRYPTPROV, DWORD, DWORD, void *, DWORD, void *, DWORD, void *); - -static void init_function_pointers(void) -{ - HMODULE hCrypt32 = GetModuleHandleA("crypt32.dll"); - -#define GET_PROC(dll, func) \ - p ## func = (void *)GetProcAddress(dll, #func); \ - if(!p ## func) \ - trace("GetProcAddress(%s) failed\n", #func); - - GET_PROC(hCrypt32, CertCreateSelfSignCertificate) - GET_PROC(hCrypt32, CertGetValidUsages) - GET_PROC(hCrypt32, CryptAcquireCertificatePrivateKey) - GET_PROC(hCrypt32, CryptEncodeObjectEx) - GET_PROC(hCrypt32, CryptHashCertificate2) - GET_PROC(hCrypt32, CryptVerifyCertificateSignatureEx) -#undef GET_PROC -} - static BYTE subjectName[] = { 0x30, 0x15, 0x31, 0x13, 0x30, 0x11, 0x06, 0x03, 0x55, 0x04, 0x03, 0x13, 0x0a, 0x4a, 0x75, 0x61, 0x6e, 0x20, 0x4c, 0x61, 0x6e, 0x67, 0x00 }; @@ -152,24 +126,18 @@ static void testAddCert(void) if (!store) return; - /* Weird--bad add disposition leads to an access violation in Windows. - * Both tests crash on some win9x boxes. - */ - if (0) - { - ret = CertAddEncodedCertificateToStore(0, X509_ASN_ENCODING, bigCert, - sizeof(bigCert), 0, NULL); - ok(!ret && (GetLastError() == STATUS_ACCESS_VIOLATION || - GetLastError() == E_INVALIDARG), - "Expected STATUS_ACCESS_VIOLATION or E_INVALIDARG, got %08lx\n", - GetLastError()); - ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, - bigCert, sizeof(bigCert), 0, NULL); - ok(!ret && (GetLastError() == STATUS_ACCESS_VIOLATION || - GetLastError() == E_INVALIDARG), - "Expected STATUS_ACCESS_VIOLATION or E_INVALIDARG, got %08lx\n", - GetLastError()); - } + ret = CertAddEncodedCertificateToStore(0, X509_ASN_ENCODING, bigCert, + sizeof(bigCert), 0, NULL); + ok(!ret && (GetLastError() == STATUS_ACCESS_VIOLATION || + GetLastError() == E_INVALIDARG), + "Expected STATUS_ACCESS_VIOLATION or E_INVALIDARG, got %08lx\n", + GetLastError()); + ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, + bigCert, sizeof(bigCert), 0, NULL); + ok(!ret && (GetLastError() == STATUS_ACCESS_VIOLATION || + GetLastError() == E_INVALIDARG), + "Expected STATUS_ACCESS_VIOLATION or E_INVALIDARG, got %08lx\n", + GetLastError()); /* Weird--can add a cert to the NULL store (does this have special * meaning?) @@ -177,15 +145,8 @@ static void testAddCert(void) context = NULL; ret = CertAddEncodedCertificateToStore(0, X509_ASN_ENCODING, bigCert, sizeof(bigCert), CERT_STORE_ADD_ALWAYS, &context); - ok(ret || broken(GetLastError() == OSS_DATA_ERROR /* win98 */), - "CertAddEncodedCertificateToStore failed: %08lx\n", GetLastError()); - if (context) - CertFreeCertificateContext(context); - if (!ret && GetLastError() == OSS_DATA_ERROR) - { - skip("bigCert can't be decoded, skipping tests\n"); - return; - } + ok(ret, "CertAddEncodedCertificateToStore failed: %08lx\n", GetLastError()); + CertFreeCertificateContext(context); ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, bigCert, sizeof(bigCert), CERT_STORE_ADD_ALWAYS, NULL); @@ -409,14 +370,11 @@ static void testCertProperties(void) CRYPT_DATA_BLOB blob; CERT_KEY_CONTEXT keyContext; - ok(context != NULL || broken(GetLastError() == OSS_DATA_ERROR /* win98 */), - "CertCreateCertificateContext failed: %08lx\n", GetLastError()); - if (!context) - return; + ok(context != NULL, "CertCreateCertificateContext failed: %08lx\n", GetLastError()); /* This crashes propID = CertEnumCertificateContextProperties(NULL, 0); - */ + */ propID = 0; numProps = 0; @@ -513,10 +471,7 @@ static void testCertProperties(void) size = 0; ret = CertGetCertificateContextProperty(context, CERT_SIGNATURE_HASH_PROP_ID, NULL, &size); - ok(!ret && - (GetLastError() == CRYPT_E_ASN1_BADTAG || - GetLastError() == CRYPT_E_NOT_FOUND || - GetLastError() == OSS_DATA_ERROR), /* win9x */ + ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, "Expected CRYPT_E_ASN1_BADTAG, got %08lx\n", GetLastError()); /* Test key contexts and handles and such */ @@ -646,9 +601,7 @@ static void testCreateCert(void) "expected E_INVALIDARG, got %08lx\n", GetLastError()); SetLastError(0xdeadbeef); cert = CertCreateCertificateContext(X509_ASN_ENCODING, NULL, 0); - ok(!cert && - (GetLastError() == CRYPT_E_ASN1_EOD || - broken(GetLastError() == OSS_MORE_INPUT /* NT4 */)), + ok(!cert && GetLastError() == CRYPT_E_ASN1_EOD, "expected CRYPT_E_ASN1_EOD, got %08lx\n", GetLastError()); cert = CertCreateCertificateContext(X509_ASN_ENCODING, @@ -687,13 +640,7 @@ static void testDupCert(void) ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, bigCert, sizeof(bigCert), CERT_STORE_ADD_ALWAYS, &context); - ok(ret || broken(GetLastError() == OSS_DATA_ERROR /* win98 */), - "CertAddEncodedCertificateToStore failed: %08lx\n", GetLastError()); - if (!ret && GetLastError() == OSS_DATA_ERROR) - { - skip("bigCert can't be decoded, skipping tests\n"); - return; - } + ok(ret, "CertAddEncodedCertificateToStore failed: %08lx\n", GetLastError()); ok(context != NULL, "Expected a valid cert context\n"); if (context) { @@ -1143,13 +1090,8 @@ static void testFindCert(void) ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, bigCert, sizeof(bigCert), CERT_STORE_ADD_NEW, NULL); - ok(ret || broken(GetLastError() == OSS_DATA_ERROR /* win98 */), - "CertAddEncodedCertificateToStore failed: %08lx\n", GetLastError()); - if (!ret && GetLastError() == OSS_DATA_ERROR) - { - skip("bigCert can't be decoded, skipping tests\n"); - return; - } + ok(ret, "CertAddEncodedCertificateToStore failed: %08lx\n", GetLastError()); + ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, bigCert2, sizeof(bigCert2), CERT_STORE_ADD_NEW, NULL); ok(ret, "CertAddEncodedCertificateToStore failed: %08lx\n", @@ -1368,13 +1310,8 @@ static void testGetSubjectCert(void) ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, bigCert, sizeof(bigCert), CERT_STORE_ADD_ALWAYS, NULL); - ok(ret || broken(GetLastError() == OSS_DATA_ERROR /* win98 */), - "CertAddEncodedCertificateToStore failed: %08lx\n", GetLastError()); - if (!ret && GetLastError() == OSS_DATA_ERROR) - { - skip("bigCert can't be decoded, skipping tests\n"); - return; - } + ok(ret, "CertAddEncodedCertificateToStore failed: %08lx\n", GetLastError()); + ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, bigCert2, sizeof(bigCert2), CERT_STORE_ADD_NEW, &context1); ok(ret, "CertAddEncodedCertificateToStore failed: %08lx\n", @@ -1791,29 +1728,23 @@ static void testCryptHashCert2(void) BYTE hash[20]; DWORD hashLen; - if (!pCryptHashCertificate2) - { - win_skip("CryptHashCertificate2() is not available\n"); - return; - } - /* Test empty hash */ hashLen = sizeof(hash); - ret = pCryptHashCertificate2(L"SHA1", 0, NULL, NULL, 0, hash, &hashLen); + ret = CryptHashCertificate2(L"SHA1", 0, NULL, NULL, 0, hash, &hashLen); ok(ret, "CryptHashCertificate2 failed: %08lx\n", GetLastError()); ok(hashLen == sizeof(hash), "Got unexpected size of hash %ld\n", hashLen); ok(!memcmp(hash, emptyHash, sizeof(emptyHash)), "Unexpected hash of nothing\n"); /* Test known hash */ hashLen = sizeof(hash); - ret = pCryptHashCertificate2(L"SHA1", 0, NULL, toHash, sizeof(toHash), hash, &hashLen); + ret = CryptHashCertificate2(L"SHA1", 0, NULL, toHash, sizeof(toHash), hash, &hashLen); ok(ret, "CryptHashCertificate2 failed: %08lx\n", GetLastError()); ok(hashLen == sizeof(hash), "Got unexpected size of hash %ld\n", hashLen); ok(!memcmp(hash, knownHash, sizeof(knownHash)), "Unexpected hash\n"); /* Test null hash size pointer just sets hash size */ hashLen = 0; - ret = pCryptHashCertificate2(L"SHA1", 0, NULL, toHash, sizeof(toHash), NULL, &hashLen); + ret = CryptHashCertificate2(L"SHA1", 0, NULL, toHash, sizeof(toHash), NULL, &hashLen); ok(ret, "CryptHashCertificate2 failed: %08lx\n", GetLastError()); ok(hashLen == sizeof(hash), "Hash size not set correctly (%ld)\n", hashLen); @@ -1821,30 +1752,30 @@ static void testCryptHashCert2(void) if (0) { /* Test null algorithm ID */ hashLen = sizeof(hash); - ret = pCryptHashCertificate2(NULL, 0, NULL, toHash, sizeof(toHash), hash, &hashLen); + ret = CryptHashCertificate2(NULL, 0, NULL, toHash, sizeof(toHash), hash, &hashLen); } /* Test invalid algorithm */ hashLen = sizeof(hash); SetLastError(0xdeadbeef); - ret = pCryptHashCertificate2(L"_SHOULDNOTEXIST_", 0, NULL, toHash, sizeof(toHash), hash, &hashLen); + ret = CryptHashCertificate2(L"_SHOULDNOTEXIST_", 0, NULL, toHash, sizeof(toHash), hash, &hashLen); ok(!ret && GetLastError() == STATUS_NOT_FOUND, "Expected STATUS_NOT_FOUND (0x%08lx), got 0x%08lx\n", STATUS_NOT_FOUND, GetLastError()); /* Test hash buffer too small */ hashLen = sizeof(hash) / 2; SetLastError(0xdeadbeef); - ret = pCryptHashCertificate2(L"SHA1", 0, NULL, toHash, sizeof(toHash), hash, &hashLen); + ret = CryptHashCertificate2(L"SHA1", 0, NULL, toHash, sizeof(toHash), hash, &hashLen); ok(!ret && GetLastError() == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA (%d), got %ld\n", ERROR_MORE_DATA, GetLastError()); /* Null hash length crashes Windows implementations */ if (0) { /* Test hashLen null with hash */ - ret = pCryptHashCertificate2(L"SHA1", 0, NULL, toHash, sizeof(toHash), hash, NULL); + ret = CryptHashCertificate2(L"SHA1", 0, NULL, toHash, sizeof(toHash), hash, NULL); /* Test hashLen null with no hash */ - ret = pCryptHashCertificate2(L"SHA1", 0, NULL, toHash, sizeof(toHash), NULL, NULL); + ret = CryptHashCertificate2(L"SHA1", 0, NULL, toHash, sizeof(toHash), NULL, NULL); } } @@ -1862,7 +1793,6 @@ static void verifySig(HCRYPTPROV csp, const BYTE *toSign, size_t toSignLen, ret = CryptHashData(hash, toSign, toSignLen, 0); ok(ret, "CryptHashData failed: %08lx\n", GetLastError()); - /* use the A variant so the test can run on Win9x */ ret = CryptSignHashA(hash, AT_SIGNATURE, NULL, 0, mySig, &mySigSize); ok(ret, "CryptSignHash failed: %08lx\n", GetLastError()); if (ret) @@ -1950,11 +1880,6 @@ static void testVerifyCertSig(HCRYPTPROV csp, const CRYPT_DATA_BLOB *toBeSigned, DWORD size = 0; BOOL ret; - if (!pCryptEncodeObjectEx) - { - win_skip("no CryptEncodeObjectEx support\n"); - return; - } ret = CryptVerifyCertificateSignature(0, 0, NULL, 0, NULL); ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %08lx\n", GetLastError()); @@ -1963,9 +1888,8 @@ static void testVerifyCertSig(HCRYPTPROV csp, const CRYPT_DATA_BLOB *toBeSigned, "Expected ERROR_FILE_NOT_FOUND, got %08lx\n", GetLastError()); ret = CryptVerifyCertificateSignature(csp, X509_ASN_ENCODING, NULL, 0, NULL); - ok(!ret && (GetLastError() == CRYPT_E_ASN1_EOD || - GetLastError() == OSS_BAD_ARG), - "Expected CRYPT_E_ASN1_EOD or OSS_BAD_ARG, got %08lx\n", GetLastError()); + ok(!ret && GetLastError() == CRYPT_E_ASN1_EOD, + "Expected CRYPT_E_ASN1_EOD, got %08lx\n", GetLastError()); info.ToBeSigned.cbData = toBeSigned->cbData; info.ToBeSigned.pbData = toBeSigned->pbData; info.SignatureAlgorithm.pszObjId = (LPSTR)sigOID; @@ -1973,7 +1897,7 @@ static void testVerifyCertSig(HCRYPTPROV csp, const CRYPT_DATA_BLOB *toBeSigned, info.Signature.cbData = sigLen; info.Signature.pbData = (BYTE *)sig; info.Signature.cUnusedBits = 0; - ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, X509_CERT, &info, + ret = CryptEncodeObjectEx(X509_ASN_ENCODING, X509_CERT, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &cert, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (cert) @@ -2017,28 +1941,18 @@ static void testVerifyCertSigEx(HCRYPTPROV csp, const CRYPT_DATA_BLOB *toBeSigne DWORD size = 0; BOOL ret; - if (!pCryptVerifyCertificateSignatureEx) - { - win_skip("no CryptVerifyCertificateSignatureEx support\n"); - return; - } - if (!pCryptEncodeObjectEx) - { - win_skip("no CryptEncodeObjectEx support\n"); - return; - } - ret = pCryptVerifyCertificateSignatureEx(0, 0, 0, NULL, 0, NULL, 0, NULL); + ret = CryptVerifyCertificateSignatureEx(0, 0, 0, NULL, 0, NULL, 0, NULL); ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08lx\n", GetLastError()); - ret = pCryptVerifyCertificateSignatureEx(csp, 0, 0, NULL, 0, NULL, 0, NULL); + ret = CryptVerifyCertificateSignatureEx(csp, 0, 0, NULL, 0, NULL, 0, NULL); ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08lx\n", GetLastError()); - ret = pCryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, 0, NULL, 0, + ret = CryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, 0, NULL, 0, NULL, 0, NULL); ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08lx\n", GetLastError()); /* This crashes - ret = pCryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, + ret = CryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, CRYPT_VERIFY_CERT_SIGN_SUBJECT_BLOB, NULL, 0, NULL, 0, NULL); */ info.ToBeSigned.cbData = toBeSigned->cbData; @@ -2048,7 +1962,7 @@ static void testVerifyCertSigEx(HCRYPTPROV csp, const CRYPT_DATA_BLOB *toBeSigne info.Signature.cbData = sigLen; info.Signature.pbData = (BYTE *)sig; info.Signature.cUnusedBits = 0; - ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, X509_CERT, &info, + ret = CryptEncodeObjectEx(X509_ASN_ENCODING, X509_CERT, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &cert, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (cert) @@ -2056,33 +1970,31 @@ static void testVerifyCertSigEx(HCRYPTPROV csp, const CRYPT_DATA_BLOB *toBeSigne CRYPT_DATA_BLOB certBlob = { 0, NULL }; PCERT_PUBLIC_KEY_INFO pubKeyInfo = NULL; - ret = pCryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, + ret = CryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, CRYPT_VERIFY_CERT_SIGN_SUBJECT_BLOB, &certBlob, 0, NULL, 0, NULL); ok(!ret && GetLastError() == CRYPT_E_ASN1_EOD, "Expected CRYPT_E_ASN1_EOD, got %08lx\n", GetLastError()); certBlob.cbData = 1; certBlob.pbData = (void *)0xdeadbeef; - ret = pCryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, + ret = CryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, CRYPT_VERIFY_CERT_SIGN_SUBJECT_BLOB, &certBlob, 0, NULL, 0, NULL); - ok(!ret && (GetLastError() == STATUS_ACCESS_VIOLATION || - GetLastError() == CRYPT_E_ASN1_EOD /* Win9x */ || - GetLastError() == CRYPT_E_ASN1_BADTAG /* Win98 */), + ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, CRYPT_E_ASN1_EOD, OR CRYPT_E_ASN1_BADTAG, got %08lx\n", GetLastError()); certBlob.cbData = size; certBlob.pbData = cert; - ret = pCryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, + ret = CryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, CRYPT_VERIFY_CERT_SIGN_SUBJECT_BLOB, &certBlob, 0, NULL, 0, NULL); ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08lx\n", GetLastError()); - ret = pCryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, + ret = CryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, CRYPT_VERIFY_CERT_SIGN_SUBJECT_BLOB, &certBlob, CRYPT_VERIFY_CERT_SIGN_ISSUER_NULL, NULL, 0, NULL); ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08lx\n", GetLastError()); /* This crashes - ret = pCryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, + ret = CryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, CRYPT_VERIFY_CERT_SIGN_SUBJECT_BLOB, &certBlob, CRYPT_VERIFY_CERT_SIGN_ISSUER_PUBKEY, NULL, 0, NULL); */ @@ -2096,7 +2008,7 @@ static void testVerifyCertSigEx(HCRYPTPROV csp, const CRYPT_DATA_BLOB *toBeSigne ok(ret, "CryptExportKey failed: %08lx\n", GetLastError()); if (ret) { - ret = pCryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, + ret = CryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, CRYPT_VERIFY_CERT_SIGN_SUBJECT_BLOB, &certBlob, CRYPT_VERIFY_CERT_SIGN_ISSUER_PUBKEY, pubKeyInfo, 0, NULL); ok(ret, "CryptVerifyCertificateSignatureEx failed: %08lx\n", @@ -2177,31 +2089,23 @@ static void testSignAndEncodeCert(void) &algID, NULL, NULL, &size); ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %08lx\n", GetLastError()); - /* Crashes on some win9x boxes */ - if (0) - { - ret = CryptSignAndEncodeCertificate(0, 0, X509_ASN_ENCODING, - X509_CERT_TO_BE_SIGNED, NULL, &algID, NULL, NULL, &size); - ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, - "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", GetLastError()); - } + ret = CryptSignAndEncodeCertificate(0, 0, X509_ASN_ENCODING, + X509_CERT_TO_BE_SIGNED, NULL, &algID, NULL, NULL, &size); + ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, + "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", GetLastError()); + /* Crashes ret = CryptSignAndEncodeCertificate(0, 0, X509_ASN_ENCODING, X509_CERT_TO_BE_SIGNED, &info, NULL, NULL, NULL, &size); */ ret = CryptSignAndEncodeCertificate(0, 0, X509_ASN_ENCODING, X509_CERT_TO_BE_SIGNED, &info, &algID, NULL, NULL, &size); - ok(!ret && - (GetLastError() == NTE_BAD_ALGID || - GetLastError() == OSS_BAD_PTR), /* win9x */ + ok(!ret && GetLastError() == NTE_BAD_ALGID, "Expected NTE_BAD_ALGID, got %08lx\n", GetLastError()); algID.pszObjId = oid_rsa_md5rsa; ret = CryptSignAndEncodeCertificate(0, 0, X509_ASN_ENCODING, X509_CERT_TO_BE_SIGNED, &info, &algID, NULL, NULL, &size); - ok(!ret && - (GetLastError() == ERROR_INVALID_PARAMETER || - GetLastError() == NTE_BAD_ALGID || - GetLastError() == OSS_BAD_PTR), /* Win9x */ + ok(!ret && (GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == NTE_BAD_ALGID), "Expected ERROR_INVALID_PARAMETER or NTE_BAD_ALGID, got %08lx\n", GetLastError()); algID.pszObjId = oid_rsa_md5; @@ -2245,19 +2149,13 @@ static void testCreateSelfSignCert(void) HCRYPTKEY key; CRYPT_KEY_PROV_INFO info; - if (!pCertCreateSelfSignCertificate) - { - win_skip("CertCreateSelfSignCertificate() is not available\n"); - return; - } - /* This crashes: - context = pCertCreateSelfSignCertificate(0, NULL, 0, NULL, NULL, NULL, NULL, + context = CertCreateSelfSignCertificate(0, NULL, 0, NULL, NULL, NULL, NULL, NULL); * Calling this with no first parameter creates a new key container, which * lasts beyond the test, so I don't test that. Nb: the generated key * name is a GUID. - context = pCertCreateSelfSignCertificate(0, &name, 0, NULL, NULL, NULL, NULL, + context = CertCreateSelfSignCertificate(0, &name, 0, NULL, NULL, NULL, NULL, NULL); */ @@ -2268,7 +2166,7 @@ static void testCreateSelfSignCert(void) CRYPT_NEWKEYSET); ok(ret, "CryptAcquireContext failed: %08lx\n", GetLastError()); - context = pCertCreateSelfSignCertificate(csp, &name, 0, NULL, NULL, NULL, + context = CertCreateSelfSignCertificate(csp, &name, 0, NULL, NULL, NULL, NULL, NULL); ok(!context && GetLastError() == NTE_NO_KEY, "Expected NTE_NO_KEY, got %08lx\n", GetLastError()); @@ -2276,7 +2174,7 @@ static void testCreateSelfSignCert(void) ok(ret, "CryptGenKey failed: %08lx\n", GetLastError()); if (ret) { - context = pCertCreateSelfSignCertificate(csp, &name, 0, NULL, NULL, NULL, + context = CertCreateSelfSignCertificate(csp, &name, 0, NULL, NULL, NULL, NULL, NULL); ok(context != NULL, "CertCreateSelfSignCertificate failed: %08lx\n", GetLastError()); @@ -2339,7 +2237,7 @@ static void testCreateSelfSignCert(void) info.pwszContainerName = (WCHAR *)L"WineCryptTemp"; /* This should fail because the CSP doesn't have the specified key. */ SetLastError(0xdeadbeef); - context = pCertCreateSelfSignCertificate(csp, &name, 0, &info, NULL, NULL, + context = CertCreateSelfSignCertificate(csp, &name, 0, &info, NULL, NULL, NULL, NULL); ok(context == NULL, "expected failure\n"); if (context != NULL) @@ -2350,7 +2248,7 @@ static void testCreateSelfSignCert(void) /* Again, with a CSP, AT_SIGNATURE and key info */ info.dwKeySpec = AT_SIGNATURE; SetLastError(0xdeadbeef); - context = pCertCreateSelfSignCertificate(csp, &name, 0, &info, NULL, NULL, + context = CertCreateSelfSignCertificate(csp, &name, 0, &info, NULL, NULL, NULL, NULL); ok(context != NULL, "CertCreateSelfSignCertificate failed: %08lx\n", GetLastError()); @@ -2397,7 +2295,7 @@ static void testCreateSelfSignCert(void) /* Do the same test with no CSP, AT_KEYEXCHANGE and key info */ info.dwKeySpec = AT_KEYEXCHANGE; - context = pCertCreateSelfSignCertificate(0, &name, 0, &info, NULL, NULL, + context = CertCreateSelfSignCertificate(0, &name, 0, &info, NULL, NULL, NULL, NULL); ok(context != NULL, "CertCreateSelfSignCertificate failed: %08lx\n", GetLastError()); @@ -2446,7 +2344,7 @@ static void testCreateSelfSignCert(void) CRYPT_NEWKEYSET); ok(ret, "CryptAcquireContext failed: %08lx\n", GetLastError()); - context = pCertCreateSelfSignCertificate(csp, &name, 0, NULL, NULL, NULL, + context = CertCreateSelfSignCertificate(csp, &name, 0, NULL, NULL, NULL, NULL, NULL); ok(!context && GetLastError() == NTE_NO_KEY, "Expected NTE_NO_KEY, got %08lx\n", GetLastError()); @@ -2461,7 +2359,7 @@ static void testCreateSelfSignCert(void) info.pwszContainerName = (WCHAR *)L"WineCryptTemp"; /* This should fail because the CSP doesn't have the specified key. */ SetLastError(0xdeadbeef); - context = pCertCreateSelfSignCertificate(csp, &name, 0, &info, NULL, NULL, + context = CertCreateSelfSignCertificate(csp, &name, 0, &info, NULL, NULL, NULL, NULL); ok(context == NULL, "expected failure\n"); if (context != NULL) @@ -2474,7 +2372,7 @@ static void testCreateSelfSignCert(void) */ info.dwKeySpec = AT_KEYEXCHANGE; SetLastError(0xdeadbeef); - context = pCertCreateSelfSignCertificate(csp, &name, 0, &info, NULL, NULL, + context = CertCreateSelfSignCertificate(csp, &name, 0, &info, NULL, NULL, NULL, NULL); ok(context != NULL, "CertCreateSelfSignCertificate failed: %08lx\n", GetLastError()); @@ -2707,8 +2605,7 @@ static void testKeyUsage(void) SetLastError(0xbaadcafe); size = sizeof(buf); ret = CertGetEnhancedKeyUsage(context, 0, pUsage, &size); - ok(ret || broken(!ret && GetLastError() == CRYPT_E_NOT_FOUND /* NT4 */), - "CertGetEnhancedKeyUsage failed: %08lx\n", GetLastError()); + ok(ret, "CertGetEnhancedKeyUsage failed: %08lx\n", GetLastError()); ok(GetLastError() == CRYPT_E_NOT_FOUND, "Expected CRYPT_E_NOT_FOUND, got %08lx\n", GetLastError()); @@ -2882,20 +2779,14 @@ static void testGetValidUsages(void) LPSTR *oids = NULL; PCCERT_CONTEXT contexts[3]; - if (!pCertGetValidUsages) - { - win_skip("CertGetValidUsages() is not available\n"); - return; - } - /* Crash - ret = pCertGetValidUsages(0, NULL, NULL, NULL, NULL); - ret = pCertGetValidUsages(0, NULL, NULL, NULL, &size); + ret = CertGetValidUsages(0, NULL, NULL, NULL, NULL); + ret = CertGetValidUsages(0, NULL, NULL, NULL, &size); */ contexts[0] = NULL; size = numOIDs = 0xdeadbeef; SetLastError(0xdeadbeef); - ret = pCertGetValidUsages(1, &contexts[0], &numOIDs, NULL, &size); + ret = CertGetValidUsages(1, &contexts[0], &numOIDs, NULL, &size); ok(ret, "CertGetValidUsages failed: %ld\n", GetLastError()); ok(numOIDs == -1, "Expected -1, got %d\n", numOIDs); ok(size == 0, "Expected size 0, got %ld\n", size); @@ -2906,16 +2797,16 @@ static void testGetValidUsages(void) contexts[2] = CertCreateCertificateContext(X509_ASN_ENCODING, cert2WithUsage, sizeof(cert2WithUsage)); size = numOIDs = 0xdeadbeef; - ret = pCertGetValidUsages(0, NULL, &numOIDs, NULL, &size); + ret = CertGetValidUsages(0, NULL, &numOIDs, NULL, &size); ok(ret, "CertGetValidUsages failed: %08lx\n", GetLastError()); ok(numOIDs == -1, "Expected -1, got %d\n", numOIDs); ok(size == 0, "Expected size 0, got %ld\n", size); size = numOIDs = 0xdeadbeef; - ret = pCertGetValidUsages(1, contexts, &numOIDs, NULL, &size); + ret = CertGetValidUsages(1, contexts, &numOIDs, NULL, &size); ok(ret, "CertGetValidUsages failed: %08lx\n", GetLastError()); ok(numOIDs == -1, "Expected -1, got %d\n", numOIDs); ok(size == 0, "Expected size 0, got %ld\n", size); - ret = pCertGetValidUsages(1, &contexts[1], &numOIDs, NULL, &size); + ret = CertGetValidUsages(1, &contexts[1], &numOIDs, NULL, &size); ok(ret, "CertGetValidUsages failed: %08lx\n", GetLastError()); ok(numOIDs == 3, "Expected 3, got %d\n", numOIDs); ok(size, "Expected non-zero size\n"); @@ -2926,10 +2817,10 @@ static void testGetValidUsages(void) DWORD smallSize = 1; SetLastError(0xdeadbeef); - ret = pCertGetValidUsages(1, &contexts[1], &numOIDs, oids, &smallSize); + ret = CertGetValidUsages(1, &contexts[1], &numOIDs, oids, &smallSize); ok(!ret && GetLastError() == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %ld\n", GetLastError()); - ret = pCertGetValidUsages(1, &contexts[1], &numOIDs, oids, &size); + ret = CertGetValidUsages(1, &contexts[1], &numOIDs, oids, &size); ok(ret, "CertGetValidUsages failed: %08lx\n", GetLastError()); for (i = 0; i < numOIDs; i++) ok(!lstrcmpA(oids[i], expectedOIDs[i]), "unexpected OID %s\n", @@ -2938,11 +2829,11 @@ static void testGetValidUsages(void) } numOIDs = 0xdeadbeef; /* Oddly enough, this crashes when the number of contexts is not 1: - ret = pCertGetValidUsages(2, contexts, &numOIDs, NULL, &size); + ret = CertGetValidUsages(2, contexts, &numOIDs, NULL, &size); * but setting size to 0 allows it to succeed: */ size = 0; - ret = pCertGetValidUsages(2, contexts, &numOIDs, NULL, &size); + ret = CertGetValidUsages(2, contexts, &numOIDs, NULL, &size); ok(ret, "CertGetValidUsages failed: %08lx\n", GetLastError()); ok(numOIDs == 3, "Expected 3, got %d\n", numOIDs); ok(size, "Expected non-zero size\n"); @@ -2951,7 +2842,7 @@ static void testGetValidUsages(void) { int i; - ret = pCertGetValidUsages(1, &contexts[1], &numOIDs, oids, &size); + ret = CertGetValidUsages(1, &contexts[1], &numOIDs, oids, &size); ok(ret, "CertGetValidUsages failed: %08lx\n", GetLastError()); for (i = 0; i < numOIDs; i++) ok(!lstrcmpA(oids[i], expectedOIDs[i]), "unexpected OID %s\n", @@ -2960,7 +2851,7 @@ static void testGetValidUsages(void) } numOIDs = 0xdeadbeef; size = 0; - ret = pCertGetValidUsages(1, &contexts[2], &numOIDs, NULL, &size); + ret = CertGetValidUsages(1, &contexts[2], &numOIDs, NULL, &size); ok(ret, "CertGetValidUsages failed: %08lx\n", GetLastError()); ok(numOIDs == 2, "Expected 2, got %d\n", numOIDs); ok(size, "Expected non-zero size\n"); @@ -2969,7 +2860,7 @@ static void testGetValidUsages(void) { int i; - ret = pCertGetValidUsages(1, &contexts[2], &numOIDs, oids, &size); + ret = CertGetValidUsages(1, &contexts[2], &numOIDs, oids, &size); ok(ret, "CertGetValidUsages failed: %08lx\n", GetLastError()); for (i = 0; i < numOIDs; i++) ok(!lstrcmpA(oids[i], expectedOIDs2[i]), "unexpected OID %s\n", @@ -2978,7 +2869,7 @@ static void testGetValidUsages(void) } numOIDs = 0xdeadbeef; size = 0; - ret = pCertGetValidUsages(3, contexts, &numOIDs, NULL, &size); + ret = CertGetValidUsages(3, contexts, &numOIDs, NULL, &size); ok(ret, "CertGetValidUsages failed: %08lx\n", GetLastError()); ok(numOIDs == 2, "Expected 2, got %d\n", numOIDs); ok(size, "Expected non-zero size\n"); @@ -2987,7 +2878,7 @@ static void testGetValidUsages(void) { int i; - ret = pCertGetValidUsages(3, contexts, &numOIDs, oids, &size); + ret = CertGetValidUsages(3, contexts, &numOIDs, oids, &size); ok(ret, "CertGetValidUsages failed: %08lx\n", GetLastError()); for (i = 0; i < numOIDs; i++) ok(!lstrcmpA(oids[i], expectedOIDs2[i]), "unexpected OID %s\n", @@ -3396,17 +3287,15 @@ static void testHashPublicKeyInfo(void) ret = CryptHashPublicKeyInfo(0, 0, 0, 0, NULL, NULL, &len); ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %08lx\n", GetLastError()); - /* Crashes on some win9x boxes */ - if (0) + + if (0) /* crash */ { ret = CryptHashPublicKeyInfo(0, 0, 0, X509_ASN_ENCODING, NULL, NULL, &len); ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", GetLastError()); } ret = CryptHashPublicKeyInfo(0, 0, 0, X509_ASN_ENCODING, &info, NULL, &len); - ok(ret || - broken(!ret), /* win9x */ - "CryptHashPublicKeyInfo failed: %08lx\n", GetLastError()); + ok(ret, "CryptHashPublicKeyInfo failed: %08lx\n", GetLastError()); if (ret) { ok(len == 16, "Expected hash size 16, got %ld\n", len); @@ -3444,32 +3333,24 @@ static void testHashToBeSigned(void) "expected ERROR_FILE_NOT_FOUND, got %ld\n", GetLastError()); SetLastError(0xdeadbeef); ret = CryptHashToBeSigned(0, X509_ASN_ENCODING, NULL, 0, NULL, &size); - ok(!ret && - (GetLastError() == CRYPT_E_ASN1_EOD || - GetLastError() == OSS_BAD_ARG), /* win9x */ + ok(!ret && GetLastError() == CRYPT_E_ASN1_EOD, "expected CRYPT_E_ASN1_EOD, got %08lx\n", GetLastError()); /* Can't sign anything: has to be asn.1 encoded, at least */ SetLastError(0xdeadbeef); ret = CryptHashToBeSigned(0, X509_ASN_ENCODING, int1, sizeof(int1), NULL, &size); - ok(!ret && - (GetLastError() == CRYPT_E_ASN1_BADTAG || - GetLastError() == OSS_MORE_INPUT), /* win9x */ + ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, "expected CRYPT_E_ASN1_BADTAG, got %08lx\n", GetLastError()); /* Can't be empty, either */ SetLastError(0xdeadbeef); ret = CryptHashToBeSigned(0, X509_ASN_ENCODING, emptyCert, sizeof(emptyCert), NULL, &size); - ok(!ret && - (GetLastError() == CRYPT_E_ASN1_CORRUPT || - GetLastError() == OSS_DATA_ERROR), /* win9x */ + ok(!ret && GetLastError() == CRYPT_E_ASN1_CORRUPT, "expected CRYPT_E_ASN1_CORRUPT, got %08lx\n", GetLastError()); /* Signing a cert works */ ret = CryptHashToBeSigned(0, X509_ASN_ENCODING, md5SignedEmptyCert, sizeof(md5SignedEmptyCert), NULL, &size); - ok(ret || - broken(!ret), /* win9x */ - "CryptHashToBeSigned failed: %08lx\n", GetLastError()); + ok(ret, "CryptHashToBeSigned failed: %08lx\n", GetLastError()); if (ret) { ok(size == sizeof(md5SignedEmptyCertHash), "unexpected size %ld\n", size); @@ -3477,9 +3358,7 @@ static void testHashToBeSigned(void) ret = CryptHashToBeSigned(0, X509_ASN_ENCODING, md5SignedEmptyCert, sizeof(md5SignedEmptyCert), hash, &size); - ok(ret || broken(!ret && GetLastError() == NTE_BAD_ALGID) /* NT4 */, - "CryptHashToBeSigned failed: %08lx\n", GetLastError()); - + ok(ret, "CryptHashToBeSigned failed: %08lx\n", GetLastError()); ok(!memcmp(hash, md5SignedEmptyCertHash, size), "unexpected value\n"); } @@ -3700,11 +3579,6 @@ static void testVerifyRevocation(void) SetLastError(0xdeadbeef); ret = CertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, 1, (void **)certs, 0, NULL, &status); - if (!ret && GetLastError() == ERROR_FILE_NOT_FOUND) - { - win_skip("CERT_CONTEXT_REVOCATION_TYPE unsupported, skipping\n"); - return; - } ok(!ret && GetLastError() == CRYPT_E_NO_REVOCATION_CHECK, "expected CRYPT_E_NO_REVOCATION_CHECK, got %08lx\n", GetLastError()); ok(status.dwError == CRYPT_E_NO_REVOCATION_CHECK, @@ -3714,12 +3588,10 @@ static void testVerifyRevocation(void) SetLastError(0xdeadbeef); ret = CertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, 1, (void **)&certs[1], 0, NULL, &status); - ok(!ret && (GetLastError() == CRYPT_E_NO_REVOCATION_CHECK /* Win9x */ || - GetLastError() == CRYPT_E_REVOCATION_OFFLINE), + ok(!ret && (GetLastError() == CRYPT_E_REVOCATION_OFFLINE || GetLastError() == CRYPT_E_NO_REVOCATION_CHECK), "expected CRYPT_E_NO_REVOCATION_CHECK or CRYPT_E_REVOCATION_OFFLINE, got %08lx\n", GetLastError()); - ok(status.dwError == CRYPT_E_NO_REVOCATION_CHECK /* Win9x */ || - status.dwError == CRYPT_E_REVOCATION_OFFLINE, + ok(status.dwError == CRYPT_E_REVOCATION_OFFLINE || status.dwError == CRYPT_E_NO_REVOCATION_CHECK, "expected CRYPT_E_NO_REVOCATION_CHECK or CRYPT_E_REVOCATION_OFFLINE, got %08lx\n", status.dwError); ok(status.dwIndex == 0, "expected index 0, got %ld\n", status.dwIndex); @@ -3727,12 +3599,10 @@ static void testVerifyRevocation(void) SetLastError(0xdeadbeef); ret = CertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, 2, (void **)certs, 0, NULL, &status); - ok(!ret && (GetLastError() == CRYPT_E_NO_REVOCATION_CHECK || - GetLastError() == CRYPT_E_REVOCATION_OFFLINE /* WinME */), + ok(!ret && GetLastError() == CRYPT_E_NO_REVOCATION_CHECK, "expected CRYPT_E_NO_REVOCATION_CHECK or CRYPT_E_REVOCATION_OFFLINE, got %08lx\n", GetLastError()); - ok(status.dwError == CRYPT_E_NO_REVOCATION_CHECK || - status.dwError == CRYPT_E_REVOCATION_OFFLINE /* WinME */, + ok(status.dwError == CRYPT_E_NO_REVOCATION_CHECK, "expected CRYPT_E_NO_REVOCATION_CHECK or CRYPT_E_REVOCATION_OFFLINE, got %08lx\n", status.dwError); ok(status.dwIndex == 0, "expected index 0, got %ld\n", status.dwIndex); @@ -3744,12 +3614,10 @@ static void testVerifyRevocation(void) SetLastError(0xdeadbeef); ret = CertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, 2, (void **)certs, 0, &revPara, &status); - ok(!ret && (GetLastError() == CRYPT_E_NO_REVOCATION_CHECK || - GetLastError() == CRYPT_E_REVOCATION_OFFLINE /* WinME */), + ok(!ret && GetLastError() == CRYPT_E_NO_REVOCATION_CHECK, "expected CRYPT_E_NO_REVOCATION_CHECK or CRYPT_E_REVOCATION_OFFLINE, got %08lx\n", GetLastError()); - ok(status.dwError == CRYPT_E_NO_REVOCATION_CHECK || - status.dwError == CRYPT_E_REVOCATION_OFFLINE /* WinME */, + ok(status.dwError == CRYPT_E_NO_REVOCATION_CHECK, "expected CRYPT_E_NO_REVOCATION_CHECK or CRYPT_E_REVOCATION_OFFLINE, got %08lx\n", status.dwError); ok(status.dwIndex == 0, "expected index 0, got %ld\n", status.dwIndex); @@ -3767,14 +3635,9 @@ static void testVerifyRevocation(void) SetLastError(0xdeadbeef); ret = CertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, 1, (void **)&certs[1], 0, &revPara, &status); - /* Win2k thinks the cert is revoked, and it is, except the CRL is out of - * date, hence the revocation status should be unknown. - */ - ok(!ret && (GetLastError() == CRYPT_E_NO_REVOCATION_CHECK || - broken(GetLastError() == CRYPT_E_REVOKED /* Win2k */)), + ok(!ret && GetLastError() == CRYPT_E_NO_REVOCATION_CHECK, "expected CRYPT_E_NO_REVOCATION_CHECK, got %08lx\n", GetLastError()); - ok(status.dwError == CRYPT_E_NO_REVOCATION_CHECK || - broken(status.dwError == CRYPT_E_REVOKED /* Win2k */), + ok(status.dwError == CRYPT_E_NO_REVOCATION_CHECK, "expected CRYPT_E_NO_REVOCATION_CHECK, got %08lx\n", status.dwError); ok(status.dwIndex == 0, "expected index 0, got %ld\n", status.dwIndex); CertCloseStore(revPara.hCrlStore, 0); @@ -3834,12 +3697,6 @@ static void testAcquireCertPrivateKey(void) HCRYPTKEY key; WCHAR ms_def_prov_w[MAX_PATH]; - if (!pCryptAcquireCertificatePrivateKey) - { - win_skip("CryptAcquireCertificatePrivateKey() is not available\n"); - return; - } - lstrcpyW(ms_def_prov_w, MS_DEF_PROV_W); keyProvInfo.pwszContainerName = (WCHAR *)L"WineCryptTemp"; @@ -3857,28 +3714,28 @@ static void testAcquireCertPrivateKey(void) sizeof(selfSignedCert)); /* Crash - ret = pCryptAcquireCertificatePrivateKey(NULL, 0, NULL, NULL, NULL, NULL); - ret = pCryptAcquireCertificatePrivateKey(NULL, 0, NULL, NULL, NULL, + ret = CryptAcquireCertificatePrivateKey(NULL, 0, NULL, NULL, NULL, NULL); + ret = CryptAcquireCertificatePrivateKey(NULL, 0, NULL, NULL, NULL, &callerFree); - ret = pCryptAcquireCertificatePrivateKey(NULL, 0, NULL, NULL, &keySpec, + ret = CryptAcquireCertificatePrivateKey(NULL, 0, NULL, NULL, &keySpec, NULL); - ret = pCryptAcquireCertificatePrivateKey(NULL, 0, NULL, &csp, NULL, NULL); - ret = pCryptAcquireCertificatePrivateKey(NULL, 0, NULL, &csp, &keySpec, + ret = CryptAcquireCertificatePrivateKey(NULL, 0, NULL, &csp, NULL, NULL); + ret = CryptAcquireCertificatePrivateKey(NULL, 0, NULL, &csp, &keySpec, &callerFree); - ret = pCryptAcquireCertificatePrivateKey(cert, 0, NULL, NULL, NULL, NULL); + ret = CryptAcquireCertificatePrivateKey(cert, 0, NULL, NULL, NULL, NULL); */ /* Missing private key */ - ret = pCryptAcquireCertificatePrivateKey(cert, 0, NULL, &csp, NULL, NULL); + ret = CryptAcquireCertificatePrivateKey(cert, 0, NULL, &csp, NULL, NULL); ok(!ret && (GetLastError() == CRYPT_E_NO_KEY_PROPERTY || GetLastError() == NTE_BAD_PROV_TYPE /* win10 */), "Expected CRYPT_E_NO_KEY_PROPERTY, got %08lx\n", GetLastError()); - ret = pCryptAcquireCertificatePrivateKey(cert, 0, NULL, &csp, &keySpec, + ret = CryptAcquireCertificatePrivateKey(cert, 0, NULL, &csp, &keySpec, &callerFree); ok(!ret && (GetLastError() == CRYPT_E_NO_KEY_PROPERTY || GetLastError() == NTE_BAD_PROV_TYPE /* win10 */), "Expected CRYPT_E_NO_KEY_PROPERTY, got %08lx\n", GetLastError()); CertSetCertificateContextProperty(cert, CERT_KEY_PROV_INFO_PROP_ID, 0, &keyProvInfo); - ret = pCryptAcquireCertificatePrivateKey(cert, 0, NULL, &csp, &keySpec, + ret = CryptAcquireCertificatePrivateKey(cert, 0, NULL, &csp, &keySpec, &callerFree); ok(!ret && (GetLastError() == CRYPT_E_NO_KEY_PROPERTY || GetLastError() == NTE_BAD_KEYSET /* win8 */ || @@ -3896,11 +3753,9 @@ static void testAcquireCertPrivateKey(void) CERT_KEY_CONTEXT keyContext; /* Don't cache provider */ - ret = pCryptAcquireCertificatePrivateKey(cert, 0, NULL, &certCSP, + ret = CryptAcquireCertificatePrivateKey(cert, 0, NULL, &certCSP, &keySpec, &callerFree); - ok(ret || - broken(!ret), /* win95 */ - "CryptAcquireCertificatePrivateKey failed: %08lx\n", + ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", GetLastError()); if (ret) { @@ -3908,21 +3763,17 @@ static void testAcquireCertPrivateKey(void) CryptReleaseContext(certCSP, 0); } - ret = pCryptAcquireCertificatePrivateKey(cert, 0, NULL, &certCSP, + ret = CryptAcquireCertificatePrivateKey(cert, 0, NULL, &certCSP, NULL, NULL); - ok(ret || - broken(!ret), /* win95 */ - "CryptAcquireCertificatePrivateKey failed: %08lx\n", + ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", GetLastError()); CryptReleaseContext(certCSP, 0); /* Use the key prov info's caching (there shouldn't be any) */ - ret = pCryptAcquireCertificatePrivateKey(cert, + ret = CryptAcquireCertificatePrivateKey(cert, CRYPT_ACQUIRE_USE_PROV_INFO_FLAG, NULL, &certCSP, &keySpec, &callerFree); - ok(ret || - broken(!ret), /* win95 */ - "CryptAcquireCertificatePrivateKey failed: %08lx\n", + ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", GetLastError()); if (ret) { @@ -3931,19 +3782,15 @@ static void testAcquireCertPrivateKey(void) } /* Cache it (and check that it's cached) */ - ret = pCryptAcquireCertificatePrivateKey(cert, + ret = CryptAcquireCertificatePrivateKey(cert, CRYPT_ACQUIRE_CACHE_FLAG, NULL, &certCSP, &keySpec, &callerFree); - ok(ret || - broken(!ret), /* win95 */ - "CryptAcquireCertificatePrivateKey failed: %08lx\n", + ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", GetLastError()); ok(!callerFree, "Expected callerFree to be FALSE\n"); size = sizeof(keyContext); ret = CertGetCertificateContextProperty(cert, CERT_KEY_CONTEXT_PROP_ID, &keyContext, &size); - ok(ret || - broken(!ret), /* win95 */ - "CertGetCertificateContextProperty failed: %08lx\n", + ok(ret, "CertGetCertificateContextProperty failed: %08lx\n", GetLastError()); /* Remove the cached provider */ @@ -3955,20 +3802,16 @@ static void testAcquireCertPrivateKey(void) CertSetCertificateContextProperty(cert, CERT_KEY_PROV_INFO_PROP_ID, 0, &keyProvInfo); /* Now use the key prov info's caching */ - ret = pCryptAcquireCertificatePrivateKey(cert, + ret = CryptAcquireCertificatePrivateKey(cert, CRYPT_ACQUIRE_USE_PROV_INFO_FLAG, NULL, &certCSP, &keySpec, &callerFree); - ok(ret || - broken(!ret), /* win95 */ - "CryptAcquireCertificatePrivateKey failed: %08lx\n", + ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", GetLastError()); ok(!callerFree, "Expected callerFree to be FALSE\n"); size = sizeof(keyContext); ret = CertGetCertificateContextProperty(cert, CERT_KEY_CONTEXT_PROP_ID, &keyContext, &size); - ok(ret || - broken(!ret), /* win95 */ - "CertGetCertificateContextProperty failed: %08lx\n", + ok(ret, "CertGetCertificateContextProperty failed: %08lx\n", GetLastError()); CryptReleaseContext(certCSP, 0); @@ -3992,7 +3835,7 @@ static void testAcquireCertPrivateKey(void) ok(size == sizeof(exportedPublicKeyBlob), "Unexpected size %ld\n", size); ok(!memcmp(buf, exportedPublicKeyBlob, size), "Unexpected value\n"); - ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, RSA_CSP_PUBLICKEYBLOB, + ret = CryptEncodeObjectEx(X509_ASN_ENCODING, RSA_CSP_PUBLICKEYBLOB, buf, CRYPT_ENCODE_ALLOC_FLAG, NULL, &encodedKey, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -4056,9 +3899,7 @@ static void testGetPublicKeyLength(void) ret, GetLastError()); SetLastError(0xdeadbeef); ret = CertGetPublicKeyLength(X509_ASN_ENCODING, &info); - ok(ret == 0 && - (GetLastError() == CRYPT_E_ASN1_EOD || - GetLastError() == OSS_BAD_ARG), /* win9x */ + ok(ret == 0 && GetLastError() == CRYPT_E_ASN1_EOD, "Expected length 0 and CRYPT_E_ASN1_EOD, got length %ld, %08lx\n", ret, GetLastError()); /* With a nearly-empty public key info */ @@ -4070,9 +3911,7 @@ static void testGetPublicKeyLength(void) ret, GetLastError()); SetLastError(0xdeadbeef); ret = CertGetPublicKeyLength(X509_ASN_ENCODING, &info); - ok(ret == 0 && - (GetLastError() == CRYPT_E_ASN1_EOD || - GetLastError() == OSS_BAD_ARG), /* win9x */ + ok(ret == 0 && GetLastError() == CRYPT_E_ASN1_EOD, "Expected length 0 and CRYPT_E_ASN1_EOD, got length %ld, %08lx\n", ret, GetLastError()); /* With a bogus key */ @@ -4085,9 +3924,7 @@ static void testGetPublicKeyLength(void) ret, GetLastError()); SetLastError(0xdeadbeef); ret = CertGetPublicKeyLength(X509_ASN_ENCODING, &info); - ok(ret == 0 && - (GetLastError() == CRYPT_E_ASN1_BADTAG || - GetLastError() == OSS_PDU_MISMATCH), /* win9x */ + ok(ret == 0 && GetLastError() == CRYPT_E_ASN1_BADTAG, "Expected length 0 and CRYPT_E_ASN1_BADTAGTAG, got length %ld, %08lx\n", ret, GetLastError()); /* With a believable RSA key but a bogus OID */ @@ -4107,9 +3944,7 @@ static void testGetPublicKeyLength(void) info.Algorithm.pszObjId = oid_rsa_dh; SetLastError(0xdeadbeef); ret = CertGetPublicKeyLength(X509_ASN_ENCODING, &info); - ok(ret == 0 && - (GetLastError() == CRYPT_E_ASN1_BADTAG || - GetLastError() == E_INVALIDARG), /* win9x */ + ok(ret == 0 && GetLastError() == CRYPT_E_ASN1_BADTAG, "Expected length 0 and CRYPT_E_ASN1_BADTAG, got length %ld, %08lx\n", ret, GetLastError()); /* With the RSA OID */ @@ -4278,12 +4113,7 @@ static void test_VerifySignature(void) ok(!status, "got %#lx\n", status); status = BCryptCreateHash(alg, &bhash, NULL, 0, NULL, 0, 0); - ok(!status || broken(status == STATUS_INVALID_PARAMETER) /* Vista */, "got %#lx\n", status); - if (status == STATUS_INVALID_PARAMETER) - { - win_skip("broken BCryptCreateHash\n"); - goto done; - } + ok(!status, "got %#lx\n", status); status = BCryptHashData(bhash, info->ToBeSigned.pbData, info->ToBeSigned.cbData, 0); ok(!status, "got %#lx\n", status); @@ -4306,18 +4136,14 @@ static void test_VerifySignature(void) HeapFree(GetProcessHeap(), 0, sig_value); BCryptDestroyHash(bhash); -done: BCryptCloseAlgorithmProvider(alg, 0); BCryptDestroyKey(bkey); - LocalFree(info); CertFreeCertificateContext(cert); } START_TEST(cert) { - init_function_pointers(); - testAddCert(); testCertProperties(); testCreateCert(); diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index bcf51c6c811..9ed1b28bf70 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -54,12 +54,6 @@ static const BYTE selfSignedCert[] = { 0x0a, 0x8c, 0xb4, 0x5c, 0x34, 0x78, 0xe0, 0x3c, 0x9c, 0xe9, 0xf3, 0x30, 0x9f, 0xa8, 0x76, 0x57, 0x92, 0x36 }; -static BOOL (WINAPI *pCertCreateCertificateChainEngine)(PCERT_CHAIN_ENGINE_CONFIG,HCERTCHAINENGINE*); -static BOOL (WINAPI *pCertGetCertificateChain)(HCERTCHAINENGINE,PCCERT_CONTEXT,LPFILETIME,HCERTSTORE,PCERT_CHAIN_PARA,DWORD,LPVOID,PCCERT_CHAIN_CONTEXT*); -static VOID (WINAPI *pCertFreeCertificateChain)(PCCERT_CHAIN_CONTEXT); -static VOID (WINAPI *pCertFreeCertificateChainEngine)(HCERTCHAINENGINE); -static BOOL (WINAPI *pCertVerifyCertificateChainPolicy)(LPCSTR,PCCERT_CHAIN_CONTEXT,PCERT_CHAIN_POLICY_PARA,PCERT_CHAIN_POLICY_STATUS); - #define IS_INTOID(x) (((ULONG_PTR)(x) >> 16) == 0) typedef struct _CERT_CHAIN_ENGINE_CONFIG_NO_EXCLUSIVE_ROOT @@ -84,47 +78,41 @@ static void testCreateCertChainEngine(void) HCERTCHAINENGINE engine; HCERTSTORE store; - if (!pCertCreateCertificateChainEngine || !pCertFreeCertificateChainEngine) - { - win_skip("Cert*CertificateChainEngine() functions are not available\n"); - return; - } - /* Crash - ret = pCertCreateCertificateChainEngine(NULL, NULL); - ret = pCertCreateCertificateChainEngine(NULL, &engine); - ret = pCertCreateCertificateChainEngine(pConfig, NULL); + ret = CertCreateCertificateChainEngine(NULL, NULL); + ret = CertCreateCertificateChainEngine(NULL, &engine); + ret = CertCreateCertificateChainEngine(pConfig, NULL); */ - ret = pCertCreateCertificateChainEngine(pConfig, &engine); + ret = CertCreateCertificateChainEngine(pConfig, &engine); ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08lx\n", GetLastError()); /* Crashes config.cbSize = sizeof(config); - ret = pCertCreateCertificateChainEngine(pConfig, NULL); + ret = CertCreateCertificateChainEngine(pConfig, NULL); */ config.cbSize = sizeof(config); - ret = pCertCreateCertificateChainEngine(pConfig, &engine); + ret = CertCreateCertificateChainEngine(pConfig, &engine); ok(ret, "CertCreateCertificateChainEngine failed: %08lx\n", GetLastError()); - pCertFreeCertificateChainEngine(engine); + CertFreeCertificateChainEngine(engine); config.dwFlags = 0xff000000; - ret = pCertCreateCertificateChainEngine(pConfig, &engine); + ret = CertCreateCertificateChainEngine(pConfig, &engine); ok(ret, "CertCreateCertificateChainEngine failed: %08lx\n", GetLastError()); - pCertFreeCertificateChainEngine(engine); + CertFreeCertificateChainEngine(engine); /* Creating a cert with no root certs at all is allowed.. */ store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); config.hRestrictedRoot = store; - ret = pCertCreateCertificateChainEngine(pConfig, &engine); + ret = CertCreateCertificateChainEngine(pConfig, &engine); ok(ret, "CertCreateCertificateChainEngine failed: %08lx\n", GetLastError()); - pCertFreeCertificateChainEngine(engine); + CertFreeCertificateChainEngine(engine); /* but creating one with a restricted root with a cert that isn't a member * of the Root store isn't allowed. */ CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, selfSignedCert, sizeof(selfSignedCert), CERT_STORE_ADD_ALWAYS, NULL); - ret = pCertCreateCertificateChainEngine(pConfig, &engine); + ret = CertCreateCertificateChainEngine(pConfig, &engine); /* ERROR_FILE_NOT_FOUND used in Windows 10 */ ok(!ret && ((GetLastError() == CRYPT_E_NOT_FOUND) || (GetLastError() == ERROR_FILE_NOT_FOUND)), @@ -3399,7 +3387,7 @@ static PCCERT_CHAIN_CONTEXT getChain(HCERTCHAINENGINE engine, ok(SystemTimeToFileTime(checkTime, &fileTime), "SystemTimeToFileTime failed for day %d, month %d, year %d\n", checkTime->wDay, checkTime->wMonth, checkTime->wYear); - ret = pCertGetCertificateChain(engine, endCert, &fileTime, + ret = CertGetCertificateChain(engine, endCert, &fileTime, includeStore ? store : NULL, &chainPara, flags, NULL, &chain); todo_wine_if (todo & TODO_CHAIN) ok(ret, "Chain %ld: CertGetCertificateChain failed: %08lx\n", @@ -4356,17 +4344,17 @@ static void testGetCertChain(void) if (0) { /* Crash on Vista */ - ret = pCertGetCertificateChain(NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL); + ret = CertGetCertificateChain(NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL); ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08lx\n", GetLastError()); } - ret = pCertGetCertificateChain(NULL, NULL, NULL, NULL, NULL, 0, NULL, + ret = CertGetCertificateChain(NULL, NULL, NULL, NULL, NULL, 0, NULL, &chain); ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08lx\n", GetLastError()); /* Crash - ret = pCertGetCertificateChain(NULL, NULL, NULL, NULL, &para, 0, NULL, NULL); - ret = pCertGetCertificateChain(NULL, NULL, NULL, NULL, &para, 0, NULL, + ret = CertGetCertificateChain(NULL, NULL, NULL, NULL, &para, 0, NULL, NULL); + ret = CertGetCertificateChain(NULL, NULL, NULL, NULL, &para, 0, NULL, &chain); */ cert = CertCreateCertificateContext(X509_ASN_ENCODING, bigCert, @@ -4374,17 +4362,17 @@ static void testGetCertChain(void) if (0) { /* Crash on Vista */ - ret = pCertGetCertificateChain(NULL, cert, NULL, NULL, NULL, 0, NULL, NULL); + ret = CertGetCertificateChain(NULL, cert, NULL, NULL, NULL, 0, NULL, NULL); ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08lx\n", GetLastError()); } /* Crash - ret = pCertGetCertificateChain(NULL, cert, NULL, NULL, &para, 0, NULL, NULL); + ret = CertGetCertificateChain(NULL, cert, NULL, NULL, &para, 0, NULL, NULL); */ /* Tests with an invalid cert (one whose signature is bad) */ SetLastError(0xdeadbeef); - ret = pCertGetCertificateChain(NULL, cert, NULL, NULL, &para, 0, NULL, + ret = CertGetCertificateChain(NULL, cert, NULL, NULL, &para, 0, NULL, &chain); ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_DATA || @@ -4392,7 +4380,7 @@ static void testGetCertChain(void) "Expected ERROR_INVALID_DATA or CRYPT_E_ASN1_BADTAG, got %ld\n", GetLastError()); para.cbSize = sizeof(para); SetLastError(0xdeadbeef); - ret = pCertGetCertificateChain(NULL, cert, NULL, NULL, &para, 0, NULL, + ret = CertGetCertificateChain(NULL, cert, NULL, NULL, &para, 0, NULL, &chain); ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_DATA || @@ -4401,7 +4389,7 @@ static void testGetCertChain(void) para.cbSize = 0; SetLastError(0xdeadbeef); - ret = pCertGetCertificateChain(NULL, cert, NULL, NULL, &para, 0, NULL, + ret = CertGetCertificateChain(NULL, cert, NULL, NULL, &para, 0, NULL, &chain); ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_DATA || @@ -4426,39 +4414,39 @@ static void testGetCertChain(void) para.RequestedUsage.dwType = USAGE_MATCH_TYPE_AND; para.RequestedUsage.Usage.rgpszUsageIdentifier = oids; para.RequestedUsage.Usage.cUsageIdentifier = 1; - ret = pCertGetCertificateChain(NULL, cert, &fileTime, store, &para, + ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, 0, NULL, &chain); ok(ret, "CertGetCertificateChain failed: %08lx\n", GetLastError()); if (ret) { ok(chain->TrustStatus.dwErrorStatus & CERT_TRUST_IS_NOT_VALID_FOR_USAGE, "expected CERT_TRUST_IS_NOT_VALID_FOR_USAGE\n"); - pCertFreeCertificateChain(chain); + CertFreeCertificateChain(chain); } oids[0] = oid_server_auth; - ret = pCertGetCertificateChain(NULL, cert, &fileTime, store, &para, + ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, 0, NULL, &chain); ok(ret, "CertGetCertificateChain failed: %08lx\n", GetLastError()); if (ret) { ok(!(chain->TrustStatus.dwErrorStatus & CERT_TRUST_IS_NOT_VALID_FOR_USAGE), "didn't expect CERT_TRUST_IS_NOT_VALID_FOR_USAGE, got %lx\n", chain->TrustStatus.dwErrorStatus); - pCertFreeCertificateChain(chain); + CertFreeCertificateChain(chain); } oids[1] = one_two_three; para.RequestedUsage.Usage.cUsageIdentifier = 2; para.RequestedUsage.dwType = USAGE_MATCH_TYPE_AND; - ret = pCertGetCertificateChain(NULL, cert, &fileTime, store, &para, + ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, 0, NULL, &chain); ok(ret, "CertGetCertificateChain failed: %08lx\n", GetLastError()); if (ret) { ok(chain->TrustStatus.dwErrorStatus & CERT_TRUST_IS_NOT_VALID_FOR_USAGE, "expected CERT_TRUST_IS_NOT_VALID_FOR_USAGE\n"); - pCertFreeCertificateChain(chain); + CertFreeCertificateChain(chain); } para.RequestedUsage.dwType = USAGE_MATCH_TYPE_OR; - ret = pCertGetCertificateChain(NULL, cert, &fileTime, store, &para, + ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, 0, NULL, &chain); ok(ret, "CertGetCertificateChain failed: %08lx\n", GetLastError()); if (ret) @@ -4466,7 +4454,7 @@ static void testGetCertChain(void) ok(!(chain->TrustStatus.dwErrorStatus & CERT_TRUST_IS_NOT_VALID_FOR_USAGE), "didn't expect CERT_TRUST_IS_NOT_VALID_FOR_USAGE\n"); - pCertFreeCertificateChain(chain); + CertFreeCertificateChain(chain); } CertCloseStore(store, 0); CertFreeCertificateContext(cert); @@ -4479,7 +4467,7 @@ static void testGetCertChain(void) { checkChainStatus(chain, &chainCheck[i].status, chainCheck[i].todo, "chainCheck", i); - pCertFreeCertificateChain(chain); + CertFreeCertificateChain(chain); } } chain = getChain(NULL, &opensslChainCheck.certs, 0, TRUE, &oct2007, @@ -4502,7 +4490,7 @@ static void testGetCertChain(void) checkChainStatus(chain, &incompleteOpensslChainCheck.status, incompleteOpensslChainCheck.todo, "incompleteOpensslChainCheck", 0); - pCertFreeCertificateChain(chain); + CertFreeCertificateChain(chain); } for (i = 0; i < ARRAY_SIZE(chainCheckNoStore); i++) { @@ -4512,7 +4500,7 @@ static void testGetCertChain(void) { checkChainStatus(chain, &chainCheckNoStore[i].status, chainCheckNoStore[i].todo, "chainCheckNoStore", i); - pCertFreeCertificateChain(chain); + CertFreeCertificateChain(chain); } } chain = getChain(NULL, &chainCheckEmbeddedNull.certs, 0, TRUE, &oct2007, @@ -4535,7 +4523,7 @@ static void testGetCertChain(void) checkChainStatus(chain, &chainCheckEmbeddedNullBroken.status, chainCheckEmbeddedNullBroken.todo, "chainCheckEmbeddedNullBroken", 0); - pCertFreeCertificateChain(chain); + CertFreeCertificateChain(chain); } store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); @@ -4556,13 +4544,6 @@ static void testGetCertChain(void) ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, 0, NULL, &chain); ok(ret, "CertGetCertificateChain failed: %lu\n", GetLastError()); - if(chain->TrustStatus.dwErrorStatus == CERT_TRUST_IS_PARTIAL_CHAIN) { /* win2k */ - win_skip("winehq cert reported as partial chain, skipping its tests\n"); - pCertFreeCertificateChain(chain); - CertCloseStore(store, 0); - return; - } - ok(chain->TrustStatus.dwErrorStatus == CERT_TRUST_HAS_EXACT_MATCH_ISSUER, "chain->TrustStatus.dwErrorStatus = %lx\n", chain->TrustStatus.dwErrorStatus); todo_wine @@ -4610,7 +4591,7 @@ static void testGetCertChain(void) test_name_blob(&simple_chain->rgpElement[2]->pCertContext->pCertInfo->Subject, "US, New Jersey, Jersey City, The USERTRUST Network, USERTrust RSA Certification Authority"); - pCertFreeCertificateChain(chain); + CertFreeCertificateChain(chain); /* Test revocation flags */ ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, CERT_CHAIN_REVOCATION_CHECK_END_CERT, NULL, @@ -4618,26 +4599,25 @@ static void testGetCertChain(void) ok(ret, "CertGetCertificateChain failed: %lu\n", GetLastError()); ok(chain->TrustStatus.dwErrorStatus == CERT_TRUST_HAS_EXACT_MATCH_ISSUER, "chain->TrustStatus.dwErrorStatus = %lx\n", chain->TrustStatus.dwErrorStatus); - pCertFreeCertificateChain(chain); + CertFreeCertificateChain(chain); ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, CERT_CHAIN_REVOCATION_CHECK_CHAIN, NULL, &chain); ok(ret, "CertGetCertificateChain failed: %lu\n", GetLastError()); - ok(chain->TrustStatus.dwErrorStatus == CERT_TRUST_HAS_EXACT_MATCH_ISSUER || - broken(chain->TrustStatus.dwErrorStatus == (CERT_TRUST_IS_NOT_TIME_VALID|CERT_TRUST_REVOCATION_STATUS_UNKNOWN)), /* XP */ + ok(chain->TrustStatus.dwErrorStatus == CERT_TRUST_HAS_EXACT_MATCH_ISSUER, "chain->TrustStatus.dwErrorStatus = %lx\n", chain->TrustStatus.dwErrorStatus); - pCertFreeCertificateChain(chain); + CertFreeCertificateChain(chain); ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT, NULL, &chain); ok(ret, "CertGetCertificateChain failed: %lu\n", GetLastError()); ok(chain->TrustStatus.dwErrorStatus == CERT_TRUST_HAS_EXACT_MATCH_ISSUER, "chain->TrustStatus.dwErrorStatus = %lx\n", chain->TrustStatus.dwErrorStatus); - pCertFreeCertificateChain(chain); + CertFreeCertificateChain(chain); /* Test HCCE_LOCAL_MACHINE */ ret = CertGetCertificateChain(HCCE_LOCAL_MACHINE, cert, &fileTime, store, &para, 0, NULL, &chain); ok(ret, "CertGetCertificateChain failed: %lu\n", GetLastError()); - pCertFreeCertificateChain(chain); + CertFreeCertificateChain(chain); CertFreeCertificateContext(cert); CertCloseStore(store, 0); @@ -4671,10 +4651,10 @@ static void test_CERT_CHAIN_PARA_cbSize(void) SystemTimeToFileTime(&oct2007, &fileTime); para.cbSize = i; - ret = pCertGetCertificateChain(NULL, cert, &fileTime, + ret = CertGetCertificateChain(NULL, cert, &fileTime, NULL, &para, 0, NULL, &chain); ok(ret, "CertGetCertificateChain failed %lu\n", GetLastError()); - pCertFreeCertificateChain(chain); + CertFreeCertificateChain(chain); } CertFreeCertificateContext(cert); @@ -4996,7 +4976,7 @@ static void checkChainPolicyStatus(LPCSTR policy, HCERTCHAINENGINE engine, if (chain) { CERT_CHAIN_POLICY_STATUS policyStatus = { 0 }; - BOOL ret = pCertVerifyCertificateChainPolicy(policy, chain, para, + BOOL ret = CertVerifyCertificateChainPolicy(policy, chain, para, &policyStatus); if (check->todo & TODO_POLICY) @@ -5012,7 +4992,7 @@ static void checkChainPolicyStatus(LPCSTR policy, HCERTCHAINENGINE engine, skip("%s[%ld]: missing policy %s, skipping test\n", testName, testIndex, IS_INTOID(policy) ? num_to_str(LOWORD(policy)) : policy); - pCertFreeCertificateChain(chain); + CertFreeCertificateChain(chain); return; } ok(ret, "%s[%ld](%s): CertVerifyCertificateChainPolicy failed: %08lx\n", @@ -5037,7 +5017,7 @@ static void checkChainPolicyStatus(LPCSTR policy, HCERTCHAINENGINE engine, testName, testIndex, IS_INTOID(policy) ? num_to_str(LOWORD(policy)) : policy, policyStatus.dwError, check->status.dwError); - pCertFreeCertificateChain(chain); + CertFreeCertificateChain(chain); return; } todo_wine_if (check->todo & TODO_CHAINS) @@ -5057,7 +5037,7 @@ static void checkChainPolicyStatus(LPCSTR policy, HCERTCHAINENGINE engine, IS_INTOID(policy) ? num_to_str(LOWORD(policy)) : policy, check->status.lElementIndex, policyStatus.lElementIndex); } - pCertFreeCertificateChain(chain); + CertFreeCertificateChain(chain); } } @@ -5262,7 +5242,7 @@ static void check_ssl_policy(void) CertAddEncodedCertificateToStore(testRoot, X509_ASN_ENCODING, chain0_0, sizeof(chain0_0), CERT_STORE_ADD_ALWAYS, NULL); engineConfig.hExclusiveRoot = testRoot; - if (!pCertCreateCertificateChainEngine(&engineConfig, &engine)) + if (!CertCreateCertificateChainEngine(&engineConfig, &engine)) { skip("Couldn't create chain engine\n"); return; @@ -5283,7 +5263,7 @@ static void check_ssl_policy(void) sslPolicyPara.fdwChecks |= SECURITY_FLAG_IGNORE_CERT_CN_INVALID; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, engine, winehqPolicyCheckWithMatchingName, &oct2007, &policyPara); - pCertFreeCertificateChainEngine(engine); + CertFreeCertificateChainEngine(engine); CertCloseStore(testRoot, 0); /* Test chain30, which has an invalid critical extension in an intermediate * cert, against the SSL policy. @@ -5328,40 +5308,34 @@ static void testVerifyCertChainPolicy(void) CERT_CHAIN_POLICY_STATUS policyStatus = { 0 }; CERT_CHAIN_POLICY_PARA policyPara = { 0 }; - if (!pCertVerifyCertificateChainPolicy) - { - win_skip("CertVerifyCertificateChainPolicy() is not available\n"); - return; - } - /* Crash - ret = pCertVerifyCertificateChainPolicy(NULL, NULL, NULL, NULL); - ret = pCertVerifyCertificateChainPolicy(CERT_CHAIN_POLICY_BASE, NULL, NULL, + ret = CertVerifyCertificateChainPolicy(NULL, NULL, NULL, NULL); + ret = CertVerifyCertificateChainPolicy(CERT_CHAIN_POLICY_BASE, NULL, NULL, NULL); - ret = pCertVerifyCertificateChainPolicy(CERT_CHAIN_POLICY_BASE, NULL, + ret = CertVerifyCertificateChainPolicy(CERT_CHAIN_POLICY_BASE, NULL, &chainPara, NULL); */ SetLastError(0xdeadbeef); - ret = pCertVerifyCertificateChainPolicy(NULL, NULL, NULL, &policyStatus); + ret = CertVerifyCertificateChainPolicy(NULL, NULL, NULL, &policyStatus); ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %08lx\n", GetLastError()); /* Crashes - ret = pCertVerifyCertificateChainPolicy(CERT_CHAIN_POLICY_BASE, NULL, NULL, + ret = CertVerifyCertificateChainPolicy(CERT_CHAIN_POLICY_BASE, NULL, NULL, &policyStatus); */ cert = CertCreateCertificateContext(X509_ASN_ENCODING, selfSignedCert, sizeof(selfSignedCert)); - pCertGetCertificateChain(NULL, cert, NULL, NULL, &chainPara, 0, NULL, + CertGetCertificateChain(NULL, cert, NULL, NULL, &chainPara, 0, NULL, &chain); /* Crash - ret = pCertVerifyCertificateChainPolicy(NULL, chain, NULL, NULL); - ret = pCertVerifyCertificateChainPolicy(CERT_CHAIN_POLICY_BASE, chain, NULL, + ret = CertVerifyCertificateChainPolicy(NULL, chain, NULL, NULL); + ret = CertVerifyCertificateChainPolicy(CERT_CHAIN_POLICY_BASE, chain, NULL, NULL); - ret = pCertVerifyCertificateChainPolicy(CERT_CHAIN_POLICY_BASE, chain, + ret = CertVerifyCertificateChainPolicy(CERT_CHAIN_POLICY_BASE, chain, &chainPara, NULL); */ /* Size of policy status is apparently ignored, as is pChainPolicyPara */ - ret = pCertVerifyCertificateChainPolicy(CERT_CHAIN_POLICY_BASE, chain, NULL, + ret = CertVerifyCertificateChainPolicy(CERT_CHAIN_POLICY_BASE, chain, NULL, &policyStatus); ok(ret, "CertVerifyCertificateChainPolicy failed: %08lx\n", GetLastError()); ok(policyStatus.dwError == CERT_E_UNTRUSTEDROOT || @@ -5370,7 +5344,7 @@ static void testVerifyCertChainPolicy(void) ok(policyStatus.lChainIndex == 0 && policyStatus.lElementIndex == 0, "Expected both indexes 0, got %ld, %ld\n", policyStatus.lChainIndex, policyStatus.lElementIndex); - ret = pCertVerifyCertificateChainPolicy(CERT_CHAIN_POLICY_BASE, chain, + ret = CertVerifyCertificateChainPolicy(CERT_CHAIN_POLICY_BASE, chain, &policyPara, &policyStatus); ok(ret, "CertVerifyCertificateChainPolicy failed: %08lx\n", GetLastError()); ok(policyStatus.dwError == CERT_E_UNTRUSTEDROOT || @@ -5379,7 +5353,7 @@ static void testVerifyCertChainPolicy(void) ok(policyStatus.lChainIndex == 0 && policyStatus.lElementIndex == 0, "Expected both indexes 0, got %ld, %ld\n", policyStatus.lChainIndex, policyStatus.lElementIndex); - pCertFreeCertificateChain(chain); + CertFreeCertificateChain(chain); CertFreeCertificateContext(cert); check_base_policy(); @@ -5392,22 +5366,8 @@ static void testVerifyCertChainPolicy(void) START_TEST(chain) { - HMODULE hCrypt32 = GetModuleHandleA("crypt32.dll"); - pCertCreateCertificateChainEngine = (void*)GetProcAddress(hCrypt32, "CertCreateCertificateChainEngine"); - pCertGetCertificateChain = (void*)GetProcAddress(hCrypt32, "CertGetCertificateChain"); - pCertFreeCertificateChain = (void*)GetProcAddress(hCrypt32, "CertFreeCertificateChain"); - pCertFreeCertificateChainEngine = (void*)GetProcAddress(hCrypt32, "CertFreeCertificateChainEngine"); - pCertVerifyCertificateChainPolicy = (void*)GetProcAddress(hCrypt32, "CertVerifyCertificateChainPolicy"); - testCreateCertChainEngine(); - if (!pCertGetCertificateChain || !pCertFreeCertificateChain) - { - win_skip("Cert*CertificateChain functions not available\n"); - } - else - { - testVerifyCertChainPolicy(); - testGetCertChain(); - test_CERT_CHAIN_PARA_cbSize(); - } + testVerifyCertChainPolicy(); + testGetCertChain(); + test_CERT_CHAIN_PARA_cbSize(); } diff --git a/dlls/crypt32/tests/crl.c b/dlls/crypt32/tests/crl.c index 3797fc4cfbf..06cfc52fece 100644 --- a/dlls/crypt32/tests/crl.c +++ b/dlls/crypt32/tests/crl.c @@ -77,18 +77,6 @@ static const BYTE signedCRL[] = { 0x30, 0x45, 0x30, 0x2c, 0x30, 0x02, 0x06, 0x30, 0x5a, 0x30, 0x02, 0x06, 0x00, 0x03, 0x11, 0x00, 0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00 }; -static BOOL (WINAPI *pCertFindCertificateInCRL)(PCCERT_CONTEXT,PCCRL_CONTEXT,DWORD,void*,PCRL_ENTRY*); -static PCCRL_CONTEXT (WINAPI *pCertFindCRLInStore)(HCERTSTORE,DWORD,DWORD,DWORD,const void*,PCCRL_CONTEXT); -static BOOL (WINAPI *pCertIsValidCRLForCertificate)(PCCERT_CONTEXT, PCCRL_CONTEXT, DWORD, void*); - -static void init_function_pointers(void) -{ - HMODULE hdll = GetModuleHandleA("crypt32.dll"); - pCertFindCertificateInCRL = (void*)GetProcAddress(hdll, "CertFindCertificateInCRL"); - pCertFindCRLInStore = (void*)GetProcAddress(hdll, "CertFindCRLInStore"); - pCertIsValidCRLForCertificate = (void*)GetProcAddress(hdll, "CertIsValidCRLForCertificate"); -} - static void testCreateCRL(void) { PCCRL_CONTEXT context; @@ -99,8 +87,8 @@ static void testCreateCRL(void) "Expected E_INVALIDARG, got %08lx\n", GetLastError()); context = CertCreateCRLContext(X509_ASN_ENCODING, NULL, 0); GLE = GetLastError(); - ok(!context && (GLE == CRYPT_E_ASN1_EOD || GLE == OSS_MORE_INPUT), - "Expected CRYPT_E_ASN1_EOD or OSS_MORE_INPUT, got %08lx\n", GLE); + ok(!context && GLE == CRYPT_E_ASN1_EOD, + "Expected CRYPT_E_ASN1_EOD, got %08lx\n", GLE); context = CertCreateCRLContext(X509_ASN_ENCODING, bigCert, sizeof(bigCert)); ok(!context, "Expected failure\n"); context = CertCreateCRLContext(X509_ASN_ENCODING, signedCRL, @@ -177,29 +165,23 @@ static void testAddCRL(void) /* No CRL */ ret = CertAddEncodedCRLToStore(0, X509_ASN_ENCODING, NULL, 0, 0, NULL); GLE = GetLastError(); - ok(!ret && (GLE == CRYPT_E_ASN1_EOD || GLE == OSS_MORE_INPUT), - "Expected CRYPT_E_ASN1_EOD or OSS_MORE_INPUT, got %08lx\n", GLE); + ok(!ret && GLE == CRYPT_E_ASN1_EOD, + "Expected CRYPT_E_ASN1_EOD, got %08lx\n", GLE); ret = CertAddEncodedCRLToStore(store, X509_ASN_ENCODING, NULL, 0, 0, NULL); GLE = GetLastError(); - ok(!ret && (GLE == CRYPT_E_ASN1_EOD || GLE == OSS_MORE_INPUT), - "Expected CRYPT_E_ASN1_EOD or OSS_MORE_INPUT, got %08lx\n", GLE); + ok(!ret && GLE == CRYPT_E_ASN1_EOD, + "Expected CRYPT_E_ASN1_EOD, got %08lx\n", GLE); - /* Weird--bad add disposition leads to an access violation in Windows. - * Both tests crash on some win9x boxes. - */ - if (0) - { - ret = CertAddEncodedCRLToStore(0, X509_ASN_ENCODING, signedCRL, - sizeof(signedCRL), 0, NULL); - ok(!ret && (GetLastError() == STATUS_ACCESS_VIOLATION || - GetLastError() == E_INVALIDARG /* Vista */), - "Expected STATUS_ACCESS_VIOLATION or E_INVALIDARG, got %08lx\n", GetLastError()); - ret = CertAddEncodedCRLToStore(store, X509_ASN_ENCODING, signedCRL, - sizeof(signedCRL), 0, NULL); - ok(!ret && (GetLastError() == STATUS_ACCESS_VIOLATION || - GetLastError() == E_INVALIDARG /* Vista */), + ret = CertAddEncodedCRLToStore(0, X509_ASN_ENCODING, signedCRL, + sizeof(signedCRL), 0, NULL); + ok(!ret && (GetLastError() == STATUS_ACCESS_VIOLATION || + GetLastError() == E_INVALIDARG /* Vista */), "Expected STATUS_ACCESS_VIOLATION or E_INVALIDARG, got %08lx\n", GetLastError()); - } + ret = CertAddEncodedCRLToStore(store, X509_ASN_ENCODING, signedCRL, + sizeof(signedCRL), 0, NULL); + ok(!ret && (GetLastError() == STATUS_ACCESS_VIOLATION || + GetLastError() == E_INVALIDARG /* Vista */), + "Expected STATUS_ACCESS_VIOLATION or E_INVALIDARG, got %08lx\n", GetLastError()); /* Weird--can add a CRL to the NULL store (does this have special meaning?) */ @@ -433,12 +415,6 @@ static void testFindCRL(void) DWORD count, revoked_count; BOOL ret; - if (!pCertFindCRLInStore || !pCertFindCertificateInCRL) - { - win_skip("CertFindCRLInStore or CertFindCertificateInCRL not available\n"); - return; - } - store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); ok(store != NULL, "CertOpenStore failed: %08lx\n", GetLastError()); @@ -449,27 +425,27 @@ static void testFindCRL(void) ok(ret, "CertAddEncodedCRLToStore failed: %08lx\n", GetLastError()); /* Crashes - context = pCertFindCRLInStore(NULL, 0, 0, 0, NULL, NULL); + context = CertFindCRLInStore(NULL, 0, 0, 0, NULL, NULL); */ /* Find any context */ - context = pCertFindCRLInStore(store, 0, 0, CRL_FIND_ANY, NULL, NULL); + context = CertFindCRLInStore(store, 0, 0, CRL_FIND_ANY, NULL, NULL); ok(context != NULL, "Expected a context\n"); if (context) CertFreeCRLContext(context); /* Bogus flags are ignored */ - context = pCertFindCRLInStore(store, 0, 1234, CRL_FIND_ANY, NULL, NULL); + context = CertFindCRLInStore(store, 0, 1234, CRL_FIND_ANY, NULL, NULL); ok(context != NULL, "Expected a context\n"); if (context) CertFreeCRLContext(context); /* CRL encoding type is ignored too */ - context = pCertFindCRLInStore(store, 1234, 0, CRL_FIND_ANY, NULL, NULL); + context = CertFindCRLInStore(store, 1234, 0, CRL_FIND_ANY, NULL, NULL); ok(context != NULL, "Expected a context\n"); if (context) CertFreeCRLContext(context); /* This appears to match any cert */ - context = pCertFindCRLInStore(store, 0, 0, CRL_FIND_ISSUED_BY, NULL, NULL); + context = CertFindCRLInStore(store, 0, 0, CRL_FIND_ISSUED_BY, NULL, NULL); ok(context != NULL, "Expected a context\n"); if (context) CertFreeCRLContext(context); @@ -479,7 +455,7 @@ static void testFindCRL(void) sizeof(bigCert2)); ok(cert != NULL, "CertCreateCertificateContext failed: %08lx\n", GetLastError()); - context = pCertFindCRLInStore(store, 0, 0, CRL_FIND_ISSUED_BY, cert, NULL); + context = CertFindCRLInStore(store, 0, 0, CRL_FIND_ISSUED_BY, cert, NULL); ok(context == NULL, "Expected no matching context\n"); CertFreeCertificateContext(cert); @@ -488,17 +464,17 @@ static void testFindCRL(void) sizeof(bigCert)); ok(cert != NULL, "CertCreateCertificateContext failed: %08lx\n", GetLastError()); - context = pCertFindCRLInStore(store, 0, 0, CRL_FIND_ISSUED_BY, cert, NULL); + context = CertFindCRLInStore(store, 0, 0, CRL_FIND_ISSUED_BY, cert, NULL); ok(context != NULL, "Expected a context\n"); if (context) CertFreeCRLContext(context); /* Try various find flags */ - context = pCertFindCRLInStore(store, 0, CRL_FIND_ISSUED_BY_SIGNATURE_FLAG, + context = CertFindCRLInStore(store, 0, CRL_FIND_ISSUED_BY_SIGNATURE_FLAG, CRL_FIND_ISSUED_BY, cert, NULL); - ok(!context || broken(context != NULL /* Win9x */), "unexpected context\n"); + ok(!context, "unexpected context\n"); /* The CRL doesn't have an AKI extension, so it matches any cert */ - context = pCertFindCRLInStore(store, 0, CRL_FIND_ISSUED_BY_AKI_FLAG, + context = CertFindCRLInStore(store, 0, CRL_FIND_ISSUED_BY_AKI_FLAG, CRL_FIND_ISSUED_BY, cert, NULL); ok(context != NULL, "Expected a context\n"); if (context) @@ -507,18 +483,17 @@ static void testFindCRL(void) if (0) { /* Crash or return NULL/STATUS_ACCESS_VIOLATION */ - pCertFindCRLInStore(store, 0, 0, CRL_FIND_ISSUED_FOR, NULL, + CertFindCRLInStore(store, 0, 0, CRL_FIND_ISSUED_FOR, NULL, NULL); - pCertFindCRLInStore(store, 0, 0, CRL_FIND_ISSUED_FOR, + CertFindCRLInStore(store, 0, 0, CRL_FIND_ISSUED_FOR, &issuedForPara, NULL); } /* Test whether the cert matches the CRL in the store */ issuedForPara.pSubjectCert = cert; issuedForPara.pIssuerCert = cert; - context = pCertFindCRLInStore(store, 0, 0, CRL_FIND_ISSUED_FOR, + context = CertFindCRLInStore(store, 0, 0, CRL_FIND_ISSUED_FOR, &issuedForPara, NULL); - ok(context != NULL || broken(!context /* Win9x, NT4 */), - "Expected a context\n"); + ok(context != NULL, "Expected a context\n"); if (context) { ok(context->cbCrlEncoded == sizeof(signedCRL), @@ -544,14 +519,14 @@ static void testFindCRL(void) context = NULL; count = revoked_count = 0; do { - context = pCertFindCRLInStore(store, 0, 0, CRL_FIND_ISSUED_FOR, + context = CertFindCRLInStore(store, 0, 0, CRL_FIND_ISSUED_FOR, &issuedForPara, context); if (context) { PCRL_ENTRY entry; count++; - if (pCertFindCertificateInCRL(cert, context, 0, NULL, &entry) && + if (CertFindCertificateInCRL(cert, context, 0, NULL, &entry) && entry) revoked_count++; } @@ -560,13 +535,11 @@ static void testFindCRL(void) * match cert's issuer, but verisignCRL does not, so the expected count * is 0. */ - ok(count == 3 || broken(count == 0 /* NT4, Win9x */), - "expected 3 matching CRLs, got %ld\n", count); + ok(count == 3, "expected 3 matching CRLs, got %ld\n", count); /* Only v1CRLWithIssuerAndEntry and v2CRLWithIssuingDistPoint contain * entries, so the count of CRL entries that match cert is 2. */ - ok(revoked_count == 2 || broken(revoked_count == 0 /* NT4, Win9x */), - "expected 2 matching CRL entries, got %ld\n", revoked_count); + ok(revoked_count == 2, "expected 2 matching CRL entries, got %ld\n", revoked_count); CertFreeCertificateContext(cert); @@ -580,14 +553,14 @@ static void testFindCRL(void) context = NULL; count = revoked_count = 0; do { - context = pCertFindCRLInStore(store, 0, 0, CRL_FIND_ISSUED_FOR, + context = CertFindCRLInStore(store, 0, 0, CRL_FIND_ISSUED_FOR, &issuedForPara, context); if (context) { PCRL_ENTRY entry; count++; - if (pCertFindCertificateInCRL(cert, context, 0, NULL, &entry) && + if (CertFindCertificateInCRL(cert, context, 0, NULL, &entry) && entry) revoked_count++; } @@ -609,20 +582,19 @@ static void testFindCRL(void) context = NULL; count = revoked_count = 0; do { - context = pCertFindCRLInStore(store, 0, 0, CRL_FIND_ISSUED_FOR, + context = CertFindCRLInStore(store, 0, 0, CRL_FIND_ISSUED_FOR, &issuedForPara, context); if (context) { PCRL_ENTRY entry; count++; - if (pCertFindCertificateInCRL(cert, context, 0, NULL, &entry) && + if (CertFindCertificateInCRL(cert, context, 0, NULL, &entry) && entry) revoked_count++; } } while (context); - ok(count == 1 || broken(count == 0 /* Win9x, NT4 */), - "expected 1 matching CRLs, got %ld\n", count); + ok(count == 1, "expected 1 matching CRLs, got %ld\n", count); ok(revoked_count == 0, "expected 0 matching CRL entries, got %ld\n", revoked_count); CertFreeCertificateContext(cert); @@ -649,34 +621,32 @@ static void testFindCRL(void) context = NULL; count = revoked_count = 0; do { - context = pCertFindCRLInStore(store, 0, 0, CRL_FIND_ISSUED_FOR, + context = CertFindCRLInStore(store, 0, 0, CRL_FIND_ISSUED_FOR, &issuedForPara, context); if (context) { PCRL_ENTRY entry; count++; - if (pCertFindCertificateInCRL(endCert, context, 0, NULL, &entry) && + if (CertFindCertificateInCRL(endCert, context, 0, NULL, &entry) && entry) revoked_count++; } } while (context); - ok(count == 1 || broken(count == 0 /* Win9x, NT4 */), - "expected 1 matching CRLs, got %ld\n", count); - ok(revoked_count == 1 || broken(revoked_count == 0 /* Win9x, NT4 */), - "expected 1 matching CRL entries, got %ld\n", revoked_count); + ok(count == 1, "expected 1 matching CRLs, got %ld\n", count); + ok(revoked_count == 1, "expected 1 matching CRL entries, got %ld\n", revoked_count); /* Test CRL_FIND_ISSUED_BY flags */ count = revoked_count = 0; do { - context = pCertFindCRLInStore(store, 0, 0, CRL_FIND_ISSUED_BY, + context = CertFindCRLInStore(store, 0, 0, CRL_FIND_ISSUED_BY, endCert, context); if (context) { PCRL_ENTRY entry; count++; - if (pCertFindCertificateInCRL(endCert, context, 0, NULL, &entry) && + if (CertFindCertificateInCRL(endCert, context, 0, NULL, &entry) && entry) revoked_count++; } @@ -686,14 +656,14 @@ static void testFindCRL(void) revoked_count); count = revoked_count = 0; do { - context = pCertFindCRLInStore(store, 0, 0, CRL_FIND_ISSUED_BY, + context = CertFindCRLInStore(store, 0, 0, CRL_FIND_ISSUED_BY, rootCert, context); if (context) { PCRL_ENTRY entry; count++; - if (pCertFindCertificateInCRL(endCert, context, 0, NULL, &entry) && + if (CertFindCertificateInCRL(endCert, context, 0, NULL, &entry) && entry) revoked_count++; } @@ -703,14 +673,14 @@ static void testFindCRL(void) revoked_count); count = revoked_count = 0; do { - context = pCertFindCRLInStore(store, 0, CRL_FIND_ISSUED_BY_AKI_FLAG, + context = CertFindCRLInStore(store, 0, CRL_FIND_ISSUED_BY_AKI_FLAG, CRL_FIND_ISSUED_BY, endCert, context); if (context) { PCRL_ENTRY entry; count++; - if (pCertFindCertificateInCRL(endCert, context, 0, NULL, &entry) && + if (CertFindCertificateInCRL(endCert, context, 0, NULL, &entry) && entry) revoked_count++; } @@ -720,25 +690,24 @@ static void testFindCRL(void) revoked_count); count = revoked_count = 0; do { - context = pCertFindCRLInStore(store, 0, CRL_FIND_ISSUED_BY_AKI_FLAG, + context = CertFindCRLInStore(store, 0, CRL_FIND_ISSUED_BY_AKI_FLAG, CRL_FIND_ISSUED_BY, rootCert, context); if (context) { PCRL_ENTRY entry; count++; - if (pCertFindCertificateInCRL(rootCert, context, 0, NULL, &entry) && + if (CertFindCertificateInCRL(rootCert, context, 0, NULL, &entry) && entry) revoked_count++; } } while (context); - ok(count == 0 || broken(count == 1 /* Win9x */), - "expected 0 matching CRLs, got %ld\n", count); + ok(count == 0, "expected 0 matching CRLs, got %ld\n", count); ok(revoked_count == 0, "expected 0 matching CRL entries, got %ld\n", revoked_count); count = revoked_count = 0; do { - context = pCertFindCRLInStore(store, 0, + context = CertFindCRLInStore(store, 0, CRL_FIND_ISSUED_BY_SIGNATURE_FLAG, CRL_FIND_ISSUED_BY, endCert, context); if (context) @@ -746,7 +715,7 @@ static void testFindCRL(void) PCRL_ENTRY entry; count++; - if (pCertFindCertificateInCRL(endCert, context, 0, NULL, &entry) && + if (CertFindCertificateInCRL(endCert, context, 0, NULL, &entry) && entry) revoked_count++; } @@ -756,7 +725,7 @@ static void testFindCRL(void) revoked_count); count = revoked_count = 0; do { - context = pCertFindCRLInStore(store, 0, + context = CertFindCRLInStore(store, 0, CRL_FIND_ISSUED_BY_SIGNATURE_FLAG, CRL_FIND_ISSUED_BY, rootCert, context); if (context) @@ -764,7 +733,7 @@ static void testFindCRL(void) PCRL_ENTRY entry; count++; - if (pCertFindCertificateInCRL(endCert, context, 0, NULL, &entry) && + if (CertFindCertificateInCRL(endCert, context, 0, NULL, &entry) && entry) revoked_count++; } @@ -985,8 +954,6 @@ static void testIsValidCRLForCert(void) PCCRL_CONTEXT crl; HCERTSTORE store; - if(!pCertIsValidCRLForCertificate) return; - crl = CertCreateCRLContext(X509_ASN_ENCODING, v1CRLWithIssuerAndEntry, sizeof(v1CRLWithIssuerAndEntry)); ok(crl != NULL, "CertCreateCRLContext failed: %08lx\n", GetLastError()); @@ -1001,11 +968,11 @@ static void testIsValidCRLForCert(void) */ /* Curiously, any CRL is valid for the NULL certificate */ - ret = pCertIsValidCRLForCertificate(NULL, crl, 0, NULL); + ret = CertIsValidCRLForCertificate(NULL, crl, 0, NULL); ok(ret, "CertIsValidCRLForCertificate failed: %08lx\n", GetLastError()); /* Same issuer for both cert and CRL, this CRL is valid for that cert */ - ret = pCertIsValidCRLForCertificate(cert1, crl, 0, NULL); + ret = CertIsValidCRLForCertificate(cert1, crl, 0, NULL); ok(ret, "CertIsValidCRLForCertificate failed: %08lx\n", GetLastError()); cert2 = CertCreateCertificateContext(X509_ASN_ENCODING, @@ -1017,7 +984,7 @@ static void testIsValidCRLForCert(void) * that cert. According to MSDN, the relevant bit to check is whether the * CRL has a CRL_ISSUING_DIST_POINT extension. */ - ret = pCertIsValidCRLForCertificate(cert2, crl, 0, NULL); + ret = CertIsValidCRLForCertificate(cert2, crl, 0, NULL); ok(ret, "CertIsValidCRLForCertificate failed: %08lx\n", GetLastError()); CertFreeCRLContext(crl); @@ -1029,10 +996,10 @@ static void testIsValidCRLForCert(void) sizeof(v2CRLWithIssuingDistPoint)); ok(crl != NULL, "CertCreateCRLContext failed: %08lx\n", GetLastError()); - ret = pCertIsValidCRLForCertificate(cert1, crl, 0, NULL); + ret = CertIsValidCRLForCertificate(cert1, crl, 0, NULL); ok(!ret && GetLastError() == CRYPT_E_NO_MATCH, "expected CRYPT_E_NO_MATCH, got %08lx\n", GetLastError()); - ret = pCertIsValidCRLForCertificate(cert2, crl, 0, NULL); + ret = CertIsValidCRLForCertificate(cert2, crl, 0, NULL); ok(!ret && GetLastError() == CRYPT_E_NO_MATCH, "expected CRYPT_E_NO_MATCH, got %08lx\n", GetLastError()); @@ -1043,7 +1010,7 @@ static void testIsValidCRLForCert(void) bigCertWithCRLDistPoints, sizeof(bigCertWithCRLDistPoints)); ok(cert3 != NULL, "CertCreateCertificateContext failed: %08lx\n", GetLastError()); - ret = pCertIsValidCRLForCertificate(cert3, crl, 0, NULL); + ret = CertIsValidCRLForCertificate(cert3, crl, 0, NULL); ok(ret, "CertIsValidCRLForCertificate failed: %08lx\n", GetLastError()); CertFreeCRLContext(crl); @@ -1053,11 +1020,11 @@ static void testIsValidCRLForCert(void) sizeof(verisignCRL)); ok(crl != NULL, "CertCreateCRLContext failed: %08lx\n", GetLastError()); - ret = pCertIsValidCRLForCertificate(cert1, crl, 0, NULL); + ret = CertIsValidCRLForCertificate(cert1, crl, 0, NULL); ok(ret, "CertIsValidCRLForCertificate failed: %08lx\n", GetLastError()); - ret = pCertIsValidCRLForCertificate(cert2, crl, 0, NULL); + ret = CertIsValidCRLForCertificate(cert2, crl, 0, NULL); ok(ret, "CertIsValidCRLForCertificate failed: %08lx\n", GetLastError()); - ret = pCertIsValidCRLForCertificate(cert3, crl, 0, NULL); + ret = CertIsValidCRLForCertificate(cert3, crl, 0, NULL); ok(ret, "CertIsValidCRLForCertificate failed: %08lx\n", GetLastError()); CertFreeCRLContext(crl); @@ -1073,11 +1040,11 @@ static void testIsValidCRLForCert(void) sizeof(verisignCRL), CERT_STORE_ADD_ALWAYS, &crl); ok(ret, "CertAddEncodedCRLToStore failed: %08lx\n", GetLastError()); - ret = pCertIsValidCRLForCertificate(cert1, crl, 0, NULL); + ret = CertIsValidCRLForCertificate(cert1, crl, 0, NULL); ok(ret, "CertIsValidCRLForCertificate failed: %08lx\n", GetLastError()); - ret = pCertIsValidCRLForCertificate(cert2, crl, 0, NULL); + ret = CertIsValidCRLForCertificate(cert2, crl, 0, NULL); ok(ret, "CertIsValidCRLForCertificate failed: %08lx\n", GetLastError()); - ret = pCertIsValidCRLForCertificate(cert3, crl, 0, NULL); + ret = CertIsValidCRLForCertificate(cert3, crl, 0, NULL); ok(ret, "CertIsValidCRLForCertificate failed: %08lx\n", GetLastError()); CertFreeCRLContext(crl); @@ -1103,37 +1070,31 @@ static void testFindCertInCRL(void) PCCRL_CONTEXT crl; PCRL_ENTRY entry; - if (!pCertFindCertificateInCRL) - { - win_skip("CertFindCertificateInCRL() is not available\n"); - return; - } - cert = CertCreateCertificateContext(X509_ASN_ENCODING, bigCert, sizeof(bigCert)); ok(cert != NULL, "CertCreateCertificateContext failed: %08lx\n", GetLastError()); /* Crash - ret = pCertFindCertificateInCRL(NULL, NULL, 0, NULL, NULL); - ret = pCertFindCertificateInCRL(NULL, crl, 0, NULL, NULL); - ret = pCertFindCertificateInCRL(cert, NULL, 0, NULL, NULL); - ret = pCertFindCertificateInCRL(cert, crl, 0, NULL, NULL); - ret = pCertFindCertificateInCRL(NULL, NULL, 0, NULL, &entry); - ret = pCertFindCertificateInCRL(NULL, crl, 0, NULL, &entry); - ret = pCertFindCertificateInCRL(cert, NULL, 0, NULL, &entry); + ret = CertFindCertificateInCRL(NULL, NULL, 0, NULL, NULL); + ret = CertFindCertificateInCRL(NULL, crl, 0, NULL, NULL); + ret = CertFindCertificateInCRL(cert, NULL, 0, NULL, NULL); + ret = CertFindCertificateInCRL(cert, crl, 0, NULL, NULL); + ret = CertFindCertificateInCRL(NULL, NULL, 0, NULL, &entry); + ret = CertFindCertificateInCRL(NULL, crl, 0, NULL, &entry); + ret = CertFindCertificateInCRL(cert, NULL, 0, NULL, &entry); */ crl = CertCreateCRLContext(X509_ASN_ENCODING, verisignCRL, sizeof(verisignCRL)); - ret = pCertFindCertificateInCRL(cert, crl, 0, NULL, &entry); + ret = CertFindCertificateInCRL(cert, crl, 0, NULL, &entry); ok(ret, "CertFindCertificateInCRL failed: %08lx\n", GetLastError()); ok(entry == NULL, "Expected not to find an entry in CRL\n"); CertFreeCRLContext(crl); crl = CertCreateCRLContext(X509_ASN_ENCODING, v1CRLWithIssuerAndEntry, sizeof(v1CRLWithIssuerAndEntry)); - ret = pCertFindCertificateInCRL(cert, crl, 0, NULL, &entry); + ret = CertFindCertificateInCRL(cert, crl, 0, NULL, &entry); ok(ret, "CertFindCertificateInCRL failed: %08lx\n", GetLastError()); ok(entry != NULL, "Expected to find an entry in CRL\n"); CertFreeCRLContext(crl); @@ -1141,7 +1102,7 @@ static void testFindCertInCRL(void) /* Entry found even though CRL issuer doesn't match cert issuer */ crl = CertCreateCRLContext(X509_ASN_ENCODING, crlWithDifferentIssuer, sizeof(crlWithDifferentIssuer)); - ret = pCertFindCertificateInCRL(cert, crl, 0, NULL, &entry); + ret = CertFindCertificateInCRL(cert, crl, 0, NULL, &entry); ok(ret, "CertFindCertificateInCRL failed: %08lx\n", GetLastError()); ok(entry != NULL, "Expected to find an entry in CRL\n"); CertFreeCRLContext(crl); @@ -1205,16 +1166,12 @@ static void testVerifyCRLRevocation(void) START_TEST(crl) { - init_function_pointers(); - testCreateCRL(); testDupCRL(); testAddCRL(); testFindCRL(); testGetCRLFromStore(); - testCRLProperties(); - testIsValidCRLForCert(); testFindCertInCRL(); testVerifyCRLRevocation(); diff --git a/dlls/crypt32/tests/ctl.c b/dlls/crypt32/tests/ctl.c index c94727cda04..05dc079ff64 100644 --- a/dlls/crypt32/tests/ctl.c +++ b/dlls/crypt32/tests/ctl.c @@ -117,17 +117,13 @@ static void testCreateCTL(void) "expected E_INVALIDARG, got %08lx\n", GetLastError()); SetLastError(0xdeadbeef); ctl = CertCreateCTLContext(X509_ASN_ENCODING, NULL, 0); - ok(!ctl && - (GetLastError() == ERROR_INVALID_DATA || - GetLastError() == OSS_MORE_INPUT), /* win9x */ + ok(!ctl && GetLastError() == ERROR_INVALID_DATA, "expected ERROR_INVALID_DATA, got %ld (0x%08lx)\n", GetLastError(), GetLastError()); /* An empty CTL can't be created.. */ SetLastError(0xdeadbeef); ctl = CertCreateCTLContext(X509_ASN_ENCODING, emptyCTL, sizeof(emptyCTL)); - ok(!ctl && - (GetLastError() == ERROR_INVALID_DATA || - GetLastError() == OSS_DATA_ERROR), /* win9x */ + ok(!ctl && GetLastError() == ERROR_INVALID_DATA, "expected ERROR_INVALID_DATA, got %ld (0x%08lx)\n", GetLastError(), GetLastError()); /* Nor can any of these "signed" CTLs whose inner content OID isn't @@ -135,29 +131,20 @@ static void testCreateCTL(void) */ SetLastError(0xdeadbeef); ctl = CertCreateCTLContext(X509_ASN_ENCODING, signedCTL, sizeof(signedCTL)); - ok(!ctl && - (GetLastError() == ERROR_INVALID_DATA || - GetLastError() == CRYPT_E_UNEXPECTED_MSG_TYPE /* win9x */ || - GetLastError() == ERROR_SUCCESS /* some win98 */), - "expected ERROR_INVALID_DATA, CRYPT_E_UNEXPECTED_MSG_TYPE, or ERROR_SUCCESS, got %ld (0x%08lx)\n", GetLastError(), + ok(!ctl && GetLastError() == ERROR_INVALID_DATA, + "expected ERROR_INVALID_DATA, got %ld (0x%08lx)\n", + GetLastError(), GetLastError()); SetLastError(0xdeadbeef); ctl = CertCreateCTLContext(X509_ASN_ENCODING, ctlWithOneEntry, sizeof(ctlWithOneEntry)); - ok(!ctl && - (GetLastError() == ERROR_INVALID_DATA || - GetLastError() == CRYPT_E_UNEXPECTED_MSG_TYPE /* win9x */ || - GetLastError() == OSS_DATA_ERROR /* some win98 */ || - GetLastError() == ERROR_SUCCESS /* some win98 */), - "expected ERROR_INVALID_DATA, CRYPT_E_UNEXPECTED_MSG_TYPE, OSS_DATA_ERROR, or ERROR_SUCCESS, got %ld (0x%08lx)\n", GetLastError(), + ok(!ctl && GetLastError() == ERROR_INVALID_DATA, + "expected ERROR_INVALID_DATA, got %ld (0x%08lx)\n", GetLastError(), GetLastError()); SetLastError(0xdeadbeef); ctl = CertCreateCTLContext(X509_ASN_ENCODING, signedCTLWithSubjectAlgorithm, sizeof(signedCTLWithSubjectAlgorithm)); - ok(!ctl && - (GetLastError() == ERROR_INVALID_DATA || - GetLastError() == CRYPT_E_UNEXPECTED_MSG_TYPE /* win9x */ || - GetLastError() == ERROR_SUCCESS /* some win98 */), + ok(!ctl && GetLastError() == ERROR_INVALID_DATA, "expected ERROR_INVALID_DATA, got %ld (0x%08lx)\n", GetLastError(), GetLastError()); /* This signed CTL with the appropriate inner content type can be decoded. @@ -237,11 +224,6 @@ static void testCTLProperties(void) ctl = CertCreateCTLContext(X509_ASN_ENCODING, signedCTLWithCTLInnerContent, sizeof(signedCTLWithCTLInnerContent)); - if (!ctl) - { - skip("CertCreateCTLContext failed: %08lx\n", GetLastError()); - return; - } /* No properties as yet */ propID = 0; @@ -256,12 +238,10 @@ static void testCTLProperties(void) /* An implicit property */ ret = CertGetCTLContextProperty(ctl, CERT_ACCESS_STATE_PROP_ID, NULL, &size); - ok(ret || broken(GetLastError() == CRYPT_E_NOT_FOUND /* some win98 */), - "CertGetCTLContextProperty failed: %08lx\n", GetLastError()); + ok(ret, "CertGetCTLContextProperty failed: %08lx\n", GetLastError()); ret = CertGetCTLContextProperty(ctl, CERT_ACCESS_STATE_PROP_ID, &access, &size); - ok(ret || broken(GetLastError() == CRYPT_E_NOT_FOUND /* some win98 */), - "CertGetCTLContextProperty failed: %08lx\n", GetLastError()); + ok(ret, "CertGetCTLContextProperty failed: %08lx\n", GetLastError()); if (ret) ok(!(access & CERT_ACCESS_STATE_WRITE_PERSIST_FLAG), "Didn't expect a persisted cert\n"); @@ -390,8 +370,8 @@ static void testAddCTLToStore(void) signedCTLWithCTLInnerContentAndBadSig, sizeof(signedCTLWithCTLInnerContentAndBadSig), CERT_STORE_ADD_NEW, NULL); - ok(!ret && (GetLastError() == CRYPT_E_EXISTS || GetLastError() == OSS_DATA_ERROR), - "expected CRYPT_E_EXISTS or OSS_DATA_ERROR, got %d %08lx\n", ret, GetLastError()); + ok(!ret && GetLastError() == CRYPT_E_EXISTS, + "expected CRYPT_E_EXISTS, got %d %08lx\n", ret, GetLastError()); CertCloseStore(store, 0); store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, @@ -407,8 +387,7 @@ static void testAddCTLToStore(void) ret = CertAddEncodedCTLToStore(store, X509_ASN_ENCODING, signedCTLWithUsage, sizeof(signedCTLWithUsage), CERT_STORE_ADD_NEW, NULL); - ok(ret || broken(GetLastError() == OSS_DATA_ERROR /* some win98 */), - "CertAddEncodedCTLToStore failed: %08lx\n", GetLastError()); + ok(ret, "CertAddEncodedCTLToStore failed: %08lx\n", GetLastError()); if (ret) expectedCTLs++; /* Check that two exist */ @@ -431,11 +410,6 @@ static void testAddCTLToStore(void) ret = CertAddEncodedCTLToStore(store, X509_ASN_ENCODING, signedCTLWithListID1, sizeof(signedCTLWithListID1), CERT_STORE_ADD_NEW, NULL); - if (!ret) - { - skip("adding a CTL with an empty usage not supported\n"); - return; - } ok(ret, "CertAddEncodedCTLToStore failed: %08lx\n", GetLastError()); ret = CertAddEncodedCTLToStore(store, X509_ASN_ENCODING, signedCTLWithListID2, sizeof(signedCTLWithListID2), CERT_STORE_ADD_NEW, diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 8b1959fbef8..9dabe58efba 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -27,10 +27,6 @@ #include "wine/test.h" - -static BOOL (WINAPI *pCryptDecodeObjectEx)(DWORD,LPCSTR,const BYTE*,DWORD,DWORD,PCRYPT_DECODE_PARA,void*,DWORD*); -static BOOL (WINAPI *pCryptEncodeObjectEx)(DWORD,LPCSTR,const void*,DWORD,PCRYPT_ENCODE_PARA,void*,DWORD*); - void CRYPT_CopyReversed(BYTE *dst, const BYTE *src, size_t len) { DWORD i; @@ -103,31 +99,27 @@ static void test_encodeInt(DWORD dwEncoding) BYTE *buf = NULL; /* CryptEncodeObjectEx with NULL bufSize crashes.. - ret = pCryptEncodeObjectEx(3, X509_INTEGER, &ints[0].val, 0, NULL, NULL, + ret = CryptEncodeObjectEx(3, X509_INTEGER, &ints[0].val, 0, NULL, NULL, NULL); */ /* check bogus encoding */ - ret = pCryptEncodeObjectEx(0, X509_INTEGER, &ints[0].val, 0, NULL, NULL, + ret = CryptEncodeObjectEx(0, X509_INTEGER, &ints[0].val, 0, NULL, NULL, &bufSize); ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", GetLastError()); - if (0) - { - /* check with NULL integer buffer. Windows XP incorrectly returns an - * NTSTATUS (crashes on win9x). - */ - ret = pCryptEncodeObjectEx(dwEncoding, X509_INTEGER, NULL, 0, NULL, NULL, - &bufSize); - ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, - "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", GetLastError()); - } + + ret = CryptEncodeObjectEx(dwEncoding, X509_INTEGER, NULL, 0, NULL, NULL, + &bufSize); + ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, + "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", GetLastError()); + for (i = 0; i < ARRAY_SIZE(ints); i++) { /* encode as normal integer */ - ret = pCryptEncodeObjectEx(dwEncoding, X509_INTEGER, &ints[i].val, 0, + ret = CryptEncodeObjectEx(dwEncoding, X509_INTEGER, &ints[i].val, 0, NULL, NULL, &bufSize); ok(ret, "Expected success, got %ld\n", GetLastError()); - ret = pCryptEncodeObjectEx(dwEncoding, X509_INTEGER, &ints[i].val, + ret = CryptEncodeObjectEx(dwEncoding, X509_INTEGER, &ints[i].val, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &bufSize); ok(ret, "CryptEncodeObjectEx failed: %ld\n", GetLastError()); if (ret) @@ -143,10 +135,10 @@ static void test_encodeInt(DWORD dwEncoding) /* encode as multibyte integer */ blob.cbData = sizeof(ints[i].val); blob.pbData = (BYTE *)&ints[i].val; - ret = pCryptEncodeObjectEx(dwEncoding, X509_MULTI_BYTE_INTEGER, &blob, + ret = CryptEncodeObjectEx(dwEncoding, X509_MULTI_BYTE_INTEGER, &blob, 0, NULL, NULL, &bufSize); ok(ret, "Expected success, got %ld\n", GetLastError()); - ret = pCryptEncodeObjectEx(dwEncoding, X509_MULTI_BYTE_INTEGER, &blob, + ret = CryptEncodeObjectEx(dwEncoding, X509_MULTI_BYTE_INTEGER, &blob, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &bufSize); ok(ret, "CryptEncodeObjectEx failed: %ld\n", GetLastError()); if (ret) @@ -167,10 +159,10 @@ static void test_encodeInt(DWORD dwEncoding) { blob.cbData = strlen((const char*)bigInts[i].val); blob.pbData = (BYTE *)bigInts[i].val; - ret = pCryptEncodeObjectEx(dwEncoding, X509_MULTI_BYTE_INTEGER, &blob, + ret = CryptEncodeObjectEx(dwEncoding, X509_MULTI_BYTE_INTEGER, &blob, 0, NULL, NULL, &bufSize); ok(ret, "Expected success, got %ld\n", GetLastError()); - ret = pCryptEncodeObjectEx(dwEncoding, X509_MULTI_BYTE_INTEGER, &blob, + ret = CryptEncodeObjectEx(dwEncoding, X509_MULTI_BYTE_INTEGER, &blob, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &bufSize); ok(ret, "CryptEncodeObjectEx failed: %ld\n", GetLastError()); if (ret) @@ -190,10 +182,10 @@ static void test_encodeInt(DWORD dwEncoding) { blob.cbData = strlen((const char*)bigUInts[i].val); blob.pbData = (BYTE*)bigUInts[i].val; - ret = pCryptEncodeObjectEx(dwEncoding, X509_MULTI_BYTE_UINT, &blob, + ret = CryptEncodeObjectEx(dwEncoding, X509_MULTI_BYTE_UINT, &blob, 0, NULL, NULL, &bufSize); ok(ret, "Expected success, got %ld\n", GetLastError()); - ret = pCryptEncodeObjectEx(dwEncoding, X509_MULTI_BYTE_UINT, &blob, + ret = CryptEncodeObjectEx(dwEncoding, X509_MULTI_BYTE_UINT, &blob, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &bufSize); ok(ret, "CryptEncodeObjectEx failed: %ld\n", GetLastError()); if (ret) @@ -223,43 +215,39 @@ static void test_decodeInt(DWORD dwEncoding) BOOL ret; /* CryptDecodeObjectEx with NULL bufSize crashes.. - ret = pCryptDecodeObjectEx(3, X509_INTEGER, &ints[0].encoded, + ret = CryptDecodeObjectEx(3, X509_INTEGER, &ints[0].encoded, ints[0].encoded[1] + 2, 0, NULL, NULL, NULL); */ /* check bogus encoding */ - ret = pCryptDecodeObjectEx(3, X509_INTEGER, (BYTE *)&ints[0].encoded, + ret = CryptDecodeObjectEx(3, X509_INTEGER, (BYTE *)&ints[0].encoded, ints[0].encoded[1] + 2, 0, NULL, NULL, &bufSize); ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", GetLastError()); /* check with NULL integer buffer */ - ret = pCryptDecodeObjectEx(dwEncoding, X509_INTEGER, NULL, 0, 0, NULL, NULL, + ret = CryptDecodeObjectEx(dwEncoding, X509_INTEGER, NULL, 0, 0, NULL, NULL, &bufSize); - ok(!ret && (GetLastError() == CRYPT_E_ASN1_EOD || - GetLastError() == OSS_BAD_ARG /* Win9x */), - "Expected CRYPT_E_ASN1_EOD or OSS_BAD_ARG, got %08lx\n", GetLastError()); + ok(!ret && GetLastError() == CRYPT_E_ASN1_EOD, + "Expected CRYPT_E_ASN1_EOD, got %08lx\n", GetLastError()); /* check with a valid, but too large, integer */ - ret = pCryptDecodeObjectEx(dwEncoding, X509_INTEGER, bigInt, bigInt[1] + 2, + ret = CryptDecodeObjectEx(dwEncoding, X509_INTEGER, bigInt, bigInt[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); - ok((!ret && GetLastError() == CRYPT_E_ASN1_LARGE) || - broken(ret) /* Win9x */, + ok(!ret && GetLastError() == CRYPT_E_ASN1_LARGE, "Expected CRYPT_E_ASN1_LARGE, got %ld\n", GetLastError()); /* check with a DER-encoded string */ - ret = pCryptDecodeObjectEx(dwEncoding, X509_INTEGER, testStr, testStr[1] + 2, + ret = CryptDecodeObjectEx(dwEncoding, X509_INTEGER, testStr, testStr[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); - ok(!ret && (GetLastError() == CRYPT_E_ASN1_BADTAG || - GetLastError() == OSS_PDU_MISMATCH /* Win9x */ ), - "Expected CRYPT_E_ASN1_BADTAG or OSS_PDU_MISMATCH, got %08lx\n", - GetLastError()); + ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, + "Expected CRYPT_E_ASN1_BADTAG, got %08lx\n", GetLastError()); for (i = 0; i < ARRAY_SIZE(ints); i++) { /* When the output buffer is NULL, this always succeeds */ SetLastError(0xdeadbeef); - ret = pCryptDecodeObjectEx(dwEncoding, X509_INTEGER, + ret = CryptDecodeObjectEx(dwEncoding, X509_INTEGER, ints[i].encoded, ints[i].encoded[1] + 2, 0, NULL, NULL, &bufSize); ok(ret && GetLastError() == NOERROR, "Expected success and NOERROR, got %ld\n", GetLastError()); - ret = pCryptDecodeObjectEx(dwEncoding, X509_INTEGER, + ret = CryptDecodeObjectEx(dwEncoding, X509_INTEGER, ints[i].encoded, ints[i].encoded[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); ok(ret, "CryptDecodeObjectEx failed: %ld\n", GetLastError()); @@ -274,12 +262,12 @@ static void test_decodeInt(DWORD dwEncoding) } for (i = 0; i < ARRAY_SIZE(bigInts); i++) { - ret = pCryptDecodeObjectEx(dwEncoding, X509_MULTI_BYTE_INTEGER, + ret = CryptDecodeObjectEx(dwEncoding, X509_MULTI_BYTE_INTEGER, bigInts[i].encoded, bigInts[i].encoded[1] + 2, 0, NULL, NULL, &bufSize); ok(ret && GetLastError() == NOERROR, "Expected success and NOERROR, got %ld\n", GetLastError()); - ret = pCryptDecodeObjectEx(dwEncoding, X509_MULTI_BYTE_INTEGER, + ret = CryptDecodeObjectEx(dwEncoding, X509_MULTI_BYTE_INTEGER, bigInts[i].encoded, bigInts[i].encoded[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); ok(ret, "CryptDecodeObjectEx failed: %ld\n", GetLastError()); @@ -299,12 +287,12 @@ static void test_decodeInt(DWORD dwEncoding) } for (i = 0; i < ARRAY_SIZE(bigUInts); i++) { - ret = pCryptDecodeObjectEx(dwEncoding, X509_MULTI_BYTE_UINT, + ret = CryptDecodeObjectEx(dwEncoding, X509_MULTI_BYTE_UINT, bigUInts[i].encoded, bigUInts[i].encoded[1] + 2, 0, NULL, NULL, &bufSize); ok(ret && GetLastError() == NOERROR, "Expected success and NOERROR, got %ld\n", GetLastError()); - ret = pCryptDecodeObjectEx(dwEncoding, X509_MULTI_BYTE_UINT, + ret = CryptDecodeObjectEx(dwEncoding, X509_MULTI_BYTE_UINT, bigUInts[i].encoded, bigUInts[i].encoded[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); ok(ret, "CryptDecodeObjectEx failed: %ld\n", GetLastError()); @@ -323,7 +311,7 @@ static void test_decodeInt(DWORD dwEncoding) } } /* Decode the value 1 with long-form length */ - ret = pCryptDecodeObjectEx(dwEncoding, X509_MULTI_BYTE_INTEGER, longForm, + ret = CryptDecodeObjectEx(dwEncoding, X509_MULTI_BYTE_INTEGER, longForm, sizeof(longForm), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -332,7 +320,7 @@ static void test_decodeInt(DWORD dwEncoding) LocalFree(buf); } /* check with extra bytes at the end */ - ret = pCryptDecodeObjectEx(dwEncoding, X509_INTEGER, extraBytes, + ret = CryptDecodeObjectEx(dwEncoding, X509_INTEGER, extraBytes, sizeof(extraBytes), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -346,7 +334,7 @@ static void test_decodeInt(DWORD dwEncoding) * Under XP it fails with CRYPT_E_ASN1_LARGE, which means there's a limit * on the size decoded, but in ME it fails with CRYPT_E_ASN1_EOD or crashes. * So this test unfortunately isn't useful. - ret = pCryptDecodeObjectEx(dwEncoding, X509_MULTI_BYTE_INTEGER, tooBig, + ret = CryptDecodeObjectEx(dwEncoding, X509_MULTI_BYTE_INTEGER, tooBig, 0x7fffffff, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); ok(!ret && GetLastError() == CRYPT_E_ASN1_LARGE, "Expected CRYPT_E_ASN1_LARGE, got %08x\n", GetLastError()); @@ -357,7 +345,7 @@ static void test_decodeInt(DWORD dwEncoding) if (0) { /* a large buffer isn't guaranteed to crash, it depends on memory allocation order */ - ret = pCryptDecodeObjectEx(dwEncoding, X509_MULTI_BYTE_INTEGER, bigBogus, + ret = CryptDecodeObjectEx(dwEncoding, X509_MULTI_BYTE_INTEGER, bigBogus, 0x01ffffff, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", GetLastError()); @@ -393,7 +381,7 @@ static void test_encodeEnumerated(DWORD dwEncoding) BYTE *buf = NULL; DWORD bufSize = 0; - ret = pCryptEncodeObjectEx(dwEncoding, enumeratedTypes[i], + ret = CryptEncodeObjectEx(dwEncoding, enumeratedTypes[i], &enums[j].val, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &bufSize); ok(ret, "CryptEncodeObjectEx failed: %ld\n", GetLastError()); @@ -426,7 +414,7 @@ static void test_decodeEnumerated(DWORD dwEncoding) DWORD bufSize = sizeof(int); int val; - ret = pCryptDecodeObjectEx(dwEncoding, enumeratedTypes[i], + ret = CryptDecodeObjectEx(dwEncoding, enumeratedTypes[i], enums[j].encoded, enums[j].encoded[1] + 2, 0, NULL, &val, &bufSize); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -454,7 +442,7 @@ static void testTimeEncoding(DWORD dwEncoding, LPCSTR structType, ret = SystemTimeToFileTime(&time->sysTime, &ft); ok(ret, "SystemTimeToFileTime failed: %ld\n", GetLastError()); - ret = pCryptEncodeObjectEx(dwEncoding, structType, &ft, + ret = CryptEncodeObjectEx(dwEncoding, structType, &ft, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &bufSize); /* years other than 1950-2050 are not allowed for encodings other than * X509_CHOICE_OF_TIME. @@ -478,8 +466,7 @@ static void testTimeEncoding(DWORD dwEncoding, LPCSTR structType, } } else - ok((!ret && GetLastError() == CRYPT_E_BAD_ENCODE) || - broken(GetLastError() == ERROR_SUCCESS), + ok(!ret && GetLastError() == CRYPT_E_BAD_ENCODE, "Expected CRYPT_E_BAD_ENCODE, got 0x%08lx\n", GetLastError()); } @@ -508,20 +495,13 @@ static void compareTime(const SYSTEMTIME *expected, const FILETIME *got) SYSTEMTIME st; FileTimeToSystemTime(got, &st); - ok((expected->wYear == st.wYear && + ok(expected->wYear == st.wYear && expected->wMonth == st.wMonth && expected->wDay == st.wDay && expected->wHour == st.wHour && expected->wMinute == st.wMinute && expected->wSecond == st.wSecond && - abs(expected->wMilliseconds - st.wMilliseconds) <= 1) || - /* Some Windows systems only seem to be accurate in their time decoding to - * within about an hour. - */ - broken(expected->wYear == st.wYear && - expected->wMonth == st.wMonth && - expected->wDay == st.wDay && - abs(expected->wHour - st.wHour) <= 1), + abs(expected->wMilliseconds - st.wMilliseconds) <= 1, "Got unexpected value for time decoding:\nexpected %s, got %s\n", printSystemTime(expected), printFileTime(got)); } @@ -533,7 +513,7 @@ static void testTimeDecoding(DWORD dwEncoding, LPCSTR structType, DWORD size = sizeof(ft); BOOL ret; - ret = pCryptDecodeObjectEx(dwEncoding, structType, time->encodedTime, + ret = CryptDecodeObjectEx(dwEncoding, structType, time->encodedTime, time->encodedTime[1] + 2, 0, NULL, &ft, &size); /* years other than 1950-2050 are not allowed for encodings other than * X509_CHOICE_OF_TIME. @@ -541,17 +521,14 @@ static void testTimeDecoding(DWORD dwEncoding, LPCSTR structType, if (structType == X509_CHOICE_OF_TIME || (time->sysTime.wYear >= 1950 && time->sysTime.wYear <= 2050)) { - ok(ret || broken(GetLastError() == OSS_DATA_ERROR), - "CryptDecodeObjectEx failed: %ld (0x%08lx)\n", GetLastError(), + ok(ret, "CryptDecodeObjectEx failed: %ld (0x%08lx)\n", GetLastError(), GetLastError()); if (ret) compareTime(&time->sysTime, &ft); } else - ok(!ret && (GetLastError() == CRYPT_E_ASN1_BADTAG || - GetLastError() == OSS_PDU_MISMATCH /* Win9x */ ), - "Expected CRYPT_E_ASN1_BADTAG or OSS_PDU_MISMATCH, got %08lx\n", - GetLastError()); + ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, + "Expected CRYPT_E_ASN1_BADTAG, got %08lx\n", GetLastError()); } static const BYTE bin20[] = { @@ -648,7 +625,7 @@ static void test_decodeFiletime(DWORD dwEncoding) ret = SystemTimeToFileTime(&times[0].sysTime, &ft1); ok(ret, "SystemTimeToFileTime failed: %ld\n", GetLastError()); size = 1; - ret = pCryptDecodeObjectEx(dwEncoding, X509_CHOICE_OF_TIME, + ret = CryptDecodeObjectEx(dwEncoding, X509_CHOICE_OF_TIME, times[0].encodedTime, times[0].encodedTime[1] + 2, 0, NULL, &ft2, &size); ok(!ret && GetLastError() == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %ld\n", GetLastError()); @@ -668,13 +645,10 @@ static void test_decodeFiletime(DWORD dwEncoding) for (i = 0; i < ARRAY_SIZE(bogusTimes); i++) { size = sizeof(ft1); - ret = pCryptDecodeObjectEx(dwEncoding, X509_CHOICE_OF_TIME, + ret = CryptDecodeObjectEx(dwEncoding, X509_CHOICE_OF_TIME, bogusTimes[i], bogusTimes[i][1] + 2, 0, NULL, &ft1, &size); - ok((!ret && (GetLastError() == CRYPT_E_ASN1_CORRUPT || - GetLastError() == OSS_DATA_ERROR /* Win9x */)) || - broken(ret), /* Win9x and NT4 for bin38 */ - "Expected CRYPT_E_ASN1_CORRUPT or OSS_DATA_ERROR, got %08lx\n", - GetLastError()); + ok(!ret && GetLastError() == CRYPT_E_ASN1_CORRUPT, + "Expected CRYPT_E_ASN1_CORRUPT, got %08lx\n", GetLastError()); } } @@ -760,18 +734,16 @@ static void test_encodeName(DWORD dwEncoding) DWORD size = 0; BOOL ret; - if (0) - { - /* Test with NULL pvStructInfo (crashes on win9x) */ - ret = pCryptEncodeObjectEx(dwEncoding, X509_NAME, NULL, - CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, - "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", GetLastError()); - } + /* Test with NULL pvStructInfo */ + ret = CryptEncodeObjectEx(dwEncoding, X509_NAME, NULL, + CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, + "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", GetLastError()); + /* Test with empty CERT_NAME_INFO */ info.cRDN = 0; info.rgRDN = NULL; - ret = pCryptEncodeObjectEx(dwEncoding, X509_NAME, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_NAME, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -780,21 +752,20 @@ static void test_encodeName(DWORD dwEncoding) "Got unexpected encoding for empty name\n"); LocalFree(buf); } - if (0) - { - /* Test with bogus CERT_RDN (crashes on win9x) */ - info.cRDN = 1; - ret = pCryptEncodeObjectEx(dwEncoding, X509_NAME, &info, - CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, - "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", GetLastError()); - } + + /* Test with bogus CERT_RDN */ + info.cRDN = 1; + ret = CryptEncodeObjectEx(dwEncoding, X509_NAME, &info, + CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, + "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", GetLastError()); + /* Test with empty CERT_RDN */ rdn.cRDNAttr = 0; rdn.rgRDNAttr = NULL; info.cRDN = 1; info.rgRDN = &rdn; - ret = pCryptEncodeObjectEx(dwEncoding, X509_NAME, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_NAME, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -803,27 +774,15 @@ static void test_encodeName(DWORD dwEncoding) "Got unexpected encoding for empty RDN array\n"); LocalFree(buf); } - if (0) - { - /* Test with bogus attr array (crashes on win9x) */ - rdn.cRDNAttr = 1; - rdn.rgRDNAttr = NULL; - ret = pCryptEncodeObjectEx(dwEncoding, X509_NAME, &info, - CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, - "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", GetLastError()); - } - /* oddly, a bogus OID is accepted by Windows XP; not testing. - attrs[0].pszObjId = "bogus"; - attrs[0].dwValueType = CERT_RDN_PRINTABLE_STRING; - attrs[0].Value.cbData = sizeof(commonName); - attrs[0].Value.pbData = commonName; + + /* Test with bogus attr array */ rdn.cRDNAttr = 1; - rdn.rgRDNAttr = attrs; - ret = pCryptEncodeObjectEx(dwEncoding, X509_NAME, &info, + rdn.rgRDNAttr = NULL; + ret = CryptEncodeObjectEx(dwEncoding, X509_NAME, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(!ret, "Expected failure, got success\n"); - */ + ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, + "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", GetLastError()); + /* Check with two CERT_RDN_ATTRs. Note DER encoding forces the order of * the encoded attributes to be swapped. */ @@ -837,7 +796,7 @@ static void test_encodeName(DWORD dwEncoding) attrs[1].Value.pbData = (BYTE *)surName; rdn.cRDNAttr = 2; rdn.rgRDNAttr = attrs; - ret = pCryptEncodeObjectEx(dwEncoding, X509_NAME, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_NAME, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -851,7 +810,7 @@ static void test_encodeName(DWORD dwEncoding) attrs[0].Value.pbData = (LPBYTE)twoRDNs; attrs[0].Value.cbData = sizeof(twoRDNs); rdn.cRDNAttr = 1; - ret = pCryptEncodeObjectEx(dwEncoding, X509_NAME, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_NAME, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -864,7 +823,7 @@ static void test_encodeName(DWORD dwEncoding) /* CERT_RDN_ANY_TYPE is too vague for X509_NAMEs, check the return */ rdn.cRDNAttr = 1; attrs[0].dwValueType = CERT_RDN_ANY_TYPE; - ret = pCryptEncodeObjectEx(dwEncoding, X509_NAME, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_NAME, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08lx\n", GetLastError()); @@ -875,7 +834,7 @@ static void test_encodeName(DWORD dwEncoding) info.rgRDN = &rdn; buf = NULL; size = 0; - ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, X509_NAME, &info, + ret = CryptEncodeObjectEx(X509_ASN_ENCODING, X509_NAME, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -907,18 +866,15 @@ static void test_encodeUnicodeName(DWORD dwEncoding) DWORD size = 0; BOOL ret; - if (0) - { - /* Test with NULL pvStructInfo (crashes on win9x) */ - ret = pCryptEncodeObjectEx(dwEncoding, X509_UNICODE_NAME, NULL, - CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, - "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", GetLastError()); - } + ret = CryptEncodeObjectEx(dwEncoding, X509_UNICODE_NAME, NULL, + CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, + "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", GetLastError()); + /* Test with empty CERT_NAME_INFO */ info.cRDN = 0; info.rgRDN = NULL; - ret = pCryptEncodeObjectEx(dwEncoding, X509_UNICODE_NAME, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_UNICODE_NAME, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -938,7 +894,7 @@ static void test_encodeUnicodeName(DWORD dwEncoding) rdn.rgRDNAttr = attrs; info.cRDN = 1; info.rgRDN = &rdn; - ret = pCryptEncodeObjectEx(dwEncoding, X509_UNICODE_NAME, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_UNICODE_NAME, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(!ret && GetLastError() == CRYPT_E_INVALID_PRINTABLE_STRING, "Expected CRYPT_E_INVALID_PRINTABLE_STRING, got %08lx\n", GetLastError()); @@ -958,7 +914,7 @@ static void test_encodeUnicodeName(DWORD dwEncoding) rdn.rgRDNAttr = attrs; info.cRDN = 1; info.rgRDN = &rdn; - ret = pCryptEncodeObjectEx(dwEncoding, X509_UNICODE_NAME, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_UNICODE_NAME, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -972,7 +928,7 @@ static void test_encodeUnicodeName(DWORD dwEncoding) attrs[0].Value.pbData = (LPBYTE)twoRDNs; attrs[0].Value.cbData = sizeof(twoRDNs); rdn.cRDNAttr = 1; - ret = pCryptEncodeObjectEx(dwEncoding, X509_UNICODE_NAME, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_UNICODE_NAME, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -985,7 +941,7 @@ static void test_encodeUnicodeName(DWORD dwEncoding) /* Unicode names infer the type for CERT_RDN_ANY_TYPE */ rdn.cRDNAttr = 1; attrs[0].dwValueType = CERT_RDN_ANY_TYPE; - ret = pCryptEncodeObjectEx(dwEncoding, X509_UNICODE_NAME, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_UNICODE_NAME, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); todo_wine ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -999,13 +955,6 @@ static void test_encodeUnicodeName(DWORD dwEncoding) static void compareNameValues(const CERT_NAME_VALUE *expected, const CERT_NAME_VALUE *got) { - if (expected->dwValueType == CERT_RDN_UTF8_STRING && - got->dwValueType == CERT_RDN_ENCODED_BLOB) - { - win_skip("Can't handle CERT_RDN_UTF8_STRING\n"); - return; - } - ok(got->dwValueType == expected->dwValueType, "Expected string type %ld, got %ld\n", expected->dwValueType, got->dwValueType); @@ -1080,7 +1029,7 @@ static void test_decodeName(DWORD dwEncoding) /* test empty name */ bufSize = 0; - ret = pCryptDecodeObjectEx(dwEncoding, X509_NAME, emptySequence, + ret = CryptDecodeObjectEx(dwEncoding, X509_NAME, emptySequence, emptySequence[1] + 2, CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_SHARE_OID_STRING_FLAG, NULL, &buf, &bufSize); @@ -1097,7 +1046,7 @@ static void test_decodeName(DWORD dwEncoding) LocalFree(buf); } /* test empty name with indefinite-length encoding */ - ret = pCryptDecodeObjectEx(dwEncoding, X509_NAME, emptyIndefiniteSequence, + ret = CryptDecodeObjectEx(dwEncoding, X509_NAME, emptyIndefiniteSequence, sizeof(emptyIndefiniteSequence), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -1111,7 +1060,7 @@ static void test_decodeName(DWORD dwEncoding) } /* test empty RDN */ bufSize = 0; - ret = pCryptDecodeObjectEx(dwEncoding, X509_NAME, emptyRDNs, + ret = CryptDecodeObjectEx(dwEncoding, X509_NAME, emptyRDNs, emptyRDNs[1] + 2, CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_SHARE_OID_STRING_FLAG, NULL, &buf, &bufSize); @@ -1127,7 +1076,7 @@ static void test_decodeName(DWORD dwEncoding) } /* test two RDN attrs */ bufSize = 0; - ret = pCryptDecodeObjectEx(dwEncoding, X509_NAME, twoRDNs, + ret = CryptDecodeObjectEx(dwEncoding, X509_NAME, twoRDNs, twoRDNs[1] + 2, CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_SHARE_OID_STRING_FLAG, NULL, &buf, &bufSize); @@ -1151,13 +1100,13 @@ static void test_decodeName(DWORD dwEncoding) } /* test that two RDN attrs with extra bytes succeeds */ bufSize = 0; - ret = pCryptDecodeObjectEx(dwEncoding, X509_NAME, twoRDNsExtraBytes, + ret = CryptDecodeObjectEx(dwEncoding, X509_NAME, twoRDNsExtraBytes, sizeof(twoRDNsExtraBytes), 0, NULL, NULL, &bufSize); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); /* And, a slightly more complicated name */ buf = NULL; bufSize = 0; - ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, X509_NAME, encodedRDNAttrs, + ret = CryptDecodeObjectEx(X509_ASN_ENCODING, X509_NAME, encodedRDNAttrs, sizeof(encodedRDNAttrs), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -1179,7 +1128,7 @@ static void test_decodeUnicodeName(DWORD dwEncoding) /* test empty name */ bufSize = 0; - ret = pCryptDecodeObjectEx(dwEncoding, X509_UNICODE_NAME, emptySequence, + ret = CryptDecodeObjectEx(dwEncoding, X509_UNICODE_NAME, emptySequence, emptySequence[1] + 2, CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_SHARE_OID_STRING_FLAG, NULL, &buf, &bufSize); @@ -1195,7 +1144,7 @@ static void test_decodeUnicodeName(DWORD dwEncoding) } /* test empty RDN */ bufSize = 0; - ret = pCryptDecodeObjectEx(dwEncoding, X509_UNICODE_NAME, emptyRDNs, + ret = CryptDecodeObjectEx(dwEncoding, X509_UNICODE_NAME, emptyRDNs, emptyRDNs[1] + 2, CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_SHARE_OID_STRING_FLAG, NULL, &buf, &bufSize); @@ -1211,7 +1160,7 @@ static void test_decodeUnicodeName(DWORD dwEncoding) } /* test two RDN attrs */ bufSize = 0; - ret = pCryptDecodeObjectEx(dwEncoding, X509_UNICODE_NAME, twoRDNsNoNull, + ret = CryptDecodeObjectEx(dwEncoding, X509_UNICODE_NAME, twoRDNsNoNull, sizeof(twoRDNsNoNull), CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_SHARE_OID_STRING_FLAG, NULL, &buf, &bufSize); @@ -1326,7 +1275,7 @@ static void test_encodeNameValue(DWORD dwEncoding) value.dwValueType = CERT_RDN_ENCODED_BLOB; value.Value.pbData = printableCommonNameValue; value.Value.cbData = sizeof(printableCommonNameValue); - ret = pCryptEncodeObjectEx(dwEncoding, X509_NAME_VALUE, &value, + ret = CryptEncodeObjectEx(dwEncoding, X509_NAME_VALUE, &value, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -1339,10 +1288,9 @@ static void test_encodeNameValue(DWORD dwEncoding) } for (i = 0; i < ARRAY_SIZE(nameValues); i++) { - ret = pCryptEncodeObjectEx(dwEncoding, X509_NAME_VALUE, + ret = CryptEncodeObjectEx(dwEncoding, X509_NAME_VALUE, &nameValues[i].value, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret || broken(GetLastError() == OSS_PDU_MISMATCH) /* NT4/Win9x */, - "Type %ld: CryptEncodeObjectEx failed: %08lx\n", + ok(ret, "Type %ld: CryptEncodeObjectEx failed: %08lx\n", nameValues[i].value.dwValueType, GetLastError()); if (ret) { @@ -1353,10 +1301,9 @@ static void test_encodeNameValue(DWORD dwEncoding) LocalFree(buf); } } - ret = pCryptEncodeObjectEx(dwEncoding, X509_NAME_VALUE, + ret = CryptEncodeObjectEx(dwEncoding, X509_NAME_VALUE, &embeddedNullNameValue.value, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret || broken(GetLastError() == OSS_PDU_MISMATCH) /* NT4/Win9x */, - "Type %ld: CryptEncodeObjectEx failed: %08lx\n", + ok(ret, "Type %ld: CryptEncodeObjectEx failed: %08lx\n", embeddedNullNameValue.value.dwValueType, GetLastError()); if (ret) { @@ -1377,7 +1324,7 @@ static void test_decodeNameValue(DWORD dwEncoding) for (i = 0; i < ARRAY_SIZE(nameValues); i++) { - ret = pCryptDecodeObjectEx(dwEncoding, X509_NAME_VALUE, + ret = CryptDecodeObjectEx(dwEncoding, X509_NAME_VALUE, nameValues[i].encoded, nameValues[i].encoded[1] + 2, CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_SHARE_OID_STRING_FLAG, NULL, &buf, &bufSize); @@ -1390,7 +1337,7 @@ static void test_decodeNameValue(DWORD dwEncoding) LocalFree(buf); } } - ret = pCryptDecodeObjectEx(dwEncoding, X509_NAME_VALUE, + ret = CryptDecodeObjectEx(dwEncoding, X509_NAME_VALUE, embeddedNullNameValue.encoded, embeddedNullNameValue.encodedSize, CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_SHARE_OID_STRING_FLAG, NULL, &buf, &bufSize); @@ -1461,7 +1408,7 @@ static void test_encodeAltName(DWORD dwEncoding) char oid[] = "1.2.3"; /* Test with empty info */ - ret = pCryptEncodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); if (ret) { @@ -1472,13 +1419,13 @@ static void test_encodeAltName(DWORD dwEncoding) /* Test with an empty entry */ info.cAltEntry = 1; info.rgAltEntry = &entry; - ret = pCryptEncodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08lx\n", GetLastError()); /* Test with an empty pointer */ entry.dwAltNameChoice = CERT_ALT_NAME_URL; - ret = pCryptEncodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); if (ret) { @@ -1488,7 +1435,7 @@ static void test_encodeAltName(DWORD dwEncoding) } /* Test with a real URL */ U(entry).pwszURL = (LPWSTR)url; - ret = pCryptEncodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); if (ret) { @@ -1498,7 +1445,7 @@ static void test_encodeAltName(DWORD dwEncoding) } /* Now with the URL containing an invalid IA5 char */ U(entry).pwszURL = (WCHAR *)L"http://\x226f\x575b"; - ret = pCryptEncodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(!ret && GetLastError() == CRYPT_E_INVALID_IA5_STRING, "Expected CRYPT_E_INVALID_IA5_STRING, got %08lx\n", GetLastError()); @@ -1508,7 +1455,7 @@ static void test_encodeAltName(DWORD dwEncoding) GET_CERT_ALT_NAME_VALUE_ERR_INDEX(size)); /* Now with the URL missing a scheme */ U(entry).pwszURL = (LPWSTR)dnsName; - ret = pCryptEncodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -1518,7 +1465,7 @@ static void test_encodeAltName(DWORD dwEncoding) } /* Now with a DNS name */ entry.dwAltNameChoice = CERT_ALT_NAME_DNS_NAME; - ret = pCryptEncodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -1531,7 +1478,7 @@ static void test_encodeAltName(DWORD dwEncoding) entry.dwAltNameChoice = CERT_ALT_NAME_IP_ADDRESS; U(entry).IPAddress.cbData = sizeof(localhost); U(entry).IPAddress.pbData = (LPBYTE)localhost; - ret = pCryptEncodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); if (ret) { @@ -1542,7 +1489,7 @@ static void test_encodeAltName(DWORD dwEncoding) /* Test with OID */ entry.dwAltNameChoice = CERT_ALT_NAME_REGISTERED_ID; U(entry).pszRegisteredID = oid; - ret = pCryptEncodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); if (ret) { @@ -1554,7 +1501,7 @@ static void test_encodeAltName(DWORD dwEncoding) entry.dwAltNameChoice = CERT_ALT_NAME_DIRECTORY_NAME; U(entry).DirectoryName.cbData = sizeof(encodedCommonName); U(entry).DirectoryName.pbData = (LPBYTE)encodedCommonName; - ret = pCryptEncodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); if (ret) { @@ -1582,22 +1529,18 @@ static void test_decodeAltName(DWORD dwEncoding) CERT_ALT_NAME_INFO *info; /* Test some bogus ones first */ - ret = pCryptDecodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, + ret = CryptDecodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, unimplementedType, sizeof(unimplementedType), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); - ok(!ret && (GetLastError() == CRYPT_E_ASN1_BADTAG || - GetLastError() == OSS_DATA_ERROR /* Win9x */), - "Expected CRYPT_E_ASN1_BADTAG or OSS_DATA_ERROR, got %08lx\n", - GetLastError()); - ret = pCryptDecodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, + ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, + "Expected CRYPT_E_ASN1_BADTAG, got %08lx\n", GetLastError()); + ret = CryptDecodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, bogusType, sizeof(bogusType), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); - ok(!ret && (GetLastError() == CRYPT_E_ASN1_CORRUPT || - GetLastError() == OSS_DATA_ERROR /* Win9x */), - "Expected CRYPT_E_ASN1_CORRUPT or OSS_DATA_ERROR, got %08lx\n", - GetLastError()); + ok(!ret && GetLastError() == CRYPT_E_ASN1_CORRUPT, + "Expected CRYPT_E_ASN1_CORRUPT, got %08lx\n", GetLastError()); /* Now expected cases */ - ret = pCryptDecodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, emptySequence, + ret = CryptDecodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, emptySequence, emptySequence[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -1608,7 +1551,7 @@ static void test_decodeAltName(DWORD dwEncoding) info->cAltEntry); LocalFree(buf); } - ret = pCryptDecodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, emptyURL, + ret = CryptDecodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, emptyURL, emptyURL[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -1624,10 +1567,10 @@ static void test_decodeAltName(DWORD dwEncoding) "Expected empty URL\n"); LocalFree(buf); } - ret = pCryptDecodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, + ret = CryptDecodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, emptyURLExtraBytes, sizeof(emptyURLExtraBytes), 0, NULL, NULL, &bufSize); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); - ret = pCryptDecodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, encodedURL, + ret = CryptDecodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, encodedURL, encodedURL[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -1642,7 +1585,7 @@ static void test_decodeAltName(DWORD dwEncoding) ok(!lstrcmpW(U(info->rgAltEntry[0]).pwszURL, url), "Unexpected URL\n"); LocalFree(buf); } - ret = pCryptDecodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, encodedDnsName, + ret = CryptDecodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, encodedDnsName, encodedDnsName[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -1658,7 +1601,7 @@ static void test_decodeAltName(DWORD dwEncoding) "Unexpected DNS name\n"); LocalFree(buf); } - ret = pCryptDecodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, encodedIPAddr, + ret = CryptDecodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, encodedIPAddr, encodedIPAddr[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -1677,7 +1620,7 @@ static void test_decodeAltName(DWORD dwEncoding) sizeof(localhost)), "Unexpected IP address value\n"); LocalFree(buf); } - ret = pCryptDecodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, encodedOidName, + ret = CryptDecodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, encodedOidName, sizeof(encodedOidName), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -1693,7 +1636,7 @@ static void test_decodeAltName(DWORD dwEncoding) "Expected OID 1.2.3, got %s\n", U(info->rgAltEntry[0]).pszRegisteredID); LocalFree(buf); } - ret = pCryptDecodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, + ret = CryptDecodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, encodedDirectoryName, sizeof(encodedDirectoryName), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -1714,17 +1657,12 @@ static void test_decodeAltName(DWORD dwEncoding) "Unexpected directory name value\n"); LocalFree(buf); } - ret = pCryptDecodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, + ret = CryptDecodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, dns_embedded_null, sizeof(dns_embedded_null), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); - /* Fails on WinXP with CRYPT_E_ASN1_RULE. I'm not too concerned about the - * particular failure, just that it doesn't decode. - * It succeeds on (broken) Windows versions that haven't addressed - * embedded NULLs in alternate names. - */ - ok(!ret || broken(ret), "expected failure\n"); + ok(!ret, "expected failure\n"); /* An embedded bell character is allowed, however. */ - ret = pCryptDecodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, + ret = CryptDecodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, dns_embedded_bell, sizeof(dns_embedded_bell), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -1739,15 +1677,10 @@ static void test_decodeAltName(DWORD dwEncoding) info->rgAltEntry[0].dwAltNameChoice); LocalFree(buf); } - ret = pCryptDecodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, + ret = CryptDecodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, url_embedded_null, sizeof(dns_embedded_null), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); - /* Again, fails on WinXP with CRYPT_E_ASN1_RULE. I'm not too concerned - * about the particular failure, just that it doesn't decode. - * It succeeds on (broken) Windows versions that haven't addressed - * embedded NULLs in alternate names. - */ - ok(!ret || broken(ret), "expected failure\n"); + ok(!ret, "expected failure\n"); } struct UnicodeExpectedError @@ -1822,35 +1755,32 @@ static void test_encodeUnicodeNameValue(DWORD dwEncoding) BOOL ret; CERT_NAME_VALUE value; - if (0) - { - /* Crashes on win9x */ - ret = pCryptEncodeObjectEx(dwEncoding, X509_UNICODE_NAME_VALUE, NULL, - CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, - "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", GetLastError()); - } + ret = CryptEncodeObjectEx(dwEncoding, X509_UNICODE_NAME_VALUE, NULL, + CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, + "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", GetLastError()); + /* Have to have a string of some sort */ value.dwValueType = 0; /* aka CERT_RDN_ANY_TYPE */ value.Value.pbData = NULL; value.Value.cbData = 0; - ret = pCryptEncodeObjectEx(dwEncoding, X509_UNICODE_NAME_VALUE, &value, + ret = CryptEncodeObjectEx(dwEncoding, X509_UNICODE_NAME_VALUE, &value, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(!ret && GetLastError() == CRYPT_E_NOT_CHAR_STRING, "Expected CRYPT_E_NOT_CHAR_STRING, got %08lx\n", GetLastError()); value.dwValueType = CERT_RDN_ENCODED_BLOB; - ret = pCryptEncodeObjectEx(dwEncoding, X509_UNICODE_NAME_VALUE, &value, + ret = CryptEncodeObjectEx(dwEncoding, X509_UNICODE_NAME_VALUE, &value, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(!ret && GetLastError() == CRYPT_E_NOT_CHAR_STRING, "Expected CRYPT_E_NOT_CHAR_STRING, got %08lx\n", GetLastError()); value.dwValueType = CERT_RDN_ANY_TYPE; value.Value.pbData = (LPBYTE)L"1"; - ret = pCryptEncodeObjectEx(dwEncoding, X509_UNICODE_NAME_VALUE, &value, + ret = CryptEncodeObjectEx(dwEncoding, X509_UNICODE_NAME_VALUE, &value, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(!ret && GetLastError() == CRYPT_E_NOT_CHAR_STRING, "Expected CRYPT_E_NOT_CHAR_STRING, got %08lx\n", GetLastError()); value.Value.cbData = sizeof(L"1"); - ret = pCryptEncodeObjectEx(dwEncoding, X509_UNICODE_NAME_VALUE, &value, + ret = CryptEncodeObjectEx(dwEncoding, X509_UNICODE_NAME_VALUE, &value, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(!ret && GetLastError() == CRYPT_E_NOT_CHAR_STRING, "Expected CRYPT_E_NOT_CHAR_STRING, got %08lx\n", GetLastError()); @@ -1858,7 +1788,7 @@ static void test_encodeUnicodeNameValue(DWORD dwEncoding) value.dwValueType = CERT_RDN_ENCODED_BLOB; value.Value.pbData = oneUniversal; value.Value.cbData = sizeof(oneUniversal); - ret = pCryptEncodeObjectEx(dwEncoding, X509_UNICODE_NAME_VALUE, &value, + ret = CryptEncodeObjectEx(dwEncoding, X509_UNICODE_NAME_VALUE, &value, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(!ret && GetLastError() == CRYPT_E_NOT_CHAR_STRING, "Expected CRYPT_E_NOT_CHAR_STRING, got %08lx\n", GetLastError()); @@ -1868,7 +1798,7 @@ static void test_encodeUnicodeNameValue(DWORD dwEncoding) { value.Value.pbData = (LPBYTE)unicodeErrors[i].str; value.dwValueType = unicodeErrors[i].valueType; - ret = pCryptEncodeObjectEx(dwEncoding, X509_UNICODE_NAME_VALUE, &value, + ret = CryptEncodeObjectEx(dwEncoding, X509_UNICODE_NAME_VALUE, &value, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(!ret && GetLastError() == unicodeErrors[i].error, "Value type %ld: expected %08lx, got %08lx\n", value.dwValueType, @@ -1883,10 +1813,9 @@ static void test_encodeUnicodeNameValue(DWORD dwEncoding) { value.Value.pbData = (LPBYTE)unicodeResults[i].str; value.dwValueType = unicodeResults[i].valueType; - ret = pCryptEncodeObjectEx(dwEncoding, X509_UNICODE_NAME_VALUE, &value, + ret = CryptEncodeObjectEx(dwEncoding, X509_UNICODE_NAME_VALUE, &value, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret || broken(GetLastError() == OSS_PDU_MISMATCH /* Win9x */), - "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); + ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { ok(size == unicodeResults[i].encoded.cbData, @@ -1905,7 +1834,7 @@ static void test_encodeUnicodeNameValue(DWORD dwEncoding) { value.Value.pbData = (LPBYTE)unicodeWeirdness[i].str; value.dwValueType = unicodeWeirdness[i].valueType; - ret = pCryptEncodeObjectEx(dwEncoding, X509_UNICODE_NAME_VALUE, &value, + ret = CryptEncodeObjectEx(dwEncoding, X509_UNICODE_NAME_VALUE, &value, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -1930,11 +1859,10 @@ static void test_decodeUnicodeNameValue(DWORD dwEncoding) BOOL ret; DWORD size = 0; - ret = pCryptDecodeObjectEx(dwEncoding, X509_UNICODE_NAME_VALUE, + ret = CryptDecodeObjectEx(dwEncoding, X509_UNICODE_NAME_VALUE, unicodeResults[i].encoded.pbData, unicodeResults[i].encoded.cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret || broken(GetLastError() == CRYPT_E_NOT_CHAR_STRING /* Win9x */), - "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); + ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret && buf) { PCERT_NAME_VALUE value = (PCERT_NAME_VALUE)buf; @@ -1990,7 +1918,7 @@ static void test_encodeOctets(DWORD dwEncoding) blob.cbData = tests[i].decoded_size; blob.pbData = (BYTE*)tests[i].decoded; - ret = pCryptEncodeObjectEx(dwEncoding, X509_OCTET_STRING, &blob, + ret = CryptEncodeObjectEx(dwEncoding, X509_OCTET_STRING, &blob, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &bufSize); ok(ret, "CryptEncodeObjectEx failed: %ld\n", GetLastError()); if (ret) @@ -2062,7 +1990,7 @@ static void test_decodeOctets(DWORD dwEncoding) BOOL ret; DWORD bufSize = 0; - ret = pCryptDecodeObjectEx(dwEncoding, X509_OCTET_STRING, + ret = CryptDecodeObjectEx(dwEncoding, X509_OCTET_STRING, tests[i].encoded, tests[i].encoded_size, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); if (tests[i].error) @@ -2128,7 +2056,7 @@ static void test_encodeBits(DWORD dwEncoding) blob.cbData = sizeof(bytesToEncode); blob.pbData = (BYTE *)bytesToEncode; blob.cUnusedBits = bits[i].cUnusedBits; - ret = pCryptEncodeObjectEx(dwEncoding, X509_BITS, &blob, + ret = CryptEncodeObjectEx(dwEncoding, X509_BITS, &blob, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &bufSize); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -2155,7 +2083,7 @@ static void test_decodeBits(DWORD dwEncoding) /* normal cases */ for (i = 0; i < ARRAY_SIZE(bits); i++) { - ret = pCryptDecodeObjectEx(dwEncoding, X509_BITS, bits[i].encoded, + ret = CryptDecodeObjectEx(dwEncoding, X509_BITS, bits[i].encoded, bits[i].encoded[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -2178,7 +2106,7 @@ static void test_decodeBits(DWORD dwEncoding) /* special case: check that something that's valid in BER but not in DER * decodes successfully */ - ret = pCryptDecodeObjectEx(dwEncoding, X509_BITS, ber, ber[1] + 2, + ret = CryptDecodeObjectEx(dwEncoding, X509_BITS, ber, ber[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -2242,7 +2170,7 @@ static void test_encodeBasicConstraints(DWORD dwEncoding) /* First test with the simpler info2 */ for (i = 0; i < ARRAY_SIZE(constraints2); i++) { - ret = pCryptEncodeObjectEx(dwEncoding, X509_BASIC_CONSTRAINTS2, + ret = CryptEncodeObjectEx(dwEncoding, X509_BASIC_CONSTRAINTS2, &constraints2[i].info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &bufSize); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); @@ -2260,10 +2188,9 @@ static void test_encodeBasicConstraints(DWORD dwEncoding) info.SubjectType.cbData = 0; info.fPathLenConstraint = FALSE; info.cSubtreesConstraint = 0; - ret = pCryptEncodeObjectEx(dwEncoding, X509_BASIC_CONSTRAINTS, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_BASIC_CONSTRAINTS, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &bufSize); - ok(ret || GetLastError() == OSS_BAD_PTR /* Win9x */, - "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); + ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { ok(bufSize == sizeof(emptyConstraint), "Wrong size %ld\n", bufSize); @@ -2276,10 +2203,9 @@ static void test_encodeBasicConstraints(DWORD dwEncoding) */ info.cSubtreesConstraint = 1; info.rgSubtreesConstraint = &nameBlob; - ret = pCryptEncodeObjectEx(dwEncoding, X509_BASIC_CONSTRAINTS, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_BASIC_CONSTRAINTS, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &bufSize); - ok(ret || GetLastError() == OSS_BAD_PTR /* Win9x */, - "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); + ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { ok(bufSize == sizeof(constraintWithDomainName), "Wrong size %ld\n", bufSize); @@ -2305,7 +2231,7 @@ static void test_decodeBasicConstraints(DWORD dwEncoding) /* First test with simpler info2 */ for (i = 0; i < ARRAY_SIZE(constraints2); i++) { - ret = pCryptDecodeObjectEx(dwEncoding, X509_BASIC_CONSTRAINTS2, + ret = CryptDecodeObjectEx(dwEncoding, X509_BASIC_CONSTRAINTS2, constraints2[i].encoded, constraints2[i].encoded[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); ok(ret, "CryptDecodeObjectEx failed for item %ld: %08lx\n", i, @@ -2322,16 +2248,14 @@ static void test_decodeBasicConstraints(DWORD dwEncoding) } /* Check with the order of encoded elements inverted */ buf = (PBYTE)1; - ret = pCryptDecodeObjectEx(dwEncoding, X509_BASIC_CONSTRAINTS2, + ret = CryptDecodeObjectEx(dwEncoding, X509_BASIC_CONSTRAINTS2, inverted, inverted[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); - ok(!ret && (GetLastError() == CRYPT_E_ASN1_CORRUPT || - GetLastError() == OSS_DATA_ERROR /* Win9x */), - "Expected CRYPT_E_ASN1_CORRUPT or OSS_DATA_ERROR, got %08lx\n", - GetLastError()); + ok(!ret && GetLastError() == CRYPT_E_ASN1_CORRUPT, + "Expected CRYPT_E_ASN1_CORRUPT, got %08lx\n", GetLastError()); ok(!buf, "Expected buf to be set to NULL\n"); /* Check with a non-DER bool */ - ret = pCryptDecodeObjectEx(dwEncoding, X509_BASIC_CONSTRAINTS2, + ret = CryptDecodeObjectEx(dwEncoding, X509_BASIC_CONSTRAINTS2, badBool.encoded, badBool.encoded[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -2344,15 +2268,13 @@ static void test_decodeBasicConstraints(DWORD dwEncoding) LocalFree(buf); } /* Check with a non-basic constraints value */ - ret = pCryptDecodeObjectEx(dwEncoding, X509_BASIC_CONSTRAINTS2, + ret = CryptDecodeObjectEx(dwEncoding, X509_BASIC_CONSTRAINTS2, encodedCommonName, encodedCommonName[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); - ok(!ret && (GetLastError() == CRYPT_E_ASN1_CORRUPT || - GetLastError() == OSS_DATA_ERROR /* Win9x */), - "Expected CRYPT_E_ASN1_CORRUPT or OSS_DATA_ERROR, got %08lx\n", - GetLastError()); + ok(!ret && GetLastError() == CRYPT_E_ASN1_CORRUPT, + "Expected CRYPT_E_ASN1_CORRUPT, got %08lx\n", GetLastError()); /* Now check with the more complex CERT_BASIC_CONSTRAINTS_INFO */ - ret = pCryptDecodeObjectEx(dwEncoding, X509_BASIC_CONSTRAINTS, + ret = CryptDecodeObjectEx(dwEncoding, X509_BASIC_CONSTRAINTS, emptyConstraint, sizeof(emptyConstraint), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -2365,7 +2287,7 @@ static void test_decodeBasicConstraints(DWORD dwEncoding) ok(info->cSubtreesConstraint == 0, "Expected no subtree constraints\n"); LocalFree(buf); } - ret = pCryptDecodeObjectEx(dwEncoding, X509_BASIC_CONSTRAINTS, + ret = CryptDecodeObjectEx(dwEncoding, X509_BASIC_CONSTRAINTS, constraintWithDomainName, sizeof(constraintWithDomainName), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -2433,14 +2355,14 @@ static void test_encodeRsaPublicKey(DWORD dwEncoding) memcpy(toEncode + sizeof(BLOBHEADER) + sizeof(RSAPUBKEY), modulus1, sizeof(modulus1)); - ret = pCryptEncodeObjectEx(dwEncoding, RSA_CSP_PUBLICKEYBLOB, + ret = CryptEncodeObjectEx(dwEncoding, RSA_CSP_PUBLICKEYBLOB, toEncode, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &bufSize); ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08lx\n", GetLastError()); /* Now with a bogus reserved field */ hdr->bType = PUBLICKEYBLOB; hdr->reserved = 1; - ret = pCryptEncodeObjectEx(dwEncoding, RSA_CSP_PUBLICKEYBLOB, + ret = CryptEncodeObjectEx(dwEncoding, RSA_CSP_PUBLICKEYBLOB, toEncode, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &bufSize); if (ret) { @@ -2452,7 +2374,7 @@ static void test_encodeRsaPublicKey(DWORD dwEncoding) /* Now with a bogus blob version */ hdr->reserved = 0; hdr->bVersion = 0; - ret = pCryptEncodeObjectEx(dwEncoding, RSA_CSP_PUBLICKEYBLOB, + ret = CryptEncodeObjectEx(dwEncoding, RSA_CSP_PUBLICKEYBLOB, toEncode, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &bufSize); if (ret) { @@ -2464,7 +2386,7 @@ static void test_encodeRsaPublicKey(DWORD dwEncoding) /* And with a bogus alg ID */ hdr->bVersion = CUR_BLOB_VERSION; hdr->aiKeyAlg = CALG_DES; - ret = pCryptEncodeObjectEx(dwEncoding, RSA_CSP_PUBLICKEYBLOB, + ret = CryptEncodeObjectEx(dwEncoding, RSA_CSP_PUBLICKEYBLOB, toEncode, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &bufSize); if (ret) { @@ -2475,11 +2397,11 @@ static void test_encodeRsaPublicKey(DWORD dwEncoding) } /* Check a couple of RSA-related OIDs */ hdr->aiKeyAlg = CALG_RSA_KEYX; - ret = pCryptEncodeObjectEx(dwEncoding, szOID_RSA_RSA, + ret = CryptEncodeObjectEx(dwEncoding, szOID_RSA_RSA, toEncode, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &bufSize); ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %08lx\n", GetLastError()); - ret = pCryptEncodeObjectEx(dwEncoding, szOID_RSA_SHA1RSA, + ret = CryptEncodeObjectEx(dwEncoding, szOID_RSA_SHA1RSA, toEncode, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &bufSize); ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %08lx\n", GetLastError()); @@ -2489,7 +2411,7 @@ static void test_encodeRsaPublicKey(DWORD dwEncoding) { memcpy(toEncode + sizeof(BLOBHEADER) + sizeof(RSAPUBKEY), rsaPubKeys[i].modulus, rsaPubKeys[i].modulusLen); - ret = pCryptEncodeObjectEx(dwEncoding, RSA_CSP_PUBLICKEYBLOB, + ret = CryptEncodeObjectEx(dwEncoding, RSA_CSP_PUBLICKEYBLOB, toEncode, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &bufSize); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -2512,20 +2434,18 @@ static void test_decodeRsaPublicKey(DWORD dwEncoding) BOOL ret; /* Try with a bad length */ - ret = pCryptDecodeObjectEx(dwEncoding, RSA_CSP_PUBLICKEYBLOB, + ret = CryptDecodeObjectEx(dwEncoding, RSA_CSP_PUBLICKEYBLOB, rsaPubKeys[0].encoded, rsaPubKeys[0].encoded[1], CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); - ok(!ret && (GetLastError() == CRYPT_E_ASN1_EOD || - GetLastError() == OSS_MORE_INPUT /* Win9x/NT4 */), - "Expected CRYPT_E_ASN1_EOD or OSS_MORE_INPUT, got %08lx\n", - GetLastError()); + ok(!ret && GetLastError() == CRYPT_E_ASN1_EOD, + "Expected CRYPT_E_ASN1_EOD, got %08lx\n", GetLastError()); /* Try with a couple of RSA-related OIDs */ - ret = pCryptDecodeObjectEx(dwEncoding, szOID_RSA_RSA, + ret = CryptDecodeObjectEx(dwEncoding, szOID_RSA_RSA, rsaPubKeys[0].encoded, rsaPubKeys[0].encoded[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %08lx\n", GetLastError()); - ret = pCryptDecodeObjectEx(dwEncoding, szOID_RSA_SHA1RSA, + ret = CryptDecodeObjectEx(dwEncoding, szOID_RSA_SHA1RSA, rsaPubKeys[0].encoded, rsaPubKeys[0].encoded[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, @@ -2534,7 +2454,7 @@ static void test_decodeRsaPublicKey(DWORD dwEncoding) for (i = 0; i < ARRAY_SIZE(rsaPubKeys); i++) { bufSize = 0; - ret = pCryptDecodeObjectEx(dwEncoding, RSA_CSP_PUBLICKEYBLOB, + ret = CryptDecodeObjectEx(dwEncoding, RSA_CSP_PUBLICKEYBLOB, rsaPubKeys[i].encoded, rsaPubKeys[i].encoded[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -2594,7 +2514,7 @@ static void test_encodeRsaPublicKey_Bcrypt(DWORD dwEncoding) CRYPT_CopyReversed(toEncode + sizeof(BCRYPT_RSAKEY_BLOB), pubexp, sizeof(pubexp)); CRYPT_CopyReversed(toEncode + sizeof(BCRYPT_RSAKEY_BLOB) + sizeof(pubexp), modulus1, sizeof(modulus1)); - ret = pCryptEncodeObjectEx(dwEncoding, CNG_RSA_PUBLIC_KEY_BLOB, + ret = CryptEncodeObjectEx(dwEncoding, CNG_RSA_PUBLIC_KEY_BLOB, toEncode, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &bufSize); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); @@ -2608,7 +2528,7 @@ static void test_encodeRsaPublicKey_Bcrypt(DWORD dwEncoding) CRYPT_CopyReversed(toEncode + sizeof(BCRYPT_RSAKEY_BLOB) + sizeof(DWORD), rsaPubKeys[i].modulus, rsaPubKeys[i].modulusLen); - ret = pCryptEncodeObjectEx(dwEncoding, CNG_RSA_PUBLIC_KEY_BLOB, + ret = CryptEncodeObjectEx(dwEncoding, CNG_RSA_PUBLIC_KEY_BLOB, toEncode, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &bufSize); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -2632,18 +2552,16 @@ static void test_decodeRsaPublicKey_Bcrypt(DWORD dwEncoding) BOOL ret; /* Try with a bad length */ - ret = pCryptDecodeObjectEx(dwEncoding, CNG_RSA_PUBLIC_KEY_BLOB, + ret = CryptDecodeObjectEx(dwEncoding, CNG_RSA_PUBLIC_KEY_BLOB, rsaPubKeys[0].encoded, rsaPubKeys[0].encoded[1], CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); - ok(!ret && (GetLastError() == CRYPT_E_ASN1_EOD || - GetLastError() == OSS_MORE_INPUT /* Win9x/NT4 */), - "Expected CRYPT_E_ASN1_EOD or OSS_MORE_INPUT, got %08lx\n", - GetLastError()); + ok(!ret && GetLastError() == CRYPT_E_ASN1_EOD, + "Expected CRYPT_E_ASN1_EOD, got %08lx\n", GetLastError()); /* Now try success cases */ for (i = 0; i < ARRAY_SIZE(rsaPubKeys); i++) { bufSize = 0; - ret = pCryptDecodeObjectEx(dwEncoding, CNG_RSA_PUBLIC_KEY_BLOB, + ret = CryptDecodeObjectEx(dwEncoding, CNG_RSA_PUBLIC_KEY_BLOB, rsaPubKeys[i].encoded, rsaPubKeys[i].encoded[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -2717,7 +2635,7 @@ static void test_encodeSequenceOfAny(DWORD dwEncoding) seq.cValue = ARRAY_SIZE(ints); seq.rgValue = blobs; - ret = pCryptEncodeObjectEx(dwEncoding, X509_SEQUENCE_OF_ANY, &seq, + ret = CryptEncodeObjectEx(dwEncoding, X509_SEQUENCE_OF_ANY, &seq, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &bufSize); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -2731,7 +2649,7 @@ static void test_encodeSequenceOfAny(DWORD dwEncoding) */ blobs[0].cbData = times[0].encodedTime[1] + 2; blobs[0].pbData = (BYTE *)times[0].encodedTime; - ret = pCryptEncodeObjectEx(dwEncoding, X509_SEQUENCE_OF_ANY, &seq, + ret = CryptEncodeObjectEx(dwEncoding, X509_SEQUENCE_OF_ANY, &seq, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &bufSize); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -2749,7 +2667,7 @@ static void test_decodeSequenceOfAny(DWORD dwEncoding) BYTE *buf = NULL; DWORD bufSize = 0; - ret = pCryptDecodeObjectEx(dwEncoding, X509_SEQUENCE_OF_ANY, intSequence, + ret = CryptDecodeObjectEx(dwEncoding, X509_SEQUENCE_OF_ANY, intSequence, intSequence[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -2768,7 +2686,7 @@ static void test_decodeSequenceOfAny(DWORD dwEncoding) } LocalFree(buf); } - ret = pCryptDecodeObjectEx(dwEncoding, X509_SEQUENCE_OF_ANY, mixedSequence, + ret = CryptDecodeObjectEx(dwEncoding, X509_SEQUENCE_OF_ANY, mixedSequence, mixedSequence[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -2828,7 +2746,7 @@ static void test_encodeExtensions(DWORD dwEncoding) BYTE *buf = NULL; DWORD bufSize = 0; - ret = pCryptEncodeObjectEx(dwEncoding, X509_EXTENSIONS, &exts[i].exts, + ret = CryptEncodeObjectEx(dwEncoding, X509_EXTENSIONS, &exts[i].exts, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &bufSize); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -2852,7 +2770,7 @@ static void test_decodeExtensions(DWORD dwEncoding) BYTE *buf = NULL; DWORD bufSize = 0; - ret = pCryptDecodeObjectEx(dwEncoding, X509_EXTENSIONS, + ret = CryptDecodeObjectEx(dwEncoding, X509_EXTENSIONS, exts[i].encoded, exts[i].encoded[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -2878,13 +2796,13 @@ static void test_decodeExtensions(DWORD dwEncoding) } LocalFree(buf); } - ret = pCryptDecodeObjectEx(dwEncoding, X509_EXTENSIONS, + ret = CryptDecodeObjectEx(dwEncoding, X509_EXTENSIONS, exts[i].encoded, exts[i].encoded[1] + 2, 0, NULL, NULL, &bufSize); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufSize); if (buf) { - ret = pCryptDecodeObjectEx(dwEncoding, X509_EXTENSIONS, + ret = CryptDecodeObjectEx(dwEncoding, X509_EXTENSIONS, exts[i].encoded, exts[i].encoded[1] + 2, 0, NULL, buf, &bufSize); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); HeapFree(GetProcessHeap(), 0, buf); @@ -2966,11 +2884,10 @@ static void test_encodePublicKeyInfo(DWORD dwEncoding) BYTE *buf = NULL; DWORD bufSize = 0; - ret = pCryptEncodeObjectEx(dwEncoding, X509_PUBLIC_KEY_INFO, + ret = CryptEncodeObjectEx(dwEncoding, X509_PUBLIC_KEY_INFO, &pubKeys[i].info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &bufSize); - ok(ret || GetLastError() == OSS_BAD_PTR /* Win9x */, - "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); + ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { ok(bufSize == pubKeys[i].encoded[1] + 2, @@ -3019,7 +2936,7 @@ static void test_decodePublicKeyInfo(DWORD dwEncoding) for (i = 0; i < ARRAY_SIZE(pubKeys); i++) { /* The NULL form decodes to the decoded member */ - ret = pCryptDecodeObjectEx(dwEncoding, X509_PUBLIC_KEY_INFO, + ret = CryptDecodeObjectEx(dwEncoding, X509_PUBLIC_KEY_INFO, pubKeys[i].encoded, pubKeys[i].encoded[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -3030,7 +2947,7 @@ static void test_decodePublicKeyInfo(DWORD dwEncoding) LocalFree(buf); } /* The non-NULL form decodes to the original */ - ret = pCryptDecodeObjectEx(dwEncoding, X509_PUBLIC_KEY_INFO, + ret = CryptDecodeObjectEx(dwEncoding, X509_PUBLIC_KEY_INFO, pubKeys[i].encodedNoNull, pubKeys[i].encodedNoNull[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -3041,13 +2958,11 @@ static void test_decodePublicKeyInfo(DWORD dwEncoding) } } /* Test with bogus (not valid DER) parameters */ - ret = pCryptDecodeObjectEx(dwEncoding, X509_PUBLIC_KEY_INFO, + ret = CryptDecodeObjectEx(dwEncoding, X509_PUBLIC_KEY_INFO, bogusPubKeyInfo, bogusPubKeyInfo[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); - ok(!ret && (GetLastError() == CRYPT_E_ASN1_CORRUPT || - GetLastError() == OSS_DATA_ERROR /* Win9x */), - "Expected CRYPT_E_ASN1_CORRUPT or OSS_DATA_ERROR, got %08lx\n", - GetLastError()); + ok(!ret && GetLastError() == CRYPT_E_ASN1_CORRUPT, + "Expected CRYPT_E_ASN1_CORRUPT, got %08lx\n", GetLastError()); } static const BYTE v1Cert[] = { 0x30, 0x33, 0x02, 0x00, 0x30, 0x02, 0x06, 0x00, @@ -3169,19 +3084,16 @@ static void test_encodeCertToBeSigned(DWORD dwEncoding) static char oid_subject_key_identifier[] = szOID_SUBJECT_KEY_IDENTIFIER; CERT_EXTENSION ext; - if (0) - { - /* Test with NULL pvStructInfo (crashes on win9x) */ - ret = pCryptEncodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, NULL, - CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, - "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", GetLastError()); - } + /* Test with NULL pvStructInfo */ + ret = CryptEncodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, NULL, + CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, + "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", GetLastError()); + /* Test with a V1 cert */ - ret = pCryptEncodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret || GetLastError() == OSS_BAD_PTR /* Win9x */, - "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); + ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { ok(size == v1Cert[1] + 2, "Expected size %d, got %ld\n", @@ -3191,10 +3103,9 @@ static void test_encodeCertToBeSigned(DWORD dwEncoding) } /* Test v2 cert */ info.dwVersion = CERT_V2; - ret = pCryptEncodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret || GetLastError() == OSS_BAD_PTR /* Win9x */, - "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); + ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { ok(size == sizeof(v2Cert), "Wrong size %ld\n", size); @@ -3203,10 +3114,9 @@ static void test_encodeCertToBeSigned(DWORD dwEncoding) } /* Test v3 cert */ info.dwVersion = CERT_V3; - ret = pCryptEncodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret || GetLastError() == OSS_BAD_PTR /* Win9x */, - "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); + ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { ok(size == sizeof(v3Cert), "Wrong size %ld\n", size); @@ -3215,7 +3125,7 @@ static void test_encodeCertToBeSigned(DWORD dwEncoding) } /* A v4 cert? */ info.dwVersion = 3; /* Not a typo, CERT_V3 is 2 */ - ret = pCryptEncodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); if (ret) { @@ -3229,10 +3139,9 @@ static void test_encodeCertToBeSigned(DWORD dwEncoding) info.dwVersion = CERT_V1; info.cExtension = 1; info.rgExtension = &criticalExt; - ret = pCryptEncodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret || GetLastError() == OSS_BAD_PTR /* Win9x */, - "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); + ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { ok(size == sizeof(v1CertWithConstraints), "Wrong size %ld\n", size); @@ -3242,7 +3151,7 @@ static void test_encodeCertToBeSigned(DWORD dwEncoding) /* test v1 cert with a serial number */ info.SerialNumber.cbData = sizeof(serialNum); info.SerialNumber.pbData = (BYTE *)serialNum; - ret = pCryptEncodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); if (ret) { @@ -3255,10 +3164,9 @@ static void test_encodeCertToBeSigned(DWORD dwEncoding) info.cExtension = 0; info.IssuerUniqueId.cbData = sizeof(serialNum); info.IssuerUniqueId.pbData = (BYTE *)serialNum; - ret = pCryptEncodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret || broken(GetLastError() == OSS_BAD_PTR /* Win98 */), - "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); + ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { ok(size == sizeof(v1CertWithIssuerUniqueId), "Wrong size %ld\n", size); @@ -3275,7 +3183,7 @@ static void test_encodeCertToBeSigned(DWORD dwEncoding) info.Issuer.pbData = (BYTE *)encodedCommonName; info.Subject.cbData = sizeof(encodedCommonName); info.Subject.pbData = (BYTE *)encodedCommonName; - ret = pCryptEncodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); if (ret) { @@ -3287,7 +3195,7 @@ static void test_encodeCertToBeSigned(DWORD dwEncoding) info.SubjectPublicKeyInfo.Algorithm.pszObjId = oid_rsa_rsa; info.SubjectPublicKeyInfo.PublicKey.cbData = sizeof(aKey); info.SubjectPublicKeyInfo.PublicKey.pbData = (LPBYTE)aKey; - ret = pCryptEncodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); if (ret) { @@ -3303,7 +3211,7 @@ static void test_encodeCertToBeSigned(DWORD dwEncoding) /* Again add an issuer unique id */ info.IssuerUniqueId.cbData = sizeof(serialNum); info.IssuerUniqueId.pbData = (BYTE *)serialNum; - ret = pCryptEncodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -3333,7 +3241,7 @@ static void test_encodeCertToBeSigned(DWORD dwEncoding) ext.Value.pbData = octetCommonNameValue; info.cExtension = 1; info.rgExtension = &ext; - ret = pCryptEncodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); if (ret) { @@ -3352,26 +3260,23 @@ static void test_decodeCertToBeSigned(DWORD dwEncoding) DWORD size = 0, i; /* Test with NULL pbEncoded */ - ret = pCryptDecodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, NULL, 0, + ret = CryptDecodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, NULL, 0, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); - ok(!ret && (GetLastError() == CRYPT_E_ASN1_EOD || - GetLastError() == OSS_BAD_ARG /* Win9x */), - "Expected CRYPT_E_ASN1_EOD or OSS_BAD_ARG, got %08lx\n", GetLastError()); - if (0) - { - /* Crashes on win9x */ - ret = pCryptDecodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, NULL, 1, - CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); - ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, - "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", GetLastError()); - } + ok(!ret && GetLastError() == CRYPT_E_ASN1_EOD, + "Expected CRYPT_E_ASN1_EOD, got %08lx\n", GetLastError()); + + ret = CryptDecodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, NULL, 1, + CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); + ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, + "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", GetLastError()); + /* The following certs all fail with CRYPT_E_ASN1_CORRUPT or * CRYPT_E_ASN1_BADTAG, because at a minimum a cert must have a non-zero * serial number, an issuer, a subject, and a public key. */ for (i = 0; i < ARRAY_SIZE(corruptCerts); i++) { - ret = pCryptDecodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, + ret = CryptDecodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, corruptCerts[i], corruptCerts[i][1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(!ret, "Expected failure\n"); @@ -3379,7 +3284,7 @@ static void test_decodeCertToBeSigned(DWORD dwEncoding) /* The following succeeds, even though v1 certs are not allowed to have * extensions. */ - ret = pCryptDecodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, + ret = CryptDecodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, v1CertWithSubjectKeyId, sizeof(v1CertWithSubjectKeyId), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -3397,7 +3302,7 @@ static void test_decodeCertToBeSigned(DWORD dwEncoding) /* The following also succeeds, even though V1 certs are not allowed to * have issuer unique ids. */ - ret = pCryptDecodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, + ret = CryptDecodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, v1CertWithSubjectIssuerSerialAndIssuerUniqueId, sizeof(v1CertWithSubjectIssuerSerialAndIssuerUniqueId), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); @@ -3416,7 +3321,7 @@ static void test_decodeCertToBeSigned(DWORD dwEncoding) LocalFree(buf); } /* Now check with serial number, subject and issuer specified */ - ret = pCryptDecodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, bigCert, + ret = CryptDecodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, bigCert, sizeof(bigCert), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -3440,7 +3345,7 @@ static void test_decodeCertToBeSigned(DWORD dwEncoding) LocalFree(buf); } /* Check again with pub key specified */ - ret = pCryptDecodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, + ret = CryptDecodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, v1CertWithPubKey, sizeof(v1CertWithPubKey), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -3560,7 +3465,7 @@ static void test_encodeCert(DWORD dwEncoding) BYTE *buf = NULL; DWORD bufSize = 0; - ret = pCryptEncodeObjectEx(dwEncoding, X509_CERT, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_CERT, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &bufSize); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -3577,7 +3482,7 @@ static void test_decodeCert(DWORD dwEncoding) BYTE *buf = NULL; DWORD size = 0; - ret = pCryptDecodeObjectEx(dwEncoding, X509_CERT, signedBigCert, + ret = CryptDecodeObjectEx(dwEncoding, X509_CERT, signedBigCert, sizeof(signedBigCert), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -3595,7 +3500,7 @@ static void test_decodeCert(DWORD dwEncoding) LocalFree(buf); } /* A signed cert decodes as a CERT_INFO too */ - ret = pCryptDecodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, signedBigCert, + ret = CryptDecodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, signedBigCert, sizeof(signedBigCert), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -3618,7 +3523,7 @@ static void test_decodeCert(DWORD dwEncoding) info->Subject.cbData), "Unexpected subject\n"); LocalFree(buf); } - ret = pCryptDecodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, signedBigCertWithIndefiniteSeq, + ret = CryptDecodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, signedBigCertWithIndefiniteSeq, sizeof(signedBigCertWithIndefiniteSeq), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -3670,14 +3575,14 @@ static void test_encodeCRLDistPoints(DWORD dwEncoding) DWORD size = 0; /* Test with an empty info */ - ret = pCryptEncodeObjectEx(dwEncoding, X509_CRL_DIST_POINTS, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_CRL_DIST_POINTS, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08lx\n", GetLastError()); /* Test with one empty dist point */ info.cDistPoint = 1; info.rgDistPoint = &point; - ret = pCryptEncodeObjectEx(dwEncoding, X509_CRL_DIST_POINTS, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_CRL_DIST_POINTS, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -3692,7 +3597,7 @@ static void test_encodeCRLDistPoints(DWORD dwEncoding) U(entry).pwszURL = (WCHAR *)L"http://\x226f\x575b"; U(point.DistPointName).FullName.cAltEntry = 1; U(point.DistPointName).FullName.rgAltEntry = &entry; - ret = pCryptEncodeObjectEx(dwEncoding, X509_CRL_DIST_POINTS, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_CRL_DIST_POINTS, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(!ret && GetLastError() == CRYPT_E_INVALID_IA5_STRING, "Expected CRYPT_E_INVALID_IA5_STRING, got %08lx\n", GetLastError()); @@ -3702,7 +3607,7 @@ static void test_encodeCRLDistPoints(DWORD dwEncoding) GET_CERT_ALT_NAME_VALUE_ERR_INDEX(size)); /* A dist point with (just) a valid name */ U(entry).pwszURL = (LPWSTR)url; - ret = pCryptEncodeObjectEx(dwEncoding, X509_CRL_DIST_POINTS, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_CRL_DIST_POINTS, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -3715,7 +3620,7 @@ static void test_encodeCRLDistPoints(DWORD dwEncoding) point.DistPointName.dwDistPointNameChoice = CRL_DIST_POINT_NO_NAME; point.ReasonFlags.cbData = sizeof(crlReason); point.ReasonFlags.pbData = (LPBYTE)&crlReason; - ret = pCryptEncodeObjectEx(dwEncoding, X509_CRL_DIST_POINTS, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_CRL_DIST_POINTS, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -3728,7 +3633,7 @@ static void test_encodeCRLDistPoints(DWORD dwEncoding) point.ReasonFlags.cbData = 0; point.CRLIssuer.cAltEntry = 1; point.CRLIssuer.rgAltEntry = &entry; - ret = pCryptEncodeObjectEx(dwEncoding, X509_CRL_DIST_POINTS, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_CRL_DIST_POINTS, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -3739,7 +3644,7 @@ static void test_encodeCRLDistPoints(DWORD dwEncoding) } /* A dist point with both a name and an issuer */ point.DistPointName.dwDistPointNameChoice = CRL_DIST_POINT_FULL_NAME; - ret = pCryptEncodeObjectEx(dwEncoding, X509_CRL_DIST_POINTS, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_CRL_DIST_POINTS, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -3760,7 +3665,7 @@ static void test_decodeCRLDistPoints(DWORD dwEncoding) PCRL_DIST_POINT point; PCERT_ALT_NAME_ENTRY entry; - ret = pCryptDecodeObjectEx(dwEncoding, X509_CRL_DIST_POINTS, + ret = CryptDecodeObjectEx(dwEncoding, X509_CRL_DIST_POINTS, emptyDistPoint, emptyDistPoint[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -3779,7 +3684,7 @@ static void test_decodeCRLDistPoints(DWORD dwEncoding) ok(point->CRLIssuer.cAltEntry == 0, "Expected no issuer\n"); LocalFree(buf); } - ret = pCryptDecodeObjectEx(dwEncoding, X509_CRL_DIST_POINTS, + ret = CryptDecodeObjectEx(dwEncoding, X509_CRL_DIST_POINTS, distPointWithUrl, distPointWithUrl[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -3806,7 +3711,7 @@ static void test_decodeCRLDistPoints(DWORD dwEncoding) ok(point->CRLIssuer.cAltEntry == 0, "Expected no issuer\n"); LocalFree(buf); } - ret = pCryptDecodeObjectEx(dwEncoding, X509_CRL_DIST_POINTS, + ret = CryptDecodeObjectEx(dwEncoding, X509_CRL_DIST_POINTS, distPointWithReason, distPointWithReason[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -3829,7 +3734,7 @@ static void test_decodeCRLDistPoints(DWORD dwEncoding) ok(point->CRLIssuer.cAltEntry == 0, "Expected no issuer\n"); LocalFree(buf); } - ret = pCryptDecodeObjectEx(dwEncoding, X509_CRL_DIST_POINTS, + ret = CryptDecodeObjectEx(dwEncoding, X509_CRL_DIST_POINTS, distPointWithUrlAndIssuer, distPointWithUrlAndIssuer[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -3861,14 +3766,14 @@ static void test_decodeCRLDistPoints(DWORD dwEncoding) ok(!lstrcmpW(U(*entry).pwszURL, url), "Unexpected name\n"); LocalFree(buf); } - ret = pCryptDecodeObjectEx(dwEncoding, X509_CRL_DIST_POINTS, + ret = CryptDecodeObjectEx(dwEncoding, X509_CRL_DIST_POINTS, distPointWithUrlAndIssuer, distPointWithUrlAndIssuer[1] + 2, 0, NULL, NULL, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); if (buf) { - ret = pCryptDecodeObjectEx(dwEncoding, X509_CRL_DIST_POINTS, + ret = CryptDecodeObjectEx(dwEncoding, X509_CRL_DIST_POINTS, distPointWithUrlAndIssuer, distPointWithUrlAndIssuer[1] + 2, 0, NULL, buf, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -3890,16 +3795,11 @@ static void test_encodeCRLIssuingDistPoint(DWORD dwEncoding) CRL_ISSUING_DIST_POINT point = { { 0 } }; CERT_ALT_NAME_ENTRY entry; - ret = pCryptEncodeObjectEx(dwEncoding, X509_ISSUING_DIST_POINT, NULL, + ret = CryptEncodeObjectEx(dwEncoding, X509_ISSUING_DIST_POINT, NULL, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - if (!ret && GetLastError() == ERROR_FILE_NOT_FOUND) - { - skip("no X509_ISSUING_DIST_POINT encode support\n"); - return; - } ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", GetLastError()); - ret = pCryptEncodeObjectEx(dwEncoding, X509_ISSUING_DIST_POINT, &point, + ret = CryptEncodeObjectEx(dwEncoding, X509_ISSUING_DIST_POINT, &point, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -3911,7 +3811,7 @@ static void test_encodeCRLIssuingDistPoint(DWORD dwEncoding) /* nonsensical flags */ point.fOnlyContainsUserCerts = TRUE; point.fOnlyContainsCACerts = TRUE; - ret = pCryptEncodeObjectEx(dwEncoding, X509_ISSUING_DIST_POINT, &point, + ret = CryptEncodeObjectEx(dwEncoding, X509_ISSUING_DIST_POINT, &point, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -3923,14 +3823,14 @@ static void test_encodeCRLIssuingDistPoint(DWORD dwEncoding) /* unimplemented name type */ point.fOnlyContainsCACerts = point.fOnlyContainsUserCerts = FALSE; point.DistPointName.dwDistPointNameChoice = CRL_DIST_POINT_ISSUER_RDN_NAME; - ret = pCryptEncodeObjectEx(dwEncoding, X509_ISSUING_DIST_POINT, &point, + ret = CryptEncodeObjectEx(dwEncoding, X509_ISSUING_DIST_POINT, &point, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08lx\n", GetLastError()); /* empty name */ point.DistPointName.dwDistPointNameChoice = CRL_DIST_POINT_FULL_NAME; U(point.DistPointName).FullName.cAltEntry = 0; - ret = pCryptEncodeObjectEx(dwEncoding, X509_ISSUING_DIST_POINT, &point, + ret = CryptEncodeObjectEx(dwEncoding, X509_ISSUING_DIST_POINT, &point, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -3944,7 +3844,7 @@ static void test_encodeCRLIssuingDistPoint(DWORD dwEncoding) U(entry).pwszURL = (LPWSTR)url; U(point.DistPointName).FullName.cAltEntry = 1; U(point.DistPointName).FullName.rgAltEntry = &entry; - ret = pCryptEncodeObjectEx(dwEncoding, X509_ISSUING_DIST_POINT, &point, + ret = CryptEncodeObjectEx(dwEncoding, X509_ISSUING_DIST_POINT, &point, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -4029,21 +3929,16 @@ static void test_decodeCRLIssuingDistPoint(DWORD dwEncoding) DWORD size = 0; CRL_ISSUING_DIST_POINT point = { { 0 } }; - ret = pCryptDecodeObjectEx(dwEncoding, X509_ISSUING_DIST_POINT, + ret = CryptDecodeObjectEx(dwEncoding, X509_ISSUING_DIST_POINT, emptySequence, emptySequence[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); - if (!ret && GetLastError() == ERROR_FILE_NOT_FOUND) - { - skip("no X509_ISSUING_DIST_POINT decode support\n"); - return; - } ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { compareCRLIssuingDistPoints(&point, (PCRL_ISSUING_DIST_POINT)buf); LocalFree(buf); } - ret = pCryptDecodeObjectEx(dwEncoding, X509_ISSUING_DIST_POINT, + ret = CryptDecodeObjectEx(dwEncoding, X509_ISSUING_DIST_POINT, badFlagsIDP, badFlagsIDP[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -4053,7 +3948,7 @@ static void test_decodeCRLIssuingDistPoint(DWORD dwEncoding) compareCRLIssuingDistPoints(&point, (PCRL_ISSUING_DIST_POINT)buf); LocalFree(buf); } - ret = pCryptDecodeObjectEx(dwEncoding, X509_ISSUING_DIST_POINT, + ret = CryptDecodeObjectEx(dwEncoding, X509_ISSUING_DIST_POINT, emptyNameIDP, emptyNameIDP[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -4065,7 +3960,7 @@ static void test_decodeCRLIssuingDistPoint(DWORD dwEncoding) compareCRLIssuingDistPoints(&point, (PCRL_ISSUING_DIST_POINT)buf); LocalFree(buf); } - ret = pCryptDecodeObjectEx(dwEncoding, X509_ISSUING_DIST_POINT, + ret = CryptDecodeObjectEx(dwEncoding, X509_ISSUING_DIST_POINT, urlIDP, urlIDP[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -4135,10 +4030,9 @@ static void test_encodeCRLToBeSigned(DWORD dwEncoding) CRL_ENTRY entry = { { 0 }, { 0 }, 0, 0 }; /* Test with a V1 CRL */ - ret = pCryptEncodeObjectEx(dwEncoding, X509_CERT_CRL_TO_BE_SIGNED, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_CERT_CRL_TO_BE_SIGNED, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret || broken(GetLastError() == OSS_DATA_ERROR /* Win9x */), - "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); + ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { ok(size == sizeof(v1CRL), "Wrong size %ld\n", size); @@ -4147,10 +4041,9 @@ static void test_encodeCRLToBeSigned(DWORD dwEncoding) } /* Test v2 CRL */ info.dwVersion = CRL_V2; - ret = pCryptEncodeObjectEx(dwEncoding, X509_CERT_CRL_TO_BE_SIGNED, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_CERT_CRL_TO_BE_SIGNED, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret || broken(GetLastError() == OSS_DATA_ERROR /* Win9x */), - "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); + ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { ok(size == v2CRL[1] + 2, "Expected size %d, got %ld\n", @@ -4162,7 +4055,7 @@ static void test_encodeCRLToBeSigned(DWORD dwEncoding) info.dwVersion = CRL_V1; info.Issuer.cbData = sizeof(encodedCommonName); info.Issuer.pbData = (BYTE *)encodedCommonName; - ret = pCryptEncodeObjectEx(dwEncoding, X509_CERT_CRL_TO_BE_SIGNED, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_CERT_CRL_TO_BE_SIGNED, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -4171,19 +4064,18 @@ static void test_encodeCRLToBeSigned(DWORD dwEncoding) ok(!memcmp(buf, v1CRLWithIssuer, size), "Got unexpected value\n"); LocalFree(buf); } - if (0) - { - /* v1 CRL with a name and a NULL entry pointer (crashes on win9x) */ - info.cCRLEntry = 1; - ret = pCryptEncodeObjectEx(dwEncoding, X509_CERT_CRL_TO_BE_SIGNED, &info, - CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, - "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", GetLastError()); - } + + /* v1 CRL with a name and a NULL entry pointer */ + info.cCRLEntry = 1; + ret = CryptEncodeObjectEx(dwEncoding, X509_CERT_CRL_TO_BE_SIGNED, &info, + CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, + "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", GetLastError()); + /* now set an empty entry */ info.cCRLEntry = 1; info.rgCRLEntry = &entry; - ret = pCryptEncodeObjectEx(dwEncoding, X509_CERT_CRL_TO_BE_SIGNED, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_CERT_CRL_TO_BE_SIGNED, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); if (ret) { @@ -4196,7 +4088,7 @@ static void test_encodeCRLToBeSigned(DWORD dwEncoding) /* an entry with a serial number */ entry.SerialNumber.cbData = sizeof(serialNum); entry.SerialNumber.pbData = (BYTE *)serialNum; - ret = pCryptEncodeObjectEx(dwEncoding, X509_CERT_CRL_TO_BE_SIGNED, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_CERT_CRL_TO_BE_SIGNED, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); if (ret) { @@ -4209,7 +4101,7 @@ static void test_encodeCRLToBeSigned(DWORD dwEncoding) /* an entry with an extension */ entry.cExtension = 1; entry.rgExtension = &criticalExt; - ret = pCryptEncodeObjectEx(dwEncoding, X509_CERT_CRL_TO_BE_SIGNED, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_CERT_CRL_TO_BE_SIGNED, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -4222,7 +4114,7 @@ static void test_encodeCRLToBeSigned(DWORD dwEncoding) entry.cExtension = 0; info.cExtension = 1; info.rgExtension = &criticalExt; - ret = pCryptEncodeObjectEx(dwEncoding, X509_CERT_CRL_TO_BE_SIGNED, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_CERT_CRL_TO_BE_SIGNED, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -4234,7 +4126,7 @@ static void test_encodeCRLToBeSigned(DWORD dwEncoding) /* a v2 CRL with an extension, this time non-critical */ info.dwVersion = CRL_V2; info.rgExtension = &nonCriticalExt; - ret = pCryptEncodeObjectEx(dwEncoding, X509_CERT_CRL_TO_BE_SIGNED, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_CERT_CRL_TO_BE_SIGNED, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -4799,16 +4691,14 @@ static void test_decodeCRLToBeSigned(DWORD dwEncoding) for (i = 0; i < ARRAY_SIZE(corruptCRLs); i++) { - ret = pCryptDecodeObjectEx(dwEncoding, X509_CERT_CRL_TO_BE_SIGNED, + ret = CryptDecodeObjectEx(dwEncoding, X509_CERT_CRL_TO_BE_SIGNED, corruptCRLs[i], corruptCRLs[i][1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); - ok(!ret && (GetLastError() == CRYPT_E_ASN1_CORRUPT || - GetLastError() == OSS_DATA_ERROR /* Win9x */), - "Expected CRYPT_E_ASN1_CORRUPT or OSS_DATA_ERROR, got %08lx\n", - GetLastError()); + ok(!ret && GetLastError() == CRYPT_E_ASN1_CORRUPT, + "Expected CRYPT_E_ASN1_CORRUPT, got %08lx\n", GetLastError()); } /* at a minimum, a CRL must contain an issuer: */ - ret = pCryptDecodeObjectEx(dwEncoding, X509_CERT_CRL_TO_BE_SIGNED, + ret = CryptDecodeObjectEx(dwEncoding, X509_CERT_CRL_TO_BE_SIGNED, v1CRLWithIssuer, v1CRLWithIssuer[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -4826,16 +4716,14 @@ static void test_decodeCRLToBeSigned(DWORD dwEncoding) LocalFree(buf); } /* check decoding with an empty CRL entry */ - ret = pCryptDecodeObjectEx(dwEncoding, X509_CERT_CRL_TO_BE_SIGNED, + ret = CryptDecodeObjectEx(dwEncoding, X509_CERT_CRL_TO_BE_SIGNED, v1CRLWithIssuerAndEmptyEntry, v1CRLWithIssuerAndEmptyEntry[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); - ok(!ret && (GetLastError() == CRYPT_E_ASN1_CORRUPT || - GetLastError() == OSS_DATA_ERROR /* Win9x */ || - GetLastError() == CRYPT_E_BAD_ENCODE /* Win8 */), - "Expected CRYPT_E_ASN1_CORRUPT or OSS_DATA_ERROR, got %08lx\n", + ok(!ret && (GetLastError() == CRYPT_E_ASN1_CORRUPT || GetLastError() == CRYPT_E_BAD_ENCODE), + "Expected CRYPT_E_ASN1_CORRUPT or CRYPT_E_BAD_ENCODE, got %08lx\n", GetLastError()); /* with a real CRL entry */ - ret = pCryptDecodeObjectEx(dwEncoding, X509_CERT_CRL_TO_BE_SIGNED, + ret = CryptDecodeObjectEx(dwEncoding, X509_CERT_CRL_TO_BE_SIGNED, v1CRLWithIssuerAndEntry, v1CRLWithIssuerAndEntry[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -4862,7 +4750,7 @@ static void test_decodeCRLToBeSigned(DWORD dwEncoding) LocalFree(buf); } /* a real CRL from verisign that has extensions */ - ret = pCryptDecodeObjectEx(dwEncoding, X509_CERT_CRL_TO_BE_SIGNED, + ret = CryptDecodeObjectEx(dwEncoding, X509_CERT_CRL_TO_BE_SIGNED, verisignCRL, sizeof(verisignCRL), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -4879,7 +4767,7 @@ static void test_decodeCRLToBeSigned(DWORD dwEncoding) LocalFree(buf); } /* another real CRL from verisign that has lots of entries */ - ret = pCryptDecodeObjectEx(dwEncoding, X509_CERT_CRL_TO_BE_SIGNED, + ret = CryptDecodeObjectEx(dwEncoding, X509_CERT_CRL_TO_BE_SIGNED, verisignCRLWithLotsOfEntries, sizeof(verisignCRLWithLotsOfEntries), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -4895,7 +4783,7 @@ static void test_decodeCRLToBeSigned(DWORD dwEncoding) LocalFree(buf); } /* and finally, with an extension */ - ret = pCryptDecodeObjectEx(dwEncoding, X509_CERT_CRL_TO_BE_SIGNED, + ret = CryptDecodeObjectEx(dwEncoding, X509_CERT_CRL_TO_BE_SIGNED, v1CRLWithExt, sizeof(v1CRLWithExt), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -4923,7 +4811,7 @@ static void test_decodeCRLToBeSigned(DWORD dwEncoding) info->cExtension); LocalFree(buf); } - ret = pCryptDecodeObjectEx(dwEncoding, X509_CERT_CRL_TO_BE_SIGNED, + ret = CryptDecodeObjectEx(dwEncoding, X509_CERT_CRL_TO_BE_SIGNED, v2CRLWithExt, sizeof(v2CRLWithExt), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -4953,7 +4841,7 @@ static void test_encodeEnhancedKeyUsage(DWORD dwEncoding) /* Test with empty usage */ usage.cUsageIdentifier = 0; - ret = pCryptEncodeObjectEx(dwEncoding, X509_ENHANCED_KEY_USAGE, &usage, + ret = CryptEncodeObjectEx(dwEncoding, X509_ENHANCED_KEY_USAGE, &usage, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -4965,7 +4853,7 @@ static void test_encodeEnhancedKeyUsage(DWORD dwEncoding) /* Test with a few usages */ usage.cUsageIdentifier = ARRAY_SIZE(keyUsages); usage.rgpszUsageIdentifier = (LPSTR *)keyUsages; - ret = pCryptEncodeObjectEx(dwEncoding, X509_ENHANCED_KEY_USAGE, &usage, + ret = CryptEncodeObjectEx(dwEncoding, X509_ENHANCED_KEY_USAGE, &usage, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -4982,7 +4870,7 @@ static void test_decodeEnhancedKeyUsage(DWORD dwEncoding) LPBYTE buf = NULL; DWORD size = 0; - ret = pCryptDecodeObjectEx(dwEncoding, X509_ENHANCED_KEY_USAGE, + ret = CryptDecodeObjectEx(dwEncoding, X509_ENHANCED_KEY_USAGE, emptySequence, sizeof(emptySequence), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -4996,7 +4884,7 @@ static void test_decodeEnhancedKeyUsage(DWORD dwEncoding) usage->cUsageIdentifier); LocalFree(buf); } - ret = pCryptDecodeObjectEx(dwEncoding, X509_ENHANCED_KEY_USAGE, + ret = CryptDecodeObjectEx(dwEncoding, X509_ENHANCED_KEY_USAGE, encodedUsage, sizeof(encodedUsage), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -5015,13 +4903,13 @@ static void test_decodeEnhancedKeyUsage(DWORD dwEncoding) usage->rgpszUsageIdentifier[i]); LocalFree(buf); } - ret = pCryptDecodeObjectEx(dwEncoding, X509_ENHANCED_KEY_USAGE, + ret = CryptDecodeObjectEx(dwEncoding, X509_ENHANCED_KEY_USAGE, encodedUsage, sizeof(encodedUsage), 0, NULL, NULL, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); if (buf) { - ret = pCryptDecodeObjectEx(dwEncoding, X509_ENHANCED_KEY_USAGE, + ret = CryptDecodeObjectEx(dwEncoding, X509_ENHANCED_KEY_USAGE, encodedUsage, sizeof(encodedUsage), 0, NULL, buf, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); HeapFree(GetProcessHeap(), 0, buf); @@ -5044,7 +4932,7 @@ static void test_encodeAuthorityKeyId(DWORD dwEncoding) DWORD size = 0; /* Test with empty id */ - ret = pCryptEncodeObjectEx(dwEncoding, X509_AUTHORITY_KEY_ID, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_AUTHORITY_KEY_ID, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -5056,7 +4944,7 @@ static void test_encodeAuthorityKeyId(DWORD dwEncoding) /* With just a key id */ info.KeyId.cbData = sizeof(keyId); info.KeyId.pbData = keyId; - ret = pCryptEncodeObjectEx(dwEncoding, X509_AUTHORITY_KEY_ID, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_AUTHORITY_KEY_ID, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -5069,7 +4957,7 @@ static void test_encodeAuthorityKeyId(DWORD dwEncoding) info.KeyId.cbData = 0; info.CertIssuer.cbData = sizeof(encodedCommonName); info.CertIssuer.pbData = (BYTE *)encodedCommonName; - ret = pCryptEncodeObjectEx(dwEncoding, X509_AUTHORITY_KEY_ID, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_AUTHORITY_KEY_ID, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -5083,7 +4971,7 @@ static void test_encodeAuthorityKeyId(DWORD dwEncoding) info.CertIssuer.cbData = 0; info.CertSerialNumber.cbData = sizeof(serialNum); info.CertSerialNumber.pbData = (BYTE *)serialNum; - ret = pCryptEncodeObjectEx(dwEncoding, X509_AUTHORITY_KEY_ID, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_AUTHORITY_KEY_ID, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -5101,7 +4989,7 @@ static void test_decodeAuthorityKeyId(DWORD dwEncoding) LPBYTE buf = NULL; DWORD size = 0; - ret = pCryptDecodeObjectEx(dwEncoding, X509_AUTHORITY_KEY_ID, + ret = CryptDecodeObjectEx(dwEncoding, X509_AUTHORITY_KEY_ID, emptySequence, sizeof(emptySequence), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -5116,7 +5004,7 @@ static void test_decodeAuthorityKeyId(DWORD dwEncoding) ok(info->CertSerialNumber.cbData == 0, "Expected no serial number\n"); LocalFree(buf); } - ret = pCryptDecodeObjectEx(dwEncoding, X509_AUTHORITY_KEY_ID, + ret = CryptDecodeObjectEx(dwEncoding, X509_AUTHORITY_KEY_ID, authorityKeyIdWithId, sizeof(authorityKeyIdWithId), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -5133,7 +5021,7 @@ static void test_decodeAuthorityKeyId(DWORD dwEncoding) ok(info->CertSerialNumber.cbData == 0, "Expected no serial number\n"); LocalFree(buf); } - ret = pCryptDecodeObjectEx(dwEncoding, X509_AUTHORITY_KEY_ID, + ret = CryptDecodeObjectEx(dwEncoding, X509_AUTHORITY_KEY_ID, authorityKeyIdWithIssuer, sizeof(authorityKeyIdWithIssuer), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -5151,7 +5039,7 @@ static void test_decodeAuthorityKeyId(DWORD dwEncoding) ok(info->CertSerialNumber.cbData == 0, "Expected no serial number\n"); LocalFree(buf); } - ret = pCryptDecodeObjectEx(dwEncoding, X509_AUTHORITY_KEY_ID, + ret = CryptDecodeObjectEx(dwEncoding, X509_AUTHORITY_KEY_ID, authorityKeyIdWithSerial, sizeof(authorityKeyIdWithSerial), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -5184,7 +5072,7 @@ static void test_encodeAuthorityKeyId2(DWORD dwEncoding) DWORD size = 0; /* Test with empty id */ - ret = pCryptEncodeObjectEx(dwEncoding, X509_AUTHORITY_KEY_ID2, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_AUTHORITY_KEY_ID2, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -5196,7 +5084,7 @@ static void test_encodeAuthorityKeyId2(DWORD dwEncoding) /* With just a key id */ info.KeyId.cbData = sizeof(keyId); info.KeyId.pbData = keyId; - ret = pCryptEncodeObjectEx(dwEncoding, X509_AUTHORITY_KEY_ID2, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_AUTHORITY_KEY_ID2, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -5210,14 +5098,14 @@ static void test_encodeAuthorityKeyId2(DWORD dwEncoding) info.KeyId.cbData = 0; info.AuthorityCertIssuer.cAltEntry = 1; info.AuthorityCertIssuer.rgAltEntry = &entry; - ret = pCryptEncodeObjectEx(dwEncoding, X509_AUTHORITY_KEY_ID2, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_AUTHORITY_KEY_ID2, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08lx\n", GetLastError()); /* With an issuer name */ entry.dwAltNameChoice = CERT_ALT_NAME_URL; U(entry).pwszURL = (LPWSTR)url; - ret = pCryptEncodeObjectEx(dwEncoding, X509_AUTHORITY_KEY_ID2, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_AUTHORITY_KEY_ID2, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -5232,7 +5120,7 @@ static void test_encodeAuthorityKeyId2(DWORD dwEncoding) info.AuthorityCertIssuer.cAltEntry = 0; info.AuthorityCertSerialNumber.cbData = sizeof(serialNum); info.AuthorityCertSerialNumber.pbData = (BYTE *)serialNum; - ret = pCryptEncodeObjectEx(dwEncoding, X509_AUTHORITY_KEY_ID2, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_AUTHORITY_KEY_ID2, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -5250,7 +5138,7 @@ static void test_decodeAuthorityKeyId2(DWORD dwEncoding) LPBYTE buf = NULL; DWORD size = 0; - ret = pCryptDecodeObjectEx(dwEncoding, X509_AUTHORITY_KEY_ID2, + ret = CryptDecodeObjectEx(dwEncoding, X509_AUTHORITY_KEY_ID2, emptySequence, sizeof(emptySequence), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -5267,7 +5155,7 @@ static void test_decodeAuthorityKeyId2(DWORD dwEncoding) "Expected no serial number\n"); LocalFree(buf); } - ret = pCryptDecodeObjectEx(dwEncoding, X509_AUTHORITY_KEY_ID2, + ret = CryptDecodeObjectEx(dwEncoding, X509_AUTHORITY_KEY_ID2, authorityKeyIdWithId, sizeof(authorityKeyIdWithId), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -5286,7 +5174,7 @@ static void test_decodeAuthorityKeyId2(DWORD dwEncoding) "Expected no serial number\n"); LocalFree(buf); } - ret = pCryptDecodeObjectEx(dwEncoding, X509_AUTHORITY_KEY_ID2, + ret = CryptDecodeObjectEx(dwEncoding, X509_AUTHORITY_KEY_ID2, authorityKeyIdWithIssuerUrl, sizeof(authorityKeyIdWithIssuerUrl), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -5309,7 +5197,7 @@ static void test_decodeAuthorityKeyId2(DWORD dwEncoding) "Expected no serial number\n"); LocalFree(buf); } - ret = pCryptDecodeObjectEx(dwEncoding, X509_AUTHORITY_KEY_ID2, + ret = CryptDecodeObjectEx(dwEncoding, X509_AUTHORITY_KEY_ID2, authorityKeyIdWithSerial, sizeof(authorityKeyIdWithSerial), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -5352,7 +5240,7 @@ static void test_encodeAuthorityInfoAccess(DWORD dwEncoding) aia.cAccDescr = 0; aia.rgAccDescr = NULL; /* Having no access descriptions is allowed */ - ret = pCryptEncodeObjectEx(dwEncoding, X509_AUTHORITY_INFO_ACCESS, &aia, + ret = CryptEncodeObjectEx(dwEncoding, X509_AUTHORITY_INFO_ACCESS, &aia, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -5365,21 +5253,20 @@ static void test_encodeAuthorityInfoAccess(DWORD dwEncoding) /* It can't have an empty access method */ aia.cAccDescr = 1; aia.rgAccDescr = accessDescription; - ret = pCryptEncodeObjectEx(dwEncoding, X509_AUTHORITY_INFO_ACCESS, &aia, + ret = CryptEncodeObjectEx(dwEncoding, X509_AUTHORITY_INFO_ACCESS, &aia, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(!ret && (GetLastError() == E_INVALIDARG || - GetLastError() == OSS_LIMITED /* Win9x */), - "expected E_INVALIDARG or OSS_LIMITED, got %08lx\n", GetLastError()); + ok(!ret && GetLastError() == E_INVALIDARG, + "expected E_INVALIDARG, got %08lx\n", GetLastError()); /* It can't have an empty location */ accessDescription[0].pszAccessMethod = oid1; SetLastError(0xdeadbeef); - ret = pCryptEncodeObjectEx(dwEncoding, X509_AUTHORITY_INFO_ACCESS, &aia, + ret = CryptEncodeObjectEx(dwEncoding, X509_AUTHORITY_INFO_ACCESS, &aia, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08lx\n", GetLastError()); accessDescription[0].AccessLocation.dwAltNameChoice = CERT_ALT_NAME_URL; U(accessDescription[0].AccessLocation).pwszURL = (LPWSTR)url; - ret = pCryptEncodeObjectEx(dwEncoding, X509_AUTHORITY_INFO_ACCESS, &aia, + ret = CryptEncodeObjectEx(dwEncoding, X509_AUTHORITY_INFO_ACCESS, &aia, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -5399,7 +5286,7 @@ static void test_encodeAuthorityInfoAccess(DWORD dwEncoding) U(accessDescription[1].AccessLocation).IPAddress.pbData = (LPBYTE)encodedIPAddr; aia.cAccDescr = 2; - ret = pCryptEncodeObjectEx(dwEncoding, X509_AUTHORITY_INFO_ACCESS, &aia, + ret = CryptEncodeObjectEx(dwEncoding, X509_AUTHORITY_INFO_ACCESS, &aia, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -5441,7 +5328,7 @@ static void test_decodeAuthorityInfoAccess(DWORD dwEncoding) LPBYTE buf = NULL; DWORD size = 0; - ret = pCryptDecodeObjectEx(dwEncoding, X509_AUTHORITY_INFO_ACCESS, + ret = CryptDecodeObjectEx(dwEncoding, X509_AUTHORITY_INFO_ACCESS, emptySequence, sizeof(emptySequence), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptDecodeObjectEx failed: %lx\n", GetLastError()); @@ -5454,7 +5341,7 @@ static void test_decodeAuthorityInfoAccess(DWORD dwEncoding) LocalFree(buf); buf = NULL; } - ret = pCryptDecodeObjectEx(dwEncoding, X509_AUTHORITY_INFO_ACCESS, + ret = CryptDecodeObjectEx(dwEncoding, X509_AUTHORITY_INFO_ACCESS, authorityInfoAccessWithUrl, sizeof(authorityInfoAccessWithUrl), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptDecodeObjectEx failed: %lx\n", GetLastError()); @@ -5473,7 +5360,7 @@ static void test_decodeAuthorityInfoAccess(DWORD dwEncoding) LocalFree(buf); buf = NULL; } - ret = pCryptDecodeObjectEx(dwEncoding, X509_AUTHORITY_INFO_ACCESS, + ret = CryptDecodeObjectEx(dwEncoding, X509_AUTHORITY_INFO_ACCESS, authorityInfoAccessWithUrlAndIPAddr, sizeof(authorityInfoAccessWithUrlAndIPAddr), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); @@ -5500,14 +5387,14 @@ static void test_decodeAuthorityInfoAccess(DWORD dwEncoding) LocalFree(buf); buf = NULL; } - ret = pCryptDecodeObjectEx(dwEncoding, X509_AUTHORITY_INFO_ACCESS, + ret = CryptDecodeObjectEx(dwEncoding, X509_AUTHORITY_INFO_ACCESS, authorityInfoAccessWithUrlAndIPAddr, sizeof(authorityInfoAccessWithUrlAndIPAddr), 0, NULL, NULL, &size); ok(ret, "CryptDecodeObjectEx failed: %lx\n", GetLastError()); buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); if (buf) { - ret = pCryptDecodeObjectEx(dwEncoding, X509_AUTHORITY_INFO_ACCESS, + ret = CryptDecodeObjectEx(dwEncoding, X509_AUTHORITY_INFO_ACCESS, authorityInfoAccessWithUrlAndIPAddr, sizeof(authorityInfoAccessWithUrlAndIPAddr), 0, NULL, buf, &size); ok(ret, "CryptDecodeObjectEx failed: %lx\n", GetLastError()); @@ -5570,7 +5457,7 @@ static void test_encodeCTL(DWORD dwEncoding) CRYPT_ATTR_BLOB value1, value2; memset(&info, 0, sizeof(info)); - ret = pCryptEncodeObjectEx(dwEncoding, PKCS_CTL, &info, + ret = CryptEncodeObjectEx(dwEncoding, PKCS_CTL, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -5581,7 +5468,7 @@ static void test_encodeCTL(DWORD dwEncoding) buf = NULL; } info.dwVersion = 1; - ret = pCryptEncodeObjectEx(dwEncoding, PKCS_CTL, &info, + ret = CryptEncodeObjectEx(dwEncoding, PKCS_CTL, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -5594,7 +5481,7 @@ static void test_encodeCTL(DWORD dwEncoding) info.dwVersion = 0; info.SubjectUsage.cUsageIdentifier = 1; info.SubjectUsage.rgpszUsageIdentifier = &pOid1; - ret = pCryptEncodeObjectEx(dwEncoding, PKCS_CTL, &info, + ret = CryptEncodeObjectEx(dwEncoding, PKCS_CTL, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -5608,7 +5495,7 @@ static void test_encodeCTL(DWORD dwEncoding) info.SubjectUsage.cUsageIdentifier = 0; info.ListIdentifier.cbData = sizeof(serialNum); info.ListIdentifier.pbData = (LPBYTE)serialNum; - ret = pCryptEncodeObjectEx(dwEncoding, PKCS_CTL, &info, + ret = CryptEncodeObjectEx(dwEncoding, PKCS_CTL, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -5621,7 +5508,7 @@ static void test_encodeCTL(DWORD dwEncoding) info.ListIdentifier.cbData = 0; info.SequenceNumber.cbData = sizeof(serialNum); info.SequenceNumber.pbData = (LPBYTE)serialNum; - ret = pCryptEncodeObjectEx(dwEncoding, PKCS_CTL, &info, + ret = CryptEncodeObjectEx(dwEncoding, PKCS_CTL, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -5634,7 +5521,7 @@ static void test_encodeCTL(DWORD dwEncoding) } info.SequenceNumber.cbData = 0; SystemTimeToFileTime(&thisUpdate, &info.ThisUpdate); - ret = pCryptEncodeObjectEx(dwEncoding, PKCS_CTL, &info, + ret = CryptEncodeObjectEx(dwEncoding, PKCS_CTL, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -5645,7 +5532,7 @@ static void test_encodeCTL(DWORD dwEncoding) buf = NULL; } SystemTimeToFileTime(&thisUpdate, &info.NextUpdate); - ret = pCryptEncodeObjectEx(dwEncoding, PKCS_CTL, &info, + ret = CryptEncodeObjectEx(dwEncoding, PKCS_CTL, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -5659,7 +5546,7 @@ static void test_encodeCTL(DWORD dwEncoding) info.ThisUpdate.dwLowDateTime = info.ThisUpdate.dwHighDateTime = 0; info.NextUpdate.dwLowDateTime = info.NextUpdate.dwHighDateTime = 0; info.SubjectAlgorithm.pszObjId = oid2; - ret = pCryptEncodeObjectEx(dwEncoding, PKCS_CTL, &info, + ret = CryptEncodeObjectEx(dwEncoding, PKCS_CTL, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -5684,7 +5571,7 @@ static void test_encodeCTL(DWORD dwEncoding) ctlEntry[0].rgAttribute = &attr1; info.cCTLEntry = 1; info.rgCTLEntry = ctlEntry; - ret = pCryptEncodeObjectEx(dwEncoding, PKCS_CTL, &info, + ret = CryptEncodeObjectEx(dwEncoding, PKCS_CTL, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -5696,7 +5583,7 @@ static void test_encodeCTL(DWORD dwEncoding) } value1.cbData = sizeof(emptySequence); value1.pbData = (LPBYTE)emptySequence; - ret = pCryptEncodeObjectEx(dwEncoding, PKCS_CTL, &info, + ret = CryptEncodeObjectEx(dwEncoding, PKCS_CTL, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -5716,7 +5603,7 @@ static void test_encodeCTL(DWORD dwEncoding) ctlEntry[1].cAttribute = 1; ctlEntry[1].rgAttribute = &attr2; info.cCTLEntry = 2; - ret = pCryptEncodeObjectEx(dwEncoding, PKCS_CTL, &info, + ret = CryptEncodeObjectEx(dwEncoding, PKCS_CTL, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -5906,7 +5793,7 @@ static void test_decodeCTL(DWORD dwEncoding) CRYPT_ATTR_BLOB value1, value2; memset(&info, 0, sizeof(info)); - ret = pCryptDecodeObjectEx(dwEncoding, PKCS_CTL, emptyCTL, sizeof(emptyCTL), + ret = CryptDecodeObjectEx(dwEncoding, PKCS_CTL, emptyCTL, sizeof(emptyCTL), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -5916,7 +5803,7 @@ static void test_decodeCTL(DWORD dwEncoding) buf = NULL; } info.dwVersion = 1; - ret = pCryptDecodeObjectEx(dwEncoding, PKCS_CTL, emptyCTLWithVersion1, + ret = CryptDecodeObjectEx(dwEncoding, PKCS_CTL, emptyCTLWithVersion1, sizeof(emptyCTLWithVersion1), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -5929,7 +5816,7 @@ static void test_decodeCTL(DWORD dwEncoding) info.dwVersion = 0; info.SubjectUsage.cUsageIdentifier = 1; info.SubjectUsage.rgpszUsageIdentifier = &pOid1; - ret = pCryptDecodeObjectEx(dwEncoding, PKCS_CTL, ctlWithUsageIdentifier, + ret = CryptDecodeObjectEx(dwEncoding, PKCS_CTL, ctlWithUsageIdentifier, sizeof(ctlWithUsageIdentifier), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -5942,7 +5829,7 @@ static void test_decodeCTL(DWORD dwEncoding) info.SubjectUsage.cUsageIdentifier = 0; info.ListIdentifier.cbData = sizeof(serialNum); info.ListIdentifier.pbData = (LPBYTE)serialNum; - ret = pCryptDecodeObjectEx(dwEncoding, PKCS_CTL, ctlWithListIdentifier, + ret = CryptDecodeObjectEx(dwEncoding, PKCS_CTL, ctlWithListIdentifier, sizeof(ctlWithListIdentifier), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -5954,7 +5841,7 @@ static void test_decodeCTL(DWORD dwEncoding) info.ListIdentifier.cbData = 0; info.SequenceNumber.cbData = sizeof(serialNum); info.SequenceNumber.pbData = (LPBYTE)serialNum; - ret = pCryptDecodeObjectEx(dwEncoding, PKCS_CTL, ctlWithSequenceNumber, + ret = CryptDecodeObjectEx(dwEncoding, PKCS_CTL, ctlWithSequenceNumber, sizeof(ctlWithSequenceNumber), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -5965,7 +5852,7 @@ static void test_decodeCTL(DWORD dwEncoding) } info.SequenceNumber.cbData = 0; SystemTimeToFileTime(&thisUpdate, &info.ThisUpdate); - ret = pCryptDecodeObjectEx(dwEncoding, PKCS_CTL, ctlWithThisUpdate, + ret = CryptDecodeObjectEx(dwEncoding, PKCS_CTL, ctlWithThisUpdate, sizeof(ctlWithThisUpdate), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -5975,7 +5862,7 @@ static void test_decodeCTL(DWORD dwEncoding) buf = NULL; } SystemTimeToFileTime(&thisUpdate, &info.NextUpdate); - ret = pCryptDecodeObjectEx(dwEncoding, PKCS_CTL, ctlWithThisAndNextUpdate, + ret = CryptDecodeObjectEx(dwEncoding, PKCS_CTL, ctlWithThisAndNextUpdate, sizeof(ctlWithThisAndNextUpdate), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -5990,7 +5877,7 @@ static void test_decodeCTL(DWORD dwEncoding) info.SubjectAlgorithm.pszObjId = oid2; info.SubjectAlgorithm.Parameters.cbData = sizeof(nullData); info.SubjectAlgorithm.Parameters.pbData = nullData; - ret = pCryptDecodeObjectEx(dwEncoding, PKCS_CTL, ctlWithAlgId, + ret = CryptDecodeObjectEx(dwEncoding, PKCS_CTL, ctlWithAlgId, sizeof(ctlWithAlgId), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -6000,12 +5887,9 @@ static void test_decodeCTL(DWORD dwEncoding) buf = NULL; } SetLastError(0xdeadbeef); - ret = pCryptDecodeObjectEx(dwEncoding, PKCS_CTL, ctlWithBogusEntry, + ret = CryptDecodeObjectEx(dwEncoding, PKCS_CTL, ctlWithBogusEntry, sizeof(ctlWithBogusEntry), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); - ok(!ret && - (GetLastError() == CRYPT_E_ASN1_EOD || - GetLastError() == CRYPT_E_ASN1_CORRUPT || - GetLastError() == OSS_MORE_INPUT), /* Win9x */ + ok(!ret && (GetLastError() == CRYPT_E_ASN1_EOD || GetLastError() == CRYPT_E_ASN1_CORRUPT), "expected CRYPT_E_ASN1_EOD or CRYPT_E_ASN1_CORRUPT, got %08lx\n", GetLastError()); info.SubjectAlgorithm.Parameters.cbData = 0; @@ -6024,7 +5908,7 @@ static void test_decodeCTL(DWORD dwEncoding) info.cCTLEntry = 1; info.rgCTLEntry = ctlEntry; SetLastError(0xdeadbeef); - ret = pCryptDecodeObjectEx(dwEncoding, PKCS_CTL, ctlWithOneEntry, + ret = CryptDecodeObjectEx(dwEncoding, PKCS_CTL, ctlWithOneEntry, sizeof(ctlWithOneEntry), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -6043,7 +5927,7 @@ static void test_decodeCTL(DWORD dwEncoding) ctlEntry[1].cAttribute = 1; ctlEntry[1].rgAttribute = &attr2; info.cCTLEntry = 2; - ret = pCryptDecodeObjectEx(dwEncoding, PKCS_CTL, ctlWithTwoEntries, + ret = CryptDecodeObjectEx(dwEncoding, PKCS_CTL, ctlWithTwoEntries, sizeof(ctlWithTwoEntries), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -6054,20 +5938,16 @@ static void test_decodeCTL(DWORD dwEncoding) } /* A signed CTL isn't decodable, even if the inner content is a CTL */ SetLastError(0xdeadbeef); - ret = pCryptDecodeObjectEx(dwEncoding, PKCS_CTL, signedCTL, + ret = CryptDecodeObjectEx(dwEncoding, PKCS_CTL, signedCTL, sizeof(signedCTL), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); - ok(!ret && (GetLastError() == CRYPT_E_ASN1_BADTAG || - GetLastError() == OSS_DATA_ERROR /* Win9x */), - "expected CRYPT_E_ASN1_BADTAG or OSS_DATA_ERROR, got %08lx\n", - GetLastError()); + ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, + "expected CRYPT_E_ASN1_BADTAG, got %08lx\n", GetLastError()); SetLastError(0xdeadbeef); - ret = pCryptDecodeObjectEx(dwEncoding, PKCS_CTL, + ret = CryptDecodeObjectEx(dwEncoding, PKCS_CTL, signedCTLWithCTLInnerContent, sizeof(signedCTLWithCTLInnerContent), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); - ok(!ret && (GetLastError() == CRYPT_E_ASN1_BADTAG || - GetLastError() == OSS_DATA_ERROR /* Win9x */), - "expected CRYPT_E_ASN1_BADTAG or OSS_DATA_ERROR, got %08lx\n", - GetLastError()); + ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, + "expected CRYPT_E_ASN1_BADTAG, got %08lx\n", GetLastError()); } static const BYTE emptyPKCSContentInfo[] = { 0x30,0x04,0x06,0x02,0x2a,0x03 }; @@ -6087,23 +5967,19 @@ static void test_encodePKCSContentInfo(DWORD dwEncoding) CRYPT_CONTENT_INFO info = { 0 }; char oid1[] = "1.2.3"; - if (0) - { - /* Crashes on win9x */ - SetLastError(0xdeadbeef); - ret = pCryptEncodeObjectEx(dwEncoding, PKCS_CONTENT_INFO, NULL, - CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, - "Expected STATUS_ACCESS_VIOLATION, got %lx\n", GetLastError()); - } SetLastError(0xdeadbeef); - ret = pCryptEncodeObjectEx(dwEncoding, PKCS_CONTENT_INFO, &info, + ret = CryptEncodeObjectEx(dwEncoding, PKCS_CONTENT_INFO, NULL, + CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, + "Expected STATUS_ACCESS_VIOLATION, got %lx\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CryptEncodeObjectEx(dwEncoding, PKCS_CONTENT_INFO, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(!ret && (GetLastError() == E_INVALIDARG || - GetLastError() == OSS_LIMITED /* Win9x */), - "Expected E_INVALIDARG or OSS_LIMITED, got %lx\n", GetLastError()); + ok(!ret && GetLastError() == E_INVALIDARG, + "Expected E_INVALIDARG, got %lx\n", GetLastError()); info.pszObjId = oid1; - ret = pCryptEncodeObjectEx(dwEncoding, PKCS_CONTENT_INFO, &info, + ret = CryptEncodeObjectEx(dwEncoding, PKCS_CONTENT_INFO, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %lx\n", GetLastError()); if (ret) @@ -6114,7 +5990,7 @@ static void test_encodePKCSContentInfo(DWORD dwEncoding) } info.Content.pbData = bogusDER; info.Content.cbData = sizeof(bogusDER); - ret = pCryptEncodeObjectEx(dwEncoding, PKCS_CONTENT_INFO, &info, + ret = CryptEncodeObjectEx(dwEncoding, PKCS_CONTENT_INFO, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed; %lx\n", GetLastError()); if (ret) @@ -6125,7 +6001,7 @@ static void test_encodePKCSContentInfo(DWORD dwEncoding) } info.Content.pbData = (BYTE *)ints[0].encoded; info.Content.cbData = ints[0].encoded[1] + 2; - ret = pCryptEncodeObjectEx(dwEncoding, PKCS_CONTENT_INFO, &info, + ret = CryptEncodeObjectEx(dwEncoding, PKCS_CONTENT_INFO, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); if (ret) { @@ -6220,7 +6096,7 @@ static void test_decodePKCSContentInfo(DWORD dwEncoding) for (i = 0; i < ARRAY_SIZE(tests); i++) { - ret = pCryptDecodeObjectEx(dwEncoding, PKCS_CONTENT_INFO, tests[i].encoded, + ret = CryptDecodeObjectEx(dwEncoding, PKCS_CONTENT_INFO, tests[i].encoded, tests[i].encoded_size, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "[%lu] CryptDecodeObjectEx failed: %lx\n", i, GetLastError()); if (!ret) continue; @@ -6238,14 +6114,14 @@ static void test_decodePKCSContentInfo(DWORD dwEncoding) LocalFree(buf); } - ret = pCryptDecodeObjectEx(dwEncoding, PKCS_CONTENT_INFO, + ret = CryptDecodeObjectEx(dwEncoding, PKCS_CONTENT_INFO, bogusPKCSContentInfo, sizeof(bogusPKCSContentInfo), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); /* Native fails with CRYPT_E_ASN1_EOD, accept also CRYPT_E_ASN1_CORRUPT as * I doubt an app depends on that. */ - ok((!ret && (GetLastError() == CRYPT_E_ASN1_EOD || - GetLastError() == CRYPT_E_ASN1_CORRUPT)) || broken(ret), + ok(!ret && (GetLastError() == CRYPT_E_ASN1_EOD || + GetLastError() == CRYPT_E_ASN1_CORRUPT), "Expected CRYPT_E_ASN1_EOD or CRYPT_E_ASN1_CORRUPT, got %lx\n", GetLastError()); } @@ -6266,23 +6142,19 @@ static void test_encodePKCSAttribute(DWORD dwEncoding) CRYPT_ATTR_BLOB blob; char oid[] = "1.2.3"; - if (0) - { - /* Crashes on win9x */ - SetLastError(0xdeadbeef); - ret = pCryptEncodeObjectEx(dwEncoding, PKCS_ATTRIBUTE, NULL, - CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, - "Expected STATUS_ACCESS_VIOLATION, got %lx\n", GetLastError()); - } SetLastError(0xdeadbeef); - ret = pCryptEncodeObjectEx(dwEncoding, PKCS_ATTRIBUTE, &attr, + ret = CryptEncodeObjectEx(dwEncoding, PKCS_ATTRIBUTE, NULL, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(!ret && (GetLastError() == E_INVALIDARG || - GetLastError() == OSS_LIMITED /* Win9x */), - "Expected E_INVALIDARG or OSS_LIMITED, got %lx\n", GetLastError()); + ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, + "Expected STATUS_ACCESS_VIOLATION, got %lx\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CryptEncodeObjectEx(dwEncoding, PKCS_ATTRIBUTE, &attr, + CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + ok(!ret && GetLastError() == E_INVALIDARG, + "Expected E_INVALIDARG, got %lx\n", GetLastError()); attr.pszObjId = oid; - ret = pCryptEncodeObjectEx(dwEncoding, PKCS_ATTRIBUTE, &attr, + ret = CryptEncodeObjectEx(dwEncoding, PKCS_ATTRIBUTE, &attr, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %lx\n", GetLastError()); if (ret) @@ -6295,7 +6167,7 @@ static void test_encodePKCSAttribute(DWORD dwEncoding) blob.pbData = bogusDER; attr.cValue = 1; attr.rgValue = &blob; - ret = pCryptEncodeObjectEx(dwEncoding, PKCS_ATTRIBUTE, &attr, + ret = CryptEncodeObjectEx(dwEncoding, PKCS_ATTRIBUTE, &attr, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %lx\n", GetLastError()); if (ret) @@ -6306,7 +6178,7 @@ static void test_encodePKCSAttribute(DWORD dwEncoding) } blob.pbData = (BYTE *)ints[0].encoded; blob.cbData = ints[0].encoded[1] + 2; - ret = pCryptEncodeObjectEx(dwEncoding, PKCS_ATTRIBUTE, &attr, + ret = CryptEncodeObjectEx(dwEncoding, PKCS_ATTRIBUTE, &attr, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); if (ret) { @@ -6323,7 +6195,7 @@ static void test_decodePKCSAttribute(DWORD dwEncoding) DWORD size = 0; CRYPT_ATTRIBUTE *attr; - ret = pCryptDecodeObjectEx(dwEncoding, PKCS_ATTRIBUTE, + ret = CryptDecodeObjectEx(dwEncoding, PKCS_ATTRIBUTE, emptyPKCSAttr, sizeof(emptyPKCSAttr), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptDecodeObjectEx failed: %lx\n", GetLastError()); @@ -6337,18 +6209,16 @@ static void test_decodePKCSAttribute(DWORD dwEncoding) LocalFree(buf); } SetLastError(0xdeadbeef); - ret = pCryptDecodeObjectEx(dwEncoding, PKCS_ATTRIBUTE, + ret = CryptDecodeObjectEx(dwEncoding, PKCS_ATTRIBUTE, bogusPKCSAttr, sizeof(bogusPKCSAttr), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); /* Native fails with CRYPT_E_ASN1_EOD, accept also CRYPT_E_ASN1_CORRUPT as * I doubt an app depends on that. */ - ok(!ret && (GetLastError() == CRYPT_E_ASN1_EOD || - GetLastError() == CRYPT_E_ASN1_CORRUPT || - GetLastError() == OSS_MORE_INPUT /* Win9x */), - "Expected CRYPT_E_ASN1_EOD, CRYPT_E_ASN1_CORRUPT, or OSS_MORE_INPUT, got %lx\n", + ok(!ret && (GetLastError() == CRYPT_E_ASN1_EOD || GetLastError() == CRYPT_E_ASN1_CORRUPT), + "Expected CRYPT_E_ASN1_EOD, CRYPT_E_ASN1_CORRUPT, got %lx\n", GetLastError()); - ret = pCryptDecodeObjectEx(dwEncoding, PKCS_ATTRIBUTE, + ret = CryptDecodeObjectEx(dwEncoding, PKCS_ATTRIBUTE, intPKCSAttr, sizeof(intPKCSAttr), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptDecodeObjectEx failed: %lx\n", GetLastError()); @@ -6383,7 +6253,7 @@ static void test_encodePKCSAttributes(DWORD dwEncoding) DWORD size = 0; char oid1[] = "1.2.3", oid2[] = "1.5.6"; - ret = pCryptEncodeObjectEx(dwEncoding, PKCS_ATTRIBUTES, &attributes, + ret = CryptEncodeObjectEx(dwEncoding, PKCS_ATTRIBUTES, &attributes, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %lx\n", GetLastError()); if (ret) @@ -6395,13 +6265,12 @@ static void test_encodePKCSAttributes(DWORD dwEncoding) attributes.cAttr = 1; attributes.rgAttr = attr; SetLastError(0xdeadbeef); - ret = pCryptEncodeObjectEx(dwEncoding, PKCS_ATTRIBUTES, &attributes, + ret = CryptEncodeObjectEx(dwEncoding, PKCS_ATTRIBUTES, &attributes, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(!ret && (GetLastError() == E_INVALIDARG || - GetLastError() == OSS_LIMITED /* Win9x */), - "Expected E_INVALIDARG or OSS_LIMITED, got %08lx\n", GetLastError()); + ok(!ret && GetLastError() == E_INVALIDARG, + "Expected E_INVALIDARG, got %08lx\n", GetLastError()); attr[0].pszObjId = oid1; - ret = pCryptEncodeObjectEx(dwEncoding, PKCS_ATTRIBUTES, &attributes, + ret = CryptEncodeObjectEx(dwEncoding, PKCS_ATTRIBUTES, &attributes, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); if (ret) { @@ -6415,7 +6284,7 @@ static void test_encodePKCSAttributes(DWORD dwEncoding) blob.pbData = (BYTE *)ints[0].encoded; blob.cbData = ints[0].encoded[1] + 2; attributes.cAttr = 2; - ret = pCryptEncodeObjectEx(dwEncoding, PKCS_ATTRIBUTES, &attributes, + ret = CryptEncodeObjectEx(dwEncoding, PKCS_ATTRIBUTES, &attributes, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %lx\n", GetLastError()); if (ret) @@ -6433,7 +6302,7 @@ static void test_decodePKCSAttributes(DWORD dwEncoding) DWORD size = 0; CRYPT_ATTRIBUTES *attributes; - ret = pCryptDecodeObjectEx(dwEncoding, PKCS_ATTRIBUTES, + ret = CryptDecodeObjectEx(dwEncoding, PKCS_ATTRIBUTES, emptyPKCSAttributes, sizeof(emptyPKCSAttributes), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptDecodeObjectEx failed: %lx\n", GetLastError()); @@ -6444,7 +6313,7 @@ static void test_decodePKCSAttributes(DWORD dwEncoding) attributes->cAttr); LocalFree(buf); } - ret = pCryptDecodeObjectEx(dwEncoding, PKCS_ATTRIBUTES, + ret = CryptDecodeObjectEx(dwEncoding, PKCS_ATTRIBUTES, singlePKCSAttributes, sizeof(singlePKCSAttributes), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptDecodeObjectEx failed: %lx\n", GetLastError()); @@ -6459,7 +6328,7 @@ static void test_decodePKCSAttributes(DWORD dwEncoding) "Expected no attributes, got %ld\n", attributes->rgAttr[0].cValue); LocalFree(buf); } - ret = pCryptDecodeObjectEx(dwEncoding, PKCS_ATTRIBUTES, + ret = CryptDecodeObjectEx(dwEncoding, PKCS_ATTRIBUTES, doublePKCSAttributes, sizeof(doublePKCSAttributes), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptDecodeObjectEx failed: %lx\n", GetLastError()); @@ -6482,13 +6351,13 @@ static void test_decodePKCSAttributes(DWORD dwEncoding) attributes->rgAttr[1].rgValue[0].cbData), "Unexpected value\n"); LocalFree(buf); } - ret = pCryptDecodeObjectEx(dwEncoding, PKCS_ATTRIBUTES, + ret = CryptDecodeObjectEx(dwEncoding, PKCS_ATTRIBUTES, doublePKCSAttributes, sizeof(doublePKCSAttributes), 0, NULL, NULL, &size); ok(ret, "CryptDecodeObjectEx failed: %lx\n", GetLastError()); buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); if (buf) { - ret = pCryptDecodeObjectEx(dwEncoding, PKCS_ATTRIBUTES, + ret = CryptDecodeObjectEx(dwEncoding, PKCS_ATTRIBUTES, doublePKCSAttributes, sizeof(doublePKCSAttributes), 0, NULL, buf, &size); ok(ret, "CryptDecodeObjectEx failed: %lx\n", GetLastError()); HeapFree(GetProcessHeap(), 0, buf); @@ -6513,7 +6382,7 @@ static void test_encodePKCSSMimeCapabilities(DWORD dwEncoding) /* An empty capabilities is allowed */ capabilities.cCapability = 0; - ret = pCryptEncodeObjectEx(dwEncoding, PKCS_SMIME_CAPABILITIES, + ret = CryptEncodeObjectEx(dwEncoding, PKCS_SMIME_CAPABILITIES, &capabilities, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -6530,13 +6399,12 @@ static void test_encodePKCSSMimeCapabilities(DWORD dwEncoding) capabilities.cCapability = 1; capabilities.rgCapability = capability; SetLastError(0xdeadbeef); - ret = pCryptEncodeObjectEx(dwEncoding, PKCS_SMIME_CAPABILITIES, + ret = CryptEncodeObjectEx(dwEncoding, PKCS_SMIME_CAPABILITIES, &capabilities, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(!ret && (GetLastError() == E_INVALIDARG || - GetLastError() == OSS_LIMITED /* Win9x */), - "Expected E_INVALIDARG or OSS_LIMITED, got %08lx\n", GetLastError()); + ok(!ret && GetLastError() == E_INVALIDARG, + "Expected E_INVALIDARG, got %08lx\n", GetLastError()); capability[0].pszObjId = oid1; - ret = pCryptEncodeObjectEx(dwEncoding, PKCS_SMIME_CAPABILITIES, + ret = CryptEncodeObjectEx(dwEncoding, PKCS_SMIME_CAPABILITIES, &capabilities, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -6548,7 +6416,7 @@ static void test_encodePKCSSMimeCapabilities(DWORD dwEncoding) capability[1].pszObjId = oid2; capability[1].Parameters.cbData = 0; capabilities.cCapability = 2; - ret = pCryptEncodeObjectEx(dwEncoding, PKCS_SMIME_CAPABILITIES, + ret = CryptEncodeObjectEx(dwEncoding, PKCS_SMIME_CAPABILITIES, &capabilities, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -6595,7 +6463,7 @@ static void test_decodePKCSSMimeCapabilities(DWORD dwEncoding) CRYPT_SMIME_CAPABILITIES capabilities, *ptr; SetLastError(0xdeadbeef); - ret = pCryptDecodeObjectEx(dwEncoding, PKCS_SMIME_CAPABILITIES, + ret = CryptDecodeObjectEx(dwEncoding, PKCS_SMIME_CAPABILITIES, emptySequence, sizeof(emptySequence), CRYPT_DECODE_ALLOC_FLAG, NULL, &ptr, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -6606,7 +6474,7 @@ static void test_decodePKCSSMimeCapabilities(DWORD dwEncoding) LocalFree(ptr); } SetLastError(0xdeadbeef); - ret = pCryptDecodeObjectEx(dwEncoding, PKCS_SMIME_CAPABILITIES, + ret = CryptDecodeObjectEx(dwEncoding, PKCS_SMIME_CAPABILITIES, singleCapability, sizeof(singleCapability), CRYPT_DECODE_ALLOC_FLAG, NULL, &ptr, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -6620,7 +6488,7 @@ static void test_decodePKCSSMimeCapabilities(DWORD dwEncoding) LocalFree(ptr); } SetLastError(0xdeadbeef); - ret = pCryptDecodeObjectEx(dwEncoding, PKCS_SMIME_CAPABILITIES, + ret = CryptDecodeObjectEx(dwEncoding, PKCS_SMIME_CAPABILITIES, singleCapabilitywithNULL, sizeof(singleCapabilitywithNULL), CRYPT_DECODE_ALLOC_FLAG, NULL, &ptr, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -6637,7 +6505,7 @@ static void test_decodePKCSSMimeCapabilities(DWORD dwEncoding) LocalFree(ptr); } SetLastError(0xdeadbeef); - ret = pCryptDecodeObjectEx(dwEncoding, PKCS_SMIME_CAPABILITIES, + ret = CryptDecodeObjectEx(dwEncoding, PKCS_SMIME_CAPABILITIES, twoCapabilities, sizeof(twoCapabilities), CRYPT_DECODE_ALLOC_FLAG, NULL, &ptr, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -6651,14 +6519,14 @@ static void test_decodePKCSSMimeCapabilities(DWORD dwEncoding) LocalFree(ptr); } SetLastError(0xdeadbeef); - ret = pCryptDecodeObjectEx(dwEncoding, PKCS_SMIME_CAPABILITIES, + ret = CryptDecodeObjectEx(dwEncoding, PKCS_SMIME_CAPABILITIES, twoCapabilities, sizeof(twoCapabilities), 0, NULL, NULL, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); ptr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); if (ptr) { SetLastError(0xdeadbeef); - ret = pCryptDecodeObjectEx(dwEncoding, PKCS_SMIME_CAPABILITIES, + ret = CryptDecodeObjectEx(dwEncoding, PKCS_SMIME_CAPABILITIES, twoCapabilities, sizeof(twoCapabilities), 0, NULL, ptr, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); HeapFree(GetProcessHeap(), 0, ptr); @@ -6715,16 +6583,10 @@ static void test_encodePKCSSignerInfo(DWORD dwEncoding) CRYPT_ATTRIBUTE attr = { oid_common_name, 1, &commonName }; SetLastError(0xdeadbeef); - ret = pCryptEncodeObjectEx(dwEncoding, PKCS7_SIGNER_INFO, &info, + ret = CryptEncodeObjectEx(dwEncoding, PKCS7_SIGNER_INFO, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - if (!ret && GetLastError() == ERROR_FILE_NOT_FOUND) - { - skip("no PKCS7_SIGNER_INFO encode support\n"); - return; - } - ok(!ret && (GetLastError() == E_INVALIDARG || - GetLastError() == OSS_LIMITED /* Win9x */), - "Expected E_INVALIDARG or OSS_LIMITED, got %08lx\n", GetLastError()); + ok(!ret && GetLastError() == E_INVALIDARG, + "Expected E_INVALIDARG, got %08lx\n", GetLastError()); /* To be encoded, a signer must have an issuer at least, and the encoding * must include PKCS_7_ASN_ENCODING. (That isn't enough to be decoded, * see decoding tests.) @@ -6732,15 +6594,14 @@ static void test_encodePKCSSignerInfo(DWORD dwEncoding) info.Issuer.cbData = sizeof(encodedCommonNameNoNull); info.Issuer.pbData = encodedCommonNameNoNull; SetLastError(0xdeadbeef); - ret = pCryptEncodeObjectEx(dwEncoding, PKCS7_SIGNER_INFO, &info, + ret = CryptEncodeObjectEx(dwEncoding, PKCS7_SIGNER_INFO, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); if (!(dwEncoding & PKCS_7_ASN_ENCODING)) ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08lx\n", GetLastError()); else { - ok(ret || broken(GetLastError() == OSS_LIMITED /* Win9x */), - "CryptEncodeObjectEx failed: %lx\n", GetLastError()); + ok(ret, "CryptEncodeObjectEx failed: %lx\n", GetLastError()); if (ret) { ok(size == sizeof(minimalPKCSSigner), "Unexpected size %ld\n", size); @@ -6754,15 +6615,14 @@ static void test_encodePKCSSignerInfo(DWORD dwEncoding) info.SerialNumber.cbData = sizeof(serialNum); info.SerialNumber.pbData = (BYTE *)serialNum; SetLastError(0xdeadbeef); - ret = pCryptEncodeObjectEx(dwEncoding, PKCS7_SIGNER_INFO, &info, + ret = CryptEncodeObjectEx(dwEncoding, PKCS7_SIGNER_INFO, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); if (!(dwEncoding & PKCS_7_ASN_ENCODING)) ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08lx\n", GetLastError()); else { - ok(ret || broken(GetLastError() == OSS_LIMITED /* Win9x */), - "CryptEncodeObjectEx failed: %lx\n", GetLastError()); + ok(ret, "CryptEncodeObjectEx failed: %lx\n", GetLastError()); if (ret) { ok(size == sizeof(PKCSSignerWithSerial), "Unexpected size %ld\n", @@ -6777,15 +6637,14 @@ static void test_encodePKCSSignerInfo(DWORD dwEncoding) } info.HashAlgorithm.pszObjId = oid1; SetLastError(0xdeadbeef); - ret = pCryptEncodeObjectEx(dwEncoding, PKCS7_SIGNER_INFO, &info, + ret = CryptEncodeObjectEx(dwEncoding, PKCS7_SIGNER_INFO, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); if (!(dwEncoding & PKCS_7_ASN_ENCODING)) ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08lx\n", GetLastError()); else { - ok(ret || broken(GetLastError() == OSS_LIMITED /* Win9x */), - "CryptEncodeObjectEx failed: %lx\n", GetLastError()); + ok(ret, "CryptEncodeObjectEx failed: %lx\n", GetLastError()); if (ret) { ok(size == sizeof(PKCSSignerWithHashAlgo), "Unexpected size %ld\n", @@ -6800,7 +6659,7 @@ static void test_encodePKCSSignerInfo(DWORD dwEncoding) } info.HashEncryptionAlgorithm.pszObjId = oid2; SetLastError(0xdeadbeef); - ret = pCryptEncodeObjectEx(dwEncoding, PKCS7_SIGNER_INFO, &info, + ret = CryptEncodeObjectEx(dwEncoding, PKCS7_SIGNER_INFO, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); if (!(dwEncoding & PKCS_7_ASN_ENCODING)) ok(!ret && GetLastError() == E_INVALIDARG, @@ -6823,7 +6682,7 @@ static void test_encodePKCSSignerInfo(DWORD dwEncoding) info.EncryptedHash.cbData = sizeof(hash); info.EncryptedHash.pbData = (BYTE *)hash; SetLastError(0xdeadbeef); - ret = pCryptEncodeObjectEx(dwEncoding, PKCS7_SIGNER_INFO, &info, + ret = CryptEncodeObjectEx(dwEncoding, PKCS7_SIGNER_INFO, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); if (!(dwEncoding & PKCS_7_ASN_ENCODING)) ok(!ret && GetLastError() == E_INVALIDARG, @@ -6846,7 +6705,7 @@ static void test_encodePKCSSignerInfo(DWORD dwEncoding) info.AuthAttrs.cAttr = 1; info.AuthAttrs.rgAttr = &attr; SetLastError(0xdeadbeef); - ret = pCryptEncodeObjectEx(dwEncoding, PKCS7_SIGNER_INFO, &info, + ret = CryptEncodeObjectEx(dwEncoding, PKCS7_SIGNER_INFO, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); if (!(dwEncoding & PKCS_7_ASN_ENCODING)) ok(!ret && GetLastError() == E_INVALIDARG, @@ -6877,18 +6736,16 @@ static void test_decodePKCSSignerInfo(DWORD dwEncoding) /* A PKCS signer can't be decoded without a serial number. */ SetLastError(0xdeadbeef); - ret = pCryptDecodeObjectEx(dwEncoding, PKCS7_SIGNER_INFO, + ret = CryptDecodeObjectEx(dwEncoding, PKCS7_SIGNER_INFO, minimalPKCSSigner, sizeof(minimalPKCSSigner), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); - ok(!ret && (GetLastError() == CRYPT_E_ASN1_CORRUPT || - GetLastError() == OSS_DATA_ERROR /* Win9x */), - "Expected CRYPT_E_ASN1_CORRUPT or OSS_DATA_ERROR, got %lx\n", + ok(!ret && GetLastError() == CRYPT_E_ASN1_CORRUPT, + "Expected CRYPT_E_ASN1_CORRUPT, got %lx\n", GetLastError()); - ret = pCryptDecodeObjectEx(dwEncoding, PKCS7_SIGNER_INFO, + ret = CryptDecodeObjectEx(dwEncoding, PKCS7_SIGNER_INFO, PKCSSignerWithSerial, sizeof(PKCSSignerWithSerial), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret || broken(GetLastError() == OSS_DATA_ERROR), - "CryptDecodeObjectEx failed: %lx\n", GetLastError()); + ok(ret, "CryptDecodeObjectEx failed: %lx\n", GetLastError()); if (ret) { info = (CMSG_SIGNER_INFO *)buf; @@ -6904,7 +6761,7 @@ static void test_decodePKCSSignerInfo(DWORD dwEncoding) "Unexpected value\n"); LocalFree(buf); } - ret = pCryptDecodeObjectEx(dwEncoding, PKCS7_SIGNER_INFO, + ret = CryptDecodeObjectEx(dwEncoding, PKCS7_SIGNER_INFO, PKCSSignerWithHashAlgo, sizeof(PKCSSignerWithHashAlgo), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); if (ret) @@ -6924,7 +6781,7 @@ static void test_decodePKCSSignerInfo(DWORD dwEncoding) "Expected 1.2.3, got %s\n", info->HashAlgorithm.pszObjId); LocalFree(buf); } - ret = pCryptDecodeObjectEx(dwEncoding, PKCS7_SIGNER_INFO, + ret = CryptDecodeObjectEx(dwEncoding, PKCS7_SIGNER_INFO, PKCSSignerWithHashAndEncryptionAlgo, sizeof(PKCSSignerWithHashAndEncryptionAlgo), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); @@ -6947,7 +6804,7 @@ static void test_decodePKCSSignerInfo(DWORD dwEncoding) "Expected 1.5.6, got %s\n", info->HashEncryptionAlgorithm.pszObjId); LocalFree(buf); } - ret = pCryptDecodeObjectEx(dwEncoding, PKCS7_SIGNER_INFO, + ret = CryptDecodeObjectEx(dwEncoding, PKCS7_SIGNER_INFO, PKCSSignerWithHash, sizeof(PKCSSignerWithHash), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); if (ret) @@ -6973,7 +6830,7 @@ static void test_decodePKCSSignerInfo(DWORD dwEncoding) "Unexpected value\n"); LocalFree(buf); } - ret = pCryptDecodeObjectEx(dwEncoding, PKCS7_SIGNER_INFO, + ret = CryptDecodeObjectEx(dwEncoding, PKCS7_SIGNER_INFO, PKCSSignerWithAuthAttr, sizeof(PKCSSignerWithAuthAttr), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); if (ret) @@ -7008,26 +6865,16 @@ static void test_encodeCMSSignerInfo(DWORD dwEncoding) static char oid1[] = "1.2.3", oid2[] = "1.5.6"; SetLastError(0xdeadbeef); - ret = pCryptEncodeObjectEx(dwEncoding, CMS_SIGNER_INFO, &info, + ret = CryptEncodeObjectEx(dwEncoding, CMS_SIGNER_INFO, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(!ret, "Expected failure, got %d\n", ret); - if (!ret && GetLastError() == ERROR_FILE_NOT_FOUND) - { - skip("no CMS_SIGNER_INFO encode support\n"); - return; - } ok(GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08lx\n", GetLastError()); info.SignerId.dwIdChoice = CERT_ID_ISSUER_SERIAL_NUMBER; SetLastError(0xdeadbeef); - ret = pCryptEncodeObjectEx(dwEncoding, CMS_SIGNER_INFO, &info, + ret = CryptEncodeObjectEx(dwEncoding, CMS_SIGNER_INFO, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(!ret, "Expected failure, got %d\n", ret); - if (!ret && GetLastError() == ERROR_FILE_NOT_FOUND) - { - skip("no CMS_SIGNER_INFO encode support\n"); - return; - } ok(GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08lx\n", GetLastError()); /* To be encoded, a signer must have a valid cert ID, where a valid ID may @@ -7039,7 +6886,7 @@ static void test_encodeCMSSignerInfo(DWORD dwEncoding) sizeof(encodedCommonNameNoNull); U(info.SignerId).IssuerSerialNumber.Issuer.pbData = encodedCommonNameNoNull; SetLastError(0xdeadbeef); - ret = pCryptEncodeObjectEx(dwEncoding, CMS_SIGNER_INFO, &info, + ret = CryptEncodeObjectEx(dwEncoding, CMS_SIGNER_INFO, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); if (!(dwEncoding & PKCS_7_ASN_ENCODING)) ok(!ret && GetLastError() == E_INVALIDARG, @@ -7057,7 +6904,7 @@ static void test_encodeCMSSignerInfo(DWORD dwEncoding) U(info.SignerId).IssuerSerialNumber.SerialNumber.cbData = sizeof(serialNum); U(info.SignerId).IssuerSerialNumber.SerialNumber.pbData = (BYTE *)serialNum; SetLastError(0xdeadbeef); - ret = pCryptEncodeObjectEx(dwEncoding, CMS_SIGNER_INFO, &info, + ret = CryptEncodeObjectEx(dwEncoding, CMS_SIGNER_INFO, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); if (!(dwEncoding & PKCS_7_ASN_ENCODING)) ok(!ret && GetLastError() == E_INVALIDARG, @@ -7077,7 +6924,7 @@ static void test_encodeCMSSignerInfo(DWORD dwEncoding) U(info.SignerId).KeyId.cbData = sizeof(serialNum); U(info.SignerId).KeyId.pbData = (BYTE *)serialNum; SetLastError(0xdeadbeef); - ret = pCryptEncodeObjectEx(dwEncoding, CMS_SIGNER_INFO, &info, + ret = CryptEncodeObjectEx(dwEncoding, CMS_SIGNER_INFO, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); if (!(dwEncoding & PKCS_7_ASN_ENCODING)) ok(!ret && GetLastError() == E_INVALIDARG, @@ -7101,7 +6948,7 @@ static void test_encodeCMSSignerInfo(DWORD dwEncoding) U(info.SignerId).HashId.cbData = sizeof(hash); U(info.SignerId).HashId.pbData = (BYTE *)hash; SetLastError(0xdeadbeef); - ret = pCryptEncodeObjectEx(dwEncoding, CMS_SIGNER_INFO, &info, + ret = CryptEncodeObjectEx(dwEncoding, CMS_SIGNER_INFO, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08lx\n", GetLastError()); @@ -7112,7 +6959,7 @@ static void test_encodeCMSSignerInfo(DWORD dwEncoding) U(info.SignerId).IssuerSerialNumber.Issuer.pbData = encodedCommonNameNoNull; info.HashAlgorithm.pszObjId = oid1; SetLastError(0xdeadbeef); - ret = pCryptEncodeObjectEx(dwEncoding, CMS_SIGNER_INFO, &info, + ret = CryptEncodeObjectEx(dwEncoding, CMS_SIGNER_INFO, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); if (!(dwEncoding & PKCS_7_ASN_ENCODING)) ok(!ret && GetLastError() == E_INVALIDARG, @@ -7131,7 +6978,7 @@ static void test_encodeCMSSignerInfo(DWORD dwEncoding) } info.HashEncryptionAlgorithm.pszObjId = oid2; SetLastError(0xdeadbeef); - ret = pCryptEncodeObjectEx(dwEncoding, CMS_SIGNER_INFO, &info, + ret = CryptEncodeObjectEx(dwEncoding, CMS_SIGNER_INFO, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); if (!(dwEncoding & PKCS_7_ASN_ENCODING)) ok(!ret && GetLastError() == E_INVALIDARG, @@ -7151,7 +6998,7 @@ static void test_encodeCMSSignerInfo(DWORD dwEncoding) info.EncryptedHash.cbData = sizeof(hash); info.EncryptedHash.pbData = (BYTE *)hash; SetLastError(0xdeadbeef); - ret = pCryptEncodeObjectEx(dwEncoding, CMS_SIGNER_INFO, &info, + ret = CryptEncodeObjectEx(dwEncoding, CMS_SIGNER_INFO, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); if (!(dwEncoding & PKCS_7_ASN_ENCODING)) ok(!ret && GetLastError() == E_INVALIDARG, @@ -7179,18 +7026,13 @@ static void test_decodeCMSSignerInfo(DWORD dwEncoding) /* A CMS signer can't be decoded without a serial number. */ SetLastError(0xdeadbeef); - ret = pCryptDecodeObjectEx(dwEncoding, CMS_SIGNER_INFO, + ret = CryptDecodeObjectEx(dwEncoding, CMS_SIGNER_INFO, minimalPKCSSigner, sizeof(minimalPKCSSigner), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(!ret, "expected failure\n"); - if (!ret && GetLastError() == ERROR_FILE_NOT_FOUND) - { - skip("no CMS_SIGNER_INFO decode support\n"); - return; - } ok(GetLastError() == CRYPT_E_ASN1_CORRUPT, "Expected CRYPT_E_ASN1_CORRUPT, got %lx\n", GetLastError()); - ret = pCryptDecodeObjectEx(dwEncoding, CMS_SIGNER_INFO, + ret = CryptDecodeObjectEx(dwEncoding, CMS_SIGNER_INFO, PKCSSignerWithSerial, sizeof(PKCSSignerWithSerial), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptDecodeObjectEx failed: %lx\n", GetLastError()); @@ -7216,7 +7058,7 @@ static void test_decodeCMSSignerInfo(DWORD dwEncoding) serialNum, sizeof(serialNum)), "Unexpected value\n"); LocalFree(buf); } - ret = pCryptDecodeObjectEx(dwEncoding, CMS_SIGNER_INFO, + ret = CryptDecodeObjectEx(dwEncoding, CMS_SIGNER_INFO, PKCSSignerWithHashAlgo, sizeof(PKCSSignerWithHashAlgo), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptDecodeObjectEx failed: %lx\n", GetLastError()); @@ -7244,7 +7086,7 @@ static void test_decodeCMSSignerInfo(DWORD dwEncoding) "Expected %s, got %s\n", oid1, info->HashAlgorithm.pszObjId); LocalFree(buf); } - ret = pCryptDecodeObjectEx(dwEncoding, CMS_SIGNER_INFO, + ret = CryptDecodeObjectEx(dwEncoding, CMS_SIGNER_INFO, PKCSSignerWithHashAndEncryptionAlgo, sizeof(PKCSSignerWithHashAndEncryptionAlgo), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); @@ -7275,7 +7117,7 @@ static void test_decodeCMSSignerInfo(DWORD dwEncoding) "Expected %s, got %s\n", oid2, info->HashEncryptionAlgorithm.pszObjId); LocalFree(buf); } - ret = pCryptDecodeObjectEx(dwEncoding, CMS_SIGNER_INFO, + ret = CryptDecodeObjectEx(dwEncoding, CMS_SIGNER_INFO, PKCSSignerWithHash, sizeof(PKCSSignerWithHash), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptDecodeObjectEx failed: %lx\n", GetLastError()); @@ -7309,7 +7151,7 @@ static void test_decodeCMSSignerInfo(DWORD dwEncoding) "Unexpected value\n"); LocalFree(buf); } - ret = pCryptDecodeObjectEx(dwEncoding, CMS_SIGNER_INFO, + ret = CryptDecodeObjectEx(dwEncoding, CMS_SIGNER_INFO, CMSSignerWithKeyId, sizeof(CMSSignerWithKeyId), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptDecodeObjectEx failed: %lx\n", GetLastError()); @@ -7358,13 +7200,8 @@ static void test_encodeNameConstraints(DWORD dwEncoding) LPBYTE buf; DWORD size; - ret = pCryptEncodeObjectEx(dwEncoding, X509_NAME_CONSTRAINTS, &constraints, + ret = CryptEncodeObjectEx(dwEncoding, X509_NAME_CONSTRAINTS, &constraints, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - if (!ret && GetLastError() == ERROR_FILE_NOT_FOUND) - { - skip("no X509_NAME_CONSTRAINTS encode support\n"); - return; - } ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { @@ -7375,12 +7212,12 @@ static void test_encodeNameConstraints(DWORD dwEncoding) constraints.cPermittedSubtree = 1; constraints.rgPermittedSubtree = &permitted; SetLastError(0xdeadbeef); - ret = pCryptEncodeObjectEx(dwEncoding, X509_NAME_CONSTRAINTS, &constraints, + ret = CryptEncodeObjectEx(dwEncoding, X509_NAME_CONSTRAINTS, &constraints, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08lx\n", GetLastError()); permitted.Base.dwAltNameChoice = CERT_ALT_NAME_DNS_NAME; - ret = pCryptEncodeObjectEx(dwEncoding, X509_NAME_CONSTRAINTS, &constraints, + ret = CryptEncodeObjectEx(dwEncoding, X509_NAME_CONSTRAINTS, &constraints, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -7394,7 +7231,7 @@ static void test_encodeNameConstraints(DWORD dwEncoding) constraints.cExcludedSubtree = 1; constraints.rgExcludedSubtree = &excluded; excluded.Base.dwAltNameChoice = CERT_ALT_NAME_DNS_NAME; - ret = pCryptEncodeObjectEx(dwEncoding, X509_NAME_CONSTRAINTS, &constraints, + ret = CryptEncodeObjectEx(dwEncoding, X509_NAME_CONSTRAINTS, &constraints, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -7405,7 +7242,7 @@ static void test_encodeNameConstraints(DWORD dwEncoding) LocalFree(buf); } U(excluded.Base).pwszURL = (LPWSTR)url; - ret = pCryptEncodeObjectEx(dwEncoding, X509_NAME_CONSTRAINTS, &constraints, + ret = CryptEncodeObjectEx(dwEncoding, X509_NAME_CONSTRAINTS, &constraints, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -7419,7 +7256,7 @@ static void test_encodeNameConstraints(DWORD dwEncoding) U(permitted.Base).IPAddress.cbData = sizeof(encodedIPAddr); U(permitted.Base).IPAddress.pbData = (LPBYTE)encodedIPAddr; constraints.cPermittedSubtree = 1; - ret = pCryptEncodeObjectEx(dwEncoding, X509_NAME_CONSTRAINTS, &constraints, + ret = CryptEncodeObjectEx(dwEncoding, X509_NAME_CONSTRAINTS, &constraints, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -7431,7 +7268,7 @@ static void test_encodeNameConstraints(DWORD dwEncoding) LocalFree(buf); } permitted.dwMinimum = 5; - ret = pCryptEncodeObjectEx(dwEncoding, X509_NAME_CONSTRAINTS, &constraints, + ret = CryptEncodeObjectEx(dwEncoding, X509_NAME_CONSTRAINTS, &constraints, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -7445,7 +7282,7 @@ static void test_encodeNameConstraints(DWORD dwEncoding) permitted.fMaximum = TRUE; permitted.dwMaximum = 3; SetLastError(0xdeadbeef); - ret = pCryptEncodeObjectEx(dwEncoding, X509_NAME_CONSTRAINTS, &constraints, + ret = CryptEncodeObjectEx(dwEncoding, X509_NAME_CONSTRAINTS, &constraints, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -7510,15 +7347,10 @@ static void test_decodeNameConstraints(DWORD dwEncoding) { DWORD size; - ret = pCryptDecodeObjectEx(dwEncoding, X509_NAME_CONSTRAINTS, + ret = CryptDecodeObjectEx(dwEncoding, X509_NAME_CONSTRAINTS, encodedNameConstraints[i].encoded.pbData, encodedNameConstraints[i].encoded.cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, &constraints, &size); - if (!ret && GetLastError() == ERROR_FILE_NOT_FOUND) - { - skip("no X509_NAME_CONSTRAINTS decode support\n"); - return; - } ok(ret, "%ld: CryptDecodeObjectEx failed: %08lx\n", i, GetLastError()); if (ret) { @@ -7580,14 +7412,9 @@ static void test_encodePolicyQualifierUserNotice(DWORD dwEncoding) CERT_POLICY_QUALIFIER_NOTICE_REFERENCE reference; memset(&notice, 0, sizeof(notice)); - ret = pCryptEncodeObjectEx(dwEncoding, + ret = CryptEncodeObjectEx(dwEncoding, X509_PKIX_POLICY_QUALIFIER_USERNOTICE, &notice, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - if (!ret && GetLastError() == ERROR_FILE_NOT_FOUND) - { - skip("no X509_PKIX_POLICY_QUALIFIER_USERNOTICE encode support\n"); - return; - } ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { @@ -7596,7 +7423,7 @@ static void test_encodePolicyQualifierUserNotice(DWORD dwEncoding) LocalFree(buf); } notice.pszDisplayText = (WCHAR *)L"This is a notice"; - ret = pCryptEncodeObjectEx(dwEncoding, + ret = CryptEncodeObjectEx(dwEncoding, X509_PKIX_POLICY_QUALIFIER_USERNOTICE, &notice, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); @@ -7610,7 +7437,7 @@ static void test_encodePolicyQualifierUserNotice(DWORD dwEncoding) reference.cNoticeNumbers = 2; reference.rgNoticeNumbers = noticeNumbers; notice.pNoticeReference = &reference; - ret = pCryptEncodeObjectEx(dwEncoding, + ret = CryptEncodeObjectEx(dwEncoding, X509_PKIX_POLICY_QUALIFIER_USERNOTICE, &notice, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); @@ -7628,15 +7455,10 @@ static void test_decodePolicyQualifierUserNotice(DWORD dwEncoding) CERT_POLICY_QUALIFIER_USER_NOTICE *notice; DWORD size; - ret = pCryptDecodeObjectEx(dwEncoding, + ret = CryptDecodeObjectEx(dwEncoding, X509_PKIX_POLICY_QUALIFIER_USERNOTICE, emptySequence, sizeof(emptySequence), CRYPT_DECODE_ALLOC_FLAG, NULL, &notice, &size); - if (!ret && GetLastError() == ERROR_FILE_NOT_FOUND) - { - skip("no X509_PKIX_POLICY_QUALIFIER_USERNOTICE decode support\n"); - return; - } ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { @@ -7644,7 +7466,7 @@ static void test_decodePolicyQualifierUserNotice(DWORD dwEncoding) ok(notice->pNoticeReference == NULL, "unexpected notice reference\n"); LocalFree(notice); } - ret = pCryptDecodeObjectEx(dwEncoding, + ret = CryptDecodeObjectEx(dwEncoding, X509_PKIX_POLICY_QUALIFIER_USERNOTICE, noticeWithDisplayText, sizeof(noticeWithDisplayText), CRYPT_DECODE_ALLOC_FLAG, NULL, &notice, &size); @@ -7656,7 +7478,7 @@ static void test_decodePolicyQualifierUserNotice(DWORD dwEncoding) ok(notice->pNoticeReference == NULL, "unexpected notice reference\n"); LocalFree(notice); } - ret = pCryptDecodeObjectEx(dwEncoding, + ret = CryptDecodeObjectEx(dwEncoding, X509_PKIX_POLICY_QUALIFIER_USERNOTICE, noticeWithReference, sizeof(noticeWithReference), CRYPT_DECODE_ALLOC_FLAG, NULL, &notice, &size); @@ -7710,7 +7532,7 @@ static void test_encodeCertPolicies(DWORD dwEncoding) DWORD size; memset(&info, 0, sizeof(info)); - ret = pCryptEncodeObjectEx(dwEncoding, X509_CERT_POLICIES, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_CERT_POLICIES, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -7722,13 +7544,12 @@ static void test_encodeCertPolicies(DWORD dwEncoding) memset(policy, 0, sizeof(policy)); info.cPolicyInfo = 1; info.rgPolicyInfo = policy; - ret = pCryptEncodeObjectEx(dwEncoding, X509_CERT_POLICIES, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_CERT_POLICIES, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(!ret && (GetLastError() == E_INVALIDARG || - GetLastError() == OSS_LIMITED /* Win9x/NT4 */), - "expected E_INVALIDARG or OSS_LIMITED, got %08lx\n", GetLastError()); + ok(!ret && GetLastError() == E_INVALIDARG, + "expected E_INVALIDARG, got %08lx\n", GetLastError()); policy[0].pszPolicyIdentifier = oid_any_policy; - ret = pCryptEncodeObjectEx(dwEncoding, X509_CERT_POLICIES, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_CERT_POLICIES, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -7745,7 +7566,7 @@ static void test_encodeCertPolicies(DWORD dwEncoding) policy[1].cPolicyQualifier = 1; policy[1].rgPolicyQualifier = &qualifier; info.cPolicyInfo = 2; - ret = pCryptEncodeObjectEx(dwEncoding, X509_CERT_POLICIES, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_CERT_POLICIES, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -7762,7 +7583,7 @@ static void test_decodeCertPolicies(DWORD dwEncoding) CERT_POLICIES_INFO *info; DWORD size; - ret = pCryptDecodeObjectEx(dwEncoding, X509_CERT_POLICIES, + ret = CryptDecodeObjectEx(dwEncoding, X509_CERT_POLICIES, emptySequence, sizeof(emptySequence), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -7772,7 +7593,7 @@ static void test_decodeCertPolicies(DWORD dwEncoding) info->cPolicyInfo); LocalFree(info); } - ret = pCryptDecodeObjectEx(dwEncoding, X509_CERT_POLICIES, + ret = CryptDecodeObjectEx(dwEncoding, X509_CERT_POLICIES, policiesWithAnyPolicy, sizeof(policiesWithAnyPolicy), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -7788,7 +7609,7 @@ static void test_decodeCertPolicies(DWORD dwEncoding) info->rgPolicyInfo[0].cPolicyQualifier); LocalFree(info); } - ret = pCryptDecodeObjectEx(dwEncoding, X509_CERT_POLICIES, + ret = CryptDecodeObjectEx(dwEncoding, X509_CERT_POLICIES, twoPolicies, sizeof(twoPolicies), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -7821,13 +7642,13 @@ static void test_decodeCertPolicies(DWORD dwEncoding) "unexpected qualifier value\n"); LocalFree(info); } - ret = pCryptDecodeObjectEx(dwEncoding, X509_CERT_POLICIES, + ret = CryptDecodeObjectEx(dwEncoding, X509_CERT_POLICIES, twoPolicies, sizeof(twoPolicies), 0, NULL, NULL, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); info = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); if (info) { - ret = pCryptDecodeObjectEx(dwEncoding, X509_CERT_POLICIES, + ret = CryptDecodeObjectEx(dwEncoding, X509_CERT_POLICIES, twoPolicies, sizeof(twoPolicies), 0, NULL, info, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); HeapFree(GetProcessHeap(), 0, info); @@ -7857,15 +7678,9 @@ static void test_encodeCertPolicyMappings(DWORD dwEncoding) for (i = 0; i < ARRAY_SIZE(mappingOids); i++) { memset(&info, 0, sizeof(info)); - ret = pCryptEncodeObjectEx(dwEncoding, mappingOids[i], &info, + ret = CryptEncodeObjectEx(dwEncoding, mappingOids[i], &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret || broken(GetLastError() == ERROR_FILE_NOT_FOUND), - "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); - if (!ret && GetLastError() == ERROR_FILE_NOT_FOUND) - { - win_skip("no policy mappings support\n"); - return; - } + ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { ok(size == sizeof(emptySequence), "unexpected size %ld\n", size); @@ -7878,13 +7693,13 @@ static void test_encodeCertPolicyMappings(DWORD dwEncoding) info.cPolicyMapping = 1; info.rgPolicyMapping = mapping; SetLastError(0xdeadbeef); - ret = pCryptEncodeObjectEx(dwEncoding, mappingOids[i], &info, + ret = CryptEncodeObjectEx(dwEncoding, mappingOids[i], &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08lx\n", GetLastError()); mapping[0].pszIssuerDomainPolicy = oid1; mapping[0].pszSubjectDomainPolicy = oid2; - ret = pCryptEncodeObjectEx(dwEncoding, mappingOids[i], &info, + ret = CryptEncodeObjectEx(dwEncoding, mappingOids[i], &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -7898,7 +7713,7 @@ static void test_encodeCertPolicyMappings(DWORD dwEncoding) mapping[1].pszIssuerDomainPolicy = oid3; mapping[1].pszSubjectDomainPolicy = oid4; info.cPolicyMapping = 2; - ret = pCryptEncodeObjectEx(dwEncoding, mappingOids[i], &info, + ret = CryptEncodeObjectEx(dwEncoding, mappingOids[i], &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -7921,23 +7736,17 @@ static void test_decodeCertPolicyMappings(DWORD dwEncoding) /* Each of the mapping OIDs is equivalent, so check with all of them */ for (i = 0; i < ARRAY_SIZE(mappingOids); i++) { - ret = pCryptDecodeObjectEx(dwEncoding, mappingOids[i], + ret = CryptDecodeObjectEx(dwEncoding, mappingOids[i], emptySequence, sizeof(emptySequence), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); - ok(ret || broken(GetLastError() == ERROR_FILE_NOT_FOUND), - "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); - if (!ret && GetLastError() == ERROR_FILE_NOT_FOUND) - { - win_skip("no policy mappings support\n"); - return; - } + ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { ok(info->cPolicyMapping == 0, "expected 0 policy mappings, got %ld\n", info->cPolicyMapping); LocalFree(info); } - ret = pCryptDecodeObjectEx(dwEncoding, mappingOids[i], + ret = CryptDecodeObjectEx(dwEncoding, mappingOids[i], policyMappingWithOneMapping, sizeof(policyMappingWithOneMapping), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -7953,7 +7762,7 @@ static void test_decodeCertPolicyMappings(DWORD dwEncoding) info->rgPolicyMapping[0].pszSubjectDomainPolicy); LocalFree(info); } - ret = pCryptDecodeObjectEx(dwEncoding, mappingOids[i], + ret = CryptDecodeObjectEx(dwEncoding, mappingOids[i], policyMappingWithTwoMappings, sizeof(policyMappingWithTwoMappings), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -7975,14 +7784,14 @@ static void test_decodeCertPolicyMappings(DWORD dwEncoding) info->rgPolicyMapping[1].pszSubjectDomainPolicy); LocalFree(info); } - ret = pCryptDecodeObjectEx(dwEncoding, mappingOids[i], + ret = CryptDecodeObjectEx(dwEncoding, mappingOids[i], policyMappingWithTwoMappings, sizeof(policyMappingWithTwoMappings), 0, NULL, NULL, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); info = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); if (info) { - ret = pCryptDecodeObjectEx(dwEncoding, mappingOids[i], + ret = CryptDecodeObjectEx(dwEncoding, mappingOids[i], policyMappingWithTwoMappings, sizeof(policyMappingWithTwoMappings), 0, NULL, info, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -8008,15 +7817,9 @@ static void test_encodeCertPolicyConstraints(DWORD dwEncoding) /* Even though RFC 5280 explicitly states CAs must not issue empty * policy constraints (section 4.2.1.11), the API doesn't prevent it. */ - ret = pCryptEncodeObjectEx(dwEncoding, X509_POLICY_CONSTRAINTS, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_POLICY_CONSTRAINTS, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret || broken(GetLastError() == ERROR_FILE_NOT_FOUND), - "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); - if (!ret && GetLastError() == ERROR_FILE_NOT_FOUND) - { - win_skip("no policy constraints support\n"); - return; - } + ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { ok(size == sizeof(emptySequence), "unexpected size %ld\n", size); @@ -8028,7 +7831,7 @@ static void test_encodeCertPolicyConstraints(DWORD dwEncoding) * is not, then a skip of 0 is encoded. */ info.fRequireExplicitPolicy = TRUE; - ret = pCryptEncodeObjectEx(dwEncoding, X509_POLICY_CONSTRAINTS, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_POLICY_CONSTRAINTS, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -8044,7 +7847,7 @@ static void test_encodeCertPolicyConstraints(DWORD dwEncoding) info.dwRequireExplicitPolicySkipCerts = 0; info.fInhibitPolicyMapping = TRUE; info.dwInhibitPolicyMappingSkipCerts = 1; - ret = pCryptEncodeObjectEx(dwEncoding, X509_POLICY_CONSTRAINTS, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_POLICY_CONSTRAINTS, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -8058,7 +7861,7 @@ static void test_encodeCertPolicyConstraints(DWORD dwEncoding) /* And with both */ info.fRequireExplicitPolicy = TRUE; info.dwRequireExplicitPolicySkipCerts = 1; - ret = pCryptEncodeObjectEx(dwEncoding, X509_POLICY_CONSTRAINTS, &info, + ret = CryptEncodeObjectEx(dwEncoding, X509_POLICY_CONSTRAINTS, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) @@ -8080,16 +7883,10 @@ static void test_decodeCertPolicyConstraints(DWORD dwEncoding) /* Again, even though CAs must not issue such constraints, they can be * decoded. */ - ret = pCryptDecodeObjectEx(dwEncoding, X509_POLICY_CONSTRAINTS, + ret = CryptDecodeObjectEx(dwEncoding, X509_POLICY_CONSTRAINTS, emptySequence, sizeof(emptySequence), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); - ok(ret || broken(GetLastError() == ERROR_FILE_NOT_FOUND), - "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); - if (!ret && GetLastError() == ERROR_FILE_NOT_FOUND) - { - win_skip("no policy mappings support\n"); - return; - } + ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { ok(!info->fRequireExplicitPolicy, @@ -8098,7 +7895,7 @@ static void test_decodeCertPolicyConstraints(DWORD dwEncoding) "expected implicit mapping = FALSE\n"); LocalFree(info); } - ret = pCryptDecodeObjectEx(dwEncoding, X509_POLICY_CONSTRAINTS, + ret = CryptDecodeObjectEx(dwEncoding, X509_POLICY_CONSTRAINTS, policyConstraintsWithRequireExplicit, sizeof(policyConstraintsWithRequireExplicit), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); @@ -8113,7 +7910,7 @@ static void test_decodeCertPolicyConstraints(DWORD dwEncoding) "expected implicit mapping = FALSE\n"); LocalFree(info); } - ret = pCryptDecodeObjectEx(dwEncoding, X509_POLICY_CONSTRAINTS, + ret = CryptDecodeObjectEx(dwEncoding, X509_POLICY_CONSTRAINTS, policyConstraintsWithInhibitMapping, sizeof(policyConstraintsWithInhibitMapping), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); @@ -8128,7 +7925,7 @@ static void test_decodeCertPolicyConstraints(DWORD dwEncoding) info->dwInhibitPolicyMappingSkipCerts); LocalFree(info); } - ret = pCryptDecodeObjectEx(dwEncoding, X509_POLICY_CONSTRAINTS, + ret = CryptDecodeObjectEx(dwEncoding, X509_POLICY_CONSTRAINTS, policyConstraintsWithBoth, sizeof(policyConstraintsWithBoth), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -8360,7 +8157,7 @@ static void test_decodeRsaPrivateKey(DWORD dwEncoding) DWORD bufSize = 0; BOOL ret; - ret = pCryptDecodeObjectEx(dwEncoding, PKCS_RSA_PRIVATE_KEY, + ret = CryptDecodeObjectEx(dwEncoding, PKCS_RSA_PRIVATE_KEY, rsaPrivKeyDer, sizeof(rsaPrivKeyDer)-10, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); ok(!ret && (GetLastError() == CRYPT_E_ASN1_EOD), @@ -8369,7 +8166,7 @@ static void test_decodeRsaPrivateKey(DWORD dwEncoding) buf = NULL; bufSize = 0; - ret = pCryptDecodeObjectEx(dwEncoding, PKCS_RSA_PRIVATE_KEY, + ret = CryptDecodeObjectEx(dwEncoding, PKCS_RSA_PRIVATE_KEY, rsaPrivKeyDer, sizeof(rsaPrivKeyDer), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); @@ -8700,7 +8497,7 @@ static void test_encodeOCSPRequestInfo(DWORD dwEncoding) size = 0; SetLastError(0xdeadbeef); - ret = pCryptEncodeObjectEx(dwEncoding, OCSP_REQUEST, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + ret = CryptEncodeObjectEx(dwEncoding, OCSP_REQUEST, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "got %08lx\n", GetLastError()); ok(size == sizeof(expected), "got %lu\n", size); ok(!memcmp(buf, expected, sizeof(expected)), "unexpected value\n"); @@ -8711,7 +8508,7 @@ static void test_encodeOCSPRequestInfo(DWORD dwEncoding) info_signed.pOptionalSignatureInfo = NULL; size = 0; SetLastError(0xdeadbeef); - ret = pCryptEncodeObjectEx(dwEncoding, OCSP_SIGNED_REQUEST, &info_signed, CRYPT_ENCODE_ALLOC_FLAG, NULL, + ret = CryptEncodeObjectEx(dwEncoding, OCSP_SIGNED_REQUEST, &info_signed, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf2, &size); ok(ret, "got %08lx\n", GetLastError()); ok(size == sizeof(expected4), "got %lu\n", size); @@ -8731,7 +8528,7 @@ static void test_encodeOCSPRequestInfo(DWORD dwEncoding) size = 0; SetLastError(0xdeadbeef); - ret = pCryptEncodeObjectEx(dwEncoding, OCSP_REQUEST, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + ret = CryptEncodeObjectEx(dwEncoding, OCSP_REQUEST, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "got %08lx\n", GetLastError()); ok(size == sizeof(expected2), "got %lu\n", size); ok(!memcmp(buf, expected2, sizeof(expected2)), "unexpected value\n"); @@ -8741,7 +8538,7 @@ static void test_encodeOCSPRequestInfo(DWORD dwEncoding) info.pRequestorName = NULL; size = 0; SetLastError(0xdeadbeef); - ret = pCryptEncodeObjectEx(dwEncoding, OCSP_REQUEST, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + ret = CryptEncodeObjectEx(dwEncoding, OCSP_REQUEST, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "got %08lx\n", GetLastError()); ok(size == sizeof(expected3), "got %lu\n", size); ok(!memcmp(buf, expected3, sizeof(expected3)), "unexpected value\n"); @@ -8801,7 +8598,7 @@ static void test_decodeOCSPResponseInfo(DWORD dwEncoding) DWORD size; BOOL ret; - ret = pCryptDecodeObjectEx(dwEncoding, OCSP_RESPONSE, ocsp_response, sizeof(ocsp_response), + ret = CryptDecodeObjectEx(dwEncoding, OCSP_RESPONSE, ocsp_response, sizeof(ocsp_response), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); ok(ret, "got %08lx\n", GetLastError()); ok(info->dwStatus == OCSP_UNAUTHORIZED_RESPONSE, "got %lu\n", info->dwStatus); @@ -8810,7 +8607,7 @@ static void test_decodeOCSPResponseInfo(DWORD dwEncoding) ok(info->Value.pbData == NULL, "got %p\n", info->Value.pbData); LocalFree(info); - ret = pCryptDecodeObjectEx(dwEncoding, OCSP_RESPONSE, ocsp_response2, sizeof(ocsp_response2), + ret = CryptDecodeObjectEx(dwEncoding, OCSP_RESPONSE, ocsp_response2, sizeof(ocsp_response2), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); ok(ret, "got %08lx\n", GetLastError()); ok(info->dwStatus == OCSP_SUCCESSFUL_RESPONSE, "got %lu\n", info->dwStatus); @@ -8927,7 +8724,7 @@ static void test_decodeOCSPBasicSignedResponseInfo(DWORD dwEncoding) BOOL ret; size = 0; - ret = pCryptDecodeObjectEx(dwEncoding, OCSP_BASIC_SIGNED_RESPONSE, ocsp_basic_signed_response, + ret = CryptDecodeObjectEx(dwEncoding, OCSP_BASIC_SIGNED_RESPONSE, ocsp_basic_signed_response, sizeof(ocsp_basic_signed_response), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); ok(ret, "got %08lx\n", GetLastError()); if (sizeof(void *) == 4) todo_wine ok(size == 496, "got %lu\n", size); @@ -8986,8 +8783,8 @@ static void test_decodeOCSPBasicResponseInfo(DWORD dwEncoding) /* good cert */ size = 0; - ret = pCryptDecodeObjectEx(dwEncoding, OCSP_BASIC_RESPONSE, ocsp_basic_response, - sizeof(ocsp_basic_response), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); + ret = CryptDecodeObjectEx(dwEncoding, OCSP_BASIC_RESPONSE, ocsp_basic_response, + sizeof(ocsp_basic_response), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); ok(ret, "got %08lx\n", GetLastError()); ok(!info->dwVersion, "got %lu\n", info->dwVersion); @@ -9025,8 +8822,8 @@ static void test_decodeOCSPBasicResponseInfo(DWORD dwEncoding) /* revoked cert */ size = 0; - ret = pCryptDecodeObjectEx(dwEncoding, OCSP_BASIC_RESPONSE, ocsp_basic_response_revoked, - sizeof(ocsp_basic_response_revoked), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); + ret = CryptDecodeObjectEx(dwEncoding, OCSP_BASIC_RESPONSE, ocsp_basic_response_revoked, + sizeof(ocsp_basic_response_revoked), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); todo_wine ok(ret, "got %08lx\n", GetLastError()); if (ret) { @@ -9075,18 +8872,8 @@ START_TEST(encode) { static const DWORD encodings[] = { X509_ASN_ENCODING, PKCS_7_ASN_ENCODING, X509_ASN_ENCODING | PKCS_7_ASN_ENCODING }; - HMODULE hCrypt32; DWORD i; - hCrypt32 = GetModuleHandleA("crypt32.dll"); - pCryptDecodeObjectEx = (void*)GetProcAddress(hCrypt32, "CryptDecodeObjectEx"); - pCryptEncodeObjectEx = (void*)GetProcAddress(hCrypt32, "CryptEncodeObjectEx"); - if (!pCryptDecodeObjectEx || !pCryptEncodeObjectEx) - { - win_skip("CryptDecodeObjectEx() is not available\n"); - return; - } - for (i = 0; i < ARRAY_SIZE(encodings); i++) { test_encodeInt(encodings[i]); diff --git a/dlls/crypt32/tests/message.c b/dlls/crypt32/tests/message.c index 6958c15ee36..fa4790a2a6b 100644 --- a/dlls/crypt32/tests/message.c +++ b/dlls/crypt32/tests/message.c @@ -59,15 +59,13 @@ static void test_msg_get_signer_count(void) SetLastError(0xdeadbeef); count = CryptGetMessageSignerCount(PKCS_7_ASN_ENCODING, NULL, 0); ok(count == -1, "Expected -1, got %ld\n", count); - ok(GetLastError() == CRYPT_E_ASN1_EOD || - GetLastError() == OSS_BAD_ARG, /* win9x */ + ok(GetLastError() == CRYPT_E_ASN1_EOD, "Expected CRYPT_E_ASN1_EOD, got %08lx\n", GetLastError()); SetLastError(0xdeadbeef); count = CryptGetMessageSignerCount(PKCS_7_ASN_ENCODING, dataEmptyBareContent, sizeof(dataEmptyBareContent)); ok(count == -1, "Expected -1, got %ld\n", count); - ok(GetLastError() == CRYPT_E_ASN1_BADTAG || - GetLastError() == OSS_PDU_MISMATCH, /* win9x */ + ok(GetLastError() == CRYPT_E_ASN1_BADTAG, "Expected CRYPT_E_ASN1_BADTAG, got %08lx\n", GetLastError()); SetLastError(0xdeadbeef); count = CryptGetMessageSignerCount(PKCS_7_ASN_ENCODING, @@ -79,14 +77,11 @@ static void test_msg_get_signer_count(void) count = CryptGetMessageSignerCount(PKCS_7_ASN_ENCODING, signedEmptyBareContent, sizeof(signedEmptyBareContent)); ok(count == -1, "Expected -1, got %ld\n", count); - ok(GetLastError() == CRYPT_E_ASN1_BADTAG || - GetLastError() == OSS_DATA_ERROR, /* win9x */ + ok(GetLastError() == CRYPT_E_ASN1_BADTAG, "Expected CRYPT_E_ASN1_BADTAG, got %08lx\n", GetLastError()); count = CryptGetMessageSignerCount(PKCS_7_ASN_ENCODING, signedEmptyContent, sizeof(signedEmptyContent)); - ok(count == 1 || - broken(count == -1), /* win9x */ - "Expected 1, got %ld\n", count); + ok(count == 1, "Expected 1, got %ld\n", count); } static BYTE detachedHashContent[] = { @@ -126,9 +121,7 @@ static void test_verify_detached_message_hash(void) SetLastError(0xdeadbeef); ret = CryptVerifyDetachedMessageHash(&para, NULL, 0, 0, NULL, NULL, NULL, NULL); - ok(!ret && - (GetLastError() == CRYPT_E_ASN1_EOD || - GetLastError() == OSS_BAD_ARG), /* win9x */ + ok(!ret && GetLastError() == CRYPT_E_ASN1_EOD, "expected CRYPT_E_ASN1_EOD, got %08lx\n", GetLastError()); para.dwMsgEncodingType = X509_ASN_ENCODING; SetLastError(0xdeadbeef); @@ -140,9 +133,7 @@ static void test_verify_detached_message_hash(void) SetLastError(0xdeadbeef); ret = CryptVerifyDetachedMessageHash(&para, NULL, 0, 0, NULL, NULL, NULL, NULL); - ok(!ret && - (GetLastError() == CRYPT_E_ASN1_EOD || - GetLastError() == OSS_BAD_ARG), /* win9x */ + ok(!ret && GetLastError() == CRYPT_E_ASN1_EOD, "expected CRYPT_E_ASN1_EOD, got %08lx\n", GetLastError()); /* Curiously, passing no data to hash succeeds.. */ ret = CryptVerifyDetachedMessageHash(&para, detachedHashContent, @@ -221,9 +212,8 @@ static void test_verify_message_hash(void) SetLastError(0xdeadbeef); ret = CryptVerifyMessageHash(&para, NULL, 0, NULL, NULL, NULL, NULL); ok(!ret, "Expected 0, got %d\n", ret); - ok(GetLastError() == CRYPT_E_ASN1_EOD || - GetLastError() == OSS_BAD_ARG, /* win98 */ - "Expected CRYPT_E_ASN1_EOD or OSS_BAD_ARG, got %08lx\n", GetLastError()); + ok(GetLastError() == CRYPT_E_ASN1_EOD, + "Expected CRYPT_E_ASN1_EOD, got %08lx\n", GetLastError()); /* Verifying the hash of a detached message succeeds? */ ret = CryptVerifyMessageHash(&para, detachedHashContent, sizeof(detachedHashContent), NULL, NULL, NULL, NULL); @@ -361,9 +351,8 @@ static void test_verify_detached_message_signature(void) ret = CryptVerifyDetachedMessageSignature(&para, 0, NULL, 0, 0, NULL, NULL, NULL); ok(!ret, "Expected 0, got %d\n", ret); - ok(GetLastError() == CRYPT_E_ASN1_EOD || - GetLastError() == OSS_BAD_ARG, /* win98 */ - "Expected CRYPT_E_ASN1_EOD or OSS_BAD_ARG, got %08lx\n", GetLastError()); + ok(GetLastError() == CRYPT_E_ASN1_EOD, + "Expected CRYPT_E_ASN1_EOD, got %08lx\n", GetLastError()); /* None of these messages contains a cert in the message itself, so the * default callback isn't able to verify their signature. */ @@ -372,39 +361,33 @@ static void test_verify_detached_message_signature(void) sizeof(signedWithCertContent), 0, NULL, NULL, NULL); ok(!ret, "Expected 0, got %d\n", ret); todo_wine - ok(GetLastError() == CRYPT_E_NOT_FOUND || - GetLastError() == OSS_DATA_ERROR, /* win98 */ - "Expected CRYPT_E_NOT_FOUND or OSS_DATA_ERROR, got %08lx\n", GetLastError()); + ok(GetLastError() == CRYPT_E_NOT_FOUND, + "Expected CRYPT_E_NOT_FOUND, got %08lx\n", GetLastError()); SetLastError(0xdeadbeef); ret = CryptVerifyDetachedMessageSignature(&para, 0, signedContent, sizeof(signedContent), 0, NULL, NULL, NULL); ok(!ret, "Expected 0, got %d\n", ret); - ok(GetLastError() == CRYPT_E_NOT_FOUND || - GetLastError() == OSS_DATA_ERROR, /* win98 */ - "Expected CRYPT_E_NOT_FOUND or OSS_DATA_ERROR, got %08lx\n", GetLastError()); + ok(GetLastError() == CRYPT_E_NOT_FOUND, + "Expected CRYPT_E_NOT_FOUND, got %08lx\n", GetLastError()); SetLastError(0xdeadbeef); ret = CryptVerifyDetachedMessageSignature(&para, 0, detachedSignedContent, sizeof(detachedSignedContent), 0, NULL, NULL, NULL); ok(!ret, "Expected 0, got %d\n", ret); - ok(GetLastError() == CRYPT_E_NOT_FOUND || - GetLastError() == OSS_DATA_ERROR, /* win98 */ - "Expected CRYPT_E_NOT_FOUND or OSS_DATA_ERROR, got %08lx\n", GetLastError()); + ok(GetLastError() == CRYPT_E_NOT_FOUND, + "Expected CRYPT_E_NOT_FOUND, got %08lx\n", GetLastError()); SetLastError(0xdeadbeef); pContent = msgData; cbContent = sizeof(msgData); ret = CryptVerifyDetachedMessageSignature(&para, 0, detachedSignedContent, sizeof(detachedSignedContent), 1, &pContent, &cbContent, NULL); ok(!ret, "Expected 0, got %d\n", ret); - ok(GetLastError() == CRYPT_E_NOT_FOUND || - GetLastError() == OSS_DATA_ERROR, /* win98 */ - "Expected CRYPT_E_NOT_FOUND or OSS_DATA_ERROR, got %08lx\n", GetLastError()); + ok(GetLastError() == CRYPT_E_NOT_FOUND, + "Expected CRYPT_E_NOT_FOUND, got %08lx\n", GetLastError()); /* Passing the correct callback results in success */ para.pfnGetSignerCertificate = msg_get_signer_callback; ret = CryptVerifyDetachedMessageSignature(&para, 0, detachedSignedContent, sizeof(detachedSignedContent), 1, &pContent, &cbContent, NULL); - ok(ret || - broken(!ret), /* win98 */ - "CryptVerifyDetachedMessageSignature failed: %08lx\n", + ok(ret, "CryptVerifyDetachedMessageSignature failed: %08lx\n", GetLastError()); /* Not passing the correct data to be signed results in the signature not * matching. @@ -413,9 +396,8 @@ static void test_verify_detached_message_signature(void) ret = CryptVerifyDetachedMessageSignature(&para, 0, detachedSignedContent, sizeof(detachedSignedContent), 0, NULL, NULL, NULL); ok(!ret, "Expected 0, got %d\n", ret); - ok(GetLastError() == NTE_BAD_SIGNATURE || - GetLastError() == OSS_DATA_ERROR, /* win98 */ - "Expected NTE_BAD_SIGNATURE or OSS_DATA_ERROR, got %08lx\n", GetLastError()); + ok(GetLastError() == NTE_BAD_SIGNATURE, + "Expected NTE_BAD_SIGNATURE, got %08lx\n", GetLastError()); } static const BYTE signedWithCertEmptyContent[] = { @@ -519,33 +501,27 @@ static void test_verify_message_signature(void) para.cbSize = sizeof(para); SetLastError(0xdeadbeef); ret = CryptVerifyMessageSignature(&para, 0, NULL, 0, NULL, 0, NULL); - ok(!ret && - (GetLastError() == CRYPT_E_ASN1_EOD || - GetLastError() == OSS_BAD_ARG), /* win9x */ + ok(!ret && GetLastError() == CRYPT_E_ASN1_EOD, "Expected CRYPT_E_ASN1_EOD, got %08lx\n", GetLastError()); /* Check whether cert is set on error */ cert = (PCCERT_CONTEXT)0xdeadbeef; ret = CryptVerifyMessageSignature(&para, 0, NULL, 0, NULL, 0, &cert); - ok(!ret && (GetLastError() == CRYPT_E_ASN1_EOD || - GetLastError() == OSS_BAD_ARG /* NT40 */), + ok(!ret && GetLastError() == CRYPT_E_ASN1_EOD, "Expected CRYPT_E_ASN1_EOD, got %08lx\n", GetLastError()); ok(cert == NULL, "Expected NULL cert\n"); /* Check whether cbDecoded is set on error */ cbDecoded = 0xdeadbeef; ret = CryptVerifyMessageSignature(&para, 0, NULL, 0, NULL, &cbDecoded, NULL); - ok(!ret && (GetLastError() == CRYPT_E_ASN1_EOD || - GetLastError() == OSS_BAD_ARG /* NT40 */), + ok(!ret && GetLastError() == CRYPT_E_ASN1_EOD, "Expected CRYPT_E_ASN1_EOD, got %08lx\n", GetLastError()); ok(!cbDecoded, "Expected 0\n"); SetLastError(0xdeadbeef); ret = CryptVerifyMessageSignature(&para, 0, dataEmptyBareContent, sizeof(dataEmptyBareContent), NULL, 0, NULL); - ok(!ret && (GetLastError() == CRYPT_E_ASN1_BADTAG || - GetLastError() == OSS_PDU_MISMATCH /* NT40 */), + ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, "Expected CRYPT_E_ASN1_BADTAG, got %08lx\n", GetLastError()); - ok(GetLastError() == CRYPT_E_ASN1_BADTAG || - GetLastError() == OSS_PDU_MISMATCH, /* win9x */ + ok(GetLastError() == CRYPT_E_ASN1_BADTAG, "Expected CRYPT_E_ASN1_BADTAG, got %08lx\n", GetLastError()); SetLastError(0xdeadbeef); ret = CryptVerifyMessageSignature(&para, 0, dataEmptyContent, @@ -555,23 +531,17 @@ static void test_verify_message_signature(void) SetLastError(0xdeadbeef); ret = CryptVerifyMessageSignature(&para, 0, signedEmptyBareContent, sizeof(signedEmptyBareContent), NULL, 0, NULL); - ok(!ret && - (GetLastError() == CRYPT_E_ASN1_BADTAG || - GetLastError() == OSS_DATA_ERROR), /* win9x */ + ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, "Expected CRYPT_E_ASN1_BADTAG, got %08lx\n", GetLastError()); SetLastError(0xdeadbeef); ret = CryptVerifyMessageSignature(&para, 0, signedEmptyContent, sizeof(signedEmptyContent), NULL, 0, NULL); - ok(!ret && - (GetLastError() == CRYPT_E_NOT_FOUND || - GetLastError() == OSS_DATA_ERROR), /* win9x */ + ok(!ret && GetLastError() == CRYPT_E_NOT_FOUND, "Expected CRYPT_E_NOT_FOUND, got %08lx\n", GetLastError()); SetLastError(0xdeadbeef); ret = CryptVerifyMessageSignature(&para, 0, signedContent, sizeof(signedContent), NULL, 0, NULL); - ok(!ret && - (GetLastError() == CRYPT_E_NOT_FOUND || - GetLastError() == OSS_DATA_ERROR), /* win9x */ + ok(!ret && GetLastError() == CRYPT_E_NOT_FOUND, "Expected CRYPT_E_NOT_FOUND, got %08lx\n", GetLastError()); /* FIXME: Windows fails with CRYPT_E_NOT_FOUND for these messages, but * their signer certs have invalid public keys that fail to decode. In @@ -1021,13 +991,6 @@ static void test_sign_message(void) SetLastError(0xdeadbeef); ret = CryptImportKey(hCryptProv, publicPrivateKeyPair, sizeof(publicPrivateKeyPair), 0, 0, &hKey); - if (!ret && GetLastError() == NTE_PERM) /* Win9x */ - { - skip("Failed to import a key\n"); - if (hCryptProv) - CryptReleaseContext(hCryptProv, 0); - return; - } ok(ret, "CryptImportKey failed: %08lx\n", GetLastError()); para.dwMsgEncodingType = X509_ASN_ENCODING | PKCS_7_ASN_ENCODING; @@ -1239,9 +1202,7 @@ static void test_encrypt_message(void) encryptedBlobSize = 255; ret = CryptEncryptMessage(&para, 0, NULL, NULL, 0, NULL, &encryptedBlobSize); - ok(!ret && - (GetLastError() == CRYPT_E_UNKNOWN_ALGO || - GetLastError() == E_INVALIDARG), /* Win9x */ + ok(!ret && GetLastError() == CRYPT_E_UNKNOWN_ALGO, "expected CRYPT_E_UNKNOWN_ALGO or E_INVALIDARG, got %08lx\n", GetLastError()); ok(!encryptedBlobSize, "unexpected size %ld\n", encryptedBlobSize); @@ -1253,9 +1214,7 @@ static void test_encrypt_message(void) encryptedBlobSize = 0; ret = CryptEncryptMessage(&para, 0, NULL, NULL, 0, NULL, &encryptedBlobSize); - ok(ret || - broken(!ret) /* Win9x */, - "CryptEncryptMessage failed: %08lx\n", GetLastError()); + ok(ret, "CryptEncryptMessage failed: %08lx\n", GetLastError()); if (ret) { encryptedBlob = CryptMemAlloc(encryptedBlobSize); @@ -1265,7 +1224,7 @@ static void test_encrypt_message(void) ret = CryptEncryptMessage(&para, 0, NULL, NULL, 0, encryptedBlob, &encryptedBlobSize); ok(ret, "CryptEncryptMessage failed: %08lx\n", GetLastError()); - ok(encryptedBlobSize == sizeof(encryptedMessage), + ok(encryptedBlobSize == sizeof(encryptedMessage), "unexpected size of encrypted blob %ld\n", encryptedBlobSize); ok(!memcmp(encryptedBlob, encryptedMessage, encryptedBlobSize), "unexpected value\n"); @@ -1295,9 +1254,7 @@ static void test_encrypt_message(void) encryptedBlobSize = 0; ret = CryptEncryptMessage(&para, 0, NULL, blob, sizeof(blob), NULL, &encryptedBlobSize); - ok(ret || - broken(!ret) /* Win9x */, - "CryptEncryptMessage failed: %08lx\n", GetLastError()); + ok(ret, "CryptEncryptMessage failed: %08lx\n", GetLastError()); if (ret) { encryptedBlob = CryptMemAlloc(encryptedBlobSize); @@ -1306,9 +1263,7 @@ static void test_encrypt_message(void) SetLastError(0xdeadbeef); ret = CryptEncryptMessage(&para, 0, NULL, blob, sizeof(blob), encryptedBlob, &encryptedBlobSize); - ok(ret || - broken(!ret && GetLastError() == NTE_PERM), /* some NT4 */ - "CryptEncryptMessage failed: %08lx\n", GetLastError()); + ok(ret, "CryptEncryptMessage failed: %08lx\n", GetLastError()); if (ret) { ok(encryptedBlobSize == 55, @@ -1331,9 +1286,7 @@ static void test_encrypt_message(void) SetLastError(0xdeadbeef); ret = CryptEncryptMessage(&para, 2, certs, blob, sizeof(blob), encryptedBlob, &encryptedBlobSize); - ok(ret || - broken(!ret), /* some Win95 and some NT4 */ - "CryptEncryptMessage failed: %08lx\n", GetLastError()); + ok(ret, "CryptEncryptMessage failed: %08lx\n", GetLastError()); CryptMemFree(encryptedBlob); } } diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index d66a972da05..f779d70695e 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -29,7 +29,6 @@ #include "wine/test.h" -static BOOL old_crypt32 = FALSE; static char oid_rsa_md5[] = szOID_RSA_MD5; static void test_msg_open_to_encode(void) @@ -174,7 +173,7 @@ static void test_msg_get_param(void) ret = CryptMsgGetParam(msg, CMSG_TYPE_PARAM, 0, &value, &size); ok(ret, "CryptMsgGetParam failed: %lx\n", GetLastError()); ok(value == CMSG_DATA, "Expected CMSG_DATA, got %ld\n", value); - for (i = CMSG_CONTENT_PARAM; !old_crypt32 && (i <= CMSG_CMS_SIGNER_INFO_PARAM); i++) + for (i = CMSG_CONTENT_PARAM; i <= CMSG_CMS_SIGNER_INFO_PARAM; i++) { size = 0; ret = CryptMsgGetParam(msg, i, 0, NULL, &size); @@ -189,7 +188,7 @@ static void test_msg_get_param(void) ret = CryptMsgGetParam(msg, CMSG_TYPE_PARAM, 0, &value, &size); ok(ret, "CryptMsgGetParam failed: %lx\n", GetLastError()); ok(value == CMSG_ENVELOPED, "Expected CMSG_ENVELOPED, got %ld\n", value); - for (i = CMSG_CONTENT_PARAM; !old_crypt32 && (i <= CMSG_CMS_SIGNER_INFO_PARAM); i++) + for (i = CMSG_CONTENT_PARAM; i <= CMSG_CMS_SIGNER_INFO_PARAM; i++) { size = 0; ret = CryptMsgGetParam(msg, i, 0, NULL, &size); @@ -204,7 +203,7 @@ static void test_msg_get_param(void) ret = CryptMsgGetParam(msg, CMSG_TYPE_PARAM, 0, &value, &size); ok(ret, "CryptMsgGetParam failed: %lx\n", GetLastError()); ok(value == CMSG_HASHED, "Expected CMSG_HASHED, got %ld\n", value); - for (i = CMSG_CONTENT_PARAM; !old_crypt32 && (i <= CMSG_CMS_SIGNER_INFO_PARAM); i++) + for (i = CMSG_CONTENT_PARAM; i <= CMSG_CMS_SIGNER_INFO_PARAM; i++) { size = 0; ret = CryptMsgGetParam(msg, i, 0, NULL, &size); @@ -219,7 +218,7 @@ static void test_msg_get_param(void) ret = CryptMsgGetParam(msg, CMSG_TYPE_PARAM, 0, &value, &size); ok(ret, "CryptMsgGetParam failed: %lx\n", GetLastError()); ok(value == CMSG_SIGNED, "Expected CMSG_SIGNED, got %ld\n", value); - for (i = CMSG_CONTENT_PARAM; !old_crypt32 && (i <= CMSG_CMS_SIGNER_INFO_PARAM); i++) + for (i = CMSG_CONTENT_PARAM; i <= CMSG_CMS_SIGNER_INFO_PARAM; i++) { size = 0; ret = CryptMsgGetParam(msg, i, 0, NULL, &size); @@ -273,14 +272,8 @@ static void check_param(LPCSTR test, HCRYPTMSG msg, DWORD param, size = 0xdeadbeef; ret = CryptMsgGetParam(msg, param, 0, NULL, &size); - ok(ret || broken(GetLastError() == OSS_LIMITED /* Win9x */ || - GetLastError() == CRYPT_E_INVALID_MSG_TYPE /* Win9x, for some params */), - "%s: CryptMsgGetParam failed: %08lx\n", test, GetLastError()); - if (!ret) - { - win_skip("parameter %ld not supported, skipping tests\n", param); - return; - } + ok(ret, "%s: CryptMsgGetParam failed: %08lx\n", test, GetLastError()); + buf = HeapAlloc(GetProcessHeap(), 0, size); ret = CryptMsgGetParam(msg, param, 0, buf, &size); ok(ret, "%s: CryptMsgGetParam failed: %08lx\n", test, GetLastError()); @@ -371,7 +364,7 @@ static void test_data_msg_update(void) NULL); /* Starting with Vista, can update a message with no data. */ ret = CryptMsgUpdate(msg, NULL, 0, TRUE); - ok(ret || broken(!ret), "CryptMsgUpdate failed: %08lx\n", GetLastError()); + ok(ret, "CryptMsgUpdate failed: %08lx\n", GetLastError()); if (ret) { DWORD size; @@ -405,37 +398,28 @@ static void test_data_msg_update(void) SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, NULL, 0, FALSE); - ok(!ret && - (GetLastError() == E_INVALIDARG || - broken(GetLastError() == ERROR_SUCCESS)), /* Older NT4 */ + ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %lx\n", GetLastError()); SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), FALSE); - ok(!ret && - (GetLastError() == E_INVALIDARG || - broken(GetLastError() == ERROR_SUCCESS)), /* Older NT4 */ + ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %lx\n", GetLastError()); ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); ok(ret, "CryptMsgUpdate failed: %lx\n", GetLastError()); CryptMsgClose(msg); - if (!old_crypt32) - { - /* Calling update after opening with an empty stream info (with a bogus - * output function) yields an error: - */ - /* Crashes on some Win9x */ - msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_DATA, NULL, NULL, - &streamInfo); - SetLastError(0xdeadbeef); - ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), FALSE); - ok(!ret && (GetLastError() == STATUS_ACCESS_VIOLATION || - GetLastError() == STATUS_ILLEGAL_INSTRUCTION /* WinME */), - "Expected STATUS_ACCESS_VIOLATION or STATUS_ILLEGAL_INSTRUCTION, got %lx\n", - GetLastError()); - CryptMsgClose(msg); - } + /* Calling update after opening with an empty stream info (with a bogus + * output function) yields an error: + */ + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_DATA, NULL, NULL, + &streamInfo); + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), FALSE); + ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, + "Expected STATUS_ACCESS_VIOLATION, got %lx\n", GetLastError()); + CryptMsgClose(msg); + /* Calling update with a valid output function succeeds, even if the data * exceeds the size specified in the stream info. */ @@ -488,11 +472,11 @@ static void test_data_msg_get_param(void) NULL, &streamInfo); SetLastError(0xdeadbeef); ret = CryptMsgGetParam(msg, CMSG_BARE_CONTENT_PARAM, 0, NULL, &size); - ok((!ret && GetLastError() == E_INVALIDARG) || broken(ret /* Win9x */), + ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %lx\n", GetLastError()); SetLastError(0xdeadbeef); ret = CryptMsgGetParam(msg, CMSG_CONTENT_PARAM, 0, NULL, &size); - ok((!ret && GetLastError() == E_INVALIDARG) || broken(ret /* Win9x */), + ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %lx\n", GetLastError()); CryptMsgClose(msg); } @@ -804,18 +788,15 @@ static void test_hash_msg_get_param(void) /* Content and bare content are always gettable for non-streamed messages */ size = 0; ret = CryptMsgGetParam(msg, CMSG_CONTENT_PARAM, 0, NULL, &size); - ok(ret || broken(GetLastError() == OSS_LIMITED /* Win9x */), - "CryptMsgGetParam failed: %08lx\n", GetLastError()); + ok(ret, "CryptMsgGetParam failed: %08lx\n", GetLastError()); size = 0; ret = CryptMsgGetParam(msg, CMSG_BARE_CONTENT_PARAM, 0, NULL, &size); - ok(ret || broken(GetLastError() == OSS_LIMITED /* Win9x */), - "CryptMsgGetParam failed: %08lx\n", GetLastError()); + ok(ret, "CryptMsgGetParam failed: %08lx\n", GetLastError()); /* For an encoded hash message, the hash data aren't available */ SetLastError(0xdeadbeef); ret = CryptMsgGetParam(msg, CMSG_HASH_DATA_PARAM, 0, NULL, &size); - ok(!ret && (GetLastError() == CRYPT_E_INVALID_MSG_TYPE || - GetLastError() == OSS_LIMITED /* Win9x */), - "Expected CRYPT_E_INVALID_MSG_TYPE or OSS_LIMITED, got %08lx\n", + ok(!ret && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, + "Expected CRYPT_E_INVALID_MSG_TYPE, got %08lx\n", GetLastError()); /* The hash is also available. */ size = 0; @@ -830,12 +811,8 @@ static void test_hash_msg_get_param(void) /* By getting the hash, further updates are not allowed */ SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); - ok(!ret && - (GetLastError() == NTE_BAD_HASH_STATE /* NT */ || - GetLastError() == NTE_BAD_ALGID /* 9x */ || - GetLastError() == CRYPT_E_MSG_ERROR /* Vista */ || - broken(GetLastError() == ERROR_SUCCESS) /* Some Win9x */), - "Expected NTE_BAD_HASH_STATE or NTE_BAD_ALGID or CRYPT_E_MSG_ERROR, got 0x%lx\n", GetLastError()); + ok(!ret && (GetLastError() == NTE_BAD_HASH_STATE || GetLastError() == CRYPT_E_MSG_ERROR), + "Expected CRYPT_E_MSG_ERROR, got 0x%lx\n", GetLastError()); /* Even after a final update, the hash data aren't available */ SetLastError(0xdeadbeef); @@ -845,12 +822,10 @@ static void test_hash_msg_get_param(void) /* The version is also available, and should be zero for this message. */ size = 0; ret = CryptMsgGetParam(msg, CMSG_VERSION_PARAM, 0, NULL, &size); - ok(ret || broken(GetLastError() == CRYPT_E_INVALID_MSG_TYPE /* Win9x */), - "CryptMsgGetParam failed: %08lx\n", GetLastError()); + ok(ret, "CryptMsgGetParam failed: %08lx\n", GetLastError()); size = sizeof(value); ret = CryptMsgGetParam(msg, CMSG_VERSION_PARAM, 0, &value, &size); - ok(ret || broken(GetLastError() == CRYPT_E_INVALID_MSG_TYPE /* Win9x */), - "CryptMsgGetParam failed: %08lx\n", GetLastError()); + ok(ret, "CryptMsgGetParam failed: %08lx\n", GetLastError()); if (ret) ok(value == 0, "Expected version 0, got %ld\n", value); /* As usual, the type isn't available. */ @@ -863,14 +838,12 @@ static void test_hash_msg_get_param(void) /* Streamed messages don't allow you to get the content or bare content. */ SetLastError(0xdeadbeef); ret = CryptMsgGetParam(msg, CMSG_CONTENT_PARAM, 0, NULL, &size); - ok(!ret && (GetLastError() == E_INVALIDARG || - GetLastError() == OSS_LIMITED /* Win9x */), - "Expected E_INVALIDARG or OSS_LIMITED, got %lx\n", GetLastError()); + ok(!ret && GetLastError() == E_INVALIDARG, + "Expected E_INVALIDARG, got %lx\n", GetLastError()); SetLastError(0xdeadbeef); ret = CryptMsgGetParam(msg, CMSG_BARE_CONTENT_PARAM, 0, NULL, &size); - ok(!ret && (GetLastError() == E_INVALIDARG || - GetLastError() == OSS_LIMITED /* Win9x */), - "Expected E_INVALIDARG or OSS_LIMITED, got %lx\n", GetLastError()); + ok(!ret && GetLastError() == E_INVALIDARG, + "Expected E_INVALIDARG, got %lx\n", GetLastError()); /* The hash is still available. */ size = 0; ret = CryptMsgGetParam(msg, CMSG_COMPUTED_HASH_PARAM, 0, NULL, &size); @@ -885,12 +858,8 @@ static void test_hash_msg_get_param(void) */ SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); - ok(!ret && - (GetLastError() == NTE_BAD_HASH_STATE /* NT */ || - GetLastError() == NTE_BAD_ALGID /* 9x */ || - GetLastError() == CRYPT_E_MSG_ERROR /* Vista */ || - broken(GetLastError() == ERROR_SUCCESS) /* Some Win9x */), - "Expected NTE_BAD_HASH_STATE or NTE_BAD_ALGID or CRYPT_E_MSG_ERROR, got 0x%lx\n", GetLastError()); + ok(!ret && (GetLastError() == NTE_BAD_HASH_STATE || GetLastError() == CRYPT_E_MSG_ERROR), + "Expected CRYPT_E_MSG_ERROR, got 0x%lx\n", GetLastError()); CryptMsgClose(msg); } @@ -1083,19 +1052,15 @@ static void test_signed_msg_open(void) SetLastError(0xdeadbeef); msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_SIGNED, &signInfo, NULL, NULL); - /* NT: E_INVALIDARG, 9x: unchanged or CRYPT_E_UNKNOWN_ALGO */ - ok(!msg && (GetLastError() == E_INVALIDARG || GetLastError() == 0xdeadbeef - || GetLastError() == CRYPT_E_UNKNOWN_ALGO), - "Expected E_INVALIDARG or 0xdeadbeef or CRYPT_E_UNKNOWN_ALGO, got 0x%lx\n", - GetLastError()); + ok(!msg && GetLastError() == E_INVALIDARG, + "Expected E_INVALIDARG, got 0x%lx\n", GetLastError()); certInfo.Issuer.cbData = sizeof(encodedCommonName); certInfo.Issuer.pbData = encodedCommonName; SetLastError(0xdeadbeef); msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_SIGNED, &signInfo, NULL, NULL); - ok(!msg && (GetLastError() == E_INVALIDARG || - GetLastError() == CRYPT_E_UNKNOWN_ALGO), + ok(!msg && (GetLastError() == E_INVALIDARG || GetLastError() == CRYPT_E_UNKNOWN_ALGO), "Expected E_INVALIDARG or CRYPT_E_UNKNOWN_ALGO, got %lx\n", GetLastError()); /* The signer's hCryptProv must be set to something. Whether it's usable @@ -1214,11 +1179,6 @@ static void test_signed_msg_update(void) } ok(ret, "CryptAcquireContext failed: 0x%lx\n", GetLastError()); - if (!ret) { - skip("No context for tests\n"); - return; - } - msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, CMSG_DETACHED_FLAG, CMSG_SIGNED, &signInfo, NULL, NULL); ok(msg != NULL, "CryptMsgOpenToEncode failed: %lx\n", GetLastError()); @@ -1233,10 +1193,7 @@ static void test_signed_msg_update(void) */ SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, NULL, 0, TRUE); - ok(!ret && - (GetLastError() == NTE_BAD_KEYSET || - GetLastError() == NTE_NO_KEY || - broken(GetLastError() == ERROR_SUCCESS)), /* Some Win9x */ + ok(!ret && (GetLastError() == NTE_BAD_KEYSET || GetLastError() == NTE_NO_KEY), "Expected NTE_BAD_KEYSET or NTE_NO_KEY, got %lx\n", GetLastError()); ret = CryptImportKey(signer.hCryptProv, privKey, sizeof(privKey), 0, 0, &key); @@ -1652,11 +1609,6 @@ static void test_signed_msg_encoding(void) } ok(ret, "CryptAcquireContext failed: 0x%lx\n", GetLastError()); - if (!ret) { - skip("No context for tests\n"); - return; - } - ret = CryptImportKey(signer.hCryptProv, privKey, sizeof(privKey), 0, 0, &key); ok(ret, "CryptImportKey failed: %08lx\n", GetLastError()); @@ -1680,8 +1632,7 @@ static void test_signed_msg_encoding(void) detachedSignedContent, sizeof(detachedSignedContent)); SetLastError(0xdeadbeef); ret = CryptMsgGetParam(msg, CMSG_COMPUTED_HASH_PARAM, 1, NULL, &size); - ok(!ret && (GetLastError() == CRYPT_E_INVALID_INDEX || - broken(GetLastError() == CRYPT_E_INVALID_MSG_TYPE /* Win9x */)), + ok(!ret && GetLastError() == CRYPT_E_INVALID_INDEX, "Expected CRYPT_E_INVALID_INDEX, got %lx\n", GetLastError()); check_param("detached signed encoded signer", msg, CMSG_ENCODED_SIGNER, signedEncodedSigner, sizeof(signedEncodedSigner)); @@ -1834,13 +1785,8 @@ static void test_signed_msg_get_param(void) /* Content and bare content are always gettable */ size = 0; ret = CryptMsgGetParam(msg, CMSG_CONTENT_PARAM, 0, NULL, &size); - ok(ret || broken(!ret /* Win9x */), "CryptMsgGetParam failed: %08lx\n", - GetLastError()); - if (!ret) - { - skip("message parameters are broken, skipping tests\n"); - return; - } + ok(ret, "CryptMsgGetParam failed: %08lx\n", GetLastError()); + size = 0; ret = CryptMsgGetParam(msg, CMSG_BARE_CONTENT_PARAM, 0, NULL, &size); ok(ret, "CryptMsgGetParam failed: %08lx\n", GetLastError()); @@ -1888,11 +1834,6 @@ static void test_signed_msg_get_param(void) } ok(ret, "CryptAcquireContext failed: 0x%lx\n", GetLastError()); - if (!ret) { - skip("No context for tests\n"); - return; - } - msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_SIGNED, &signInfo, NULL, NULL); ok(msg != NULL, "CryptMsgOpenToEncode failed: %lx\n", GetLastError()); @@ -1945,8 +1886,7 @@ static void test_signed_msg_get_param(void) */ size = sizeof(value); ret = CryptMsgGetParam(msg, CMSG_VERSION_PARAM, 0, &value, &size); - ok(ret || broken(GetLastError() == CRYPT_E_INVALID_MSG_TYPE), - "CryptMsgGetParam failed: %08lx\n", GetLastError()); + ok(ret, "CryptMsgGetParam failed: %08lx\n", GetLastError()); if (ret) ok(value == CMSG_SIGNED_DATA_V1, "expected version 1, got %ld\n", value); /* Apparently the encoded signer can be retrieved.. */ @@ -2037,54 +1977,43 @@ static void test_enveloped_msg_open(void) SetLastError(0xdeadbeef); msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_ENVELOPED, &envelopedInfo, NULL, NULL); - ok(!msg && - (GetLastError() == CRYPT_E_UNKNOWN_ALGO || - GetLastError() == E_INVALIDARG), /* Win9x */ - "expected CRYPT_E_UNKNOWN_ALGO or E_INVALIDARG, got %08lx\n", GetLastError()); + ok(!msg && GetLastError() == CRYPT_E_UNKNOWN_ALGO, + "expected CRYPT_E_UNKNOWN_ALGO, got %08lx\n", GetLastError()); envelopedInfo.ContentEncryptionAlgorithm.pszObjId = oid_rsa_rc4; SetLastError(0xdeadbeef); msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_ENVELOPED, &envelopedInfo, NULL, NULL); - ok(msg != NULL || - broken(!msg), /* Win9x */ - "CryptMsgOpenToEncode failed: %08lx\n", GetLastError()); + ok(msg != NULL, "CryptMsgOpenToEncode failed: %08lx\n", GetLastError()); CryptMsgClose(msg); envelopedInfo.cRecipients = 1; - if (!old_crypt32) - { - SetLastError(0xdeadbeef); - msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_ENVELOPED, - &envelopedInfo, NULL, NULL); - ok(!msg && GetLastError() == E_INVALIDARG, - "expected E_INVALIDARG, got %08lx\n", GetLastError()); - } + SetLastError(0xdeadbeef); + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_ENVELOPED, + &envelopedInfo, NULL, NULL); + ok(!msg && GetLastError() == E_INVALIDARG, + "expected E_INVALIDARG, got %08lx\n", GetLastError()); context = CertCreateCertificateContext(X509_ASN_ENCODING, v1CertWithValidPubKey, sizeof(v1CertWithValidPubKey)); - if (context) - { - envelopedInfo.rgpRecipientCert = (PCERT_INFO *)&context->pCertInfo; - SetLastError(0xdeadbeef); - msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_ENVELOPED, - &envelopedInfo, NULL, NULL); - ok(msg != NULL, "CryptMsgOpenToEncode failed: %08lx\n", GetLastError()); - CryptMsgClose(msg); - SetLastError(0xdeadbeef); - ret = CryptAcquireContextA(&envelopedInfo.hCryptProv, NULL, NULL, - PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); - ok(ret, "CryptAcquireContextA failed: %08lx\n", GetLastError()); - SetLastError(0xdeadbeef); - msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_ENVELOPED, - &envelopedInfo, NULL, NULL); - ok(msg != NULL, "CryptMsgOpenToEncode failed: %08lx\n", GetLastError()); - CryptMsgClose(msg); - CryptReleaseContext(envelopedInfo.hCryptProv, 0); - CertFreeCertificateContext(context); - } - else - win_skip("failed to create certificate context, skipping tests\n"); + + envelopedInfo.rgpRecipientCert = (PCERT_INFO *)&context->pCertInfo; + SetLastError(0xdeadbeef); + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_ENVELOPED, + &envelopedInfo, NULL, NULL); + ok(msg != NULL, "CryptMsgOpenToEncode failed: %08lx\n", GetLastError()); + CryptMsgClose(msg); + SetLastError(0xdeadbeef); + ret = CryptAcquireContextA(&envelopedInfo.hCryptProv, NULL, NULL, + PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); + ok(ret, "CryptAcquireContextA failed: %08lx\n", GetLastError()); + SetLastError(0xdeadbeef); + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_ENVELOPED, + &envelopedInfo, NULL, NULL); + ok(msg != NULL, "CryptMsgOpenToEncode failed: %08lx\n", GetLastError()); + CryptMsgClose(msg); + CryptReleaseContext(envelopedInfo.hCryptProv, 0); + CertFreeCertificateContext(context); } static void test_enveloped_msg_update(void) @@ -2098,117 +2027,92 @@ static void test_enveloped_msg_update(void) SetLastError(0xdeadbeef); msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_ENVELOPED, &envelopedInfo, NULL, NULL); - ok(msg != NULL || - broken(!msg), /* Win9x */ - "CryptMsgOpenToEncode failed: %08lx\n", GetLastError()); - if (msg) - { - SetLastError(0xdeadbeef); - ret = CryptMsgUpdate(msg, NULL, 0, FALSE); - ok(!ret && GetLastError() == CRYPT_E_MSG_ERROR, - "expected CRYPT_E_MSG_ERROR, got %08lx\n", GetLastError()); - SetLastError(0xdeadbeef); - ret = CryptMsgUpdate(msg, NULL, 0, TRUE); - ok(ret, "CryptMsgUpdate failed: %08lx\n", GetLastError()); - SetLastError(0xdeadbeef); - ret = CryptMsgUpdate(msg, NULL, 0, TRUE); - ok(!ret && GetLastError() == CRYPT_E_MSG_ERROR, - "expected CRYPT_E_MSG_ERROR, got %08lx\n", GetLastError()); - CryptMsgClose(msg); - } + ok(msg != NULL, "CryptMsgOpenToEncode failed: %08lx\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, NULL, 0, FALSE); + ok(!ret && GetLastError() == CRYPT_E_MSG_ERROR, + "expected CRYPT_E_MSG_ERROR, got %08lx\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, NULL, 0, TRUE); + ok(ret, "CryptMsgUpdate failed: %08lx\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, NULL, 0, TRUE); + ok(!ret && GetLastError() == CRYPT_E_MSG_ERROR, + "expected CRYPT_E_MSG_ERROR, got %08lx\n", GetLastError()); + CryptMsgClose(msg); + SetLastError(0xdeadbeef); msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_ENVELOPED, &envelopedInfo, NULL, NULL); - ok(msg != NULL || - broken(!msg), /* Win9x */ - "CryptMsgOpenToEncode failed: %08lx\n", GetLastError()); - if (msg) - { - SetLastError(0xdeadbeef); - ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), FALSE); - ok(!ret && GetLastError() == CRYPT_E_MSG_ERROR, - "expected CRYPT_E_MSG_ERROR, got %08lx\n", GetLastError()); - SetLastError(0xdeadbeef); - ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); - ok(ret || - broken(!ret && GetLastError() == NTE_PERM), /* some NT4 */ - "CryptMsgUpdate failed: %08lx\n", GetLastError()); - SetLastError(0xdeadbeef); - ret = CryptMsgUpdate(msg, NULL, 0, TRUE); - ok(!ret && GetLastError() == CRYPT_E_MSG_ERROR, - "expected CRYPT_E_MSG_ERROR, got %08lx\n", GetLastError()); - CryptMsgClose(msg); - } + ok(msg != NULL, "CryptMsgOpenToEncode failed: %08lx\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), FALSE); + ok(!ret && GetLastError() == CRYPT_E_MSG_ERROR, + "expected CRYPT_E_MSG_ERROR, got %08lx\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); + ok(ret, "CryptMsgUpdate failed: %08lx\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, NULL, 0, TRUE); + ok(!ret && GetLastError() == CRYPT_E_MSG_ERROR, + "expected CRYPT_E_MSG_ERROR, got %08lx\n", GetLastError()); + CryptMsgClose(msg); + SetLastError(0xdeadbeef); msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, CMSG_DETACHED_FLAG, CMSG_ENVELOPED, &envelopedInfo, NULL, NULL); - ok(msg != NULL || - broken(!msg), /* Win9x */ - "CryptMsgOpenToEncode failed: %08lx\n", GetLastError()); - if (msg) - { - SetLastError(0xdeadbeef); - ret = CryptMsgUpdate(msg, NULL, 0, FALSE); - ok(!ret && GetLastError() == E_INVALIDARG, - "expected E_INVALIDARG, got %08lx\n", GetLastError()); - SetLastError(0xdeadbeef); - ret = CryptMsgUpdate(msg, NULL, 0, TRUE); - ok(ret, "CryptMsgUpdate failed: %08lx\n", GetLastError()); - CryptMsgClose(msg); - } + ok(msg != NULL, "CryptMsgOpenToEncode failed: %08lx\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, NULL, 0, FALSE); + ok(!ret && GetLastError() == E_INVALIDARG, + "expected E_INVALIDARG, got %08lx\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, NULL, 0, TRUE); + ok(ret, "CryptMsgUpdate failed: %08lx\n", GetLastError()); + CryptMsgClose(msg); + SetLastError(0xdeadbeef); msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, CMSG_DETACHED_FLAG, CMSG_ENVELOPED, &envelopedInfo, NULL, NULL); - ok(msg != NULL || - broken(!msg), /* Win9x */ - "CryptMsgOpenToEncode failed: %08lx\n", GetLastError()); - if (msg) - { - SetLastError(0xdeadbeef); - ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), FALSE); - ok(!ret && GetLastError() == E_INVALIDARG, - "expected E_INVALIDARG, got %08lx\n", GetLastError()); - SetLastError(0xdeadbeef); - ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); - ok(ret || - broken(!ret && GetLastError() == NTE_PERM), /* some NT4 */ - "CryptMsgUpdate failed: %08lx\n", GetLastError()); - CryptMsgClose(msg); - } + ok(msg != NULL, "CryptMsgOpenToEncode failed: %08lx\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), FALSE); + ok(!ret && GetLastError() == E_INVALIDARG, + "expected E_INVALIDARG, got %08lx\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); + ok(ret, "CryptMsgUpdate failed: %08lx\n", GetLastError()); + CryptMsgClose(msg); + SetLastError(0xdeadbeef); msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_ENVELOPED, &envelopedInfo, NULL, &streamInfo); - ok(msg != NULL || - broken(!msg), /* Win9x */ - "CryptMsgOpenToEncode failed: %08lx\n", GetLastError()); - if (msg) - { - SetLastError(0xdeadbeef); - ret = CryptMsgUpdate(msg, NULL, 0, FALSE); - ok(ret, "CryptMsgUpdate failed: %08lx\n", GetLastError()); - SetLastError(0xdeadbeef); - ret = CryptMsgUpdate(msg, NULL, 0, TRUE); - ok(ret, "CryptMsgUpdate failed: %08lx\n", GetLastError()); - CryptMsgClose(msg); - } + ok(msg != NULL, "CryptMsgOpenToEncode failed: %08lx\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, NULL, 0, FALSE); + ok(ret, "CryptMsgUpdate failed: %08lx\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, NULL, 0, TRUE); + ok(ret, "CryptMsgUpdate failed: %08lx\n", GetLastError()); + CryptMsgClose(msg); + SetLastError(0xdeadbeef); msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_ENVELOPED, &envelopedInfo, NULL, &streamInfo); - ok(msg != NULL || - broken(!msg), /* Win9x */ - "CryptMsgOpenToEncode failed: %08lx\n", GetLastError()); - if (msg) - { - SetLastError(0xdeadbeef); - ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), FALSE); - ok(ret, "CryptMsgUpdate failed: %08lx\n", GetLastError()); - SetLastError(0xdeadbeef); - ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); - ok(ret || - broken(!ret && GetLastError() == NTE_PERM), /* some NT4 */ - "CryptMsgUpdate failed: %08lx\n", GetLastError()); - CryptMsgClose(msg); - } + ok(msg != NULL, "CryptMsgOpenToEncode failed: %08lx\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), FALSE); + ok(ret, "CryptMsgUpdate failed: %08lx\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); + ok(ret, "CryptMsgUpdate failed: %08lx\n", GetLastError()); + CryptMsgClose(msg); } static const BYTE envelopedEmptyBareContent[] = { @@ -2230,18 +2134,13 @@ static void test_enveloped_msg_encoding(void) SetLastError(0xdeadbeef); msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_ENVELOPED, &envelopedInfo, NULL, NULL); - ok(msg != NULL || - broken(!msg), /* Win9x */ - "CryptMsgOpenToEncode failed: %08lx\n", GetLastError()); - if (msg) - { - check_param("enveloped empty bare content", msg, - CMSG_BARE_CONTENT_PARAM, envelopedEmptyBareContent, - sizeof(envelopedEmptyBareContent)); - check_param("enveloped empty content", msg, CMSG_CONTENT_PARAM, - envelopedEmptyContent, sizeof(envelopedEmptyContent)); - CryptMsgClose(msg); - } + ok(msg != NULL, "CryptMsgOpenToEncode failed: %08lx\n", GetLastError()); + check_param("enveloped empty bare content", msg, + CMSG_BARE_CONTENT_PARAM, envelopedEmptyBareContent, + sizeof(envelopedEmptyBareContent)); + check_param("enveloped empty content", msg, CMSG_CONTENT_PARAM, + envelopedEmptyContent, sizeof(envelopedEmptyContent)); + CryptMsgClose(msg); } static void test_enveloped_msg(void) @@ -2311,33 +2210,23 @@ static void test_decode_msg_update(void) ok(ret, "CryptMsgUpdate failed: %lx\n", GetLastError()); CryptMsgClose(msg); - if (!old_crypt32) - { - msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, &streamInfo); - /* Updating a message that has a NULL stream callback fails */ - SetLastError(0xdeadbeef); - /* Crashes on some Win9x */ - ret = CryptMsgUpdate(msg, dataEmptyContent, sizeof(dataEmptyContent), - FALSE); - todo_wine - ok(!ret && (GetLastError() == STATUS_ACCESS_VIOLATION || - GetLastError() == STATUS_ILLEGAL_INSTRUCTION /* WinME */), - "Expected STATUS_ACCESS_VIOLATION or STATUS_ILLEGAL_INSTRUCTION, got %lx\n", - GetLastError()); - /* Changing the callback pointer after the fact yields the same error (so - * the message must copy the stream info, not just store a pointer to it) - */ - streamInfo.pfnStreamOutput = nop_stream_output; - SetLastError(0xdeadbeef); - ret = CryptMsgUpdate(msg, dataEmptyContent, sizeof(dataEmptyContent), - FALSE); - todo_wine - ok(!ret && (GetLastError() == STATUS_ACCESS_VIOLATION || - GetLastError() == STATUS_ILLEGAL_INSTRUCTION /* WinME */), - "Expected STATUS_ACCESS_VIOLATION or STATUS_ILLEGAL_INSTRUCTION, got %lx\n", - GetLastError()); - CryptMsgClose(msg); - } + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, &streamInfo); + /* Updating a message that has a NULL stream callback fails */ + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, dataEmptyContent, sizeof(dataEmptyContent), FALSE); + todo_wine + ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, + "Expected STATUS_ACCESS_VIOLATION, got %lx\n", GetLastError()); + /* Changing the callback pointer after the fact yields the same error (so + * the message must copy the stream info, not just store a pointer to it) + */ + streamInfo.pfnStreamOutput = nop_stream_output; + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, dataEmptyContent, sizeof(dataEmptyContent), FALSE); + todo_wine + ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, + "Expected STATUS_ACCESS_VIOLATION or STATUS_ILLEGAL_INSTRUCTION, got %lx\n", GetLastError()); + CryptMsgClose(msg); /* Empty non-final updates are allowed when streaming.. */ msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, &streamInfo); @@ -2369,9 +2258,8 @@ static void test_decode_msg_update(void) msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); - ok(!ret && (GetLastError() == CRYPT_E_ASN1_BADTAG || - GetLastError() == OSS_PDU_MISMATCH /* Win9x */), - "Expected CRYPT_E_ASN1_BADTAG or OSS_PDU_MISMATCH, got %lx\n", + ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, + "Expected CRYPT_E_ASN1_BADTAG, got %lx\n", GetLastError()); CryptMsgClose(msg); /* and as the final update in streaming mode.. */ @@ -2379,9 +2267,8 @@ static void test_decode_msg_update(void) msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, &streamInfo); SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); - ok(!ret && (GetLastError() == CRYPT_E_ASN1_BADTAG || - GetLastError() == OSS_PDU_MISMATCH /* Win9x */), - "Expected CRYPT_E_ASN1_BADTAG or OSS_PDU_MISMATCH, got %lx\n", + ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, + "Expected CRYPT_E_ASN1_BADTAG, got %lx\n", GetLastError()); CryptMsgClose(msg); /* and even as a non-final update in streaming mode. */ @@ -2390,10 +2277,8 @@ static void test_decode_msg_update(void) SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), FALSE); todo_wine - ok(!ret && (GetLastError() == CRYPT_E_ASN1_BADTAG || - GetLastError() == OSS_PDU_MISMATCH /* Win9x */), - "Expected CRYPT_E_ASN1_BADTAG or OSS_PDU_MISMATCH, got %lx\n", - GetLastError()); + ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, + "Expected CRYPT_E_ASN1_BADTAG, got %lx\n", GetLastError()); CryptMsgClose(msg); /* An empty message can be opened with undetermined type.. */ @@ -2408,10 +2293,8 @@ static void test_decode_msg_update(void) SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, dataEmptyContent, sizeof(dataEmptyContent), TRUE); - ok(!ret && (GetLastError() == CRYPT_E_ASN1_BADTAG || - GetLastError() == OSS_PDU_MISMATCH /* Win9x */), - "Expected CRYPT_E_ASN1_BADTAG or OSS_PDU_MISMATCH, got %lx\n", - GetLastError()); + ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, + "Expected CRYPT_E_ASN1_BADTAG, got %lx\n", GetLastError()); CryptMsgClose(msg); /* On the other hand, decoding the bare content of an empty message fails * with unspecified type.. @@ -2420,10 +2303,8 @@ static void test_decode_msg_update(void) SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, dataEmptyBareContent, sizeof(dataEmptyBareContent), TRUE); - ok(!ret && (GetLastError() == CRYPT_E_ASN1_BADTAG || - GetLastError() == OSS_PDU_MISMATCH /* Win9x */), - "Expected CRYPT_E_ASN1_BADTAG or OSS_PDU_MISMATCH, got %lx\n", - GetLastError()); + ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, + "Expected CRYPT_E_ASN1_BADTAG, got %lx\n", GetLastError()); CryptMsgClose(msg); /* but succeeds with explicit type. */ msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, CMSG_DATA, 0, NULL, @@ -2445,19 +2326,15 @@ static void test_decode_msg_update(void) msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, hashEmptyContent, sizeof(hashEmptyContent), TRUE); - ok(ret || broken(GetLastError() == OSS_DATA_ERROR /* Win9x */), - "CryptMsgUpdate failed: %08lx\n", GetLastError()); + ok(ret, "CryptMsgUpdate failed: %08lx\n", GetLastError()); CryptMsgClose(msg); /* while with specified type it fails. */ msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, CMSG_HASHED, 0, NULL, NULL); SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, hashEmptyContent, sizeof(hashEmptyContent), TRUE); - ok(!ret && (GetLastError() == CRYPT_E_ASN1_BADTAG || - GetLastError() == OSS_PDU_MISMATCH /* some Win9x */ || - GetLastError() == OSS_DATA_ERROR /* some Win9x */), - "Expected CRYPT_E_ASN1_BADTAG or OSS_PDU_MISMATCH or OSS_DATA_ERROR, got %lx\n", - GetLastError()); + ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, + "Expected CRYPT_E_ASN1_BADTAG, got %lx\n", GetLastError()); CryptMsgClose(msg); /* On the other hand, decoding the bare content of an empty hash message * fails with unspecified type.. @@ -2466,19 +2343,15 @@ static void test_decode_msg_update(void) SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, hashEmptyBareContent, sizeof(hashEmptyBareContent), TRUE); - ok(!ret && (GetLastError() == CRYPT_E_ASN1_BADTAG || - GetLastError() == OSS_PDU_MISMATCH /* some Win9x */ || - GetLastError() == OSS_DATA_ERROR /* some Win9x */), - "Expected CRYPT_E_ASN1_BADTAG or OSS_PDU_MISMATCH or OSS_DATA_ERROR, got %lx\n", - GetLastError()); + ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, + "Expected CRYPT_E_ASN1_BADTAG, got %lx\n", GetLastError()); CryptMsgClose(msg); /* but succeeds with explicit type. */ msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, CMSG_HASHED, 0, NULL, NULL); ret = CryptMsgUpdate(msg, hashEmptyBareContent, sizeof(hashEmptyBareContent), TRUE); - ok(ret || broken(GetLastError() == OSS_DATA_ERROR /* win9x */), - "CryptMsgUpdate failed: %lx\n", GetLastError()); + ok(ret, "CryptMsgUpdate failed: %lx\n", GetLastError()); CryptMsgClose(msg); /* And again, opening a (non-empty) hash message with unspecified type @@ -2494,11 +2367,8 @@ static void test_decode_msg_update(void) NULL); SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, hashContent, sizeof(hashContent), TRUE); - ok(!ret && (GetLastError() == CRYPT_E_ASN1_BADTAG || - GetLastError() == OSS_PDU_MISMATCH /* some Win9x */ || - GetLastError() == OSS_DATA_ERROR /* some Win9x */), - "Expected CRYPT_E_ASN1_BADTAG or OSS_PDU_MISMATCH or OSS_DATA_ERROR, got %lx\n", - GetLastError()); + ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, + "Expected CRYPT_E_ASN1_BADTAG, got %lx\n", GetLastError()); CryptMsgClose(msg); /* and decoding the bare content of a non-empty hash message fails with * unspecified type.. @@ -2506,10 +2376,8 @@ static void test_decode_msg_update(void) msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, hashBareContent, sizeof(hashBareContent), TRUE); - ok(!ret && (GetLastError() == CRYPT_E_ASN1_BADTAG || - GetLastError() == OSS_PDU_MISMATCH /* some Win9x */ || - GetLastError() == OSS_DATA_ERROR /* some Win9x */), - "Expected CRYPT_E_ASN1_BADTAG or OSS_PDU_MISMATCH or OSS_DATA_ERROR, got %lx\n", + ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, + "Expected CRYPT_E_ASN1_BADTAG, got %lx\n", GetLastError()); CryptMsgClose(msg); /* but succeeds with explicit type. */ @@ -2536,10 +2404,8 @@ static void test_decode_msg_update(void) SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, signedWithCertAndCrlBareContent, sizeof(signedWithCertAndCrlBareContent), TRUE); - ok(!ret && (GetLastError() == CRYPT_E_ASN1_BADTAG || - GetLastError() == OSS_DATA_ERROR /* Win9x */), - "Expected CRYPT_E_ASN1_BADTAG or OSS_DATA_ERROR, got %08lx\n", - GetLastError()); + ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, + "Expected CRYPT_E_ASN1_BADTAG, got %08lx\n", GetLastError()); CryptMsgClose(msg); msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, CMSG_SIGNED, 0, NULL, NULL); @@ -2593,9 +2459,7 @@ static void test_decode_msg_update(void) SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, envelopedEmptyContent, sizeof(envelopedEmptyContent), TRUE); - ok(!ret && - (GetLastError() == CRYPT_E_ASN1_BADTAG || - GetLastError() == OSS_DATA_ERROR), /* Win9x */ + ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, "expected CRYPT_E_ASN1_BADTAG, got %08lx\n", GetLastError()); CryptMsgClose(msg); @@ -2603,9 +2467,7 @@ static void test_decode_msg_update(void) SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, envelopedEmptyBareContent, sizeof(envelopedEmptyBareContent), TRUE); - ok(!ret && - (GetLastError() == CRYPT_E_ASN1_BADTAG || - GetLastError() == OSS_DATA_ERROR), /* Win9x */ + ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, "expected CRYPT_E_ASN1_BADTAG, got %08lx\n", GetLastError()); CryptMsgClose(msg); @@ -2844,14 +2706,12 @@ static void test_decode_msg_get_param(void) msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); ret = CryptMsgUpdate(msg, hashEmptyContent, sizeof(hashEmptyContent), TRUE); - if (ret) - { - /* Crashes on some Win9x */ - check_param("empty hash content", msg, CMSG_CONTENT_PARAM, NULL, 0); - check_param("empty hash hash data", msg, CMSG_HASH_DATA_PARAM, NULL, 0); - check_param("empty hash computed hash", msg, CMSG_COMPUTED_HASH_PARAM, - emptyHashParam, sizeof(emptyHashParam)); - } + + check_param("empty hash content", msg, CMSG_CONTENT_PARAM, NULL, 0); + check_param("empty hash hash data", msg, CMSG_HASH_DATA_PARAM, NULL, 0); + check_param("empty hash computed hash", msg, CMSG_COMPUTED_HASH_PARAM, + emptyHashParam, sizeof(emptyHashParam)); + CryptMsgClose(msg); msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); ret = CryptMsgUpdate(msg, hashContent, sizeof(hashContent), TRUE); @@ -2862,16 +2722,10 @@ static void test_decode_msg_get_param(void) sizeof(hashParam)); check_param("hash computed hash", msg, CMSG_COMPUTED_HASH_PARAM, hashParam, sizeof(hashParam)); - /* Curiously, on NT-like systems, getting the hash of index 1 succeeds, - * even though there's only one hash. - */ + ret = CryptMsgGetParam(msg, CMSG_COMPUTED_HASH_PARAM, 1, NULL, &size); - ok(ret || GetLastError() == OSS_DATA_ERROR /* Win9x */, - "CryptMsgGetParam failed: %08lx\n", GetLastError()); - if (ret) - buf = CryptMemAlloc(size); - else - buf = NULL; + ok(ret, "CryptMsgGetParam failed: %08lx\n", GetLastError()); + buf = CryptMemAlloc(size); if (buf) { ret = CryptMsgGetParam(msg, CMSG_COMPUTED_HASH_PARAM, 1, buf, &size); @@ -2901,12 +2755,8 @@ static void test_decode_msg_get_param(void) ok(value == 1, "Expected 1 signer, got %ld\n", value); size = 0; ret = CryptMsgGetParam(msg, CMSG_SIGNER_INFO_PARAM, 0, NULL, &size); - ok(ret || broken(GetLastError() == OSS_DATA_ERROR /* Win9x */), - "CryptMsgGetParam failed: %08lx\n", GetLastError()); - if (ret) - buf = CryptMemAlloc(size); - else - buf = NULL; + ok(ret, "CryptMsgGetParam failed: %08lx\n", GetLastError()); + buf = CryptMemAlloc(size); if (buf) { CMSG_SIGNER_INFO signer = { 0 }; @@ -2927,12 +2777,8 @@ static void test_decode_msg_get_param(void) /* Getting the CMS signer info of a PKCS7 message is possible. */ size = 0; ret = CryptMsgGetParam(msg, CMSG_CMS_SIGNER_INFO_PARAM, 0, NULL, &size); - ok(ret || broken(GetLastError() == CRYPT_E_INVALID_MSG_TYPE /* Win9x */), - "CryptMsgGetParam failed: %08lx\n", GetLastError()); - if (ret) - buf = CryptMemAlloc(size); - else - buf = NULL; + ok(ret, "CryptMsgGetParam failed: %08lx\n", GetLastError()); + buf = CryptMemAlloc(size); if (buf) { CMSG_CMS_SIGNER_INFO signer = { 0 }; @@ -2983,12 +2829,6 @@ static void test_decode_msg_get_param(void) msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); ret = CryptMsgUpdate(msg, signedKeyIdEmptyContent, sizeof(signedKeyIdEmptyContent), TRUE); - if (!ret && GetLastError() == OSS_DATA_ERROR) - { - CryptMsgClose(msg); - win_skip("Subsequent tests crash on some Win9x\n"); - return; - } ok(ret, "CryptMsgUpdate failed: %08lx\n", GetLastError()); size = sizeof(value); ret = CryptMsgGetParam(msg, CMSG_SIGNER_COUNT_PARAM, 0, &value, &size); @@ -3000,10 +2840,7 @@ static void test_decode_msg_get_param(void) size = 0; ret = CryptMsgGetParam(msg, CMSG_SIGNER_INFO_PARAM, 0, NULL, &size); ok(ret, "CryptMsgGetParam failed: %08lx\n", GetLastError()); - if (ret) - buf = CryptMemAlloc(size); - else - buf = NULL; + buf = CryptMemAlloc(size); if (buf) { CMSG_SIGNER_INFO signer; @@ -3027,10 +2864,7 @@ static void test_decode_msg_get_param(void) size = 0; ret = CryptMsgGetParam(msg, CMSG_CMS_SIGNER_INFO_PARAM, 0, NULL, &size); ok(ret, "CryptMsgGetParam failed: %08lx\n", GetLastError()); - if (ret) - buf = CryptMemAlloc(size); - else - buf = NULL; + buf = CryptMemAlloc(size); if (buf) { CMSG_CMS_SIGNER_INFO signer = { 0 }; @@ -3065,30 +2899,23 @@ static void test_decode_msg_get_param(void) SetLastError(0xdeadbeef); ret = CryptImportKey(hCryptProv, publicPrivateKeyPair, sizeof(publicPrivateKeyPair), 0, 0, &key); - ok(ret || - broken(!ret && GetLastError() == NTE_PERM), /* WinME and some NT4 */ - "CryptImportKey failed: %08lx\n", GetLastError()); + ok(ret, "CryptImportKey failed: %08lx\n", GetLastError()); msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); CryptMsgUpdate(msg, envelopedMessage, sizeof(envelopedMessage), TRUE); check_param("enveloped message before decrypting", msg, CMSG_CONTENT_PARAM, envelopedMessage + sizeof(envelopedMessage) - 4, 4); - if (key) - { - decryptPara.hCryptProv = hCryptProv; - SetLastError(0xdeadbeef); - ret = CryptMsgControl(msg, 0, CMSG_CTRL_DECRYPT, &decryptPara); - ok(ret, "CryptMsgControl failed: %08lx\n", GetLastError()); - decryptPara.hCryptProv = 0; - SetLastError(0xdeadbeef); - ret = CryptMsgControl(msg, 0, CMSG_CTRL_DECRYPT, &decryptPara); - ok(!ret && GetLastError() == CRYPT_E_ALREADY_DECRYPTED, - "expected CRYPT_E_ALREADY_DECRYPTED, got %08lx\n", GetLastError()); - check_param("enveloped message", msg, CMSG_CONTENT_PARAM, msgData, - sizeof(msgData)); - } - else - win_skip("failed to import a key, skipping tests\n"); + + decryptPara.hCryptProv = hCryptProv; + SetLastError(0xdeadbeef); + ret = CryptMsgControl(msg, 0, CMSG_CTRL_DECRYPT, &decryptPara); + ok(ret, "CryptMsgControl failed: %08lx\n", GetLastError()); + decryptPara.hCryptProv = 0; + SetLastError(0xdeadbeef); + ret = CryptMsgControl(msg, 0, CMSG_CTRL_DECRYPT, &decryptPara); + ok(!ret && GetLastError() == CRYPT_E_ALREADY_DECRYPTED, + "expected CRYPT_E_ALREADY_DECRYPTED, got %08lx\n", GetLastError()); + check_param("enveloped message", msg, CMSG_CONTENT_PARAM, msgData, sizeof(msgData)); CryptMsgClose(msg); msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, CMSG_ENVELOPED, 0, NULL, @@ -3098,17 +2925,12 @@ static void test_decode_msg_get_param(void) check_param("enveloped bare message before decrypting", msg, CMSG_CONTENT_PARAM, envelopedBareMessage + sizeof(envelopedBareMessage) - 4, 4); - if (key) - { - decryptPara.hCryptProv = hCryptProv; - SetLastError(0xdeadbeef); - ret = CryptMsgControl(msg, 0, CMSG_CTRL_DECRYPT, &decryptPara); - ok(ret, "CryptMsgControl failed: %08lx\n", GetLastError()); - check_param("enveloped bare message", msg, CMSG_CONTENT_PARAM, msgData, - sizeof(msgData)); - } - else - win_skip("failed to import a key, skipping tests\n"); + + decryptPara.hCryptProv = hCryptProv; + SetLastError(0xdeadbeef); + ret = CryptMsgControl(msg, 0, CMSG_CTRL_DECRYPT, &decryptPara); + ok(ret, "CryptMsgControl failed: %08lx\n", GetLastError()); + check_param("enveloped bare message", msg, CMSG_CONTENT_PARAM, msgData, sizeof(msgData)); CryptMsgClose(msg); if (key) @@ -3191,7 +3013,7 @@ static void test_msg_control(void) msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_DATA, NULL, NULL, NULL); /* either with no prior update.. */ - for (i = 1; !old_crypt32 && (i <= CMSG_CTRL_ADD_CMS_SIGNER_INFO); i++) + for (i = 1; i <= CMSG_CTRL_ADD_CMS_SIGNER_INFO; i++) { SetLastError(0xdeadbeef); ret = CryptMsgControl(msg, 0, i, NULL); @@ -3201,7 +3023,7 @@ static void test_msg_control(void) ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); ok(ret, "CryptMsgUpdate failed: %08lx\n", GetLastError()); /* or after an update. */ - for (i = 1; !old_crypt32 && (i <= CMSG_CTRL_ADD_CMS_SIGNER_INFO); i++) + for (i = 1; i <= CMSG_CTRL_ADD_CMS_SIGNER_INFO; i++) { SetLastError(0xdeadbeef); ret = CryptMsgControl(msg, 0, i, NULL); @@ -3216,7 +3038,7 @@ static void test_msg_control(void) msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_HASHED, &hashInfo, NULL, NULL); /* either with no prior update.. */ - for (i = 1; !old_crypt32 && (i <= CMSG_CTRL_ADD_CMS_SIGNER_INFO); i++) + for (i = 1; i <= CMSG_CTRL_ADD_CMS_SIGNER_INFO; i++) { SetLastError(0xdeadbeef); ret = CryptMsgControl(msg, 0, i, NULL); @@ -3226,7 +3048,7 @@ static void test_msg_control(void) ret = CryptMsgUpdate(msg, NULL, 0, TRUE); ok(ret, "CryptMsgUpdate failed: %08lx\n", GetLastError()); /* or after an update. */ - for (i = 1; !old_crypt32 && (i <= CMSG_CTRL_ADD_CMS_SIGNER_INFO); i++) + for (i = 1; i <= CMSG_CTRL_ADD_CMS_SIGNER_INFO; i++) { SetLastError(0xdeadbeef); ret = CryptMsgControl(msg, 0, i, NULL); @@ -3240,7 +3062,7 @@ static void test_msg_control(void) msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_SIGNED, &signInfo, NULL, NULL); /* either before an update.. */ - for (i = 1; !old_crypt32 && (i <= CMSG_CTRL_ADD_CMS_SIGNER_INFO); i++) + for (i = 1; i <= CMSG_CTRL_ADD_CMS_SIGNER_INFO; i++) { SetLastError(0xdeadbeef); ret = CryptMsgControl(msg, 0, i, NULL); @@ -3250,7 +3072,7 @@ static void test_msg_control(void) ret = CryptMsgUpdate(msg, NULL, 0, TRUE); ok(ret, "CryptMsgUpdate failed: %08lx\n", GetLastError()); /* or after an update. */ - for (i = 1; !old_crypt32 && (i <= CMSG_CTRL_ADD_CMS_SIGNER_INFO); i++) + for (i = 1; i <= CMSG_CTRL_ADD_CMS_SIGNER_INFO; i++) { SetLastError(0xdeadbeef); ret = CryptMsgControl(msg, 0, i, NULL); @@ -3284,31 +3106,25 @@ static void test_msg_control(void) "Expected CRYPT_E_INVALID_MSG_TYPE, got %08lx\n", GetLastError()); CryptMsgClose(msg); - if (!old_crypt32) - { - msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, CMSG_HASHED, 0, NULL, - NULL); - /* Can't verify the hash of an empty message */ - SetLastError(0xdeadbeef); - /* Crashes on some Win9x */ - ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_HASH, NULL); - todo_wine - ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, - "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", GetLastError()); - /* Crashes - ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_SIGNATURE, NULL); - */ - /* Can't verify the signature of a hash message */ - ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_SIGNATURE, &certInfo); - ok(!ret && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, - "Expected CRYPT_E_INVALID_MSG_TYPE, got %08lx\n", GetLastError()); - CryptMsgUpdate(msg, hashEmptyBareContent, sizeof(hashEmptyBareContent), - TRUE); - /* Oddly enough, this fails, crashes on some Win9x */ - ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_HASH, NULL); - ok(!ret, "Expected failure\n"); - CryptMsgClose(msg); - } + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, CMSG_HASHED, 0, NULL, NULL); + /* Can't verify the hash of an empty message */ + SetLastError(0xdeadbeef); + ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_HASH, NULL); + todo_wine + ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, + "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", GetLastError()); + /* Crashes + ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_SIGNATURE, NULL); + */ + /* Can't verify the signature of a hash message */ + ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_SIGNATURE, &certInfo); + ok(!ret && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, + "Expected CRYPT_E_INVALID_MSG_TYPE, got %08lx\n", GetLastError()); + CryptMsgUpdate(msg, hashEmptyBareContent, sizeof(hashEmptyBareContent), TRUE); + ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_HASH, NULL); + ok(!ret, "Expected failure\n"); + CryptMsgClose(msg); + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, CMSG_HASHED, 0, NULL, NULL); CryptMsgUpdate(msg, hashBareContent, sizeof(hashBareContent), TRUE); @@ -3344,10 +3160,7 @@ static void test_msg_control(void) SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); todo_wine - ok(!ret && - (GetLastError() == NTE_BAD_HASH_STATE || - GetLastError() == NTE_BAD_ALGID || /* Win9x */ - GetLastError() == CRYPT_E_MSG_ERROR), /* Vista */ + ok(!ret && (GetLastError() == NTE_BAD_HASH_STATE || GetLastError() == CRYPT_E_MSG_ERROR), /* Vista */ "Expected NTE_BAD_HASH_STATE or NTE_BAD_ALGID or CRYPT_E_MSG_ERROR, " "got %08lx\n", GetLastError()); CryptMsgClose(msg); @@ -3393,10 +3206,8 @@ static void test_msg_control(void) */ SetLastError(0xdeadbeef); ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_SIGNATURE, &certInfo); - ok(!ret && (GetLastError() == CRYPT_E_SIGNER_NOT_FOUND || - GetLastError() == OSS_DATA_ERROR /* Win9x */), - "Expected CRYPT_E_SIGNER_NOT_FOUND or OSS_DATA_ERROR, got %08lx\n", - GetLastError()); + ok(!ret && GetLastError() == CRYPT_E_SIGNER_NOT_FOUND, + "Expected CRYPT_E_SIGNER_NOT_FOUND, got %08lx\n", GetLastError()); /* The cert info is expected to have an issuer, serial number, and public * key info set. */ @@ -3406,9 +3217,8 @@ static void test_msg_control(void) certInfo.Issuer.pbData = encodedCommonName; SetLastError(0xdeadbeef); ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_SIGNATURE, &certInfo); - ok(!ret && (GetLastError() == CRYPT_E_ASN1_EOD || - GetLastError() == OSS_DATA_ERROR /* Win9x */), - "Expected CRYPT_E_ASN1_EOD or OSS_DATA_ERROR, got %08lx\n", GetLastError()); + ok(!ret && GetLastError() == CRYPT_E_ASN1_EOD, + "Expected CRYPT_E_ASN1_EOD, got %08lx\n", GetLastError()); CryptMsgClose(msg); /* This cert has a public key, but it's not in a usable form */ msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, CMSG_SIGNED, 0, NULL, @@ -3417,7 +3227,6 @@ static void test_msg_control(void) sizeof(signedWithCertWithPubKeyBareContent), TRUE); if (ret) { - /* Crashes on some Win9x */ /* Again, cert info needs to have a public key set */ SetLastError(0xdeadbeef); ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_SIGNATURE, &certInfo); @@ -3471,7 +3280,6 @@ static void test_msg_control(void) certInfo.SubjectPublicKeyInfo.PublicKey.cbData = sizeof(pubKey); certInfo.SubjectPublicKeyInfo.PublicKey.pbData = pubKey; SetLastError(0xdeadbeef); - /* Crashes on some Win9x */ ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_SIGNATURE, &certInfo); ok(!ret && (GetLastError() == NTE_BAD_SIGNATURE || @@ -3484,8 +3292,7 @@ static void test_msg_control(void) CryptMsgUpdate(msg, signedWithCertWithValidPubKeyContent, sizeof(signedWithCertWithValidPubKeyContent), TRUE); ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_SIGNATURE, &certInfo); - ok(ret || broken(GetLastError() == OSS_DATA_ERROR /* Win9x */), - "CryptMsgControl failed: %08lx\n", GetLastError()); + ok(ret, "CryptMsgControl failed: %08lx\n", GetLastError()); CryptMsgClose(msg); /* Test verifying signature of a detached signed message */ @@ -3497,21 +3304,15 @@ static void test_msg_control(void) /* Can't verify the sig without having updated the data */ SetLastError(0xdeadbeef); ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_SIGNATURE, &certInfo); - ok(!ret && (GetLastError() == NTE_BAD_SIGNATURE || - GetLastError() == OSS_DATA_ERROR /* Win9x */), - "expected NTE_BAD_SIGNATURE or OSS_DATA_ERROR, got %08lx\n", + ok(!ret && GetLastError() == NTE_BAD_SIGNATURE, + "expected NTE_BAD_SIGNATURE, got %08lx\n", GetLastError()); /* Now that the signature's been checked, can't do the final update */ SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); todo_wine - ok((!ret && - (GetLastError() == NTE_BAD_HASH_STATE || - GetLastError() == NTE_BAD_ALGID || /* Win9x */ - GetLastError() == CRYPT_E_MSG_ERROR)) || /* Vista */ - broken(ret), /* Win9x */ - "expected NTE_BAD_HASH_STATE or NTE_BAD_ALGID or CRYPT_E_MSG_ERROR, " - "got %08lx\n", GetLastError()); + ok(!ret && (GetLastError() == NTE_BAD_HASH_STATE || GetLastError() == CRYPT_E_MSG_ERROR), /* Vista */ + "expected NTE_BAD_HASH_STATE or CRYPT_E_MSG_ERROR, got %08lx\n", GetLastError()); CryptMsgClose(msg); /* Updating with the detached portion of the message and the data of the * the message allows the sig to be verified. @@ -3524,8 +3325,7 @@ static void test_msg_control(void) ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); ok(ret, "CryptMsgUpdate failed: %08lx\n", GetLastError()); ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_SIGNATURE, &certInfo); - ok(ret || broken(GetLastError() == OSS_DATA_ERROR /* Win9x */), - "CryptMsgControl failed: %08lx\n", GetLastError()); + ok(ret, "CryptMsgControl failed: %08lx\n", GetLastError()); CryptMsgClose(msg); msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, CMSG_ENVELOPED, 0, NULL, @@ -3536,13 +3336,12 @@ static void test_msg_control(void) ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08lx\n", GetLastError()); decryptPara.cbSize = sizeof(decryptPara); - if (!old_crypt32) - { - SetLastError(0xdeadbeef); - ret = CryptMsgControl(msg, 0, CMSG_CTRL_DECRYPT, &decryptPara); - ok(!ret && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, - "expected CRYPT_E_INVALID_MSG_TYPE, got %08lx\n", GetLastError()); - } + + SetLastError(0xdeadbeef); + ret = CryptMsgControl(msg, 0, CMSG_CTRL_DECRYPT, &decryptPara); + ok(!ret && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, + "expected CRYPT_E_INVALID_MSG_TYPE, got %08lx\n", GetLastError()); + SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, envelopedEmptyBareContent, sizeof(envelopedEmptyBareContent), TRUE); @@ -3616,7 +3415,6 @@ static void test_msg_get_and_verify_signer(void) ret = CryptMsgUpdate(msg, signedEmptyContent, sizeof(signedEmptyContent), TRUE); if (ret) { - /* Crashes on most Win9x */ ret = CryptMsgGetAndVerifySigner(msg, 0, NULL, 0, NULL, NULL); ok(!ret && GetLastError() == CRYPT_E_NO_TRUSTED_SIGNER, "expected CRYPT_E_NO_TRUSTED_SIGNER, got 0x%08lx\n", GetLastError()); @@ -3628,20 +3426,17 @@ static void test_msg_get_and_verify_signer(void) CryptMsgUpdate(msg, signedWithCertWithValidPubKeyContent, sizeof(signedWithCertWithValidPubKeyContent), TRUE); ret = CryptMsgGetAndVerifySigner(msg, 0, NULL, 0, NULL, NULL); - ok(ret || broken(GetLastError() == OSS_DATA_ERROR /* Win9x */), - "CryptMsgGetAndVerifySigner failed: 0x%08lx\n", GetLastError()); + ok(ret, "CryptMsgGetAndVerifySigner failed: 0x%08lx\n", GetLastError()); /* the signer index can be retrieved, .. */ signerIndex = 0xdeadbeef; ret = CryptMsgGetAndVerifySigner(msg, 0, NULL, 0, NULL, &signerIndex); - ok(ret || broken(GetLastError() == OSS_DATA_ERROR /* Win9x */), - "CryptMsgGetAndVerifySigner failed: 0x%08lx\n", GetLastError()); + ok(ret, "CryptMsgGetAndVerifySigner failed: 0x%08lx\n", GetLastError()); if (ret) ok(signerIndex == 0, "expected 0, got %ld\n", signerIndex); /* as can the signer cert. */ signer = (PCCERT_CONTEXT)0xdeadbeef; ret = CryptMsgGetAndVerifySigner(msg, 0, NULL, 0, &signer, NULL); - ok(ret || broken(GetLastError() == OSS_DATA_ERROR /* Win9x */), - "CryptMsgGetAndVerifySigner failed: 0x%08lx\n", GetLastError()); + ok(ret, "CryptMsgGetAndVerifySigner failed: 0x%08lx\n", GetLastError()); if (ret) ok(signer != NULL && signer != (PCCERT_CONTEXT)0xdeadbeef, "expected a valid signer\n"); @@ -3661,8 +3456,7 @@ static void test_msg_get_and_verify_signer(void) SetLastError(0xdeadbeef); ret = CryptMsgGetAndVerifySigner(msg, 0, NULL, CMSG_TRUSTED_SIGNER_FLAG, NULL, NULL); - ok(!ret && (GetLastError() == CRYPT_E_NO_TRUSTED_SIGNER || - broken(GetLastError() == OSS_DATA_ERROR /* Win9x */)), + ok(!ret && GetLastError() == CRYPT_E_NO_TRUSTED_SIGNER, "expected CRYPT_E_NO_TRUSTED_SIGNER, got 0x%08lx\n", GetLastError()); /* Specifying CMSG_TRUSTED_SIGNER_FLAG and an empty cert store also causes * the message signer not to be found. @@ -3672,35 +3466,25 @@ static void test_msg_get_and_verify_signer(void) SetLastError(0xdeadbeef); ret = CryptMsgGetAndVerifySigner(msg, 1, &store, CMSG_TRUSTED_SIGNER_FLAG, NULL, NULL); - ok(!ret && (GetLastError() == CRYPT_E_NO_TRUSTED_SIGNER || - broken(GetLastError() == OSS_DATA_ERROR /* Win9x */)), + ok(!ret && GetLastError() == CRYPT_E_NO_TRUSTED_SIGNER, "expected CRYPT_E_NO_TRUSTED_SIGNER, got 0x%08lx\n", GetLastError()); ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, v1CertWithValidPubKey, sizeof(v1CertWithValidPubKey), CERT_STORE_ADD_ALWAYS, NULL); - ok(ret || broken(GetLastError() == OSS_DATA_ERROR /* Win98 */), - "CertAddEncodedCertificateToStore failed: 0x%08lx\n", GetLastError()); + ok(ret, "CertAddEncodedCertificateToStore failed: 0x%08lx\n", GetLastError()); /* Specifying CMSG_TRUSTED_SIGNER_FLAG with a cert store that contains * the signer succeeds. */ SetLastError(0xdeadbeef); ret = CryptMsgGetAndVerifySigner(msg, 1, &store, CMSG_TRUSTED_SIGNER_FLAG, NULL, NULL); - ok(ret || broken(GetLastError() == OSS_DATA_ERROR /* Win9x */), - "CryptMsgGetAndVerifySigner failed: 0x%08lx\n", GetLastError()); + ok(ret, "CryptMsgGetAndVerifySigner failed: 0x%08lx\n", GetLastError()); CertCloseStore(store, 0); CryptMsgClose(msg); } START_TEST(msg) { - /* I_CertUpdateStore can be used for verification if crypt32 is new enough */ - if (!GetProcAddress(GetModuleHandleA("crypt32.dll"), "I_CertUpdateStore")) - { - win_skip("Some tests will crash on older crypt32 implementations\n"); - old_crypt32 = TRUE; - } - /* Basic parameter checking tests */ test_msg_open_to_encode(); test_msg_open_to_decode(); diff --git a/dlls/crypt32/tests/object.c b/dlls/crypt32/tests/object.c index 8fbba2cd83c..a3c7c8c0743 100644 --- a/dlls/crypt32/tests/object.c +++ b/dlls/crypt32/tests/object.c @@ -26,9 +26,6 @@ #include "wine/test.h" -static BOOL (WINAPI * pCryptQueryObject)(DWORD, const void *, DWORD, DWORD, - DWORD, DWORD *, DWORD *, DWORD *, HCERTSTORE *, HCRYPTMSG *, const void **); - static BYTE bigCert[] = { 0x30,0x7a,0x02,0x01,0x01,0x30,0x02,0x06,0x00,0x30,0x15,0x31, 0x13,0x30,0x11,0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75, @@ -105,12 +102,12 @@ static void test_query_object(void) /* Test the usual invalid arguments */ SetLastError(0xdeadbeef); - ret = pCryptQueryObject(0, NULL, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, + ret = CryptQueryObject(0, NULL, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL); ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08lx\n", GetLastError()); SetLastError(0xdeadbeef); - ret = pCryptQueryObject(CERT_QUERY_OBJECT_BLOB, NULL, 0, 0, 0, NULL, NULL, + ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, NULL, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL); ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08lx\n", GetLastError()); @@ -118,7 +115,7 @@ static void test_query_object(void) blob.pbData = bigCert; blob.cbData = sizeof(bigCert); SetLastError(0xdeadbeef); - ret = pCryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, + ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, CERT_QUERY_CONTENT_FLAG_ALL, CERT_QUERY_FORMAT_FLAG_ALL, 0, NULL, NULL, NULL, NULL, NULL, NULL); ok(ret, "CryptQueryObject failed: %08lx\n", GetLastError()); @@ -126,19 +123,19 @@ static void test_query_object(void) blob.pbData = (BYTE *)bigCertBase64; blob.cbData = sizeof(bigCertBase64); SetLastError(0xdeadbeef); - ret = pCryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, + ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, CERT_QUERY_CONTENT_FLAG_ALL, CERT_QUERY_FORMAT_FLAG_ALL, 0, NULL, NULL, NULL, NULL, NULL, NULL); ok(ret, "CryptQueryObject failed: %08lx\n", GetLastError()); /* The same base64-encoded cert, restricting the format types */ SetLastError(0xdeadbeef); - ret = pCryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, + ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, CERT_QUERY_CONTENT_FLAG_ALL, CERT_QUERY_FORMAT_FLAG_BINARY, 0, NULL, NULL, NULL, NULL, NULL, NULL); ok(!ret && GetLastError() == CRYPT_E_NO_MATCH, "expected CRYPT_E_NO_MATCH, got %08lx\n", GetLastError()); SetLastError(0xdeadbeef); - ret = pCryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, + ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, CERT_QUERY_CONTENT_FLAG_ALL, CERT_QUERY_FORMAT_FLAG_BASE64_ENCODED, 0, NULL, NULL, NULL, NULL, NULL, NULL); ok(ret, "CryptQueryObject failed: %08lx\n", GetLastError()); @@ -146,7 +143,7 @@ static void test_query_object(void) blob.pbData = (BYTE *)bigCertBase64W; blob.cbData = sizeof(bigCertBase64W); SetLastError(0xdeadbeef); - ret = pCryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, + ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, CERT_QUERY_CONTENT_FLAG_ALL, CERT_QUERY_FORMAT_FLAG_ALL, 0, NULL, NULL, NULL, NULL, NULL, NULL); ok(!ret && GetLastError() == CRYPT_E_NO_MATCH, @@ -159,14 +156,14 @@ static void test_query_object(void) blob.pbData = signedWithCertWithValidPubKeyContent; blob.cbData = sizeof(signedWithCertWithValidPubKeyContent); SetLastError(0xdeadbeef); - ret = pCryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, + ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, CERT_QUERY_CONTENT_FLAG_ALL, CERT_QUERY_FORMAT_FLAG_ALL, 0, NULL, NULL, NULL, NULL, NULL, NULL); ok(ret, "CryptQueryObject failed: %08lx\n", GetLastError()); blob.pbData = (BYTE *)signedWithCertWithValidPubKeyContentBase64; blob.cbData = sizeof(signedWithCertWithValidPubKeyContentBase64); SetLastError(0xdeadbeef); - ret = pCryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, + ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, CERT_QUERY_CONTENT_FLAG_ALL, CERT_QUERY_FORMAT_FLAG_ALL, 0, NULL, NULL, NULL, NULL, NULL, NULL); ok(ret, "CryptQueryObject failed: %08lx\n", GetLastError()); @@ -176,18 +173,18 @@ static void test_query_object(void) blob.pbData = (BYTE *)signedWithCertWithValidPubKeyContentBase64W; blob.cbData = sizeof(signedWithCertWithValidPubKeyContentBase64W); SetLastError(0xdeadbeef); - ret = pCryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, + ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, CERT_QUERY_CONTENT_FLAG_ALL, CERT_QUERY_FORMAT_FLAG_ALL, 0, NULL, NULL, NULL, NULL, NULL, NULL); ok(ret, "CryptQueryObject failed: %08lx\n", GetLastError()); SetLastError(0xdeadbeef); - ret = pCryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, + ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, CERT_QUERY_CONTENT_FLAG_ALL, CERT_QUERY_FORMAT_FLAG_BINARY, 0, NULL, NULL, NULL, NULL, NULL, NULL); ok(!ret && GetLastError() == CRYPT_E_NO_MATCH, "expected CRYPT_E_NO_MATCH, got %08lx\n", GetLastError()); SetLastError(0xdeadbeef); - ret = pCryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, + ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, CERT_QUERY_CONTENT_FLAG_ALL, CERT_QUERY_FORMAT_FLAG_BASE64_ENCODED, 0, NULL, NULL, NULL, NULL, NULL, NULL); ok(ret, "CryptQueryObject failed: %08lx\n", GetLastError()); @@ -195,15 +192,5 @@ static void test_query_object(void) START_TEST(object) { - HMODULE mod = GetModuleHandleA("crypt32.dll"); - - pCryptQueryObject = (void *)GetProcAddress(mod, "CryptQueryObject"); - - if (!pCryptQueryObject) - { - win_skip("CryptQueryObject is not available\n"); - return; - } - test_query_object(); } diff --git a/dlls/crypt32/tests/oid.c b/dlls/crypt32/tests/oid.c index 291636be388..9520e8c5a4a 100644 --- a/dlls/crypt32/tests/oid.c +++ b/dlls/crypt32/tests/oid.c @@ -29,73 +29,68 @@ #include "wine/test.h" - -static BOOL (WINAPI *pCryptEnumOIDInfo)(DWORD,DWORD,void*,PFN_CRYPT_ENUM_OID_INFO); - - struct OIDToAlgID { LPCSTR oid; - LPCSTR altOid; DWORD algID; DWORD altAlgID; }; static const struct OIDToAlgID oidToAlgID[] = { - { szOID_RSA_RSA, NULL, CALG_RSA_KEYX }, - { szOID_RSA_MD2RSA, NULL, CALG_MD2 }, - { szOID_RSA_MD4RSA, NULL, CALG_MD4 }, - { szOID_RSA_MD5RSA, NULL, CALG_MD5 }, - { szOID_RSA_SHA1RSA, NULL, CALG_SHA }, - { szOID_RSA_DH, NULL, CALG_DH_SF }, - { szOID_RSA_SMIMEalgESDH, NULL, CALG_DH_EPHEM }, - { szOID_RSA_SMIMEalgCMS3DESwrap, NULL, CALG_3DES }, - { szOID_RSA_SMIMEalgCMSRC2wrap, NULL, CALG_RC2 }, - { szOID_RSA_MD2, NULL, CALG_MD2 }, - { szOID_RSA_MD4, NULL, CALG_MD4 }, - { szOID_RSA_MD5, NULL, CALG_MD5 }, - { szOID_RSA_RC2CBC, NULL, CALG_RC2 }, - { szOID_RSA_RC4, NULL, CALG_RC4 }, - { szOID_RSA_DES_EDE3_CBC, NULL, CALG_3DES }, - { szOID_ANSI_X942_DH, NULL, CALG_DH_SF }, - { szOID_X957_DSA, NULL, CALG_DSS_SIGN }, - { szOID_X957_SHA1DSA, NULL, CALG_SHA }, - { szOID_OIWSEC_md4RSA, NULL, CALG_MD4 }, - { szOID_OIWSEC_md5RSA, NULL, CALG_MD5 }, - { szOID_OIWSEC_md4RSA2, NULL, CALG_MD4 }, - { szOID_OIWSEC_desCBC, NULL, CALG_DES }, - { szOID_OIWSEC_dsa, NULL, CALG_DSS_SIGN }, - { szOID_OIWSEC_shaDSA, NULL, CALG_SHA }, - { szOID_OIWSEC_shaRSA, NULL, CALG_SHA }, - { szOID_OIWSEC_sha, NULL, CALG_SHA }, - { szOID_OIWSEC_rsaXchg, NULL, CALG_RSA_KEYX }, - { szOID_OIWSEC_sha1, NULL, CALG_SHA }, - { szOID_OIWSEC_dsaSHA1, NULL, CALG_SHA }, - { szOID_OIWSEC_sha1RSASign, NULL, CALG_SHA }, - { szOID_OIWDIR_md2RSA, NULL, CALG_MD2 }, - { szOID_INFOSEC_mosaicUpdatedSig, NULL, CALG_SHA }, - { szOID_INFOSEC_mosaicKMandUpdSig, NULL, CALG_DSS_SIGN }, - { szOID_NIST_sha256, NULL, CALG_SHA_256, -1 }, - { szOID_NIST_sha384, NULL, CALG_SHA_384, -1 }, - { szOID_NIST_sha512, NULL, CALG_SHA_512, -1 } + { szOID_RSA_RSA, CALG_RSA_KEYX }, + { szOID_RSA_MD2RSA, CALG_MD2 }, + { szOID_RSA_MD4RSA, CALG_MD4 }, + { szOID_RSA_MD5RSA, CALG_MD5 }, + { szOID_RSA_SHA1RSA, CALG_SHA }, + { szOID_RSA_DH, CALG_DH_SF }, + { szOID_RSA_SMIMEalgESDH, CALG_DH_EPHEM }, + { szOID_RSA_SMIMEalgCMS3DESwrap, CALG_3DES }, + { szOID_RSA_SMIMEalgCMSRC2wrap, CALG_RC2 }, + { szOID_RSA_MD2, CALG_MD2 }, + { szOID_RSA_MD4, CALG_MD4 }, + { szOID_RSA_MD5, CALG_MD5 }, + { szOID_RSA_RC2CBC, CALG_RC2 }, + { szOID_RSA_RC4, CALG_RC4 }, + { szOID_RSA_DES_EDE3_CBC, CALG_3DES }, + { szOID_ANSI_X942_DH, CALG_DH_SF }, + { szOID_X957_DSA, CALG_DSS_SIGN }, + { szOID_X957_SHA1DSA, CALG_SHA }, + { szOID_OIWSEC_md4RSA, CALG_MD4 }, + { szOID_OIWSEC_md5RSA, CALG_MD5 }, + { szOID_OIWSEC_md4RSA2, CALG_MD4 }, + { szOID_OIWSEC_desCBC, CALG_DES }, + { szOID_OIWSEC_dsa, CALG_DSS_SIGN }, + { szOID_OIWSEC_shaDSA, CALG_SHA }, + { szOID_OIWSEC_shaRSA, CALG_SHA }, + { szOID_OIWSEC_sha, CALG_SHA }, + { szOID_OIWSEC_rsaXchg, CALG_RSA_KEYX }, + { szOID_OIWSEC_sha1, CALG_SHA }, + { szOID_OIWSEC_dsaSHA1, CALG_SHA }, + { szOID_OIWSEC_sha1RSASign, CALG_SHA }, + { szOID_OIWDIR_md2RSA, CALG_MD2 }, + { szOID_INFOSEC_mosaicUpdatedSig, CALG_SHA }, + { szOID_INFOSEC_mosaicKMandUpdSig, CALG_DSS_SIGN }, + { szOID_NIST_sha256, CALG_SHA_256, -1 }, + { szOID_NIST_sha384, CALG_SHA_384, -1 }, + { szOID_NIST_sha512, CALG_SHA_512, -1 } }; static const struct OIDToAlgID algIDToOID[] = { - { szOID_RSA_RSA, NULL, CALG_RSA_KEYX }, - { szOID_RSA_SMIMEalgESDH, NULL, CALG_DH_EPHEM }, - { szOID_RSA_MD2, NULL, CALG_MD2 }, - { szOID_RSA_MD4, NULL, CALG_MD4 }, - { szOID_RSA_MD5, NULL, CALG_MD5 }, - { szOID_RSA_RC2CBC, NULL, CALG_RC2 }, - { szOID_RSA_RC4, NULL, CALG_RC4 }, - { szOID_RSA_DES_EDE3_CBC, NULL, CALG_3DES }, - { szOID_ANSI_X942_DH, NULL, CALG_DH_SF }, - { szOID_X957_DSA, szOID_OIWSEC_dsa /* some Win98 */, CALG_DSS_SIGN }, - { szOID_OIWSEC_desCBC, NULL, CALG_DES }, - { szOID_OIWSEC_sha1, NULL, CALG_SHA }, + { szOID_RSA_RSA, CALG_RSA_KEYX }, + { szOID_RSA_SMIMEalgESDH, CALG_DH_EPHEM }, + { szOID_RSA_MD2, CALG_MD2 }, + { szOID_RSA_MD4, CALG_MD4 }, + { szOID_RSA_MD5, CALG_MD5 }, + { szOID_RSA_RC2CBC, CALG_RC2 }, + { szOID_RSA_RC4, CALG_RC4 }, + { szOID_RSA_DES_EDE3_CBC, CALG_3DES }, + { szOID_ANSI_X942_DH, CALG_DH_SF }, + { szOID_X957_DSA, CALG_DSS_SIGN }, + { szOID_OIWSEC_desCBC, CALG_DES }, + { szOID_OIWSEC_sha1, CALG_SHA }, }; -static void testOIDToAlgID(void) +static void test_OIDToAlgID(void) { int i; DWORD alg; @@ -112,7 +107,7 @@ static void testOIDToAlgID(void) } } -static void testAlgIDToOID(void) +static void test_AlgIDToOID(void) { int i; LPCSTR oid; @@ -126,27 +121,9 @@ static void testAlgIDToOID(void) { oid = CertAlgIdToOID(algIDToOID[i].algID); /* Allow failure, not every version of Windows supports every algo */ - ok(oid != NULL || broken(!oid), "CertAlgIdToOID failed, expected %s\n", algIDToOID[i].oid); + ok(oid != NULL, "CertAlgIdToOID failed, expected %s\n", algIDToOID[i].oid); if (oid) - { - if (strcmp(oid, algIDToOID[i].oid)) - { - if (algIDToOID[i].altOid) - ok(!strcmp(oid, algIDToOID[i].altOid), - "Expected %s or %s, got %s\n", algIDToOID[i].oid, - algIDToOID[i].altOid, oid); - else - { - /* No need to rerun the test, we already know it failed. */ - ok(0, "Expected %s, got %s\n", algIDToOID[i].oid, oid); - } - } - else - { - /* No need to rerun the test, we already know it succeeded. */ - ok(1, "Expected %s, got %s\n", algIDToOID[i].oid, oid); - } - } + ok(!strcmp(oid, algIDToOID[i].oid), "Expected %s, got %s\n", algIDToOID[i].oid, oid); } } @@ -213,8 +190,7 @@ static void test_oidFunctionSet(void) ret = CryptGetOIDFunctionAddress(set1, X509_ASN_ENCODING, X509_CERT, 0, &funcAddr, &hFuncAddr); - ok((!ret && GetLastError() == ERROR_FILE_NOT_FOUND) || - broken(ret) /* some Win98 */, + ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %08lx\n", GetLastError()); } } @@ -266,10 +242,8 @@ static void test_installOIDFunctionAddress(void) */ ret = CryptGetOIDFunctionAddress(set, X509_ASN_ENCODING, 0, 0, (void **)&funcAddr, &hFuncAddr); - ok(!ret && (GetLastError() == ERROR_FILE_NOT_FOUND || - GetLastError() == E_INVALIDARG /* some Win98 */), - "Expected ERROR_FILE_NOT_FOUND or E_INVALIDARG, got %ld\n", - GetLastError()); + ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, + "Expected ERROR_FILE_NOT_FOUND, got %ld\n", GetLastError()); ret = CryptGetOIDFunctionAddress(set, X509_ASN_ENCODING, X509_CERT, 0, (void **)&funcAddr, &hFuncAddr); ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, @@ -520,20 +494,14 @@ static void test_enumOIDInfo(void) BOOL ret; DWORD count = 0; - if (!pCryptEnumOIDInfo) - { - win_skip("CryptEnumOIDInfo() is not available\n"); - return; - } - /* This crashes - ret = pCryptEnumOIDInfo(7, 0, NULL, NULL); + ret = CryptEnumOIDInfo(7, 0, NULL, NULL); */ /* Silly tests, check that more than one thing is enumerated */ - ret = pCryptEnumOIDInfo(0, 0, &count, countOidInfo); + ret = CryptEnumOIDInfo(0, 0, &count, countOidInfo); ok(ret && count > 0, "Expected more than item enumerated\n"); - ret = pCryptEnumOIDInfo(0, 0, NULL, noOidInfo); + ret = CryptEnumOIDInfo(0, 0, NULL, noOidInfo); ok(!ret, "Expected FALSE\n"); } @@ -700,11 +668,8 @@ static void test_registerOIDInfo(void) START_TEST(oid) { - HMODULE hCrypt32 = GetModuleHandleA("crypt32.dll"); - pCryptEnumOIDInfo = (void*)GetProcAddress(hCrypt32, "CryptEnumOIDInfo"); - - testOIDToAlgID(); - testAlgIDToOID(); + test_OIDToAlgID(); + test_AlgIDToOID(); test_enumOIDInfo(); test_findOIDInfo(); test_registerOIDInfo(); diff --git a/dlls/crypt32/tests/protectdata.c b/dlls/crypt32/tests/protectdata.c index 162dab090e2..362f1faddb4 100644 --- a/dlls/crypt32/tests/protectdata.c +++ b/dlls/crypt32/tests/protectdata.c @@ -27,9 +27,6 @@ #include "wine/test.h" -static BOOL (WINAPI *pCryptProtectData)(DATA_BLOB*,LPCWSTR,DATA_BLOB*,PVOID,CRYPTPROTECT_PROMPTSTRUCT*,DWORD,DATA_BLOB*); -static BOOL (WINAPI *pCryptUnprotectData)(DATA_BLOB*,LPWSTR*,DATA_BLOB*,PVOID,CRYPTPROTECT_PROMPTSTRUCT*,DWORD,DATA_BLOB*); - static char secret[] = "I am a super secret string that no one can see!"; static char secret2[] = "I am a super secret string indescribable string"; static char key[] = "Wibble wibble wibble"; @@ -51,13 +48,13 @@ static void test_cryptprotectdata(void) entropy.cbData=strlen(key)+1; SetLastError(0xDEADBEEF); - protected = pCryptProtectData(NULL, L"Ultra secret test message", NULL, NULL, NULL, 0, &cipher); + protected = CryptProtectData(NULL, L"Ultra secret test message", NULL, NULL, NULL, 0, &cipher); ok(!protected, "Encrypting without plain data source.\n"); r = GetLastError(); ok(r == ERROR_INVALID_PARAMETER, "Wrong (%lu) GetLastError seen\n",r); SetLastError(0xDEADBEEF); - protected = pCryptProtectData(&plain, L"Ultra secret test message", NULL, NULL, NULL, 0, NULL); + protected = CryptProtectData(&plain, L"Ultra secret test message", NULL, NULL, NULL, 0, NULL); ok(!protected, "Encrypting without cipher destination.\n"); r = GetLastError(); ok(r == ERROR_INVALID_PARAMETER, "Wrong (%lu) GetLastError seen\n",r); @@ -67,16 +64,12 @@ static void test_cryptprotectdata(void) /* without entropy */ SetLastError(0xDEADBEEF); - protected = pCryptProtectData(&plain, L"Ultra secret test message", NULL, NULL, NULL, 0, &cipher); - ok(protected || - broken(!protected), /* Win9x/NT4 */ - "Encrypting without entropy.\n"); + protected = CryptProtectData(&plain, L"Ultra secret test message", NULL, NULL, NULL, 0, &cipher); + ok(protected, "Encrypting without entropy.\n"); if (protected) { r = GetLastError(); - ok(r == ERROR_SUCCESS || - r == ERROR_IO_PENDING, /* win2k */ - "Expected ERROR_SUCCESS or ERROR_IO_PENDING, got %ld\n",r); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n",r); } cipher_entropy.pbData=NULL; @@ -84,10 +77,8 @@ static void test_cryptprotectdata(void) /* with entropy */ SetLastError(0xDEADBEEF); - protected = pCryptProtectData(&plain, L"Ultra secret test message", &entropy, NULL, NULL, 0, &cipher_entropy); - ok(protected || - broken(!protected), /* Win9x/NT4 */ - "Encrypting with entropy.\n"); + protected = CryptProtectData(&plain, L"Ultra secret test message", &entropy, NULL, NULL, 0, &cipher_entropy); + ok(protected, "Encrypting with entropy.\n"); cipher_no_desc.pbData=NULL; cipher_no_desc.cbData=0; @@ -96,13 +87,8 @@ static void test_cryptprotectdata(void) plain.pbData=(void*)secret2; plain.cbData=strlen(secret2)+1; SetLastError(0xDEADBEEF); - protected = pCryptProtectData(&plain,NULL,&entropy,NULL,NULL,0,&cipher_no_desc); - if (!protected) - { - /* fails in win2k */ - ok(GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); - } + protected = CryptProtectData(&plain,NULL,&entropy,NULL,NULL,0,&cipher_no_desc); + ok(protected, "Encrypting with entropy.\n"); } static void test_cryptunprotectdata(void) @@ -116,24 +102,17 @@ static void test_cryptunprotectdata(void) entropy.pbData=(void*)key; entropy.cbData=strlen(key)+1; - /* fails in win2k */ - if (!protected) - { - skip("CryptProtectData failed to run\n"); - return; - } - plain.pbData=NULL; plain.cbData=0; SetLastError(0xDEADBEEF); - okay = pCryptUnprotectData(&cipher,NULL,NULL,NULL,NULL,0,NULL); + okay = CryptUnprotectData(&cipher,NULL,NULL,NULL,NULL,0,NULL); ok(!okay,"Decrypting without destination\n"); r = GetLastError(); ok(r == ERROR_INVALID_PARAMETER, "Wrong (%lu) GetLastError seen\n",r); SetLastError(0xDEADBEEF); - okay = pCryptUnprotectData(NULL,NULL,NULL,NULL,NULL,0,&plain); + okay = CryptUnprotectData(NULL,NULL,NULL,NULL,NULL,0,&plain); ok(!okay,"Decrypting without source\n"); r = GetLastError(); ok(r == ERROR_INVALID_PARAMETER, "Wrong (%lu) GetLastError seen\n",r); @@ -142,7 +121,7 @@ static void test_cryptunprotectdata(void) plain.cbData=0; SetLastError(0xDEADBEEF); - okay = pCryptUnprotectData(&cipher_entropy,NULL,NULL,NULL,NULL,0,&plain); + okay = CryptUnprotectData(&cipher_entropy,NULL,NULL,NULL,NULL,0,&plain); ok(!okay,"Decrypting without needed entropy\n"); r = GetLastError(); ok(r == ERROR_INVALID_DATA, "Wrong (%lu) GetLastError seen\n", r); @@ -153,7 +132,7 @@ static void test_cryptunprotectdata(void) /* without entropy */ SetLastError(0xDEADBEEF); - okay = pCryptUnprotectData(&cipher,&data_desc,NULL,NULL,NULL,0,&plain); + okay = CryptUnprotectData(&cipher,&data_desc,NULL,NULL,NULL,0,&plain); ok(okay,"Decrypting without entropy\n"); ok(plain.pbData!=NULL,"Plain DATA_BLOB missing data\n"); @@ -171,14 +150,14 @@ static void test_cryptunprotectdata(void) /* with wrong entropy */ SetLastError(0xDEADBEEF); - okay = pCryptUnprotectData(&cipher_entropy,&data_desc,&cipher_entropy,NULL,NULL,0,&plain); + okay = CryptUnprotectData(&cipher_entropy,&data_desc,&cipher_entropy,NULL,NULL,0,&plain); ok(!okay,"Decrypting with wrong entropy\n"); r = GetLastError(); ok(r == ERROR_INVALID_DATA, "Wrong (%lu) GetLastError seen\n",r); /* with entropy */ SetLastError(0xDEADBEEF); - okay = pCryptUnprotectData(&cipher_entropy,&data_desc,&entropy,NULL,NULL,0,&plain); + okay = CryptUnprotectData(&cipher_entropy,&data_desc,&entropy,NULL,NULL,0,&plain); ok(okay,"Decrypting with entropy\n"); ok(plain.pbData!=NULL,"Plain DATA_BLOB missing data\n"); @@ -196,7 +175,7 @@ static void test_cryptunprotectdata(void) /* with entropy but no description */ SetLastError(0xDEADBEEF); - okay = pCryptUnprotectData(&cipher_no_desc,&data_desc,&entropy,NULL,NULL,0,&plain); + okay = CryptUnprotectData(&cipher_no_desc,&data_desc,&entropy,NULL,NULL,0,&plain); ok(okay,"Decrypting with entropy and no description\n"); ok(plain.pbData!=NULL,"Plain DATA_BLOB missing data\n"); @@ -223,16 +202,10 @@ static void test_simpleroundtrip(const char *plaintext) emptyW[0] = 0; input.pbData = (unsigned char *)plaintext; input.cbData = strlen(plaintext); - res = pCryptProtectData(&input, emptyW, NULL, NULL, NULL, 0, &encrypted); - ok(res != 0 || broken(!res), "can't protect\n"); - if (!res) - { - /* Fails on Win9x, NT4 */ - win_skip("CryptProtectData failed\n"); - return; - } + res = CryptProtectData(&input, emptyW, NULL, NULL, NULL, 0, &encrypted); + ok(res != 0, "can't protect\n"); - res = pCryptUnprotectData(&encrypted, NULL, NULL, NULL, NULL, 0, &output); + res = CryptUnprotectData(&encrypted, NULL, NULL, NULL, NULL, 0, &output); ok(res != 0, "can't unprotect; last error %lu\n", GetLastError()); ok(output.cbData == strlen(plaintext), "output wrong length %ld for input '%s', wanted %d\n", output.cbData, plaintext, lstrlenA(plaintext)); ok(!memcmp(plaintext, (char *)output.pbData, output.cbData), "output wrong contents for input '%s'\n", plaintext); @@ -242,16 +215,7 @@ static void test_simpleroundtrip(const char *plaintext) START_TEST(protectdata) { - HMODULE hCrypt32 = GetModuleHandleA("crypt32.dll"); - pCryptProtectData = (void*)GetProcAddress(hCrypt32, "CryptProtectData"); - pCryptUnprotectData = (void*)GetProcAddress(hCrypt32, "CryptUnprotectData"); - if (!pCryptProtectData || !pCryptUnprotectData) - { - win_skip("Crypt(Un)ProtectData() is not available\n"); - return; - } - - protected=FALSE; + protected = FALSE; test_cryptprotectdata(); test_cryptunprotectdata(); test_simpleroundtrip(""); diff --git a/dlls/crypt32/tests/sip.c b/dlls/crypt32/tests/sip.c index 4a89393484e..1a61c558dd0 100644 --- a/dlls/crypt32/tests/sip.c +++ b/dlls/crypt32/tests/sip.c @@ -57,17 +57,6 @@ static void test_AddRemoveProvider(void) /* Apparently the needed rights are checked before the existence of the provider */ skip("Need admin rights\n"); } - else - { - /* On some Win98 systems, CryptSIPRemoveProvider always succeeds if - * the arguments are correct, whether or not the registry key is - * present, so don't test ret, just check the last error if it does - * return FALSE. - */ - if (!ret) - ok (GetLastError() == ERROR_FILE_NOT_FOUND, - "Expected ERROR_FILE_NOT_FOUND, got %ld.\n", GetLastError()); - } /* Everything OK, pwszIsFunctionName and pwszIsFunctionNameFmt2 are left NULL * as allowed */ @@ -96,14 +85,8 @@ static void test_AddRemoveProvider(void) */ SetLastError(0xdeadbeef); ret = CryptSIPRemoveProvider(&actionid); - /* On some Win98 systems, CryptSIPRemoveProvider always succeeds if - * the arguments are correct, whether or not the registry key is - * present, so don't test ret, just check the last error if it does - * return FALSE. - */ - if (!ret) - ok (GetLastError() == ERROR_FILE_NOT_FOUND, - "Expected ERROR_FILE_NOT_FOUND, got %ld.\n", GetLastError()); + ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, + "Expected ERROR_FILE_NOT_FOUND, got %ld.\n", GetLastError()); /* Everything OK */ memset(&newprov, 0, sizeof(SIP_ADD_NEWPROVIDER)); @@ -223,11 +206,8 @@ static void test_SIPRetrieveSubjectGUID(void) memset(&subject, 1, sizeof(GUID)); ret = CryptSIPRetrieveSubjectGuid(tempfileW, NULL, &subject); ok ( !ret, "Expected CryptSIPRetrieveSubjectGuid to fail\n"); - ok ( GetLastError() == ERROR_FILE_INVALID || - GetLastError() == ERROR_INVALID_PARAMETER /* Vista */ || - GetLastError() == ERROR_SUCCESS /* most Win98 */ || - GetLastError() == TRUST_E_SUBJECT_FORM_UNKNOWN /* some Win98 */, - "Expected ERROR_FILE_INVALID, ERROR_INVALID_PARAMETER, ERROR_SUCCESS or TRUST_E_SUBJECT_FORM_UNKNOWN, got 0x%08lx\n", GetLastError()); + ok ( GetLastError() == ERROR_FILE_INVALID || GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_FILE_INVALID, ERROR_INVALID_PARAMETER, got 0x%08lx\n", GetLastError()); ok(IsEqualGUID(&subject, &nullSubject), "Expected a NULL GUID for empty file %s, not %s\n", tempfile, wine_dbgstr_guid(&subject)); @@ -240,10 +220,8 @@ static void test_SIPRetrieveSubjectGUID(void) memset(&subject, 1, sizeof(GUID)); ret = CryptSIPRetrieveSubjectGuid(tempfileW, NULL, &subject); ok ( !ret, "Expected CryptSIPRetrieveSubjectGuid to fail\n"); - ok ( GetLastError() == ERROR_INVALID_PARAMETER || - GetLastError() == ERROR_SUCCESS /* most Win98 */ || - GetLastError() == TRUST_E_SUBJECT_FORM_UNKNOWN /* some Win98 */, - "Expected ERROR_INVALID_PARAMETER, ERROR_SUCCESS or TRUST_E_SUBJECT_FORM_UNKNOWN, got 0x%08lx\n", GetLastError()); + ok ( GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got 0x%08lx\n", GetLastError()); ok(IsEqualGUID(&subject, &nullSubject), "Expected a NULL GUID for empty file %s, not %s\n", tempfile, wine_dbgstr_guid(&subject)); @@ -256,8 +234,7 @@ static void test_SIPRetrieveSubjectGUID(void) memset(&subject, 1, sizeof(GUID)); ret = CryptSIPRetrieveSubjectGuid(tempfileW, NULL, &subject); ok ( !ret, "Expected CryptSIPRetrieveSubjectGuid to fail\n"); - ok ( GetLastError() == TRUST_E_SUBJECT_FORM_UNKNOWN || - GetLastError() == ERROR_SUCCESS /* Win98 */, + ok ( GetLastError() == TRUST_E_SUBJECT_FORM_UNKNOWN, "Expected TRUST_E_SUBJECT_FORM_UNKNOWN or ERROR_SUCCESS, got 0x%08lx\n", GetLastError()); ok(IsEqualGUID(&subject, &nullSubject), "Expected a NULL GUID for empty file %s, not %s\n", tempfile, wine_dbgstr_guid(&subject)); diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index f1124459d6a..00c2cae19e0 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -157,14 +157,13 @@ static void testMemStore(void) context = NULL; ret = CertAddEncodedCertificateToStore(store1, X509_ASN_ENCODING, emptyCert, sizeof(emptyCert), CERT_STORE_ADD_ALWAYS, &context); - /* Windows returns CRYPT_E_ASN1_EOD or OSS_DATA_ERROR, but accept + /* Windows returns CRYPT_E_ASN1_EOD, but accept * CRYPT_E_ASN1_CORRUPT as well (because matching errors is tough in this * case) */ GLE = GetLastError(); - ok(!ret && (GLE == CRYPT_E_ASN1_EOD || GLE == CRYPT_E_ASN1_CORRUPT || - GLE == OSS_DATA_ERROR), - "Expected CRYPT_E_ASN1_EOD or CRYPT_E_ASN1_CORRUPT or OSS_DATA_ERROR, got %08lx\n", + ok(!ret && (GLE == CRYPT_E_ASN1_EOD || GLE == CRYPT_E_ASN1_CORRUPT), + "Expected CRYPT_E_ASN1_EOD or CRYPT_E_ASN1_CORRUPT, got %08lx\n", GLE); /* add a "signed" cert--the signature isn't a real signature, so this adds * without any check of the signature's validity @@ -188,9 +187,8 @@ static void testMemStore(void) ret = CertAddEncodedCertificateToStore(store1, X509_ASN_ENCODING, signedCRL, sizeof(signedCRL), CERT_STORE_ADD_ALWAYS, &context); GLE = GetLastError(); - ok(!ret && (GLE == CRYPT_E_ASN1_BADTAG || GLE == CRYPT_E_ASN1_CORRUPT || - GLE == OSS_DATA_ERROR), - "Expected CRYPT_E_ASN1_BADTAG or CRYPT_E_ASN1_CORRUPT or OSS_DATA_ERROR, got %08lx\n", + ok(!ret && (GLE == CRYPT_E_ASN1_BADTAG || GLE == CRYPT_E_ASN1_CORRUPT), + "Expected CRYPT_E_ASN1_BADTAG or CRYPT_E_ASN1_CORRUPT, got %08lx\n", GLE); /* add a cert to store1 */ ret = CertAddEncodedCertificateToStore(store1, X509_ASN_ENCODING, bigCert, @@ -3232,8 +3230,7 @@ static void test_PFXImportCertStore(void) pfx.pbData = (BYTE *)pfxdata; pfx.cbData = sizeof(pfxdata); store = PFXImportCertStore( &pfx, NULL, CRYPT_EXPORTABLE|CRYPT_USER_KEYSET|PKCS12_NO_PERSIST_KEY ); - ok( store != NULL || broken(store == NULL) /* winxp */, "got %lu\n", GetLastError() ); - if (!store) return; + ok( store != NULL, "got %lu\n", GetLastError() ); count = countCertsInStore( store ); ok( count == 1, "got %lu\n", count ); diff --git a/dlls/crypt32/tests/str.c b/dlls/crypt32/tests/str.c index 6a19d264c14..a94381591c0 100644 --- a/dlls/crypt32/tests/str.c +++ b/dlls/crypt32/tests/str.c @@ -130,23 +130,6 @@ static char subjectStrCRLF[] = static char x500SubjectStr[] = "C=US, S=Minnesota, L=Minneapolis, O=CodeWeavers, OU=Wine Development, CN=localhost, E=aric(a)codeweavers.com"; static char x500SubjectStrSemicolonReverse[] = "E=aric(a)codeweavers.com; CN=localhost; OU=Wine Development; O=CodeWeavers; L=Minneapolis; S=Minnesota; C=US"; -static HMODULE dll; -static DWORD (WINAPI *pCertNameToStrA)(DWORD,LPVOID,DWORD,LPSTR,DWORD); -static DWORD (WINAPI *pCertNameToStrW)(DWORD,LPVOID,DWORD,LPWSTR,DWORD); -static DWORD (WINAPI *pCertRDNValueToStrA)(DWORD, PCERT_RDN_VALUE_BLOB, - LPSTR, DWORD); -static DWORD (WINAPI *pCertRDNValueToStrW)(DWORD, PCERT_RDN_VALUE_BLOB, - LPWSTR, DWORD); -static BOOL (WINAPI *pCertStrToNameA)(DWORD dwCertEncodingType, - LPCSTR pszX500, DWORD dwStrType, void *pvReserved, BYTE *pbEncoded, - DWORD *pcbEncoded, LPCSTR *ppszError); -static BOOL (WINAPI *pCertStrToNameW)(DWORD dwCertEncodingType, - LPCWSTR pszX500, DWORD dwStrType, void *pvReserved, BYTE *pbEncoded, - DWORD *pcbEncoded, LPCWSTR *ppszError); -static DWORD (WINAPI *pCertGetNameStringA)(PCCERT_CONTEXT cert, DWORD type, - DWORD flags, void *typePara, LPSTR str, DWORD cch); - - static void test_CertRDNValueToStrA(void) { CertRDNAttrEncoding attrs[] = { @@ -182,22 +165,20 @@ static void test_CertRDNValueToStrA(void) CERT_RDN_VALUE_BLOB blob = { 0, NULL }; static const char ePKI[] = "ePKI Root Certification Authority"; - if (!pCertRDNValueToStrA) return; - /* This crashes - ret = pCertRDNValueToStrA(0, NULL, NULL, 0); + ret = CertRDNValueToStrA(0, NULL, NULL, 0); */ /* With empty input, it generates the empty string */ SetLastError(0xdeadbeef); - ret = pCertRDNValueToStrA(0, &blob, NULL, 0); + ret = CertRDNValueToStrA(0, &blob, NULL, 0); ok(ret == 1 && GetLastError() == 0xdeadbeef, "Expected empty string\n"); - ret = pCertRDNValueToStrA(0, &blob, buffer, sizeof(buffer)); + ret = CertRDNValueToStrA(0, &blob, buffer, sizeof(buffer)); ok(ret == 1 && GetLastError() == 0xdeadbeef, "Expected empty string\n"); ok(!buffer[0], "Expected empty string\n"); for (i = 0; i < ARRAY_SIZE(attrs); i++) { - ret = pCertRDNValueToStrA(attrs[i].dwValueType, &attrs[i].Value, + ret = CertRDNValueToStrA(attrs[i].dwValueType, &attrs[i].Value, buffer, sizeof(buffer)); todo_wine_if (attrs[i].todo) { @@ -209,10 +190,9 @@ static void test_CertRDNValueToStrA(void) } blob.pbData = bin8; blob.cbData = sizeof(bin8); - ret = pCertRDNValueToStrA(CERT_RDN_UTF8_STRING, &blob, buffer, + ret = CertRDNValueToStrA(CERT_RDN_UTF8_STRING, &blob, buffer, sizeof(buffer)); - ok(ret == strlen(ePKI) + 1 || broken(ret != strlen(ePKI) + 1), - "Expected length %d, got %ld\n", lstrlenA(ePKI), ret); + ok(ret == strlen(ePKI) + 1, "Expected length %d, got %ld\n", lstrlenA(ePKI), ret); if (ret == strlen(ePKI) + 1) ok(!strcmp(buffer, ePKI), "Expected %s, got %s\n", ePKI, buffer); } @@ -252,26 +232,20 @@ static void test_CertRDNValueToStrW(void) WCHAR buffer[2000]; CERT_RDN_VALUE_BLOB blob = { 0, NULL }; - if (!pCertRDNValueToStrW) - { - win_skip("CertRDNValueToStrW is not available\n"); - return; - } - /* This crashes - ret = pCertRDNValueToStrW(0, NULL, NULL, 0); + ret = CertRDNValueToStrW(0, NULL, NULL, 0); */ /* With empty input, it generates the empty string */ SetLastError(0xdeadbeef); - ret = pCertRDNValueToStrW(0, &blob, NULL, 0); + ret = CertRDNValueToStrW(0, &blob, NULL, 0); ok(ret == 1 && GetLastError() == 0xdeadbeef, "Expected empty string\n"); - ret = pCertRDNValueToStrW(0, &blob, buffer, ARRAY_SIZE(buffer)); + ret = CertRDNValueToStrW(0, &blob, buffer, ARRAY_SIZE(buffer)); ok(ret == 1 && GetLastError() == 0xdeadbeef, "Expected empty string\n"); ok(!buffer[0], "Expected empty string\n"); for (i = 0; i < ARRAY_SIZE(attrs); i++) { - ret = pCertRDNValueToStrW(attrs[i].dwValueType, &attrs[i].Value, buffer, ARRAY_SIZE(buffer)); + ret = CertRDNValueToStrW(attrs[i].dwValueType, &attrs[i].Value, buffer, ARRAY_SIZE(buffer)); todo_wine_if (attrs[i].todo) { ok(ret == lstrlenW(attrs[i].str) + 1, @@ -282,10 +256,9 @@ static void test_CertRDNValueToStrW(void) } blob.pbData = bin8; blob.cbData = sizeof(bin8); - ret = pCertRDNValueToStrW(CERT_RDN_UTF8_STRING, &blob, buffer, + ret = CertRDNValueToStrW(CERT_RDN_UTF8_STRING, &blob, buffer, sizeof(buffer)); - ok(ret == lstrlenW(ePKIW) + 1 || broken(ret != lstrlenW(ePKIW) + 1), - "Expected length %d, got %ld\n", lstrlenW(ePKIW), ret); + ok(ret == lstrlenW(ePKIW) + 1, "Expected length %d, got %ld\n", lstrlenW(ePKIW), ret); if (ret == lstrlenW(ePKIW) + 1) ok(!lstrcmpW(buffer, ePKIW), "Expected %s, got %s\n", wine_dbgstr_w(ePKIW), wine_dbgstr_w(buffer)); @@ -297,11 +270,11 @@ static void test_NameToStrConversionA(PCERT_NAME_BLOB pName, DWORD dwStrType, char buffer[2000] = { 0 }; DWORD i; - i = pCertNameToStrA(X509_ASN_ENCODING, pName, dwStrType, NULL, 0); + i = CertNameToStrA(X509_ASN_ENCODING, pName, dwStrType, NULL, 0); todo_wine_if (todo) ok(i == strlen(expected) + 1, "Expected %d chars, got %ld\n", lstrlenA(expected) + 1, i); - i = pCertNameToStrA(X509_ASN_ENCODING,pName, dwStrType, buffer, + i = CertNameToStrA(X509_ASN_ENCODING,pName, dwStrType, buffer, sizeof(buffer)); todo_wine_if (todo) ok(i == strlen(expected) + 1, "Expected %d chars, got %ld\n", @@ -357,12 +330,6 @@ static void test_CertNameToStrA(void) PCCERT_CONTEXT context; CERT_NAME_BLOB blob; - if (!pCertNameToStrA) - { - win_skip("CertNameToStrA is not available\n"); - return; - } - context = CertCreateCertificateContext(X509_ASN_ENCODING, cert, sizeof(cert)); ok(context != NULL, "CertCreateCertificateContext failed: %08lx\n", @@ -372,16 +339,16 @@ static void test_CertNameToStrA(void) DWORD ret; /* This crashes - ret = pCertNameToStrA(0, NULL, 0, NULL, 0); + ret = CertNameToStrA(0, NULL, 0, NULL, 0); */ /* Test with a bogus encoding type */ SetLastError(0xdeadbeef); - ret = pCertNameToStrA(0, &context->pCertInfo->Issuer, 0, NULL, 0); + ret = CertNameToStrA(0, &context->pCertInfo->Issuer, 0, NULL, 0); ok(ret == 1 && GetLastError() == ERROR_FILE_NOT_FOUND, "Expected retval 1 and ERROR_FILE_NOT_FOUND, got %ld - %08lx\n", ret, GetLastError()); SetLastError(0xdeadbeef); - ret = pCertNameToStrA(X509_ASN_ENCODING, &context->pCertInfo->Issuer, + ret = CertNameToStrA(X509_ASN_ENCODING, &context->pCertInfo->Issuer, 0, NULL, 0); ok(ret && GetLastError() == ERROR_SUCCESS, "Expected positive return and ERROR_SUCCESS, got %ld - %08lx\n", @@ -468,11 +435,11 @@ static void test_NameToStrConversionW(PCERT_NAME_BLOB pName, DWORD dwStrType, WCHAR buffer[2000] = { 0 }; DWORD i; - i = pCertNameToStrW(X509_ASN_ENCODING,pName, dwStrType, NULL, 0); + i = CertNameToStrW(X509_ASN_ENCODING,pName, dwStrType, NULL, 0); todo_wine_if (todo) ok(i == lstrlenW(expected) + 1, "Expected %d chars, got %ld\n", lstrlenW(expected) + 1, i); - i = pCertNameToStrW(X509_ASN_ENCODING,pName, dwStrType, buffer, ARRAY_SIZE(buffer)); + i = CertNameToStrW(X509_ASN_ENCODING,pName, dwStrType, buffer, ARRAY_SIZE(buffer)); todo_wine_if (todo) ok(i == lstrlenW(expected) + 1, "Expected %d chars, got %ld\n", lstrlenW(expected) + 1, i); @@ -486,12 +453,6 @@ static void test_CertNameToStrW(void) PCCERT_CONTEXT context; CERT_NAME_BLOB blob; - if (!pCertNameToStrW) - { - win_skip("CertNameToStrW is not available\n"); - return; - } - context = CertCreateCertificateContext(X509_ASN_ENCODING, cert, sizeof(cert)); ok(context != NULL, "CertCreateCertificateContext failed: %08lx\n", @@ -501,16 +462,16 @@ static void test_CertNameToStrW(void) DWORD ret; /* This crashes - ret = pCertNameToStrW(0, NULL, 0, NULL, 0); + ret = CertNameToStrW(0, NULL, 0, NULL, 0); */ /* Test with a bogus encoding type */ SetLastError(0xdeadbeef); - ret = pCertNameToStrW(0, &context->pCertInfo->Issuer, 0, NULL, 0); + ret = CertNameToStrW(0, &context->pCertInfo->Issuer, 0, NULL, 0); ok(ret == 1 && GetLastError() == ERROR_FILE_NOT_FOUND, "Expected retval 1 and ERROR_FILE_NOT_FOUND, got %ld - %08lx\n", ret, GetLastError()); SetLastError(0xdeadbeef); - ret = pCertNameToStrW(X509_ASN_ENCODING, &context->pCertInfo->Issuer, + ret = CertNameToStrW(X509_ASN_ENCODING, &context->pCertInfo->Issuer, 0, NULL, 0); ok(ret && GetLastError() == ERROR_SUCCESS, "Expected positive return and ERROR_SUCCESS, got %ld - %08lx\n", @@ -640,69 +601,63 @@ static void test_CertStrToNameA(void) DWORD size, i; BYTE buf[100]; - if (!pCertStrToNameA) - { - win_skip("CertStrToNameA is not available\n"); - return; - } - /* Crash - ret = pCertStrToNameA(0, NULL, 0, NULL, NULL, NULL, NULL); + ret = CertStrToNameA(0, NULL, 0, NULL, NULL, NULL, NULL); */ - ret = pCertStrToNameA(0, NULL, 0, NULL, NULL, &size, NULL); + ret = CertStrToNameA(0, NULL, 0, NULL, NULL, &size, NULL); ok(!ret, "Expected failure\n"); - ret = pCertStrToNameA(0, "bogus", 0, NULL, NULL, &size, NULL); + ret = CertStrToNameA(0, "bogus", 0, NULL, NULL, &size, NULL); ok(!ret && GetLastError() == CRYPT_E_INVALID_X500_STRING, "Expected CRYPT_E_INVALID_X500_STRING, got %08lx\n", GetLastError()); - ret = pCertStrToNameA(0, "foo=1", 0, NULL, NULL, &size, NULL); + ret = CertStrToNameA(0, "foo=1", 0, NULL, NULL, &size, NULL); ok(!ret && GetLastError() == CRYPT_E_INVALID_X500_STRING, "Expected CRYPT_E_INVALID_X500_STRING, got %08lx\n", GetLastError()); - ret = pCertStrToNameA(0, "CN=1", 0, NULL, NULL, &size, NULL); + ret = CertStrToNameA(0, "CN=1", 0, NULL, NULL, &size, NULL); ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %08lx\n", GetLastError()); - ret = pCertStrToNameA(X509_ASN_ENCODING, "CN=1", 0, NULL, NULL, &size, NULL); + ret = CertStrToNameA(X509_ASN_ENCODING, "CN=1", 0, NULL, NULL, &size, NULL); ok(ret, "CertStrToNameA failed: %08lx\n", GetLastError()); size = sizeof(buf); - ret = pCertStrToNameA(X509_ASN_ENCODING, "CN=\"\"1\"\"", 0, NULL, buf, &size, + ret = CertStrToNameA(X509_ASN_ENCODING, "CN=\"\"1\"\"", 0, NULL, buf, &size, NULL); ok(!ret && GetLastError() == CRYPT_E_INVALID_X500_STRING, "Expected CRYPT_E_INVALID_X500_STRING, got %08lx\n", GetLastError()); - ret = pCertStrToNameA(X509_ASN_ENCODING, "CN=1+2", 0, NULL, buf, + ret = CertStrToNameA(X509_ASN_ENCODING, "CN=1+2", 0, NULL, buf, &size, NULL); ok(!ret && GetLastError() == CRYPT_E_INVALID_X500_STRING, "Expected CRYPT_E_INVALID_X500_STRING, got %08lx\n", GetLastError()); - ret = pCertStrToNameA(X509_ASN_ENCODING, "CN=1+2", CERT_NAME_STR_NO_PLUS_FLAG, NULL, buf, + ret = CertStrToNameA(X509_ASN_ENCODING, "CN=1+2", CERT_NAME_STR_NO_PLUS_FLAG, NULL, buf, &size, NULL); ok(ret && GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %08lx\n", GetLastError()); - ret = pCertStrToNameA(X509_ASN_ENCODING, "CN=1,2", CERT_NAME_STR_NO_QUOTING_FLAG, NULL, buf, + ret = CertStrToNameA(X509_ASN_ENCODING, "CN=1,2", CERT_NAME_STR_NO_QUOTING_FLAG, NULL, buf, &size, NULL); ok(!ret && GetLastError() == CRYPT_E_INVALID_X500_STRING, "Expected CRYPT_E_INVALID_X500_STRING, got %08lx\n", GetLastError()); - ret = pCertStrToNameA(X509_ASN_ENCODING, "CN=\"1,2;3,4\"", CERT_NAME_STR_NO_QUOTING_FLAG, NULL, buf, + ret = CertStrToNameA(X509_ASN_ENCODING, "CN=\"1,2;3,4\"", CERT_NAME_STR_NO_QUOTING_FLAG, NULL, buf, &size, NULL); ok(!ret && GetLastError() == CRYPT_E_INVALID_X500_STRING, "Expected CRYPT_E_INVALID_X500_STRING, got %08lx\n", GetLastError()); - ret = pCertStrToNameA(X509_ASN_ENCODING, "CN=abc", 0, NULL, buf, + ret = CertStrToNameA(X509_ASN_ENCODING, "CN=abc", 0, NULL, buf, &size, NULL); ok(ret && GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %08lx\n", GetLastError()); - ret = pCertStrToNameA(X509_ASN_ENCODING, "CN=abc", CERT_NAME_STR_NO_QUOTING_FLAG, NULL, buf, + ret = CertStrToNameA(X509_ASN_ENCODING, "CN=abc", CERT_NAME_STR_NO_QUOTING_FLAG, NULL, buf, &size, NULL); ok(ret && GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %08lx\n", GetLastError()); - ret = pCertStrToNameA(X509_ASN_ENCODING, "CN=\"abc\"", 0, NULL, buf, + ret = CertStrToNameA(X509_ASN_ENCODING, "CN=\"abc\"", 0, NULL, buf, &size, NULL); ok(ret && GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %08lx\n", GetLastError()); - ret = pCertStrToNameA(X509_ASN_ENCODING, "CN=\"abc\"", CERT_NAME_STR_NO_QUOTING_FLAG, NULL, buf, + ret = CertStrToNameA(X509_ASN_ENCODING, "CN=\"abc\"", CERT_NAME_STR_NO_QUOTING_FLAG, NULL, buf, &size, NULL); ok(!ret && GetLastError() == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %08lx\n", GetLastError()); for (i = 0; i < ARRAY_SIZE(namesA); i++) { size = sizeof(buf); - ret = pCertStrToNameA(X509_ASN_ENCODING, namesA[i].x500, 0, NULL, buf, + ret = CertStrToNameA(X509_ASN_ENCODING, namesA[i].x500, 0, NULL, buf, &size, NULL); ok(ret, "CertStrToNameA failed on string %s: %08lx\n", namesA[i].x500, GetLastError()); @@ -750,35 +705,29 @@ static void test_CertStrToNameW(void) LPCWSTR errorPtr; BYTE buf[100]; - if (!pCertStrToNameW) - { - win_skip("CertStrToNameW is not available\n"); - return; - } - /* Crash - ret = pCertStrToNameW(0, NULL, 0, NULL, NULL, NULL, NULL); + ret = CertStrToNameW(0, NULL, 0, NULL, NULL, NULL, NULL); */ - ret = pCertStrToNameW(0, NULL, 0, NULL, NULL, &size, NULL); + ret = CertStrToNameW(0, NULL, 0, NULL, NULL, &size, NULL); ok(!ret, "Expected failure\n"); - ret = pCertStrToNameW(0, L"bogus", 0, NULL, NULL, &size, NULL); + ret = CertStrToNameW(0, L"bogus", 0, NULL, NULL, &size, NULL); ok(!ret && GetLastError() == CRYPT_E_INVALID_X500_STRING, "Expected CRYPT_E_INVALID_X500_STRING, got %08lx\n", GetLastError()); - ret = pCertStrToNameW(0, L"foo=1", 0, NULL, NULL, &size, NULL); + ret = CertStrToNameW(0, L"foo=1", 0, NULL, NULL, &size, NULL); ok(!ret && GetLastError() == CRYPT_E_INVALID_X500_STRING, "Expected CRYPT_E_INVALID_X500_STRING, got %08lx\n", GetLastError()); - ret = pCertStrToNameW(0, L"CN=1", 0, NULL, NULL, &size, NULL); + ret = CertStrToNameW(0, L"CN=1", 0, NULL, NULL, &size, NULL); ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %08lx\n", GetLastError()); - ret = pCertStrToNameW(X509_ASN_ENCODING, L"CN=1", 0, NULL, NULL, &size, + ret = CertStrToNameW(X509_ASN_ENCODING, L"CN=1", 0, NULL, NULL, &size, NULL); ok(ret, "CertStrToNameW failed: %08lx\n", GetLastError()); size = sizeof(buf); - ret = pCertStrToNameW(X509_ASN_ENCODING, L"CN=\"\"1\"\"", 0, NULL, buf, + ret = CertStrToNameW(X509_ASN_ENCODING, L"CN=\"\"1\"\"", 0, NULL, buf, &size, NULL); ok(!ret && GetLastError() == CRYPT_E_INVALID_X500_STRING, "Expected CRYPT_E_INVALID_X500_STRING, got %08lx\n", GetLastError()); - ret = pCertStrToNameW(X509_ASN_ENCODING, L"CN=\"\"1\"\"", 0, NULL, buf, + ret = CertStrToNameW(X509_ASN_ENCODING, L"CN=\"\"1\"\"", 0, NULL, buf, &size, &errorPtr); ok(!ret && GetLastError() == CRYPT_E_INVALID_X500_STRING, "Expected CRYPT_E_INVALID_X500_STRING, got %08lx\n", GetLastError()); @@ -786,7 +735,7 @@ static void test_CertStrToNameW(void) for (i = 0; i < ARRAY_SIZE(namesW); i++) { size = sizeof(buf); - ret = pCertStrToNameW(X509_ASN_ENCODING, namesW[i].x500, 0, NULL, buf, + ret = CertStrToNameW(X509_ASN_ENCODING, namesW[i].x500, 0, NULL, buf, &size, NULL); ok(ret, "Index %ld: CertStrToNameW failed: %08lx\n", i, GetLastError()); ok(size == namesW[i].encodedSize, @@ -802,12 +751,6 @@ static void test_CertGetNameStringA(void) { PCCERT_CONTEXT context; - if (!pCertGetNameStringA) - { - win_skip("CertGetNameStringA is not available\n"); - return; - } - context = CertCreateCertificateContext(X509_ASN_ENCODING, cert, sizeof(cert)); ok(context != NULL, "CertCreateCertificateContext failed: %08lx\n", @@ -820,130 +763,129 @@ static void test_CertGetNameStringA(void) LPSTR str; /* Bad string types/types missing from the cert */ - len = pCertGetNameStringA(NULL, 0, 0, NULL, NULL, 0); + len = CertGetNameStringA(NULL, 0, 0, NULL, NULL, 0); ok(len == 1, "expected 1, got %ld\n", len); - len = pCertGetNameStringA(context, 0, 0, NULL, NULL, 0); + len = CertGetNameStringA(context, 0, 0, NULL, NULL, 0); ok(len == 1, "expected 1, got %ld\n", len); - len = pCertGetNameStringA(context, CERT_NAME_URL_TYPE, 0, NULL, NULL, + len = CertGetNameStringA(context, CERT_NAME_URL_TYPE, 0, NULL, NULL, 0); ok(len == 1, "expected 1, got %ld\n", len); - len = pCertGetNameStringA(context, CERT_NAME_EMAIL_TYPE, 0, NULL, NULL, + len = CertGetNameStringA(context, CERT_NAME_EMAIL_TYPE, 0, NULL, NULL, 0); ok(len == strlen(aric) + 1, "unexpected length %ld\n", len); str = HeapAlloc(GetProcessHeap(), 0, len); if (str) { - len = pCertGetNameStringA(context, CERT_NAME_EMAIL_TYPE, 0, NULL, + len = CertGetNameStringA(context, CERT_NAME_EMAIL_TYPE, 0, NULL, str, len); ok(!strcmp(str, aric), "unexpected value %s\n", str); HeapFree(GetProcessHeap(), 0, str); } - len = pCertGetNameStringA(context, CERT_NAME_RDN_TYPE, 0, NULL, NULL, + len = CertGetNameStringA(context, CERT_NAME_RDN_TYPE, 0, NULL, NULL, 0); ok(len == strlen(issuerStr) + 1, "unexpected length %ld\n", len); str = HeapAlloc(GetProcessHeap(), 0, len); if (str) { - len = pCertGetNameStringA(context, CERT_NAME_RDN_TYPE, 0, NULL, + len = CertGetNameStringA(context, CERT_NAME_RDN_TYPE, 0, NULL, str, len); ok(!strcmp(str, issuerStr), "unexpected value %s\n", str); HeapFree(GetProcessHeap(), 0, str); } type = 0; - len = pCertGetNameStringA(context, CERT_NAME_RDN_TYPE, 0, &type, NULL, + len = CertGetNameStringA(context, CERT_NAME_RDN_TYPE, 0, &type, NULL, 0); ok(len == strlen(issuerStr) + 1, "unexpected length %ld\n", len); str = HeapAlloc(GetProcessHeap(), 0, len); if (str) { - len = pCertGetNameStringA(context, CERT_NAME_RDN_TYPE, 0, &type, + len = CertGetNameStringA(context, CERT_NAME_RDN_TYPE, 0, &type, str, len); ok(!strcmp(str, issuerStr), "unexpected value %s\n", str); HeapFree(GetProcessHeap(), 0, str); } type = CERT_OID_NAME_STR; - len = pCertGetNameStringA(context, CERT_NAME_RDN_TYPE, 0, &type, NULL, + len = CertGetNameStringA(context, CERT_NAME_RDN_TYPE, 0, &type, NULL, 0); ok(len == strlen(subjectStr) + 1, "unexpected length %ld\n", len); str = HeapAlloc(GetProcessHeap(), 0, len); if (str) { - len = pCertGetNameStringA(context, CERT_NAME_RDN_TYPE, 0, &type, + len = CertGetNameStringA(context, CERT_NAME_RDN_TYPE, 0, &type, str, len); ok(!strcmp(str, subjectStr), "unexpected value %s\n", str); HeapFree(GetProcessHeap(), 0, str); } - len = pCertGetNameStringA(context, CERT_NAME_ATTR_TYPE, 0, NULL, NULL, + len = CertGetNameStringA(context, CERT_NAME_ATTR_TYPE, 0, NULL, NULL, 0); ok(len == strlen(aric) + 1, "unexpected length %ld\n", len); str = HeapAlloc(GetProcessHeap(), 0, len); if (str) { - len = pCertGetNameStringA(context, CERT_NAME_ATTR_TYPE, 0, NULL, + len = CertGetNameStringA(context, CERT_NAME_ATTR_TYPE, 0, NULL, str, len); ok(!strcmp(str, aric), "unexpected value %s\n", str); HeapFree(GetProcessHeap(), 0, str); } - len = pCertGetNameStringA(context, CERT_NAME_ATTR_TYPE, 0, + len = CertGetNameStringA(context, CERT_NAME_ATTR_TYPE, 0, (void *)szOID_RSA_emailAddr, NULL, 0); ok(len == strlen(aric) + 1, "unexpected length %ld\n", len); str = HeapAlloc(GetProcessHeap(), 0, len); if (str) { - len = pCertGetNameStringA(context, CERT_NAME_ATTR_TYPE, 0, + len = CertGetNameStringA(context, CERT_NAME_ATTR_TYPE, 0, (void *)szOID_RSA_emailAddr, str, len); ok(!strcmp(str, aric), "unexpected value %s\n", str); HeapFree(GetProcessHeap(), 0, str); } - len = pCertGetNameStringA(context, CERT_NAME_ATTR_TYPE, 0, + len = CertGetNameStringA(context, CERT_NAME_ATTR_TYPE, 0, (void *)szOID_COMMON_NAME, NULL, 0); ok(len == strlen(localhost) + 1, "unexpected length %ld\n", len); str = HeapAlloc(GetProcessHeap(), 0, len); if (str) { - len = pCertGetNameStringA(context, CERT_NAME_ATTR_TYPE, 0, + len = CertGetNameStringA(context, CERT_NAME_ATTR_TYPE, 0, (void *)szOID_COMMON_NAME, str, len); ok(!strcmp(str, localhost), "unexpected value %s\n", str); HeapFree(GetProcessHeap(), 0, str); } - len = pCertGetNameStringA(context, CERT_NAME_SIMPLE_DISPLAY_TYPE, 0, + len = CertGetNameStringA(context, CERT_NAME_SIMPLE_DISPLAY_TYPE, 0, NULL, NULL, 0); ok(len == strlen(localhost) + 1, "unexpected length %ld\n", len); str = HeapAlloc(GetProcessHeap(), 0, len); if (str) { - len = pCertGetNameStringA(context, CERT_NAME_SIMPLE_DISPLAY_TYPE, + len = CertGetNameStringA(context, CERT_NAME_SIMPLE_DISPLAY_TYPE, 0, NULL, str, len); ok(!strcmp(str, localhost), "unexpected value %s\n", str); HeapFree(GetProcessHeap(), 0, str); } - len = pCertGetNameStringA(context, CERT_NAME_FRIENDLY_DISPLAY_TYPE, 0, + len = CertGetNameStringA(context, CERT_NAME_FRIENDLY_DISPLAY_TYPE, 0, NULL, NULL, 0); ok(len == strlen(localhost) + 1, "unexpected length %ld\n", len); str = HeapAlloc(GetProcessHeap(), 0, len); if (str) { - len = pCertGetNameStringA(context, CERT_NAME_FRIENDLY_DISPLAY_TYPE, + len = CertGetNameStringA(context, CERT_NAME_FRIENDLY_DISPLAY_TYPE, 0, NULL, str, len); ok(!strcmp(str, localhost), "unexpected value %s\n", str); HeapFree(GetProcessHeap(), 0, str); } - len = pCertGetNameStringA(context, CERT_NAME_DNS_TYPE, 0, NULL, NULL, + len = CertGetNameStringA(context, CERT_NAME_DNS_TYPE, 0, NULL, NULL, 0); - ok(len == strlen(localhost) + 1 || broken(len == 1) /* NT4 */, - "unexpected length %ld\n", len); + ok(len == strlen(localhost) + 1, "unexpected length %ld\n", len); if (len > 1) { str = HeapAlloc(GetProcessHeap(), 0, len); if (str) { - len = pCertGetNameStringA(context, CERT_NAME_DNS_TYPE, 0, NULL, + len = CertGetNameStringA(context, CERT_NAME_DNS_TYPE, 0, NULL, str, len); ok(!strcmp(str, localhost), "unexpected value %s\n", str); HeapFree(GetProcessHeap(), 0, str); @@ -956,16 +898,6 @@ static void test_CertGetNameStringA(void) START_TEST(str) { - dll = GetModuleHandleA("Crypt32.dll"); - - pCertNameToStrA = (void*)GetProcAddress(dll,"CertNameToStrA"); - pCertNameToStrW = (void*)GetProcAddress(dll,"CertNameToStrW"); - pCertRDNValueToStrA = (void*)GetProcAddress(dll, "CertRDNValueToStrA"); - pCertRDNValueToStrW = (void*)GetProcAddress(dll, "CertRDNValueToStrW"); - pCertStrToNameA = (void*)GetProcAddress(dll,"CertStrToNameA"); - pCertStrToNameW = (void*)GetProcAddress(dll,"CertStrToNameW"); - pCertGetNameStringA = (void*)GetProcAddress(dll, "CertGetNameStringA"); - test_CertRDNValueToStrA(); test_CertRDNValueToStrW(); test_CertNameToStrA(); -- 2.30.2

1 0

[PATCH 1/2] wbemprox: Use CRT memory allocation functions.
by Nikolay Sivov April 12, 2022

April 12, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/wbemprox/security.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/security.c b/dlls/wbemprox/security.c index a27cca798f3..df8c55c48fc 100644 --- a/dlls/wbemprox/security.c +++ b/dlls/wbemprox/security.c @@ -113,7 +113,7 @@ static HRESULT get_sd( SECURITY_DESCRIPTOR **sd, DWORD *size ) *size = GetSecurityDescriptorLength( &absolute_sd ); - *sd = HeapAlloc( GetProcessHeap(), 0, *size ); + *sd = malloc( *size ); if (!*sd) hr = E_OUTOFMEMORY; @@ -121,7 +121,7 @@ static HRESULT get_sd( SECURITY_DESCRIPTOR **sd, DWORD *size ) { if (!MakeSelfRelativeSD(&absolute_sd, *sd, size)) { - HeapFree( GetProcessHeap(), 0, *sd ); + free( *sd ); *sd = NULL; hr = E_FAIL; } @@ -162,7 +162,7 @@ HRESULT security_get_sd( IWbemClassObject *obj, IWbemContext *context, IWbemClas if (SUCCEEDED(hr)) hr = IWbemClassObject_Put( out_params, L"SD", 0, &var_sd, CIM_UINT8|CIM_FLAG_ARRAY ); - HeapFree( GetProcessHeap(), 0, sd ); + free( sd ); VariantClear( &var_sd ); } -- 2.35.1

2 3

[PATCH v11 4/8] wdscore/tests: Add CurrentIP test.
by Mohamad Al-Jaf April 12, 2022

April 12, 2022

Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v10: - Remove redundant headers. Hopefully this was the reason why it wasn't getting committed. --- configure.ac | 1 + dlls/wdscore/tests/Makefile.in | 4 +++ dlls/wdscore/tests/main.c | 59 ++++++++++++++++++++++++++++++++++ 3 files changed, 64 insertions(+) create mode 100644 dlls/wdscore/tests/Makefile.in create mode 100644 dlls/wdscore/tests/main.c diff --git a/configure.ac b/configure.ac index 6cbc0a61be1..48445cc7b2f 100644 --- a/configure.ac +++ b/configure.ac @@ -3072,6 +3072,7 @@ WINE_CONFIG_MAKEFILE(dlls/wbemdisp/tests) WINE_CONFIG_MAKEFILE(dlls/wbemprox) WINE_CONFIG_MAKEFILE(dlls/wbemprox/tests) WINE_CONFIG_MAKEFILE(dlls/wdscore) +WINE_CONFIG_MAKEFILE(dlls/wdscore/tests) WINE_CONFIG_MAKEFILE(dlls/webservices) WINE_CONFIG_MAKEFILE(dlls/webservices/tests) WINE_CONFIG_MAKEFILE(dlls/websocket) diff --git a/dlls/wdscore/tests/Makefile.in b/dlls/wdscore/tests/Makefile.in new file mode 100644 index 00000000000..baf4adf23a1 --- /dev/null +++ b/dlls/wdscore/tests/Makefile.in @@ -0,0 +1,4 @@ +TESTDLL = wdscore.dll + +C_SRCS = \ + main.c diff --git a/dlls/wdscore/tests/main.c b/dlls/wdscore/tests/main.c new file mode 100644 index 00000000000..f1f8c6d27ae --- /dev/null +++ b/dlls/wdscore/tests/main.c @@ -0,0 +1,59 @@ +/* + * Unit test suite for wdscore + * + * Copyright 2022 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "wine/test.h" + +static HMODULE dll; +static LPVOID (*pCurrentIP)(void); + +static BOOL init_function_pointers(void) +{ + dll = LoadLibraryA("wdscore.dll"); + + if (dll) + { + pCurrentIP = (void*)GetProcAddress(dll, "CurrentIP"); + return TRUE; + } + return FALSE; +} + +static void test_CurrentIP(void) +{ + char *cur; + char *ret; + + cur = (char*)&test_CurrentIP; + ret = (char*)pCurrentIP(); + + ok(cur <= ret && ret < (cur + 0x100), "Address %p not in function starting at %p.\n", ret, cur); +} + +START_TEST(main) +{ + if (init_function_pointers()) + { + test_CurrentIP(); + FreeLibrary(dll); + } + else + skip("could not load wdscore.dll\n"); +} -- 2.35.1

1 4

[PATCH v11 3/8] wdscore: Implement CurrentIP.
by Mohamad Al-Jaf April 12, 2022

April 12, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51850 Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v10: - Revert to stdcall since it makes no difference. --- dlls/wdscore/Makefile.in | 3 +++ dlls/wdscore/main.c | 55 +++++++++++++++++++++++++++++++++++++++ dlls/wdscore/wdscore.spec | 2 +- 3 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 dlls/wdscore/main.c diff --git a/dlls/wdscore/Makefile.in b/dlls/wdscore/Makefile.in index 20ba1d3b1c9..2020e72c7bb 100644 --- a/dlls/wdscore/Makefile.in +++ b/dlls/wdscore/Makefile.in @@ -1,3 +1,6 @@ MODULE = wdscore.dll EXTRADLLFLAGS = -Wb,--prefer-native + +C_SRCS = \ + main.c diff --git a/dlls/wdscore/main.c b/dlls/wdscore/main.c new file mode 100644 index 00000000000..95dea0e7e5f --- /dev/null +++ b/dlls/wdscore/main.c @@ -0,0 +1,55 @@ +/* + * Copyright 2022 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wdscore_internal.h" + +#include "wine/asm.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wdscore); + +/*********************************************************************** + * CurrentIP (wdscore.@) + */ +#ifdef __i386__ +__ASM_STDCALL_FUNC(CurrentIP, 0, + "movl (%esp), %eax\n\t" + "ret") +#elif defined(__x86_64__) +__ASM_STDCALL_FUNC(CurrentIP, 0, + "movq (%rsp), %rax\n\t" + "ret") +#elif defined(__arm__) +__ASM_STDCALL_FUNC(CurrentIP, 0, + "mov r0, lr\n\t" + "bx lr") +#elif defined(__aarch64__) +__ASM_STDCALL_FUNC(CurrentIP, 0, + "mov x0, lr\n\t" + "ret") +#else +LPVOID WINAPI CurrentIP(void) +{ + FIXME( "not implemented\n" ); + return NULL; +} +#endif diff --git a/dlls/wdscore/wdscore.spec b/dlls/wdscore/wdscore.spec index aa55f494387..282b6301688 100644 --- a/dlls/wdscore/wdscore.spec +++ b/dlls/wdscore/wdscore.spec @@ -71,7 +71,7 @@ @ stub ConstructPartialMsgIfW @ stub ConstructPartialMsgVA @ stub ConstructPartialMsgVW -@ stub CurrentIP +@ stdcall CurrentIP() @ stub EndMajorTask @ stub EndMinorTask @ stub GetMajorTask -- 2.35.1

1 0

[PATCH v11 2/8] wdscore: Add wdscore_internal.h file.
by Mohamad Al-Jaf April 12, 2022

April 12, 2022

Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v11: - Don't move the assembly code to the header. The way I was testing this gave me a false ok. I didn't think it through completely. Doesn't help that I'm sleep-deprived and hadn't eaten anything all day. At this point I'm pretty sure my patches are automatically getting sent straight to /dev/null :( --- dlls/wdscore/wdscore_internal.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 dlls/wdscore/wdscore_internal.h diff --git a/dlls/wdscore/wdscore_internal.h b/dlls/wdscore/wdscore_internal.h new file mode 100644 index 00000000000..02df26acc20 --- /dev/null +++ b/dlls/wdscore/wdscore_internal.h @@ -0,0 +1,24 @@ +/* + * Copyright 2022 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WDSCORE_INTERNAL_H__ +#define __WDSCORE_INTERNAL_H__ + +LPVOID WINAPI CurrentIP(void); + +#endif /* __WDSCORE_INTERNAL_H__ */ -- 2.35.1

1 0

[PATCH v11 1/8] wdscore: Fix spec entries.
by Mohamad Al-Jaf April 12, 2022

April 12, 2022

Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- dlls/wdscore/wdscore.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wdscore/wdscore.spec b/dlls/wdscore/wdscore.spec index 15958b86aba..aa55f494387 100644 --- a/dlls/wdscore/wdscore.spec +++ b/dlls/wdscore/wdscore.spec @@ -116,7 +116,7 @@ @ stub WdsGetBlackboardValue @ stub WdsGetCurrentExecutionGroup @ stub WdsGetSetupLog -@ stub WdsTempDir +@ stub WdsGetTempDir @ stub WdsInitialize @ stub WdsInitializeCallbackArray @ stub WdsInitializeDataBinary @@ -139,7 +139,7 @@ @ stub WdsPackCollection @ stub WdsPublish @ stub WdsPublishEx -@ stub WdsPublishImmediateAsynch +@ stub WdsPublishImmediateAsync @ stub WdsPublishImmediateEx @ stub WdsPublishOffline @ stub WdsSeqAlloc @@ -150,8 +150,8 @@ @ stub WdsSetUILanguage @ stub WdsSetupLogDestroy @ stub WdsSetupLogInit -@ stub WdsSetLogMessageA -@ stub WdsSetLogMessageW +@ stub WdsSetupLogMessageA +@ stub WdsSetupLogMessageW @ stub WdsSubscribeEx @ stub WdsTerminate @ stub WdsUnlockExecutionGroup -- 2.35.1

1 0

[PATCH v10 1/8] wdscore: Fix spec entries.
by Mohamad Al-Jaf April 12, 2022

April 12, 2022

Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- dlls/wdscore/wdscore.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wdscore/wdscore.spec b/dlls/wdscore/wdscore.spec index 15958b86aba..aa55f494387 100644 --- a/dlls/wdscore/wdscore.spec +++ b/dlls/wdscore/wdscore.spec @@ -116,7 +116,7 @@ @ stub WdsGetBlackboardValue @ stub WdsGetCurrentExecutionGroup @ stub WdsGetSetupLog -@ stub WdsTempDir +@ stub WdsGetTempDir @ stub WdsInitialize @ stub WdsInitializeCallbackArray @ stub WdsInitializeDataBinary @@ -139,7 +139,7 @@ @ stub WdsPackCollection @ stub WdsPublish @ stub WdsPublishEx -@ stub WdsPublishImmediateAsynch +@ stub WdsPublishImmediateAsync @ stub WdsPublishImmediateEx @ stub WdsPublishOffline @ stub WdsSeqAlloc @@ -150,8 +150,8 @@ @ stub WdsSetUILanguage @ stub WdsSetupLogDestroy @ stub WdsSetupLogInit -@ stub WdsSetLogMessageA -@ stub WdsSetLogMessageW +@ stub WdsSetupLogMessageA +@ stub WdsSetupLogMessageW @ stub WdsSubscribeEx @ stub WdsTerminate @ stub WdsUnlockExecutionGroup -- 2.35.1

2 8

[PATCH v4 1/4] include/ddk: Add winusbio.h file.
by Mohamad Al-Jaf April 11, 2022

April 11, 2022

Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- GUID was uppercased for copyright reasons. --- include/Makefile.in | 1 + include/ddk/winusbio.h | 58 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 include/ddk/winusbio.h diff --git a/include/Makefile.in b/include/Makefile.in index 047e7ff9146..25cd9c6f4eb 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -209,6 +209,7 @@ SOURCES = \ ddk/wdm.h \ ddk/winddiui.h \ ddk/winsplp.h \ + ddk/winusbio.h \ ddk/wsk.h \ ddraw.h \ ddrawgdi.h \ diff --git a/include/ddk/winusbio.h b/include/ddk/winusbio.h new file mode 100644 index 00000000000..7b6b7c92efc --- /dev/null +++ b/include/ddk/winusbio.h @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2022 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _WINUSBIO_H_ +#define _WINUSBIO_H_ + +#define SHORT_PACKET_TERMINATE 0x01 +#define AUTO_CLEAR_STALL 0x02 +#define PIPE_TRANSFER_TIMEOUT 0x03 +#define IGNORE_SHORT_PACKETS 0x04 +#define ALLOW_PARTIAL_READS 0x05 +#define AUTO_FLUSH 0x06 +#define RAW_IO 0x07 +#define MAXIMUM_TRANSFER_SIZE 0x08 +#define RESET_PIPE_ON_RESUME 0x09 + +#define AUTO_SUSPEND 0x81 +#define SUSPEND_DELAY 0x83 + +#define DEVICE_SPEED 0x01 + +#define LowSpeed 0x01 +#define FullSpeed 0x02 +#define HighSpeed 0x03 + +DEFINE_GUID(WinUSB_TestGuid, 0XDA812BFF, 0X12C3, 0X46A2, 0X8E, 0X2B, 0XDB, 0XD3, 0XB7, 0X83, 0X4C, 0X43); + +typedef struct _WINUSB_PIPE_INFORMATION { + USBD_PIPE_TYPE PipeType; + UCHAR PipeId; + USHORT MaximumPacketSize; + UCHAR Interval; +} WINUSB_PIPE_INFORMATION, *PWINUSB_PIPE_INFORMATION; + +typedef struct _WINUSB_PIPE_INFORMATION_EX { + USBD_PIPE_TYPE PipeType; + UCHAR PipeId; + USHORT MaximumPacketSize; + UCHAR Interval; + ULONG MaximumBytesPerInterval; +} WINUSB_PIPE_INFORMATION_EX, *PWINUSB_PIPE_INFORMATION_EX; + +#endif /* _WINUSBIO_H_ */ -- 2.35.1

1 4

[PATCH v4] include: Add some math declarations.
by Daniel Lehman April 11, 2022

April 11, 2022

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- v4: fix build using gcc without mingw v3: remove incorrect declarations and other unavailable functions v2: correct some declarations --- dlls/msvcrt/math.c | 20 ++++++++++---------- include/msvcrt/math.h | 32 +++++++++++++++++++++++++++++--- 2 files changed, 39 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 854403a71bf..31200562f00 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -8695,13 +8695,13 @@ __msvcrt_long CDECL lrintf(float x) /********************************************************************* * llrint (MSVCR120.@) */ -__int64 CDECL llrint(double x) +long long CDECL llrint(double x) { double d; d = rint(x); - if ((d < 0 && d != (double)(__int64)d) - || (d >= 0 && d != (double)(unsigned __int64)d)) { + if ((d < 0 && d != (double)(long long)d) + || (d >= 0 && d != (double)(unsigned long long)d)) { *_errno() = EDOM; return 0; } @@ -8711,13 +8711,13 @@ __int64 CDECL llrint(double x) /********************************************************************* * llrintf (MSVCR120.@) */ -__int64 CDECL llrintf(float x) +long long CDECL llrintf(float x) { float f; f = rintf(x); - if ((f < 0 && f != (float)(__int64)f) - || (f >= 0 && f != (float)(unsigned __int64)f)) { + if ((f < 0 && f != (float)(long long)f) + || (f >= 0 && f != (float)(unsigned long long)f)) { *_errno() = EDOM; return 0; } @@ -8798,10 +8798,10 @@ __msvcrt_long CDECL lroundf(float x) * * Copied from musl: src/math/llround.c */ -__int64 CDECL llround(double x) +long long CDECL llround(double x) { double d = round(x); - if (d != (double)(__int64)d) { + if (d != (double)(long long)d) { *_errno() = EDOM; return 0; } @@ -8813,10 +8813,10 @@ __int64 CDECL llround(double x) * * Copied from musl: src/math/llroundf.c */ -__int64 CDECL llroundf(float x) +long long CDECL llroundf(float x) { float f = roundf(x); - if (f != (float)(__int64)f) { + if (f != (float)(long long)f) { *_errno() = EDOM; return 0; } diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index da07303bcd9..97ae6dfe240 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -69,12 +69,16 @@ _ACRTIMP double __cdecl fabs(double); _ACRTIMP double __cdecl ldexp(double, int); _ACRTIMP double __cdecl frexp(double, int*); _ACRTIMP double __cdecl modf(double, double*); +_ACRTIMP double __cdecl fdim(double, double); _ACRTIMP double __cdecl fmod(double, double); _ACRTIMP double __cdecl fmin(double, double); _ACRTIMP double __cdecl fmax(double, double); _ACRTIMP double __cdecl erf(double); +_ACRTIMP double __cdecl remainder(double, double); _ACRTIMP double __cdecl remquo(double, double, int*); _ACRTIMP float __cdecl remquof(float, float, int*); +_ACRTIMP double __cdecl lgamma(double); +_ACRTIMP double __cdecl tgamma(double); _ACRTIMP double __cdecl _hypot(double, double); _ACRTIMP double __cdecl _j0(double); @@ -86,18 +90,31 @@ _ACRTIMP double __cdecl _yn(int, double); _ACRTIMP double __cdecl cbrt(double); _ACRTIMP double __cdecl exp2(double); +_ACRTIMP double __cdecl expm1(double); +_ACRTIMP double __cdecl log1p(double); _ACRTIMP double __cdecl log2(double); +_ACRTIMP double __cdecl logb(double); _ACRTIMP double __cdecl rint(double); _ACRTIMP double __cdecl round(double); _ACRTIMP double __cdecl trunc(double); _ACRTIMP float __cdecl cbrtf(float); _ACRTIMP float __cdecl exp2f(float); +_ACRTIMP float __cdecl expm1f(float); +_ACRTIMP float __cdecl log1pf(float); _ACRTIMP float __cdecl log2f(float); +_ACRTIMP float __cdecl logbf(float); _ACRTIMP float __cdecl rintf(float); _ACRTIMP float __cdecl roundf(float); _ACRTIMP float __cdecl truncf(float); +_ACRTIMP int __cdecl ilogb(double); +_ACRTIMP int __cdecl ilogbf(float); + +_ACRTIMP long long __cdecl llrint(double); +_ACRTIMP long long __cdecl llrintf(float); +_ACRTIMP long long __cdecl llround(double); +_ACRTIMP long long __cdecl llroundf(float); _ACRTIMP __msvcrt_long __cdecl lrint(double); _ACRTIMP __msvcrt_long __cdecl lrintf(float); _ACRTIMP __msvcrt_long __cdecl lround(double); @@ -105,6 +122,8 @@ _ACRTIMP __msvcrt_long __cdecl lroundf(float); _ACRTIMP double __cdecl scalbn(double,int); _ACRTIMP float __cdecl scalbnf(float,int); +_ACRTIMP double __cdecl scalbln(double,__msvcrt_long); +_ACRTIMP float __cdecl scalblnf(float,__msvcrt_long); _ACRTIMP double __cdecl _copysign (double, double); _ACRTIMP double __cdecl _chgsign (double); @@ -115,6 +134,8 @@ _ACRTIMP int __cdecl _finite(double); _ACRTIMP int __cdecl _isnan(double); _ACRTIMP int __cdecl _fpclass(double); +_ACRTIMP double __cdecl nextafter(double, double); + #ifndef __i386__ _ACRTIMP float __cdecl sinf(float); @@ -199,15 +220,20 @@ _ACRTIMP float __cdecl _logbf(float); _ACRTIMP float __cdecl acoshf(float); _ACRTIMP float __cdecl asinhf(float); _ACRTIMP float __cdecl atanhf(float); +_ACRTIMP float __cdecl erff(float); +_ACRTIMP float __cdecl fdimf(float, float); +_ACRTIMP float __cdecl fmaxf(float, float); +_ACRTIMP float __cdecl fminf(float, float); +_ACRTIMP float __cdecl lgammaf(float); +_ACRTIMP float __cdecl nextafterf(float, float); +_ACRTIMP float __cdecl remainderf(float, float); +_ACRTIMP float __cdecl tgammaf(float); #else static inline float _chgsignf(float x) { return _chgsign(x); } static inline float _copysignf(float x, float y) { return _copysign(x, y); } static inline float _logbf(float x) { return _logb(x); } -static inline float acoshf(float x) { return acosh(x); } -static inline float asinhf(float x) { return asinh(x); } -static inline float atanhf(float x) { return atanh(x); } #endif -- 2.25.1

2 1

[PATCH v2 1/2] msvcp140: Implement _Copy_file().
by Paul Gofman April 11, 2022

April 11, 2022

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - don't call SetLastError() on success. dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp140/tests/msvcp140.c | 62 ++++++++++++++++++++++++++++++++++ dlls/msvcp90/ios.c | 11 ++++++ dlls/msvcp_win/msvcp_win.spec | 2 +- 4 files changed, 75 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 3de0318a4d5..e7bdcd0378e 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3632,7 +3632,7 @@ @ cdecl _Cnd_timedwait(ptr ptr ptr) @ cdecl _Cnd_unregister_at_thread_exit(ptr) @ cdecl _Cnd_wait(ptr ptr) -@ stub _Copy_file +@ cdecl _Copy_file(wstr wstr) @ stub _Cosh @ cdecl _Current_get(ptr) @ cdecl _Current_set(wstr) tr2_sys__Current_set_wchar diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 14ba4a767d0..423c4c652b9 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -227,6 +227,7 @@ static int (__cdecl *p__Xtime_diff_to_millis2)(const xtime*, const xtime*); static int (__cdecl *p_xtime_get)(xtime*, int); static void (__cdecl *p_Close_dir)(void*); +static DWORD (__cdecl *p_Copy_file)(WCHAR const *, WCHAR const *); static MSVCP_bool (__cdecl *p_Current_get)(WCHAR *); static MSVCP_bool (__cdecl *p_Current_set)(WCHAR const *); static int (__cdecl *p_Equivalent)(WCHAR const*, WCHAR const*); @@ -338,6 +339,7 @@ static BOOL init(void) SET(p_xtime_get, "xtime_get"); SET(p_Close_dir, "_Close_dir"); + SET(p_Copy_file, "_Copy_file"); SET(p_Current_get, "_Current_get"); SET(p_Current_set, "_Current_set"); SET(p_Equivalent, "_Equivalent"); @@ -1575,6 +1577,65 @@ static void test_cnd(void) CloseHandle(cm.initialized); } +static void test_Copy_file(void) +{ + WCHAR origin_path[MAX_PATH], temp_path[MAX_PATH]; + HANDLE file; + DWORD ret; + + GetCurrentDirectoryW(MAX_PATH, origin_path); + GetTempPathW(MAX_PATH, temp_path); + ok(SetCurrentDirectoryW(temp_path), "SetCurrentDirectoryW to temp_path failed\n"); + + CreateDirectoryW(L"wine_test_dir", NULL); + + file = CreateFileW(L"wine_test_dir/f1", 0, 0, NULL, CREATE_NEW, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); + ok(CloseHandle(file), "CloseHandle\n"); + + file = CreateFileW(L"wine_test_dir/f2", 0, 0, NULL, CREATE_NEW, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); + ok(CloseHandle(file), "CloseHandle\n"); + SetFileAttributesW(L"wine_test_dir/f2", FILE_ATTRIBUTE_READONLY); + + ok(CreateDirectoryW(L"wine_test_dir/d1", NULL) || GetLastError() == ERROR_ALREADY_EXISTS, + "CreateDirectoryW failed.\n"); + + SetLastError(0xdeadbeef); + ret = p_Copy_file(L"wine_test_dir/f1", L"wine_test_dir/d1"); + ok(ret == ERROR_ACCESS_DENIED, "Got unexpected ret %lu.\n", ret); + ok(GetLastError() == ret, "Got unexpected err %lu.\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = p_Copy_file(L"wine_test_dir/f1", L"wine_test_dir/f2"); + ok(ret == ERROR_ACCESS_DENIED, "Got unexpected ret %lu.\n", ret); + ok(GetLastError() == ret, "Got unexpected err %lu.\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = p_Copy_file(L"wine_test_dir/f1", L"wine_test_dir/f3"); + ok(ret == ERROR_SUCCESS, "Got unexpected ret %lu.\n", ret); + ok(GetLastError() == ret, "Got unexpected err %lu.\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = p_Copy_file(L"wine_test_dir/f1", L"wine_test_dir/f3"); + ok(ret == ERROR_SUCCESS, "Got unexpected ret %lu.\n", ret); + todo_wine ok(GetLastError() == ret, "Got unexpected err %lu.\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = p_Copy_file(L"wine_test_dir/missing", L"wine_test_dir/f3"); + ok(ret == ERROR_FILE_NOT_FOUND, "Got unexpected ret %lu.\n", ret); + ok(GetLastError() == ret, "Got unexpected err %lu.\n", GetLastError()); + + ok(RemoveDirectoryW(L"wine_test_dir/d1"), "expect wine_test_dir to exist\n"); + ok(DeleteFileW(L"wine_test_dir/f1"), "expect wine_test_dir/f1 to exist\n"); + SetFileAttributesW(L"wine_test_dir/f2", FILE_ATTRIBUTE_NORMAL); + ok(DeleteFileW(L"wine_test_dir/f2"), "expect wine_test_dir/f2 to exist\n"); + ok(DeleteFileW(L"wine_test_dir/f3"), "expect wine_test_dir/f3 to exist\n"); + ok(RemoveDirectoryW(L"wine_test_dir"), "expect wine_test_dir to exist\n"); + + ok(SetCurrentDirectoryW(origin_path), "SetCurrentDirectoryW to origin_path failed\n"); +} + START_TEST(msvcp140) { if(!init()) return; @@ -1601,5 +1662,6 @@ START_TEST(msvcp140) test__Syserror_map(); test_Equivalent(); test_cnd(); + test_Copy_file(); FreeLibrary(msvcp); } diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 61308f49203..ef2c122f17f 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -15776,6 +15776,17 @@ enum file_type __cdecl _Stat(WCHAR const* path, int* permissions) return (attr & FILE_ATTRIBUTE_DIRECTORY) ? directory_file : regular_file; } +/* _Copy_file, msvcp140 version */ +DWORD __cdecl _Copy_file(WCHAR const* src, WCHAR const* dst) +{ + TRACE("src %s, dst %s.\n", debugstr_w(src), debugstr_w(dst)); + + if (CopyFileW(src, dst, FALSE)) + return ERROR_SUCCESS; + + return GetLastError(); +} + /* ?_Lstat(a)sys@tr2(a)std@@YA?AW4file_type(a)123@PB_WAAH(a)Z */ /* ?_Lstat(a)sys@tr2(a)std@@YA?AW4file_type(a)123@PEB_WAEAH(a)Z */ enum file_type __cdecl tr2_sys__Lstat_wchar(WCHAR const* path, int* err_code) diff --git a/dlls/msvcp_win/msvcp_win.spec b/dlls/msvcp_win/msvcp_win.spec index a15fb5c7ee3..3ba0ce1dfba 100644 --- a/dlls/msvcp_win/msvcp_win.spec +++ b/dlls/msvcp_win/msvcp_win.spec @@ -3632,7 +3632,7 @@ @ cdecl _Cnd_timedwait(ptr ptr ptr) msvcp140._Cnd_timedwait @ cdecl _Cnd_unregister_at_thread_exit(ptr) msvcp140._Cnd_unregister_at_thread_exit @ cdecl _Cnd_wait(ptr ptr) msvcp140._Cnd_wait -@ stub _Copy_file +@ cdecl _Copy_file(wstr wstr) msvcp140._Copy_file @ stub _Cosh @ cdecl _Current_get(ptr) msvcp140._Current_get @ cdecl _Current_set(wstr) msvcp140._Current_set -- 2.35.1

2 2

[PATCH v2 1/6] urlmon: Add basic implementation of MapBrowserEmulationModeToUserAgent.
by Gabriel Ivăncescu April 11, 2022

April 11, 2022

This is necessary for mshtml's navigator userAgent to work properly, since some apps expect it. The second argument seems to be output pointer that gets allocated (by CoTaskMemAlloc, or something compatible with it), but the first argument seems to be a pointer to an unknown struct, which makes it almost impossible to guess reliably what it does by just inspecting its behavior... Thankfully, it seems only the first DWORD field is necessary for this. Changing it returns the user agent for that given mode, if the rest is zeros. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/urlmon/session.c | 40 +++++++++++++++++++++++++++ dlls/urlmon/tests/misc.c | 57 +++++++++++++++++++++++++++++++++++++++ dlls/urlmon/urlmon.spec | 2 +- dlls/urlmon/urlmon_main.c | 10 ------- 4 files changed, 98 insertions(+), 11 deletions(-) diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index 052444d..e5dd26c 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -504,6 +504,7 @@ static BOOL get_url_encoding(HKEY root, DWORD *encoding) } static LPWSTR user_agent; +static BOOL user_agent_set; static size_t obtain_user_agent(unsigned int version, WCHAR *ret, size_t size) { @@ -710,6 +711,7 @@ HRESULT WINAPI UrlMkSetSessionOption(DWORD dwOption, LPVOID pBuffer, DWORD dwBuf heap_free(user_agent); user_agent = new_user_agent; + user_agent_set = TRUE; update_user_agent(user_agent); LeaveCriticalSection(&session_cs); @@ -748,6 +750,44 @@ HRESULT WINAPI ObtainUserAgentString(DWORD option, char *ret, DWORD *ret_size) return hres; } +/*********************************************************************** + * MapBrowserEmulationModeToUserAgent (URLMON.445) + * Undocumented, added in IE8 + */ +HRESULT WINAPI MapBrowserEmulationModeToUserAgent(const void *arg, WCHAR **ret) +{ + DWORD size, version; + const WCHAR *ua; + WCHAR buf[1024]; + + TRACE("%p %p: semi-stub\n", arg, ret); + + if(user_agent_set) { + /* Native ignores first arg if custom user agent has been set, doesn't crash even if NULL */ + size = (wcslen(user_agent) + 1) * sizeof(WCHAR); + ua = user_agent; + }else { + *ret = NULL; + + /* First arg seems to be a pointer to a structure of unknown size, and crashes + if it's too small (or filled with arbitrary values from the stack). For our + purposes, we only check first field which seems to be the requested version. */ + version = *(DWORD*)arg; + if(version == 5) + version = 7; + if(version < 7 || version > 11) + return E_FAIL; + + size = obtain_user_agent(version, buf, ARRAY_SIZE(buf)) * sizeof(WCHAR); + ua = buf; + } + + if(!(*ret = CoTaskMemAlloc(size))) + return E_OUTOFMEMORY; + memcpy(*ret, ua, size); + return S_OK; +} + void free_session(void) { name_space *ns_iter, *ns_last; diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 0575a43..c67b1d5 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -83,6 +83,7 @@ static HRESULT (WINAPI *pCompareSecurityIds)(BYTE*,DWORD,BYTE*,DWORD,DWORD); static HRESULT (WINAPI *pCoInternetIsFeatureEnabled)(INTERNETFEATURELIST,DWORD); static HRESULT (WINAPI *pCoInternetSetFeatureEnabled)(INTERNETFEATURELIST,DWORD,BOOL); static HRESULT (WINAPI *pIEInstallScope)(DWORD*); +static HRESULT (WINAPI *pMapBrowserEmulationModeToUserAgent)(const void*,WCHAR**); static WCHAR *a2co(const char *str) { @@ -2721,6 +2722,59 @@ static void test_bsc_marshaling(void) TerminateThread(thread, 0); } +static void test_MapBrowserEmulationModeToUserAgent(BOOL custom_ua) +{ + /* Undocumented structure of unknown size, crashes if it's too small (with arbitrary values from stack) */ + struct + { + DWORD version; + char unknown[252]; + } arg; + static char test_str[] = "test"; + const char *custom_ua_msg = ""; + HRESULT hres; + unsigned i; + WCHAR *ua; + + if(!pMapBrowserEmulationModeToUserAgent) { + win_skip("MapBrowserEmulationModeToUserAgent not available\n"); + return; + } + memset(&arg, 0, sizeof(arg)); + + if(custom_ua) { + hres = UrlMkSetSessionOption(URLMON_OPTION_USERAGENT, test_str, sizeof(test_str), 0); + ok(hres == S_OK, "UrlMkSetSessionOption failed: %08lx\n", hres); + custom_ua_msg = " (with custom ua)"; + } + + for(i = 0; i < 12; i++) { + arg.version = i; + ua = (WCHAR*)0xdeadbeef; + hres = pMapBrowserEmulationModeToUserAgent(&arg, &ua); + ok(hres == (i == 5 || i >= 7 || custom_ua ? S_OK : E_FAIL), + "[%u] MapBrowserEmulationModeToUserAgent%s returned %08lx\n", i, custom_ua_msg, hres); + if(hres != S_OK) + ok(ua == NULL, "[%u] ua%s = %p\n", i, custom_ua_msg, ua); + else { + char buf[1024]; + DWORD size = sizeof(buf); + WCHAR *ua2; + + if(custom_ua) + ua2 = a2co(test_str); + else { + hres = pObtainUserAgentString(i, buf, &size); + ok(hres == S_OK, "[%u] ObtainUserAgentString%s failed: %08lx\n", i, custom_ua_msg, hres); + ua2 = a2co(buf); + } + ok(!lstrcmpW(ua, ua2), "[%u] ua%s = %s, expected %s\n", i, custom_ua_msg, wine_dbgstr_w(ua), wine_dbgstr_w(ua2)); + CoTaskMemFree(ua2); + CoTaskMemFree(ua); + } + } +} + START_TEST(misc) { HMODULE hurlmon; @@ -2745,6 +2799,7 @@ START_TEST(misc) pCoInternetIsFeatureEnabled = (void*) GetProcAddress(hurlmon, "CoInternetIsFeatureEnabled"); pCoInternetSetFeatureEnabled = (void*) GetProcAddress(hurlmon, "CoInternetSetFeatureEnabled"); pIEInstallScope = (void*) GetProcAddress(hurlmon, "IEInstallScope"); + pMapBrowserEmulationModeToUserAgent = (void*) GetProcAddress(hurlmon, (const char*)445); if (!pCoInternetCompareUrl || !pCoInternetGetSecurityUrl || !pCoInternetGetSession || !pCoInternetParseUrl || !pCompareSecurityIds) { @@ -2757,6 +2812,7 @@ START_TEST(misc) if(argc <= 2 || strcmp(argv[2], "internet_features")) { register_protocols(); + test_MapBrowserEmulationModeToUserAgent(FALSE); test_CreateFormatEnum(); test_RegisterFormatEnumerator(); test_CoInternetParseUrl(); @@ -2773,6 +2829,7 @@ START_TEST(misc) test_MkParseDisplayNameEx(); test_IsValidURL(); test_bsc_marshaling(); + test_MapBrowserEmulationModeToUserAgent(TRUE); } test_internet_features(); diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index ea3cd38..2fda69e 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -110,6 +110,6 @@ 410 stdcall @(long long) LogSqmBits 423 stdcall @(long long long long) LogSqmUXCommandOffsetInternal 444 stdcall @(long long long) MapUriToBrowserEmulationState -445 stdcall @(long long) MapBrowserEmulationModeToUserAgent +445 stdcall @(ptr ptr) MapBrowserEmulationModeToUserAgent 446 stdcall @(long) CoInternetGetBrowserProfile 455 stdcall @() FlushUrlmonZonesCache diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index b540313..56c2257 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -791,16 +791,6 @@ int WINAPI MapUriToBrowserEmulationState(DWORD unk1, DWORD unk2, DWORD unk3) return 0; } -/*********************************************************************** - * MapBrowserEmulationModeToUserAgent (URLMON.445) - * Undocumented, added in IE8 - */ -int WINAPI MapBrowserEmulationModeToUserAgent(DWORD unk1, DWORD unk2) -{ - FIXME("stub: %ld %ld\n", unk1, unk2); - return 0; -} - /*********************************************************************** * CoInternetGetBrowserProfile (URLMON.446) * Undocumented, added in IE8 -- 2.34.1

3 13

[PATCH] msvcp140: Implement _Copy_file().
by Paul Gofman April 11, 2022

April 11, 2022

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp140/tests/msvcp140.c | 62 ++++++++++++++++++++++++++++++++++ dlls/msvcp90/ios.c | 13 +++++++ dlls/msvcp_win/msvcp_win.spec | 2 +- 4 files changed, 77 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 3de0318a4d5..e7bdcd0378e 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3632,7 +3632,7 @@ @ cdecl _Cnd_timedwait(ptr ptr ptr) @ cdecl _Cnd_unregister_at_thread_exit(ptr) @ cdecl _Cnd_wait(ptr ptr) -@ stub _Copy_file +@ cdecl _Copy_file(wstr wstr) @ stub _Cosh @ cdecl _Current_get(ptr) @ cdecl _Current_set(wstr) tr2_sys__Current_set_wchar diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 14ba4a767d0..1df2f058424 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -227,6 +227,7 @@ static int (__cdecl *p__Xtime_diff_to_millis2)(const xtime*, const xtime*); static int (__cdecl *p_xtime_get)(xtime*, int); static void (__cdecl *p_Close_dir)(void*); +static DWORD (__cdecl *p_Copy_file)(WCHAR const *, WCHAR const *); static MSVCP_bool (__cdecl *p_Current_get)(WCHAR *); static MSVCP_bool (__cdecl *p_Current_set)(WCHAR const *); static int (__cdecl *p_Equivalent)(WCHAR const*, WCHAR const*); @@ -338,6 +339,7 @@ static BOOL init(void) SET(p_xtime_get, "xtime_get"); SET(p_Close_dir, "_Close_dir"); + SET(p_Copy_file, "_Copy_file"); SET(p_Current_get, "_Current_get"); SET(p_Current_set, "_Current_set"); SET(p_Equivalent, "_Equivalent"); @@ -1575,6 +1577,65 @@ static void test_cnd(void) CloseHandle(cm.initialized); } +static void test_Copy_file(void) +{ + WCHAR origin_path[MAX_PATH], temp_path[MAX_PATH]; + HANDLE file; + DWORD ret; + + GetCurrentDirectoryW(MAX_PATH, origin_path); + GetTempPathW(MAX_PATH, temp_path); + ok(SetCurrentDirectoryW(temp_path), "SetCurrentDirectoryW to temp_path failed\n"); + + CreateDirectoryW(L"wine_test_dir", NULL); + + file = CreateFileW(L"wine_test_dir/f1", 0, 0, NULL, CREATE_NEW, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); + ok(CloseHandle(file), "CloseHandle\n"); + + file = CreateFileW(L"wine_test_dir/f2", 0, 0, NULL, CREATE_NEW, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); + ok(CloseHandle(file), "CloseHandle\n"); + SetFileAttributesW(L"wine_test_dir/f2", FILE_ATTRIBUTE_READONLY); + + ok(CreateDirectoryW(L"wine_test_dir/d1", NULL) || GetLastError() == ERROR_ALREADY_EXISTS, + "CreateDirectoryW failed.\n"); + + SetLastError(0xdeadbeef); + ret = p_Copy_file(L"wine_test_dir/f1", L"wine_test_dir/d1"); + ok(ret == ERROR_ACCESS_DENIED, "Got unexpected ret %lu.\n", ret); + ok(GetLastError() == ret, "Got unexpected err %lu.\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = p_Copy_file(L"wine_test_dir/f1", L"wine_test_dir/f2"); + ok(ret == ERROR_ACCESS_DENIED, "Got unexpected ret %lu.\n", ret); + ok(GetLastError() == ret, "Got unexpected err %lu.\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = p_Copy_file(L"wine_test_dir/f1", L"wine_test_dir/f3"); + ok(ret == ERROR_SUCCESS, "Got unexpected ret %lu.\n", ret); + ok(GetLastError() == ret, "Got unexpected err %lu.\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = p_Copy_file(L"wine_test_dir/f1", L"wine_test_dir/f3"); + ok(ret == ERROR_SUCCESS, "Got unexpected ret %lu.\n", ret); + ok(GetLastError() == ret, "Got unexpected err %lu.\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = p_Copy_file(L"wine_test_dir/missing", L"wine_test_dir/f3"); + ok(ret == ERROR_FILE_NOT_FOUND, "Got unexpected ret %lu.\n", ret); + ok(GetLastError() == ret, "Got unexpected err %lu.\n", GetLastError()); + + ok(RemoveDirectoryW(L"wine_test_dir/d1"), "expect wine_test_dir to exist\n"); + ok(DeleteFileW(L"wine_test_dir/f1"), "expect wine_test_dir/f1 to exist\n"); + SetFileAttributesW(L"wine_test_dir/f2", FILE_ATTRIBUTE_NORMAL); + ok(DeleteFileW(L"wine_test_dir/f2"), "expect wine_test_dir/f2 to exist\n"); + ok(DeleteFileW(L"wine_test_dir/f3"), "expect wine_test_dir/f3 to exist\n"); + ok(RemoveDirectoryW(L"wine_test_dir"), "expect wine_test_dir to exist\n"); + + ok(SetCurrentDirectoryW(origin_path), "SetCurrentDirectoryW to origin_path failed\n"); +} + START_TEST(msvcp140) { if(!init()) return; @@ -1601,5 +1662,6 @@ START_TEST(msvcp140) test__Syserror_map(); test_Equivalent(); test_cnd(); + test_Copy_file(); FreeLibrary(msvcp); } diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 61308f49203..34d05608047 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -15776,6 +15776,19 @@ enum file_type __cdecl _Stat(WCHAR const* path, int* permissions) return (attr & FILE_ATTRIBUTE_DIRECTORY) ? directory_file : regular_file; } +/* _Copy_file, msvcp140 version */ +DWORD __cdecl _Copy_file(WCHAR const* src, WCHAR const* dst) +{ + TRACE("src %s, dst %s.\n", debugstr_w(src), debugstr_w(dst)); + + if (CopyFileW(src, dst, FALSE)) + { + SetLastError(ERROR_SUCCESS); + return ERROR_SUCCESS; + } + return GetLastError(); +} + /* ?_Lstat(a)sys@tr2(a)std@@YA?AW4file_type(a)123@PB_WAAH(a)Z */ /* ?_Lstat(a)sys@tr2(a)std@@YA?AW4file_type(a)123@PEB_WAEAH(a)Z */ enum file_type __cdecl tr2_sys__Lstat_wchar(WCHAR const* path, int* err_code) diff --git a/dlls/msvcp_win/msvcp_win.spec b/dlls/msvcp_win/msvcp_win.spec index a15fb5c7ee3..3ba0ce1dfba 100644 --- a/dlls/msvcp_win/msvcp_win.spec +++ b/dlls/msvcp_win/msvcp_win.spec @@ -3632,7 +3632,7 @@ @ cdecl _Cnd_timedwait(ptr ptr ptr) msvcp140._Cnd_timedwait @ cdecl _Cnd_unregister_at_thread_exit(ptr) msvcp140._Cnd_unregister_at_thread_exit @ cdecl _Cnd_wait(ptr ptr) msvcp140._Cnd_wait -@ stub _Copy_file +@ cdecl _Copy_file(wstr wstr) msvcp140._Copy_file @ stub _Cosh @ cdecl _Current_get(ptr) msvcp140._Current_get @ cdecl _Current_set(wstr) msvcp140._Current_set -- 2.35.1

2 1

[PATCH 1/2] msvcr110: Add _Cancellation_beacon::_Cancellation_beacon_ctor stub.
by Torge Matthies April 11, 2022

April 11, 2022

The pointer is needed for Crazy Machines 3 to not crash. Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> --- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/concurrency.c | 19 +++++++++++++++++++ 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 64c015b8ab6..b77671602ea 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -19,7 +19,7 @@ @ stub -arch=win64 ??0_CancellationTokenState(a)details@Concurrency@@AEAA(a)XZ @ stub -arch=arm ??0_Cancellation_beacon(a)details@Concurrency@@QAA(a)XZ @ stub -arch=i386 ??0_Cancellation_beacon(a)details@Concurrency@@QAE(a)XZ -@ stub -arch=win64 ??0_Cancellation_beacon(a)details@Concurrency@@QEAA(a)XZ +@ cdecl -arch=win64 ??0_Cancellation_beacon(a)details@Concurrency@@QEAA(a)XZ(ptr) _Cancellation_beacon_ctor @ cdecl -arch=arm ??0_Condition_variable(a)details@Concurrency@@QAA(a)XZ(ptr) _Condition_variable_ctor @ thiscall -arch=i386 ??0_Condition_variable(a)details@Concurrency@@QAE(a)XZ(ptr) _Condition_variable_ctor @ cdecl -arch=win64 ??0_Condition_variable(a)details@Concurrency@@QEAA(a)XZ(ptr) _Condition_variable_ctor diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 8a5d20036ec..4d54227fd52 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -16,7 +16,7 @@ @ cdecl -arch=win64 ??0SchedulerPolicy(a)Concurrency@@QEAA(a)XZ(ptr) SchedulerPolicy_ctor @ stub -arch=arm ??0_Cancellation_beacon(a)details@Concurrency@@QAA(a)XZ @ stub -arch=i386 ??0_Cancellation_beacon(a)details@Concurrency@@QAE(a)XZ -@ stub -arch=win64 ??0_Cancellation_beacon(a)details@Concurrency@@QEAA(a)XZ +@ cdecl -arch=win64 ??0_Cancellation_beacon(a)details@Concurrency@@QEAA(a)XZ(ptr) _Cancellation_beacon_ctor @ cdecl -arch=arm ??0_Condition_variable(a)details@Concurrency@@QAA(a)XZ(ptr) _Condition_variable_ctor @ thiscall -arch=i386 ??0_Condition_variable(a)details@Concurrency@@QAE(a)XZ(ptr) _Condition_variable_ctor @ cdecl -arch=win64 ??0_Condition_variable(a)details@Concurrency@@QEAA(a)XZ(ptr) _Condition_variable_ctor diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 2bf4a5010f8..3bb28baa631 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -14,7 +14,7 @@ @ cdecl -arch=win64 ??0SchedulerPolicy(a)Concurrency@@QEAA(a)XZ(ptr) msvcr120.??0SchedulerPolicy(a)Concurrency@@QEAA(a)XZ @ stub -arch=arm ??0_Cancellation_beacon(a)details@Concurrency@@QAA(a)XZ @ stub -arch=i386 ??0_Cancellation_beacon(a)details@Concurrency@@QAE(a)XZ -@ stub -arch=win64 ??0_Cancellation_beacon(a)details@Concurrency@@QEAA(a)XZ +@ cdecl -arch=win64 ??0_Cancellation_beacon(a)details@Concurrency@@QEAA(a)XZ(ptr) msvcr120.??0_Cancellation_beacon(a)details@Concurrency@@QEAA(a)XZ @ cdecl -arch=arm ??0_Condition_variable(a)details@Concurrency@@QAA(a)XZ(ptr) msvcr120.??0_Condition_variable(a)details@Concurrency@@QAA(a)XZ @ thiscall -arch=i386 ??0_Condition_variable(a)details@Concurrency@@QAE(a)XZ(ptr) msvcr120.??0_Condition_variable(a)details@Concurrency@@QAE(a)XZ @ cdecl -arch=win64 ??0_Condition_variable(a)details@Concurrency@@QEAA(a)XZ(ptr) msvcr120.??0_Condition_variable(a)details@Concurrency@@QEAA(a)XZ diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index 98baf253adf..0f9d0141f4c 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -308,6 +308,10 @@ typedef struct cv_queue { LONG expired; } cv_queue; +typedef struct { + void *unknown; +} _Cancellation_beacon; + typedef struct { /* cv_queue structure is not binary compatible */ cv_queue *queue; @@ -2486,6 +2490,21 @@ int __cdecl event_wait_for_multiple(event **events, size_t count, bool wait_all, #if _MSVCR_VER >= 110 +struct { + void *unk; +} _Cancellation_beacon_unknown = { + 0x0 +}; + +/* ??0_Cancellation_beacon(a)details@Concurrency@@QEAA(a)XZ */ +DEFINE_THISCALL_WRAPPER(_Cancellation_beacon_ctor, 4) +_Cancellation_beacon* __thiscall _Cancellation_beacon_ctor(_Cancellation_beacon *this) +{ + FIXME("(%p): stub!\n", this); + this->unknown = &_Cancellation_beacon_unknown; + return this; +} + /* ??0_Condition_variable(a)details@Concurrency@@QAE(a)XZ */ /* ??0_Condition_variable(a)details@Concurrency@@QEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(_Condition_variable_ctor, 4) -- 2.35.1

1 1

[PATCH] po: Update German translation.
by Julian Rüger April 11, 2022

April 11, 2022

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH v3 1/7] jscript: Implement Object.prototype.__defineGetter__.
by Gabriel Ivăncescu April 11, 2022

April 11, 2022

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/object.c | 44 ++++++++++++++++ dlls/mshtml/tests/documentmode.js | 88 +++++++++++++++++++++++++++++++ 2 files changed, 132 insertions(+) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 9d4a747..d7650ff 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -294,6 +294,49 @@ done: return hres; } +static HRESULT Object_defineGetter(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) +{ + property_desc_t desc; + const WCHAR *name; + jsstr_t *name_str; + jsdisp_t *jsthis; + HRESULT hres; + + TRACE("\n"); + + if(!is_object_instance(vthis) || !(jsthis = to_jsdisp(get_object(vthis)))) + goto done; + + if(argc < 2 || !is_object_instance(argv[1])) + return JS_E_FUNCTION_EXPECTED; + + desc.getter = to_jsdisp(get_object(argv[1])); + if(!desc.getter) { + FIXME("getter is not JS object\n"); + return E_NOTIMPL; + } + /* FIXME: Check IsCallable */ + + hres = to_flat_string(ctx, argv[0], &name_str, &name); + if(FAILED(hres)) + return hres; + + desc.flags = desc.mask = PROPF_CONFIGURABLE | PROPF_ENUMERABLE; + desc.explicit_getter = TRUE; + desc.explicit_setter = FALSE; + desc.explicit_value = FALSE; + desc.setter = NULL; + hres = jsdisp_define_property(jsthis, name, &desc); + + jsstr_release(name_str); + if(FAILED(hres)) + return hres; +done: + if(r) + *r = jsval_undefined(); + return S_OK; +} + HRESULT Object_get_proto_(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { jsdisp_t *jsthis; @@ -365,6 +408,7 @@ static void Object_destructor(jsdisp_t *dispex) } static const builtin_prop_t Object_props[] = { + {L"__defineGetter__", Object_defineGetter, PROPF_METHOD|PROPF_ES6|2}, {L"hasOwnProperty", Object_hasOwnProperty, PROPF_METHOD|1}, {L"isPrototypeOf", Object_isPrototypeOf, PROPF_METHOD|1}, {L"propertyIsEnumerable", Object_propertyIsEnumerable, PROPF_METHOD|1}, diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 2902902..18dd65e 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -1415,6 +1415,94 @@ sync_test("__proto__", function() { } }); +sync_test("__defineGetter__", function() { + var v = document.documentMode; + var r, x = 42; + + if(v < 11) { + ok(x.__defineGetter__ === undefined, "x.__defineGetter__ = " + x.__defineGetter__); + ok(!("__defineGetter__" in Object), "Object.__defineGetter__ = " + Object.__defineGetter__); + return; + } + ok(Object.prototype.hasOwnProperty("__defineGetter__"), "__defineGetter__ is not a property of Object.prototype"); + ok(Object.prototype.__defineGetter__.length === 2, "__defineGetter__.length = " + Object.prototype.__defineGetter__.length); + + function getter() { return "wine"; } + function setter(val) { } + + r = x.__defineGetter__("foo", getter); + ok(r === undefined, "__defineGetter__ on 42 returned " + r); + ok(x.foo === undefined, "42.foo = " + x.foo); + + x = {}; + r = x.__defineGetter__("foo", getter); + ok(r === undefined, "__defineGetter__ returned " + r); + ok(x.foo === "wine", "x.foo = " + x.foo); + r = Object.getOwnPropertyDescriptor(x, "foo"); + ok(r.value === undefined, "x.foo value = " + r.value); + ok(r.get === getter, "x.foo get = " + r.get); + ok(r.set === undefined, "x.foo set = " + r.set); + ok(r.writable === undefined, "x.foo writable = " + r.writable); + ok(r.enumerable === true, "x.foo enumerable = " + r.enumerable); + ok(r.configurable === true, "x.foo configurable = " + r.configurable); + + Object.defineProperty(x, "foo", { get: undefined, set: setter, configurable: false }); + r = Object.getOwnPropertyDescriptor(x, "foo"); + ok(r.value === undefined, "x.foo setter value = " + r.value); + ok(r.get === undefined, "x.foo setter get = " + r.get); + ok(r.set === setter, "x.foo setter set = " + r.set); + ok(r.writable === undefined, "x.foo setter writable = " + r.writable); + ok(r.enumerable === true, "x.foo setter enumerable = " + r.enumerable); + ok(r.configurable === false, "x.foo setter configurable = " + r.configurable); + try { + x.__defineGetter__("foo", getter); + ok(false, "expected exception calling __defineGetter__ on non-configurable property"); + }catch(e) { + ok(e.number === 0xa13d6 - 0x80000000, "__defineGetter__ on non-configurable property threw exception " + e.number); + } + + r = Object.prototype.__defineGetter__.call(undefined, "bar", getter); + ok(r === undefined, "__defineGetter__ on undefined returned " + r); + r = Object.prototype.__defineGetter__.call(null, "bar", getter); + ok(r === undefined, "__defineGetter__ on null returned " + r); + r = x.__defineGetter__(undefined, getter); + ok(r === undefined, "__defineGetter__ undefined prop returned " + r); + ok(x["undefined"] === "wine", "x.undefined = " + x["undefined"]); + r = x.__defineGetter__(false, getter); + ok(r === undefined, "__defineGetter__ undefined prop returned " + r); + ok(x["false"] === "wine", "x.false = " + x["false"]); + + try { + x.__defineGetter__("bar", "string"); + ok(false, "expected exception calling __defineGetter__ with string"); + }catch(e) { + ok(e.number === 0xa138a - 0x80000000, "__defineGetter__ with string threw exception " + e.number); + } + try { + x.__defineGetter__("bar", undefined); + ok(false, "expected exception calling __defineGetter__ with undefined"); + }catch(e) { + ok(e.number === 0xa138a - 0x80000000, "__defineGetter__ with undefined threw exception " + e.number); + } + try { + x.__defineGetter__("bar", null); + ok(false, "expected exception calling __defineGetter__ with null"); + }catch(e) { + ok(e.number === 0xa138a - 0x80000000, "__defineGetter__ with null threw exception " + e.number); + } + try { + Object.prototype.__defineGetter__.call(x, "bar"); + ok(false, "expected exception calling __defineGetter__ with only one arg"); + }catch(e) { + ok(e.number === 0xa138a - 0x80000000, "__defineGetter__ with only one arg threw exception " + e.number); + } + + x.bar = "test"; + ok(x.bar === "test", "x.bar = " + x.bar); + x.__defineGetter__("bar", getter); + ok(x.bar === "wine", "x.bar with getter = " + x.bar); +}); + async_test("postMessage", function() { var v = document.documentMode; var onmessage_called = false; -- 2.34.1

3 20

[website] German translation for release 7.6
by Julian Rüger April 11, 2022

April 11, 2022

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for WWN issue 415
by Julian Rüger April 11, 2022

April 11, 2022

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 7.5
by Julian Rüger April 11, 2022

April 11, 2022

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH 8/8] wineoss: Move get_mix_format to the unixlib.
by Huw Davies April 11, 2022

April 11, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmdevdrv.c | 104 +++++------------------------------- dlls/wineoss.drv/oss.c | 101 ++++++++++++++++++++++++++++++++++ dlls/wineoss.drv/unixlib.h | 9 ++++ 3 files changed, 122 insertions(+), 92 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 6ab7b3e551d..f7c7864e2af 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1111,9 +1111,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient3 *iface, WAVEFORMATEX **pwfx) { ACImpl *This = impl_from_IAudioClient3(iface); - WAVEFORMATEXTENSIBLE *fmt; - oss_audioinfo ai; - int formats, fd; + struct get_mix_format_params params; TRACE("(%p)->(%p)\n", This, pwfx); @@ -1121,99 +1119,21 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient3 *iface, return E_POINTER; *pwfx = NULL; - fd = open_device(This->devnode, This->dataflow); - if(fd < 0){ - WARN("Unable to open device %s: %d (%s)\n", This->devnode, errno, strerror(errno)); - return AUDCLNT_E_DEVICE_INVALIDATED; - } - - ai.dev = -1; - if(ioctl(fd, SNDCTL_ENGINEINFO, &ai) < 0){ - WARN("Unable to get audio info for device %s: %d (%s)\n", This->devnode, - errno, strerror(errno)); - close(fd); - return E_FAIL; - } - close(fd); - - if(This->dataflow == eRender) - formats = ai.oformats; - else if(This->dataflow == eCapture) - formats = ai.iformats; - else - return E_UNEXPECTED; - - fmt = CoTaskMemAlloc(sizeof(WAVEFORMATEXTENSIBLE)); - if(!fmt) + params.device = This->devnode; + params.flow = This->dataflow; + params.fmt = CoTaskMemAlloc(sizeof(WAVEFORMATEXTENSIBLE)); + if(!params.fmt) return E_OUTOFMEMORY; - fmt->Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; - if(formats & AFMT_S16_LE){ - fmt->Format.wBitsPerSample = 16; - fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; -#ifdef AFMT_FLOAT - }else if(formats & AFMT_FLOAT){ - fmt->Format.wBitsPerSample = 32; - fmt->SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; -#endif - }else if(formats & AFMT_U8){ - fmt->Format.wBitsPerSample = 8; - fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; - }else if(formats & AFMT_S32_LE){ - fmt->Format.wBitsPerSample = 32; - fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; - }else if(formats & AFMT_S24_LE){ - fmt->Format.wBitsPerSample = 24; - fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; - }else{ - WARN("Didn't recognize any available OSS formats: %x\n", formats); - CoTaskMemFree(fmt); - return E_FAIL; - } - - /* some OSS drivers are buggy, so set reasonable defaults if - * the reported values seem wacky */ - fmt->Format.nChannels = max(ai.max_channels, ai.min_channels); - if(fmt->Format.nChannels == 0 || fmt->Format.nChannels > 8) - fmt->Format.nChannels = 2; - - /* For most hardware on Windows, users must choose a configuration with an even - * number of channels (stereo, quad, 5.1, 7.1). Users can then disable - * channels, but those channels are still reported to applications from - * GetMixFormat! Some applications behave badly if given an odd number of - * channels (e.g. 2.1). */ - if(fmt->Format.nChannels > 1 && (fmt->Format.nChannels & 0x1)) - { - if(fmt->Format.nChannels < ai.max_channels) - fmt->Format.nChannels += 1; - else - /* We could "fake" more channels and downmix the emulated channels, - * but at that point you really ought to tweak your OSS setup or - * just use PulseAudio. */ - WARN("Some Windows applications behave badly with an odd number of channels (%u)!\n", fmt->Format.nChannels); - } - - if(ai.max_rate == 0) - fmt->Format.nSamplesPerSec = 44100; - else - fmt->Format.nSamplesPerSec = min(ai.max_rate, 44100); - if(fmt->Format.nSamplesPerSec < ai.min_rate) - fmt->Format.nSamplesPerSec = ai.min_rate; - - fmt->dwChannelMask = get_channel_mask(fmt->Format.nChannels); - - fmt->Format.nBlockAlign = (fmt->Format.wBitsPerSample * - fmt->Format.nChannels) / 8; - fmt->Format.nAvgBytesPerSec = fmt->Format.nSamplesPerSec * - fmt->Format.nBlockAlign; + OSS_CALL(get_mix_format, &params); - fmt->Samples.wValidBitsPerSample = fmt->Format.wBitsPerSample; - fmt->Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX); - - *pwfx = (WAVEFORMATEX*)fmt; - dump_fmt(*pwfx); + if(SUCCEEDED(params.result)){ + *pwfx = &params.fmt->Format; + dump_fmt(*pwfx); + } else + CoTaskMemFree(params.fmt); - return S_OK; + return params.result; } static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient3 *iface, diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 49173ec6b6b..389ec73ee10 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -495,9 +495,110 @@ static NTSTATUS is_format_supported(void *args) return STATUS_SUCCESS; } +static NTSTATUS get_mix_format(void *args) +{ + struct get_mix_format_params *params = args; + WAVEFORMATEXTENSIBLE *fmt = params->fmt; + oss_audioinfo ai; + int formats, fd; + + if(params->flow != eRender && params->flow != eCapture){ + params->result = E_UNEXPECTED; + return STATUS_SUCCESS; + } + + fd = open_device(params->device, params->flow); + if(fd < 0){ + WARN("Unable to open device %s: %d (%s)\n", params->device, errno, strerror(errno)); + params->result = AUDCLNT_E_DEVICE_INVALIDATED; + return STATUS_SUCCESS; + } + + ai.dev = -1; + if(ioctl(fd, SNDCTL_ENGINEINFO, &ai) < 0){ + WARN("Unable to get audio info for device %s: %d (%s)\n", params->device, errno, strerror(errno)); + close(fd); + params->result = E_FAIL; + return STATUS_SUCCESS; + } + close(fd); + + if(params->flow == eRender) + formats = ai.oformats; + else + formats = ai.iformats; + + fmt->Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; + if(formats & AFMT_S16_LE){ + fmt->Format.wBitsPerSample = 16; + fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; +#ifdef AFMT_FLOAT + }else if(formats & AFMT_FLOAT){ + fmt->Format.wBitsPerSample = 32; + fmt->SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; +#endif + }else if(formats & AFMT_U8){ + fmt->Format.wBitsPerSample = 8; + fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + }else if(formats & AFMT_S32_LE){ + fmt->Format.wBitsPerSample = 32; + fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + }else if(formats & AFMT_S24_LE){ + fmt->Format.wBitsPerSample = 24; + fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + }else{ + WARN("Didn't recognize any available OSS formats: %x\n", formats); + params->result = E_FAIL; + return STATUS_SUCCESS; + } + + /* some OSS drivers are buggy, so set reasonable defaults if + * the reported values seem wacky */ + fmt->Format.nChannels = max(ai.max_channels, ai.min_channels); + if(fmt->Format.nChannels == 0 || fmt->Format.nChannels > 8) + fmt->Format.nChannels = 2; + + /* For most hardware on Windows, users must choose a configuration with an even + * number of channels (stereo, quad, 5.1, 7.1). Users can then disable + * channels, but those channels are still reported to applications from + * GetMixFormat! Some applications behave badly if given an odd number of + * channels (e.g. 2.1). */ + if(fmt->Format.nChannels > 1 && (fmt->Format.nChannels & 0x1)) + { + if(fmt->Format.nChannels < ai.max_channels) + fmt->Format.nChannels += 1; + else + /* We could "fake" more channels and downmix the emulated channels, + * but at that point you really ought to tweak your OSS setup or + * just use PulseAudio. */ + WARN("Some Windows applications behave badly with an odd number of channels (%u)!\n", fmt->Format.nChannels); + } + + if(ai.max_rate == 0) + fmt->Format.nSamplesPerSec = 44100; + else + fmt->Format.nSamplesPerSec = min(ai.max_rate, 44100); + if(fmt->Format.nSamplesPerSec < ai.min_rate) + fmt->Format.nSamplesPerSec = ai.min_rate; + + fmt->dwChannelMask = get_channel_mask(fmt->Format.nChannels); + + fmt->Format.nBlockAlign = (fmt->Format.wBitsPerSample * + fmt->Format.nChannels) / 8; + fmt->Format.nAvgBytesPerSec = fmt->Format.nSamplesPerSec * + fmt->Format.nBlockAlign; + + fmt->Samples.wValidBitsPerSample = fmt->Format.wBitsPerSample; + fmt->Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX); + + params->result = S_OK; + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { test_connect, get_endpoint_ids, is_format_supported, + get_mix_format, }; diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index b89e2142d93..e0817cbc9c1 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -77,11 +77,20 @@ struct is_format_supported_params HRESULT result; }; +struct get_mix_format_params +{ + const char *device; + EDataFlow flow; + WAVEFORMATEXTENSIBLE *fmt; + HRESULT result; +}; + enum oss_funcs { oss_test_connect, oss_get_endpoint_ids, oss_is_format_supported, + oss_get_mix_format, }; extern unixlib_handle_t oss_handle; -- 2.25.1

2 1

[PATCH 7/8] wineoss: Move the stream creation to AudioClient_Initialize().
by Huw Davies April 11, 2022

April 11, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmdevdrv.c | 148 +++++++++++++++++------------------- 1 file changed, 70 insertions(+), 78 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 990429156bc..6ab7b3e551d 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -430,8 +430,6 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient **out) { ACImpl *This; - struct oss_stream *stream; - oss_audioinfo ai; const OSSDevice *oss_dev; HRESULT hr; int len; @@ -448,57 +446,15 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, if(!This) return E_OUTOFMEMORY; - stream = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This->stream)); - if(!stream){ - HeapFree(GetProcessHeap(), 0, This); - return E_OUTOFMEMORY; - } - stream->flow = oss_dev->flow; - This->stream = stream; - hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient3_iface, &This->pUnkFTMarshal); if (FAILED(hr)) { - HeapFree(GetProcessHeap(), 0, stream); HeapFree(GetProcessHeap(), 0, This); return hr; } - stream->fd = open_device(oss_dev->devnode, oss_dev->flow); - if(stream->fd < 0){ - WARN("Unable to open device %s: %d (%s)\n", oss_dev->devnode, errno, - strerror(errno)); - HeapFree(GetProcessHeap(), 0, stream); - HeapFree(GetProcessHeap(), 0, This); - return AUDCLNT_E_DEVICE_INVALIDATED; - } - This->dataflow = oss_dev->flow; - - ai.dev = -1; - if(ioctl(stream->fd, SNDCTL_ENGINEINFO, &ai) < 0){ - WARN("Unable to get audio info for device %s: %d (%s)\n", oss_dev->devnode, - errno, strerror(errno)); - close(stream->fd); - HeapFree(GetProcessHeap(), 0, stream); - HeapFree(GetProcessHeap(), 0, This); - return E_FAIL; - } - strcpy(This->devnode, oss_dev->devnode); - TRACE("OSS audioinfo:\n"); - TRACE("devnode: %s\n", ai.devnode); - TRACE("name: %s\n", ai.name); - TRACE("busy: %x\n", ai.busy); - TRACE("caps: %x\n", ai.caps); - TRACE("iformats: %x\n", ai.iformats); - TRACE("oformats: %x\n", ai.oformats); - TRACE("enabled: %d\n", ai.enabled); - TRACE("min_rate: %d\n", ai.min_rate); - TRACE("max_rate: %d\n", ai.max_rate); - TRACE("min_channels: %d\n", ai.min_channels); - TRACE("max_channels: %d\n", ai.max_channels); - This->IAudioClient3_iface.lpVtbl = &AudioClient3_Vtbl; This->IAudioRenderClient_iface.lpVtbl = &AudioRenderClient_Vtbl; This->IAudioCaptureClient_iface.lpVtbl = &AudioCaptureClient_Vtbl; @@ -576,17 +532,19 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) IUnknown_Release(This->pUnkFTMarshal); This->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->lock); - close(stream->fd); if(This->initted){ EnterCriticalSection(&g_sessions_lock); list_remove(&This->entry); LeaveCriticalSection(&g_sessions_lock); } HeapFree(GetProcessHeap(), 0, This->vols); - HeapFree(GetProcessHeap(), 0, stream->local_buffer); - HeapFree(GetProcessHeap(), 0, stream->tmp_buffer); - CoTaskMemFree(stream->fmt); - HeapFree(GetProcessHeap(), 0, stream); + if(stream){ + close(stream->fd); + HeapFree(GetProcessHeap(), 0, stream->local_buffer); + HeapFree(GetProcessHeap(), 0, stream->tmp_buffer); + CoTaskMemFree(stream->fmt); + HeapFree(GetProcessHeap(), 0, stream); + } HeapFree(GetProcessHeap(), 0, This); } return ref; @@ -882,7 +840,8 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, const GUID *sessionguid) { ACImpl *This = impl_from_IAudioClient3(iface); - struct oss_stream *stream = This->stream; + struct oss_stream *stream; + oss_audioinfo ai; int i; HRESULT hr; @@ -942,18 +901,49 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, return AUDCLNT_E_ALREADY_INITIALIZED; } - hr = setup_oss_device(mode, stream->fd, fmt, NULL); - if(FAILED(hr)){ + stream = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This->stream)); + if(!stream){ LeaveCriticalSection(&This->lock); LeaveCriticalSection(&g_sessions_lock); - return hr; + return E_OUTOFMEMORY; + } + stream->flow = This->dataflow; + + stream->fd = open_device(This->devnode, This->dataflow); + if(stream->fd < 0){ + WARN("Unable to open device %s: %d (%s)\n", This->devnode, errno, strerror(errno)); + hr = AUDCLNT_E_DEVICE_INVALIDATED; + goto exit; + } + + ai.dev = -1; + if(ioctl(stream->fd, SNDCTL_ENGINEINFO, &ai) < 0){ + WARN("Unable to get audio info for device %s: %d (%s)\n", This->devnode, errno, strerror(errno)); + hr = E_FAIL; + goto exit; } + TRACE("OSS audioinfo:\n"); + TRACE("devnode: %s\n", ai.devnode); + TRACE("name: %s\n", ai.name); + TRACE("busy: %x\n", ai.busy); + TRACE("caps: %x\n", ai.caps); + TRACE("iformats: %x\n", ai.iformats); + TRACE("oformats: %x\n", ai.oformats); + TRACE("enabled: %d\n", ai.enabled); + TRACE("min_rate: %d\n", ai.min_rate); + TRACE("max_rate: %d\n", ai.max_rate); + TRACE("min_channels: %d\n", ai.min_channels); + TRACE("max_channels: %d\n", ai.max_channels); + + hr = setup_oss_device(mode, stream->fd, fmt, NULL); + if(FAILED(hr)) + goto exit; + stream->fmt = clone_format(fmt); if(!stream->fmt){ - LeaveCriticalSection(&This->lock); - LeaveCriticalSection(&g_sessions_lock); - return E_OUTOFMEMORY; + hr = E_OUTOFMEMORY; + goto exit; } stream->period_us = period / 10; @@ -965,23 +955,16 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, stream->local_buffer = HeapAlloc(GetProcessHeap(), 0, stream->bufsize_frames * fmt->nBlockAlign); if(!stream->local_buffer){ - CoTaskMemFree(stream->fmt); - stream->fmt = NULL; - LeaveCriticalSection(&This->lock); - LeaveCriticalSection(&g_sessions_lock); - return E_OUTOFMEMORY; + hr = E_OUTOFMEMORY; + goto exit; } This->channel_count = fmt->nChannels; This->vols = HeapAlloc(GetProcessHeap(), 0, This->channel_count * sizeof(float)); if(!This->vols){ - CoTaskMemFree(stream->fmt); - stream->fmt = NULL; - LeaveCriticalSection(&This->lock); - LeaveCriticalSection(&g_sessions_lock); - return E_OUTOFMEMORY; + hr = E_OUTOFMEMORY; + goto exit; } - for(i = 0; i < This->channel_count; ++i) This->vols[i] = 1.f; @@ -991,24 +974,25 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, hr = get_audio_session(sessionguid, This->parent, This->channel_count, &This->session); + +exit: if(FAILED(hr)){ HeapFree(GetProcessHeap(), 0, This->vols); This->vols = NULL; CoTaskMemFree(stream->fmt); - stream->fmt = NULL; - LeaveCriticalSection(&This->lock); - LeaveCriticalSection(&g_sessions_lock); - return hr; + if(stream->fd >= 0) close(stream->fd); + HeapFree(GetProcessHeap(), 0, stream->local_buffer); + HeapFree(GetProcessHeap(), 0, stream); + } else { + list_add_tail(&This->session->clients, &This->entry); + This->stream = stream; + This->initted = TRUE; } - list_add_tail(&This->session->clients, &This->entry); - - This->initted = TRUE; - LeaveCriticalSection(&This->lock); LeaveCriticalSection(&g_sessions_lock); - return S_OK; + return hr; } static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient3 *iface, @@ -1129,7 +1113,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient3 *iface, ACImpl *This = impl_from_IAudioClient3(iface); WAVEFORMATEXTENSIBLE *fmt; oss_audioinfo ai; - int formats; + int formats, fd; TRACE("(%p)->(%p)\n", This, pwfx); @@ -1137,12 +1121,20 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient3 *iface, return E_POINTER; *pwfx = NULL; + fd = open_device(This->devnode, This->dataflow); + if(fd < 0){ + WARN("Unable to open device %s: %d (%s)\n", This->devnode, errno, strerror(errno)); + return AUDCLNT_E_DEVICE_INVALIDATED; + } + ai.dev = -1; - if(ioctl(This->stream->fd, SNDCTL_ENGINEINFO, &ai) < 0){ + if(ioctl(fd, SNDCTL_ENGINEINFO, &ai) < 0){ WARN("Unable to get audio info for device %s: %d (%s)\n", This->devnode, errno, strerror(errno)); + close(fd); return E_FAIL; } + close(fd); if(This->dataflow == eRender) formats = ai.oformats; -- 2.25.1

2 1

[PATCH 6/8] wineoss: Don't cache the oss_audioinfo in the client.
by Huw Davies April 11, 2022

April 11, 2022

The retrieval on endpoint creation is left in for debugging purposes. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmdevdrv.c | 53 +++++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 23 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 242d2e0b359..990429156bc 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -113,8 +113,6 @@ struct ACImpl { UINT32 channel_count; struct oss_stream *stream; - oss_audioinfo ai; - BOOL initted; HANDLE timer; @@ -433,6 +431,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, { ACImpl *This; struct oss_stream *stream; + oss_audioinfo ai; const OSSDevice *oss_dev; HRESULT hr; int len; @@ -475,8 +474,8 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, This->dataflow = oss_dev->flow; - This->ai.dev = -1; - if(ioctl(stream->fd, SNDCTL_ENGINEINFO, &This->ai) < 0){ + ai.dev = -1; + if(ioctl(stream->fd, SNDCTL_ENGINEINFO, &ai) < 0){ WARN("Unable to get audio info for device %s: %d (%s)\n", oss_dev->devnode, errno, strerror(errno)); close(stream->fd); @@ -488,17 +487,17 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, strcpy(This->devnode, oss_dev->devnode); TRACE("OSS audioinfo:\n"); - TRACE("devnode: %s\n", This->ai.devnode); - TRACE("name: %s\n", This->ai.name); - TRACE("busy: %x\n", This->ai.busy); - TRACE("caps: %x\n", This->ai.caps); - TRACE("iformats: %x\n", This->ai.iformats); - TRACE("oformats: %x\n", This->ai.oformats); - TRACE("enabled: %d\n", This->ai.enabled); - TRACE("min_rate: %d\n", This->ai.min_rate); - TRACE("max_rate: %d\n", This->ai.max_rate); - TRACE("min_channels: %d\n", This->ai.min_channels); - TRACE("max_channels: %d\n", This->ai.max_channels); + TRACE("devnode: %s\n", ai.devnode); + TRACE("name: %s\n", ai.name); + TRACE("busy: %x\n", ai.busy); + TRACE("caps: %x\n", ai.caps); + TRACE("iformats: %x\n", ai.iformats); + TRACE("oformats: %x\n", ai.oformats); + TRACE("enabled: %d\n", ai.enabled); + TRACE("min_rate: %d\n", ai.min_rate); + TRACE("max_rate: %d\n", ai.max_rate); + TRACE("min_channels: %d\n", ai.min_channels); + TRACE("max_channels: %d\n", ai.max_channels); This->IAudioClient3_iface.lpVtbl = &AudioClient3_Vtbl; This->IAudioRenderClient_iface.lpVtbl = &AudioRenderClient_Vtbl; @@ -1129,6 +1128,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient3 *iface, { ACImpl *This = impl_from_IAudioClient3(iface); WAVEFORMATEXTENSIBLE *fmt; + oss_audioinfo ai; int formats; TRACE("(%p)->(%p)\n", This, pwfx); @@ -1137,10 +1137,17 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient3 *iface, return E_POINTER; *pwfx = NULL; + ai.dev = -1; + if(ioctl(This->stream->fd, SNDCTL_ENGINEINFO, &ai) < 0){ + WARN("Unable to get audio info for device %s: %d (%s)\n", This->devnode, + errno, strerror(errno)); + return E_FAIL; + } + if(This->dataflow == eRender) - formats = This->ai.oformats; + formats = ai.oformats; else if(This->dataflow == eCapture) - formats = This->ai.iformats; + formats = ai.iformats; else return E_UNEXPECTED; @@ -1174,7 +1181,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient3 *iface, /* some OSS drivers are buggy, so set reasonable defaults if * the reported values seem wacky */ - fmt->Format.nChannels = max(This->ai.max_channels, This->ai.min_channels); + fmt->Format.nChannels = max(ai.max_channels, ai.min_channels); if(fmt->Format.nChannels == 0 || fmt->Format.nChannels > 8) fmt->Format.nChannels = 2; @@ -1185,7 +1192,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient3 *iface, * channels (e.g. 2.1). */ if(fmt->Format.nChannels > 1 && (fmt->Format.nChannels & 0x1)) { - if(fmt->Format.nChannels < This->ai.max_channels) + if(fmt->Format.nChannels < ai.max_channels) fmt->Format.nChannels += 1; else /* We could "fake" more channels and downmix the emulated channels, @@ -1194,12 +1201,12 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient3 *iface, WARN("Some Windows applications behave badly with an odd number of channels (%u)!\n", fmt->Format.nChannels); } - if(This->ai.max_rate == 0) + if(ai.max_rate == 0) fmt->Format.nSamplesPerSec = 44100; else - fmt->Format.nSamplesPerSec = min(This->ai.max_rate, 44100); - if(fmt->Format.nSamplesPerSec < This->ai.min_rate) - fmt->Format.nSamplesPerSec = This->ai.min_rate; + fmt->Format.nSamplesPerSec = min(ai.max_rate, 44100); + if(fmt->Format.nSamplesPerSec < ai.min_rate) + fmt->Format.nSamplesPerSec = ai.min_rate; fmt->dwChannelMask = get_channel_mask(fmt->Format.nChannels); -- 2.25.1

2 1

[PATCH 5/8] wineoss: Move is_format_supported to the unixlib.
by Huw Davies April 11, 2022

April 11, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmdevdrv.c | 51 ++++----- dlls/wineoss.drv/oss.c | 202 ++++++++++++++++++++++++++++++++++++ dlls/wineoss.drv/unixlib.h | 11 ++ 3 files changed, 233 insertions(+), 31 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 4f8460a3b3b..242d2e0b359 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1094,45 +1094,34 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface, } static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient3 *iface, - AUDCLNT_SHAREMODE mode, const WAVEFORMATEX *pwfx, - WAVEFORMATEX **outpwfx) + AUDCLNT_SHAREMODE mode, const WAVEFORMATEX *fmt, + WAVEFORMATEX **out) { ACImpl *This = impl_from_IAudioClient3(iface); - int fd = -1; - HRESULT ret; + struct is_format_supported_params params; - TRACE("(%p)->(%x, %p, %p)\n", This, mode, pwfx, outpwfx); + TRACE("(%p)->(%x, %p, %p)\n", This, mode, fmt, out); + if(fmt) dump_fmt(fmt); - if(!pwfx || (mode == AUDCLNT_SHAREMODE_SHARED && !outpwfx)) - return E_POINTER; - - if(mode != AUDCLNT_SHAREMODE_SHARED && mode != AUDCLNT_SHAREMODE_EXCLUSIVE) - return E_INVALIDARG; + params.device = This->devnode; + params.flow = This->dataflow; + params.share = mode; + params.fmt_in = fmt; + params.fmt_out = NULL; - if(pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - pwfx->cbSize < sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX)) - return E_INVALIDARG; - - dump_fmt(pwfx); - - if(outpwfx){ - *outpwfx = NULL; - if(mode != AUDCLNT_SHAREMODE_SHARED) - outpwfx = NULL; + if(out){ + *out = NULL; + if(mode == AUDCLNT_SHAREMODE_SHARED) + params.fmt_out = CoTaskMemAlloc(sizeof(*params.fmt_out)); } + OSS_CALL(is_format_supported, &params); - fd = open_device(This->devnode, This->dataflow); - if(fd < 0){ - WARN("Unable to open device %s: %d (%s)\n", This->devnode, errno, - strerror(errno)); - return AUDCLNT_E_DEVICE_INVALIDATED; - } - - ret = setup_oss_device(mode, fd, pwfx, outpwfx); - - close(fd); + if(params.result == S_FALSE) + *out = &params.fmt_out->Format; + else + CoTaskMemFree(params.fmt_out); - return ret; + return params.result; } static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient3 *iface, diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index ab7751ac174..49173ec6b6b 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -35,6 +35,7 @@ #include "ntstatus.h" #define WIN32_NO_STATUS #include "winternl.h" +#include "initguid.h" #include "audioclient.h" #include "wine/debug.h" @@ -294,8 +295,209 @@ static NTSTATUS get_endpoint_ids(void *args) return STATUS_SUCCESS; } +static UINT get_channel_mask(unsigned int channels) +{ + switch(channels){ + case 0: + return 0; + case 1: + return KSAUDIO_SPEAKER_MONO; + case 2: + return KSAUDIO_SPEAKER_STEREO; + case 3: + return KSAUDIO_SPEAKER_STEREO | SPEAKER_LOW_FREQUENCY; + case 4: + return KSAUDIO_SPEAKER_QUAD; /* not _SURROUND */ + case 5: + return KSAUDIO_SPEAKER_QUAD | SPEAKER_LOW_FREQUENCY; + case 6: + return KSAUDIO_SPEAKER_5POINT1; /* not 5POINT1_SURROUND */ + case 7: + return KSAUDIO_SPEAKER_5POINT1 | SPEAKER_BACK_CENTER; + case 8: + return KSAUDIO_SPEAKER_7POINT1_SURROUND; /* Vista deprecates 7POINT1 */ + } + FIXME("Unknown speaker configuration: %u\n", channels); + return 0; +} + +static int get_oss_format(const WAVEFORMATEX *fmt) +{ + WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)fmt; + + if(fmt->wFormatTag == WAVE_FORMAT_PCM || + (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))){ + switch(fmt->wBitsPerSample){ + case 8: + return AFMT_U8; + case 16: + return AFMT_S16_LE; + case 24: + return AFMT_S24_LE; + case 32: + return AFMT_S32_LE; + } + return -1; + } + +#ifdef AFMT_FLOAT + if(fmt->wFormatTag == WAVE_FORMAT_IEEE_FLOAT || + (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT))){ + if(fmt->wBitsPerSample != 32) + return -1; + + return AFMT_FLOAT; + } +#endif + + return -1; +} + +static WAVEFORMATEXTENSIBLE *clone_format(const WAVEFORMATEX *fmt) +{ + WAVEFORMATEXTENSIBLE *ret; + size_t size; + + if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + size = sizeof(WAVEFORMATEXTENSIBLE); + else + size = sizeof(WAVEFORMATEX); + + ret = malloc(size); + if(!ret) + return NULL; + + memcpy(ret, fmt, size); + + ret->Format.cbSize = size - sizeof(WAVEFORMATEX); + + return ret; +} + +static HRESULT setup_oss_device(AUDCLNT_SHAREMODE share, int fd, + const WAVEFORMATEX *fmt, WAVEFORMATEXTENSIBLE *out) +{ + const WAVEFORMATEXTENSIBLE *fmtex = (const WAVEFORMATEXTENSIBLE *)fmt; + int tmp, oss_format; + double tenth; + HRESULT ret = S_OK; + WAVEFORMATEXTENSIBLE *closest; + + tmp = oss_format = get_oss_format(fmt); + if(oss_format < 0) + return AUDCLNT_E_UNSUPPORTED_FORMAT; + if(ioctl(fd, SNDCTL_DSP_SETFMT, &tmp) < 0){ + WARN("SETFMT failed: %d (%s)\n", errno, strerror(errno)); + return E_FAIL; + } + if(tmp != oss_format){ + TRACE("Format unsupported by this OSS version: %x\n", oss_format); + return AUDCLNT_E_UNSUPPORTED_FORMAT; + } + + if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + (fmtex->Format.nAvgBytesPerSec == 0 || + fmtex->Format.nBlockAlign == 0 || + fmtex->Samples.wValidBitsPerSample > fmtex->Format.wBitsPerSample)) + return E_INVALIDARG; + + if(fmt->nChannels == 0) + return AUDCLNT_E_UNSUPPORTED_FORMAT; + + closest = clone_format(fmt); + if(!closest) + return E_OUTOFMEMORY; + + tmp = fmt->nSamplesPerSec; + if(ioctl(fd, SNDCTL_DSP_SPEED, &tmp) < 0){ + WARN("SPEED failed: %d (%s)\n", errno, strerror(errno)); + free(closest); + return E_FAIL; + } + tenth = fmt->nSamplesPerSec * 0.1; + if(tmp > fmt->nSamplesPerSec + tenth || tmp < fmt->nSamplesPerSec - tenth){ + ret = S_FALSE; + closest->Format.nSamplesPerSec = tmp; + } + + tmp = fmt->nChannels; + if(ioctl(fd, SNDCTL_DSP_CHANNELS, &tmp) < 0){ + WARN("CHANNELS failed: %d (%s)\n", errno, strerror(errno)); + free(closest); + return E_FAIL; + } + if(tmp != fmt->nChannels){ + ret = S_FALSE; + closest->Format.nChannels = tmp; + } + + if(closest->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE) + closest->dwChannelMask = get_channel_mask(closest->Format.nChannels); + + if(fmt->nBlockAlign != fmt->nChannels * fmt->wBitsPerSample / 8 || + fmt->nAvgBytesPerSec != fmt->nBlockAlign * fmt->nSamplesPerSec || + (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + fmtex->Samples.wValidBitsPerSample < fmtex->Format.wBitsPerSample)) + ret = S_FALSE; + + if(share == AUDCLNT_SHAREMODE_EXCLUSIVE && + fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ + if(fmtex->dwChannelMask == 0 || fmtex->dwChannelMask & SPEAKER_RESERVED) + ret = S_FALSE; + } + + if(ret == S_FALSE && !out) + ret = AUDCLNT_E_UNSUPPORTED_FORMAT; + + if(ret == S_FALSE && out){ + closest->Format.nBlockAlign = + closest->Format.nChannels * closest->Format.wBitsPerSample / 8; + closest->Format.nAvgBytesPerSec = + closest->Format.nBlockAlign * closest->Format.nSamplesPerSec; + if(closest->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE) + closest->Samples.wValidBitsPerSample = closest->Format.wBitsPerSample; + memcpy(out, closest, closest->Format.cbSize + sizeof(WAVEFORMATEX)); + } + free(closest); + + TRACE("returning: %08x\n", ret); + return ret; +} + +static NTSTATUS is_format_supported(void *args) +{ + struct is_format_supported_params *params = args; + int fd; + + params->result = S_OK; + + if(!params->fmt_in || (params->share == AUDCLNT_SHAREMODE_SHARED && !params->fmt_out)) + params->result = E_POINTER; + else if(params->share != AUDCLNT_SHAREMODE_SHARED && params->share != AUDCLNT_SHAREMODE_EXCLUSIVE) + params->result = E_INVALIDARG; + else if(params->fmt_in->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + params->fmt_in->cbSize < sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX)) + params->result = E_INVALIDARG; + if(FAILED(params->result)) + return STATUS_SUCCESS; + + fd = open_device(params->device, params->flow); + if(fd < 0){ + WARN("Unable to open device %s: %d (%s)\n", params->device, errno, strerror(errno)); + params->result = AUDCLNT_E_DEVICE_INVALIDATED; + return STATUS_SUCCESS; + } + params->result = setup_oss_device(params->share, fd, params->fmt_in, params->fmt_out); + close(fd); + + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { test_connect, get_endpoint_ids, + is_format_supported, }; diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index f498609898a..b89e2142d93 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -67,10 +67,21 @@ struct get_endpoint_ids_params unsigned int default_idx; }; +struct is_format_supported_params +{ + const char *device; + EDataFlow flow; + AUDCLNT_SHAREMODE share; + const WAVEFORMATEX *fmt_in; + WAVEFORMATEXTENSIBLE *fmt_out; + HRESULT result; +}; + enum oss_funcs { oss_test_connect, oss_get_endpoint_ids, + oss_is_format_supported, }; extern unixlib_handle_t oss_handle; -- 2.25.1

2 1

[PATCH 4/8] wineoss: Introduce a stream structure.
by Huw Davies April 11, 2022

April 11, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmdevdrv.c | 427 +++++++++++++++++++----------------- dlls/wineoss.drv/unixlib.h | 19 ++ 2 files changed, 242 insertions(+), 204 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index af49c88e6cf..4f8460a3b3b 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -108,25 +108,14 @@ struct ACImpl { IMMDevice *parent; IUnknown *pUnkFTMarshal; - WAVEFORMATEX *fmt; - EDataFlow dataflow; - DWORD flags; - AUDCLNT_SHAREMODE share; - HANDLE event; float *vols; UINT32 channel_count; + struct oss_stream *stream; - int fd; oss_audioinfo ai; - BOOL initted, playing; - UINT64 written_frames, last_pos_frames; - UINT32 period_us, period_frames, bufsize_frames, held_frames, tmp_buffer_frames, in_oss_frames; - UINT32 oss_bufsize_bytes, lcl_offs_frames; /* offs into local_buffer where valid data starts */ - - BYTE *local_buffer, *tmp_buffer; - LONG32 getbuf_last; /* <0 when using tmp_buffer */ + BOOL initted; HANDLE timer; CRITICAL_SECTION lock; @@ -443,6 +432,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient **out) { ACImpl *This; + struct oss_stream *stream; const OSSDevice *oss_dev; HRESULT hr; int len; @@ -459,16 +449,26 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, if(!This) return E_OUTOFMEMORY; + stream = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This->stream)); + if(!stream){ + HeapFree(GetProcessHeap(), 0, This); + return E_OUTOFMEMORY; + } + stream->flow = oss_dev->flow; + This->stream = stream; + hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient3_iface, &This->pUnkFTMarshal); if (FAILED(hr)) { + HeapFree(GetProcessHeap(), 0, stream); HeapFree(GetProcessHeap(), 0, This); return hr; } - This->fd = open_device(oss_dev->devnode, oss_dev->flow); - if(This->fd < 0){ + stream->fd = open_device(oss_dev->devnode, oss_dev->flow); + if(stream->fd < 0){ WARN("Unable to open device %s: %d (%s)\n", oss_dev->devnode, errno, strerror(errno)); + HeapFree(GetProcessHeap(), 0, stream); HeapFree(GetProcessHeap(), 0, This); return AUDCLNT_E_DEVICE_INVALIDATED; } @@ -476,10 +476,11 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, This->dataflow = oss_dev->flow; This->ai.dev = -1; - if(ioctl(This->fd, SNDCTL_ENGINEINFO, &This->ai) < 0){ + if(ioctl(stream->fd, SNDCTL_ENGINEINFO, &This->ai) < 0){ WARN("Unable to get audio info for device %s: %d (%s)\n", oss_dev->devnode, errno, strerror(errno)); - close(This->fd); + close(stream->fd); + HeapFree(GetProcessHeap(), 0, stream); HeapFree(GetProcessHeap(), 0, This); return E_FAIL; } @@ -554,6 +555,7 @@ static ULONG WINAPI AudioClient_AddRef(IAudioClient3 *iface) static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) { ACImpl *This = impl_from_IAudioClient3(iface); + struct oss_stream *stream = This->stream; ULONG ref; ref = InterlockedDecrement(&This->ref); @@ -575,16 +577,17 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) IUnknown_Release(This->pUnkFTMarshal); This->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->lock); - close(This->fd); + close(stream->fd); if(This->initted){ EnterCriticalSection(&g_sessions_lock); list_remove(&This->entry); LeaveCriticalSection(&g_sessions_lock); } HeapFree(GetProcessHeap(), 0, This->vols); - HeapFree(GetProcessHeap(), 0, This->local_buffer); - HeapFree(GetProcessHeap(), 0, This->tmp_buffer); - CoTaskMemFree(This->fmt); + HeapFree(GetProcessHeap(), 0, stream->local_buffer); + HeapFree(GetProcessHeap(), 0, stream->tmp_buffer); + CoTaskMemFree(stream->fmt); + HeapFree(GetProcessHeap(), 0, stream); HeapFree(GetProcessHeap(), 0, This); } return ref; @@ -880,6 +883,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, const GUID *sessionguid) { ACImpl *This = impl_from_IAudioClient3(iface); + struct oss_stream *stream = This->stream; int i; HRESULT hr; @@ -939,31 +943,31 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, return AUDCLNT_E_ALREADY_INITIALIZED; } - hr = setup_oss_device(mode, This->fd, fmt, NULL); + hr = setup_oss_device(mode, stream->fd, fmt, NULL); if(FAILED(hr)){ LeaveCriticalSection(&This->lock); LeaveCriticalSection(&g_sessions_lock); return hr; } - This->fmt = clone_format(fmt); - if(!This->fmt){ + stream->fmt = clone_format(fmt); + if(!stream->fmt){ LeaveCriticalSection(&This->lock); LeaveCriticalSection(&g_sessions_lock); return E_OUTOFMEMORY; } - This->period_us = period / 10; - This->period_frames = MulDiv(fmt->nSamplesPerSec, period, 10000000); + stream->period_us = period / 10; + stream->period_frames = MulDiv(fmt->nSamplesPerSec, period, 10000000); - This->bufsize_frames = MulDiv(duration, fmt->nSamplesPerSec, 10000000); + stream->bufsize_frames = MulDiv(duration, fmt->nSamplesPerSec, 10000000); if(mode == AUDCLNT_SHAREMODE_EXCLUSIVE) - This->bufsize_frames -= This->bufsize_frames % This->period_frames; - This->local_buffer = HeapAlloc(GetProcessHeap(), 0, - This->bufsize_frames * fmt->nBlockAlign); - if(!This->local_buffer){ - CoTaskMemFree(This->fmt); - This->fmt = NULL; + stream->bufsize_frames -= stream->bufsize_frames % stream->period_frames; + stream->local_buffer = HeapAlloc(GetProcessHeap(), 0, + stream->bufsize_frames * fmt->nBlockAlign); + if(!stream->local_buffer){ + CoTaskMemFree(stream->fmt); + stream->fmt = NULL; LeaveCriticalSection(&This->lock); LeaveCriticalSection(&g_sessions_lock); return E_OUTOFMEMORY; @@ -972,8 +976,8 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, This->channel_count = fmt->nChannels; This->vols = HeapAlloc(GetProcessHeap(), 0, This->channel_count * sizeof(float)); if(!This->vols){ - CoTaskMemFree(This->fmt); - This->fmt = NULL; + CoTaskMemFree(stream->fmt); + stream->fmt = NULL; LeaveCriticalSection(&This->lock); LeaveCriticalSection(&g_sessions_lock); return E_OUTOFMEMORY; @@ -982,17 +986,17 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, for(i = 0; i < This->channel_count; ++i) This->vols[i] = 1.f; - This->share = mode; - This->flags = flags; - This->oss_bufsize_bytes = 0; + stream->share = mode; + stream->flags = flags; + stream->oss_bufsize_bytes = 0; hr = get_audio_session(sessionguid, This->parent, This->channel_count, &This->session); if(FAILED(hr)){ HeapFree(GetProcessHeap(), 0, This->vols); This->vols = NULL; - CoTaskMemFree(This->fmt); - This->fmt = NULL; + CoTaskMemFree(stream->fmt); + stream->fmt = NULL; LeaveCriticalSection(&This->lock); LeaveCriticalSection(&g_sessions_lock); return hr; @@ -1012,6 +1016,7 @@ static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient3 *iface, UINT32 *frames) { ACImpl *This = impl_from_IAudioClient3(iface); + struct oss_stream *stream = This->stream; TRACE("(%p)->(%p)\n", This, frames); @@ -1025,7 +1030,7 @@ static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient3 *iface, return AUDCLNT_E_NOT_INITIALIZED; } - *frames = This->bufsize_frames; + *frames = stream->bufsize_frames; TRACE("buffer size: %u\n", *frames); @@ -1038,6 +1043,7 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, REFERENCE_TIME *latency) { ACImpl *This = impl_from_IAudioClient3(iface); + struct oss_stream *stream = This->stream; TRACE("(%p)->(%p)\n", This, latency); @@ -1053,7 +1059,7 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, /* pretend we process audio in Period chunks, so max latency includes * the period time. Some native machines add .6666ms in shared mode. */ - *latency = (REFERENCE_TIME)This->period_us * 10 + 6666; + *latency = (REFERENCE_TIME)stream->period_us * 10 + 6666; LeaveCriticalSection(&This->lock); @@ -1064,6 +1070,7 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface, UINT32 *numpad) { ACImpl *This = impl_from_IAudioClient3(iface); + struct oss_stream *stream = This->stream; TRACE("(%p)->(%p)\n", This, numpad); @@ -1077,7 +1084,7 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface, return AUDCLNT_E_NOT_INITIALIZED; } - *numpad = This->held_frames; + *numpad = stream->held_frames; TRACE("padding: %u\n", *numpad); @@ -1239,19 +1246,19 @@ static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient3 *iface, return S_OK; } -static void silence_buffer(ACImpl *This, BYTE *buffer, UINT32 frames) +static void silence_buffer(struct oss_stream *stream, BYTE *buffer, UINT32 frames) { - WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)This->fmt; - if((This->fmt->wFormatTag == WAVE_FORMAT_PCM || - (This->fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)stream->fmt; + if((stream->fmt->wFormatTag == WAVE_FORMAT_PCM || + (stream->fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))) && - This->fmt->wBitsPerSample == 8) - memset(buffer, 128, frames * This->fmt->nBlockAlign); + stream->fmt->wBitsPerSample == 8) + memset(buffer, 128, frames * stream->fmt->nBlockAlign); else - memset(buffer, 0, frames * This->fmt->nBlockAlign); + memset(buffer, 0, frames * stream->fmt->nBlockAlign); } -static void oss_write_data(ACImpl *This) +static void oss_write_data(struct oss_stream *stream, BOOL mute) { ssize_t written_bytes; UINT32 written_frames, in_oss_frames, write_limit, max_period, write_offs_frames, new_frames; @@ -1259,25 +1266,25 @@ static void oss_write_data(ACImpl *This) audio_buf_info bi; BYTE *buf; - if(ioctl(This->fd, SNDCTL_DSP_GETOSPACE, &bi) < 0){ + if(ioctl(stream->fd, SNDCTL_DSP_GETOSPACE, &bi) < 0){ WARN("GETOSPACE failed: %d (%s)\n", errno, strerror(errno)); return; } - max_period = max(bi.fragsize / This->fmt->nBlockAlign, This->period_frames); + max_period = max(bi.fragsize / stream->fmt->nBlockAlign, stream->period_frames); - if(bi.bytes > This->oss_bufsize_bytes){ + if(bi.bytes > stream->oss_bufsize_bytes){ TRACE("New buffer size (%u) is larger than old buffer size (%u)\n", - bi.bytes, This->oss_bufsize_bytes); - This->oss_bufsize_bytes = bi.bytes; + bi.bytes, stream->oss_bufsize_bytes); + stream->oss_bufsize_bytes = bi.bytes; in_oss_frames = 0; }else - in_oss_frames = (This->oss_bufsize_bytes - bi.bytes) / This->fmt->nBlockAlign; + in_oss_frames = (stream->oss_bufsize_bytes - bi.bytes) / stream->fmt->nBlockAlign; - if(in_oss_frames > This->in_oss_frames){ + if(in_oss_frames > stream->in_oss_frames){ TRACE("Capping reported frames from %u to %u\n", - in_oss_frames, This->in_oss_frames); - in_oss_frames = This->in_oss_frames; + in_oss_frames, stream->in_oss_frames); + in_oss_frames = stream->in_oss_frames; } write_limit = 0; @@ -1292,48 +1299,48 @@ static void oss_write_data(ACImpl *This) * ^^^^^^^^^^ - held_frames * ^ - lcl_offs_frames */ - advanced = This->in_oss_frames - in_oss_frames; - if(advanced > This->held_frames) - advanced = This->held_frames; - This->lcl_offs_frames += advanced; - This->lcl_offs_frames %= This->bufsize_frames; - This->held_frames -= advanced; - This->in_oss_frames = in_oss_frames; + advanced = stream->in_oss_frames - in_oss_frames; + if(advanced > stream->held_frames) + advanced = stream->held_frames; + stream->lcl_offs_frames += advanced; + stream->lcl_offs_frames %= stream->bufsize_frames; + stream->held_frames -= advanced; + stream->in_oss_frames = in_oss_frames; TRACE("advanced by %lu, lcl_offs: %u, held: %u, in_oss: %u\n", - advanced, This->lcl_offs_frames, This->held_frames, This->in_oss_frames); + advanced, stream->lcl_offs_frames, stream->held_frames, stream->in_oss_frames); - if(This->held_frames == This->in_oss_frames) + if(stream->held_frames == stream->in_oss_frames) return; - write_offs_frames = (This->lcl_offs_frames + This->in_oss_frames) % This->bufsize_frames; - new_frames = This->held_frames - This->in_oss_frames; + write_offs_frames = (stream->lcl_offs_frames + stream->in_oss_frames) % stream->bufsize_frames; + new_frames = stream->held_frames - stream->in_oss_frames; - if(write_offs_frames + new_frames > This->bufsize_frames) - to_write_frames = This->bufsize_frames - write_offs_frames; + if(write_offs_frames + new_frames > stream->bufsize_frames) + to_write_frames = stream->bufsize_frames - write_offs_frames; else to_write_frames = new_frames; to_write_frames = min(to_write_frames, write_limit); - to_write_bytes = to_write_frames * This->fmt->nBlockAlign; + to_write_bytes = to_write_frames * stream->fmt->nBlockAlign; TRACE("going to write %lu frames from %u (%lu of %u)\n", to_write_frames, write_offs_frames, to_write_frames + write_offs_frames, - This->bufsize_frames); + stream->bufsize_frames); - buf = This->local_buffer + write_offs_frames * This->fmt->nBlockAlign; + buf = stream->local_buffer + write_offs_frames * stream->fmt->nBlockAlign; - if(This->session->mute) - silence_buffer(This, buf, to_write_frames); + if(mute) + silence_buffer(stream, buf, to_write_frames); - written_bytes = write(This->fd, buf, to_write_bytes); + written_bytes = write(stream->fd, buf, to_write_bytes); if(written_bytes < 0){ /* EAGAIN is OSS buffer full, log that too */ WARN("write failed: %d (%s)\n", errno, strerror(errno)); return; } - written_frames = written_bytes / This->fmt->nBlockAlign; + written_frames = written_bytes / stream->fmt->nBlockAlign; - This->in_oss_frames += written_frames; + stream->in_oss_frames += written_frames; if(written_frames < to_write_frames){ /* OSS buffer probably full */ @@ -1344,70 +1351,72 @@ static void oss_write_data(ACImpl *This) /* wrapped and have some data back at the start to write */ to_write_frames = min(write_limit - written_frames, new_frames - written_frames); - to_write_bytes = to_write_frames * This->fmt->nBlockAlign; + to_write_bytes = to_write_frames * stream->fmt->nBlockAlign; - if(This->session->mute) - silence_buffer(This, This->local_buffer, to_write_frames); + if(mute) + silence_buffer(stream, stream->local_buffer, to_write_frames); TRACE("wrapping to write %lu frames from beginning\n", to_write_frames); - written_bytes = write(This->fd, This->local_buffer, to_write_bytes); + written_bytes = write(stream->fd, stream->local_buffer, to_write_bytes); if(written_bytes < 0){ WARN("write failed: %d (%s)\n", errno, strerror(errno)); return; } - written_frames = written_bytes / This->fmt->nBlockAlign; - This->in_oss_frames += written_frames; + written_frames = written_bytes / stream->fmt->nBlockAlign; + stream->in_oss_frames += written_frames; } } -static void oss_read_data(ACImpl *This) +static void oss_read_data(struct oss_stream *stream) { UINT64 pos, readable; ssize_t nread; - pos = (This->held_frames + This->lcl_offs_frames) % This->bufsize_frames; - readable = (This->bufsize_frames - pos) * This->fmt->nBlockAlign; + pos = (stream->held_frames + stream->lcl_offs_frames) % stream->bufsize_frames; + readable = (stream->bufsize_frames - pos) * stream->fmt->nBlockAlign; - nread = read(This->fd, This->local_buffer + pos * This->fmt->nBlockAlign, + nread = read(stream->fd, stream->local_buffer + pos * stream->fmt->nBlockAlign, readable); if(nread < 0){ WARN("read failed: %d (%s)\n", errno, strerror(errno)); return; } - This->held_frames += nread / This->fmt->nBlockAlign; + stream->held_frames += nread / stream->fmt->nBlockAlign; - if(This->held_frames > This->bufsize_frames){ + if(stream->held_frames > stream->bufsize_frames){ WARN("Overflow of unread data\n"); - This->lcl_offs_frames += This->held_frames; - This->lcl_offs_frames %= This->bufsize_frames; - This->held_frames = This->bufsize_frames; + stream->lcl_offs_frames += stream->held_frames; + stream->lcl_offs_frames %= stream->bufsize_frames; + stream->held_frames = stream->bufsize_frames; } } static void CALLBACK oss_period_callback(void *user, BOOLEAN timer) { ACImpl *This = user; + struct oss_stream *stream = This->stream; EnterCriticalSection(&This->lock); - if(This->playing){ - if(This->dataflow == eRender && This->held_frames) - oss_write_data(This); - else if(This->dataflow == eCapture) - oss_read_data(This); + if(stream->playing){ + if(stream->flow == eRender && stream->held_frames) + oss_write_data(stream, This->session->mute); + else if(stream->flow == eCapture) + oss_read_data(stream); } LeaveCriticalSection(&This->lock); - if(This->event) - SetEvent(This->event); + if(stream->event) + SetEvent(stream->event); } static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) { ACImpl *This = impl_from_IAudioClient3(iface); + struct oss_stream *stream = This->stream; TRACE("(%p)\n", This); @@ -1418,24 +1427,24 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) return AUDCLNT_E_NOT_INITIALIZED; } - if((This->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK) && !This->event){ + if((stream->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK) && !stream->event){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_EVENTHANDLE_NOT_SET; } - if(This->playing){ + if(stream->playing){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_NOT_STOPPED; } if(!This->timer){ if(!CreateTimerQueueTimer(&This->timer, g_timer_q, - oss_period_callback, This, 0, This->period_us / 1000, + oss_period_callback, This, 0, stream->period_us / 1000, WT_EXECUTEINTIMERTHREAD)) ERR("Unable to create period timer: %u\n", GetLastError()); } - This->playing = TRUE; + stream->playing = TRUE; LeaveCriticalSection(&This->lock); @@ -1445,6 +1454,7 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface) { ACImpl *This = impl_from_IAudioClient3(iface); + struct oss_stream *stream = This->stream; TRACE("(%p)\n", This); @@ -1455,13 +1465,13 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface) return AUDCLNT_E_NOT_INITIALIZED; } - if(!This->playing){ + if(!stream->playing){ LeaveCriticalSection(&This->lock); return S_FALSE; } - This->playing = FALSE; - This->in_oss_frames = 0; + stream->playing = FALSE; + stream->in_oss_frames = 0; LeaveCriticalSection(&This->lock); @@ -1471,6 +1481,7 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface) static HRESULT WINAPI AudioClient_Reset(IAudioClient3 *iface) { ACImpl *This = impl_from_IAudioClient3(iface); + struct oss_stream *stream = This->stream; TRACE("(%p)\n", This); @@ -1481,25 +1492,25 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient3 *iface) return AUDCLNT_E_NOT_INITIALIZED; } - if(This->playing){ + if(stream->playing){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_NOT_STOPPED; } - if(This->getbuf_last){ + if(stream->getbuf_last){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_BUFFER_OPERATION_PENDING; } - if(This->dataflow == eRender){ - This->written_frames = 0; - This->last_pos_frames = 0; + if(stream->flow == eRender){ + stream->written_frames = 0; + stream->last_pos_frames = 0; }else{ - This->written_frames += This->held_frames; + stream->written_frames += stream->held_frames; } - This->held_frames = 0; - This->lcl_offs_frames = 0; - This->in_oss_frames = 0; + stream->held_frames = 0; + stream->lcl_offs_frames = 0; + stream->in_oss_frames = 0; LeaveCriticalSection(&This->lock); @@ -1510,6 +1521,7 @@ static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface, HANDLE event) { ACImpl *This = impl_from_IAudioClient3(iface); + struct oss_stream *stream = This->stream; TRACE("(%p)->(%p)\n", This, event); @@ -1523,18 +1535,18 @@ static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface, return AUDCLNT_E_NOT_INITIALIZED; } - if(!(This->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK)){ + if(!(stream->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK)){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_EVENTHANDLE_NOT_EXPECTED; } - if (This->event){ + if (stream->event){ LeaveCriticalSection(&This->lock); FIXME("called twice\n"); return HRESULT_FROM_WIN32(ERROR_INVALID_NAME); } - This->event = event; + stream->event = event; LeaveCriticalSection(&This->lock); @@ -1781,6 +1793,7 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, UINT32 frames, BYTE **data) { ACImpl *This = impl_from_IAudioRenderClient(iface); + struct oss_stream *stream = This->stream; UINT32 write_pos; TRACE("(%p)->(%u, %p)\n", This, frames, data); @@ -1792,7 +1805,7 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, EnterCriticalSection(&This->lock); - if(This->getbuf_last){ + if(stream->getbuf_last){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_OUT_OF_ORDER; } @@ -1802,52 +1815,52 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, return S_OK; } - if(This->held_frames + frames > This->bufsize_frames){ + if(stream->held_frames + frames > stream->bufsize_frames){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_BUFFER_TOO_LARGE; } write_pos = - (This->lcl_offs_frames + This->held_frames) % This->bufsize_frames; - if(write_pos + frames > This->bufsize_frames){ - if(This->tmp_buffer_frames < frames){ - HeapFree(GetProcessHeap(), 0, This->tmp_buffer); - This->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, - frames * This->fmt->nBlockAlign); - if(!This->tmp_buffer){ + (stream->lcl_offs_frames + stream->held_frames) % stream->bufsize_frames; + if(write_pos + frames > stream->bufsize_frames){ + if(stream->tmp_buffer_frames < frames){ + HeapFree(GetProcessHeap(), 0, stream->tmp_buffer); + stream->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, + frames * stream->fmt->nBlockAlign); + if(!stream->tmp_buffer){ LeaveCriticalSection(&This->lock); return E_OUTOFMEMORY; } - This->tmp_buffer_frames = frames; + stream->tmp_buffer_frames = frames; } - *data = This->tmp_buffer; - This->getbuf_last = -frames; + *data = stream->tmp_buffer; + stream->getbuf_last = -frames; }else{ - *data = This->local_buffer + write_pos * This->fmt->nBlockAlign; - This->getbuf_last = frames; + *data = stream->local_buffer + write_pos * stream->fmt->nBlockAlign; + stream->getbuf_last = frames; } - silence_buffer(This, *data, frames); + silence_buffer(stream, *data, frames); LeaveCriticalSection(&This->lock); return S_OK; } -static void oss_wrap_buffer(ACImpl *This, BYTE *buffer, UINT32 written_frames) +static void oss_wrap_buffer(struct oss_stream *stream, BYTE *buffer, UINT32 written_frames) { UINT32 write_offs_frames = - (This->lcl_offs_frames + This->held_frames) % This->bufsize_frames; - UINT32 write_offs_bytes = write_offs_frames * This->fmt->nBlockAlign; - UINT32 chunk_frames = This->bufsize_frames - write_offs_frames; - UINT32 chunk_bytes = chunk_frames * This->fmt->nBlockAlign; - UINT32 written_bytes = written_frames * This->fmt->nBlockAlign; + (stream->lcl_offs_frames + stream->held_frames) % stream->bufsize_frames; + UINT32 write_offs_bytes = write_offs_frames * stream->fmt->nBlockAlign; + UINT32 chunk_frames = stream->bufsize_frames - write_offs_frames; + UINT32 chunk_bytes = chunk_frames * stream->fmt->nBlockAlign; + UINT32 written_bytes = written_frames * stream->fmt->nBlockAlign; if(written_bytes <= chunk_bytes){ - memcpy(This->local_buffer + write_offs_bytes, buffer, written_bytes); + memcpy(stream->local_buffer + write_offs_bytes, buffer, written_bytes); }else{ - memcpy(This->local_buffer + write_offs_bytes, buffer, chunk_bytes); - memcpy(This->local_buffer, buffer + chunk_bytes, + memcpy(stream->local_buffer + write_offs_bytes, buffer, chunk_bytes); + memcpy(stream->local_buffer, buffer + chunk_bytes, written_bytes - chunk_bytes); } } @@ -1856,6 +1869,7 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( IAudioRenderClient *iface, UINT32 written_frames, DWORD flags) { ACImpl *This = impl_from_IAudioRenderClient(iface); + struct oss_stream *stream = This->stream; BYTE *buffer; TRACE("(%p)->(%u, %x)\n", This, written_frames, flags); @@ -1863,36 +1877,36 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( EnterCriticalSection(&This->lock); if(!written_frames){ - This->getbuf_last = 0; + stream->getbuf_last = 0; LeaveCriticalSection(&This->lock); return S_OK; } - if(!This->getbuf_last){ + if(!stream->getbuf_last){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_OUT_OF_ORDER; } - if(written_frames > (This->getbuf_last >= 0 ? This->getbuf_last : -This->getbuf_last)){ + if(written_frames > (stream->getbuf_last >= 0 ? stream->getbuf_last : -stream->getbuf_last)){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_INVALID_SIZE; } - if(This->getbuf_last >= 0) - buffer = This->local_buffer + This->fmt->nBlockAlign * - ((This->lcl_offs_frames + This->held_frames) % This->bufsize_frames); + if(stream->getbuf_last >= 0) + buffer = stream->local_buffer + stream->fmt->nBlockAlign * + ((stream->lcl_offs_frames + stream->held_frames) % stream->bufsize_frames); else - buffer = This->tmp_buffer; + buffer = stream->tmp_buffer; if(flags & AUDCLNT_BUFFERFLAGS_SILENT) - silence_buffer(This, buffer, written_frames); + silence_buffer(stream, buffer, written_frames); - if(This->getbuf_last < 0) - oss_wrap_buffer(This, buffer, written_frames); + if(stream->getbuf_last < 0) + oss_wrap_buffer(stream, buffer, written_frames); - This->held_frames += written_frames; - This->written_frames += written_frames; - This->getbuf_last = 0; + stream->held_frames += written_frames; + stream->written_frames += written_frames; + stream->getbuf_last = 0; LeaveCriticalSection(&This->lock); @@ -1948,6 +1962,7 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, UINT64 *qpcpos) { ACImpl *This = impl_from_IAudioCaptureClient(iface); + struct oss_stream *stream = This->stream; TRACE("(%p)->(%p, %p, %p, %p, %p)\n", This, data, frames, flags, devpos, qpcpos); @@ -1962,12 +1977,12 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, EnterCriticalSection(&This->lock); - if(This->getbuf_last){ + if(stream->getbuf_last){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_OUT_OF_ORDER; } - if(This->held_frames < This->period_frames){ + if(stream->held_frames < stream->period_frames){ *frames = 0; LeaveCriticalSection(&This->lock); return AUDCLNT_S_BUFFER_EMPTY; @@ -1975,37 +1990,37 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, *flags = 0; - *frames = This->period_frames; + *frames = stream->period_frames; - if(This->lcl_offs_frames + *frames > This->bufsize_frames){ + if(stream->lcl_offs_frames + *frames > stream->bufsize_frames){ UINT32 chunk_bytes, offs_bytes, frames_bytes; - if(This->tmp_buffer_frames < *frames){ - HeapFree(GetProcessHeap(), 0, This->tmp_buffer); - This->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, - *frames * This->fmt->nBlockAlign); - if(!This->tmp_buffer){ + if(stream->tmp_buffer_frames < *frames){ + HeapFree(GetProcessHeap(), 0, stream->tmp_buffer); + stream->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, + *frames * stream->fmt->nBlockAlign); + if(!stream->tmp_buffer){ LeaveCriticalSection(&This->lock); return E_OUTOFMEMORY; } - This->tmp_buffer_frames = *frames; + stream->tmp_buffer_frames = *frames; } - *data = This->tmp_buffer; - chunk_bytes = (This->bufsize_frames - This->lcl_offs_frames) * - This->fmt->nBlockAlign; - offs_bytes = This->lcl_offs_frames * This->fmt->nBlockAlign; - frames_bytes = *frames * This->fmt->nBlockAlign; - memcpy(This->tmp_buffer, This->local_buffer + offs_bytes, chunk_bytes); - memcpy(This->tmp_buffer + chunk_bytes, This->local_buffer, + *data = stream->tmp_buffer; + chunk_bytes = (stream->bufsize_frames - stream->lcl_offs_frames) * + stream->fmt->nBlockAlign; + offs_bytes = stream->lcl_offs_frames * stream->fmt->nBlockAlign; + frames_bytes = *frames * stream->fmt->nBlockAlign; + memcpy(stream->tmp_buffer, stream->local_buffer + offs_bytes, chunk_bytes); + memcpy(stream->tmp_buffer + chunk_bytes, stream->local_buffer, frames_bytes - chunk_bytes); }else - *data = This->local_buffer + - This->lcl_offs_frames * This->fmt->nBlockAlign; + *data = stream->local_buffer + + stream->lcl_offs_frames * stream->fmt->nBlockAlign; - This->getbuf_last = *frames; + stream->getbuf_last = *frames; if(devpos) - *devpos = This->written_frames; + *devpos = stream->written_frames; if(qpcpos){ LARGE_INTEGER stamp, freq; QueryPerformanceCounter(&stamp); @@ -2022,32 +2037,33 @@ static HRESULT WINAPI AudioCaptureClient_ReleaseBuffer( IAudioCaptureClient *iface, UINT32 done) { ACImpl *This = impl_from_IAudioCaptureClient(iface); + struct oss_stream *stream = This->stream; TRACE("(%p)->(%u)\n", This, done); EnterCriticalSection(&This->lock); if(!done){ - This->getbuf_last = 0; + stream->getbuf_last = 0; LeaveCriticalSection(&This->lock); return S_OK; } - if(!This->getbuf_last){ + if(!stream->getbuf_last){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_OUT_OF_ORDER; } - if(This->getbuf_last != done){ + if(stream->getbuf_last != done){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_INVALID_SIZE; } - This->written_frames += done; - This->held_frames -= done; - This->lcl_offs_frames += done; - This->lcl_offs_frames %= This->bufsize_frames; - This->getbuf_last = 0; + stream->written_frames += done; + stream->held_frames -= done; + stream->lcl_offs_frames += done; + stream->lcl_offs_frames %= stream->bufsize_frames; + stream->getbuf_last = 0; LeaveCriticalSection(&This->lock); @@ -2058,6 +2074,7 @@ static HRESULT WINAPI AudioCaptureClient_GetNextPacketSize( IAudioCaptureClient *iface, UINT32 *frames) { ACImpl *This = impl_from_IAudioCaptureClient(iface); + struct oss_stream *stream = This->stream; TRACE("(%p)->(%p)\n", This, frames); @@ -2066,7 +2083,7 @@ static HRESULT WINAPI AudioCaptureClient_GetNextPacketSize( EnterCriticalSection(&This->lock); - *frames = This->held_frames < This->period_frames ? 0 : This->period_frames; + *frames = stream->held_frames < stream->period_frames ? 0 : stream->period_frames; LeaveCriticalSection(&This->lock); @@ -2122,13 +2139,14 @@ static ULONG WINAPI AudioClock_Release(IAudioClock *iface) static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) { ACImpl *This = impl_from_IAudioClock(iface); + struct oss_stream *stream = This->stream; TRACE("(%p)->(%p)\n", This, freq); - if(This->share == AUDCLNT_SHAREMODE_SHARED) - *freq = (UINT64)This->fmt->nSamplesPerSec * This->fmt->nBlockAlign; + if(stream->share == AUDCLNT_SHAREMODE_SHARED) + *freq = (UINT64)stream->fmt->nSamplesPerSec * stream->fmt->nBlockAlign; else - *freq = This->fmt->nSamplesPerSec; + *freq = stream->fmt->nSamplesPerSec; return S_OK; } @@ -2137,6 +2155,7 @@ static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, UINT64 *qpctime) { ACImpl *This = impl_from_IAudioClock(iface); + struct oss_stream *stream = This->stream; TRACE("(%p)->(%p, %p)\n", This, pos, qpctime); @@ -2145,32 +2164,32 @@ static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, EnterCriticalSection(&This->lock); - if(This->dataflow == eRender){ - *pos = This->written_frames - This->held_frames; - if(*pos < This->last_pos_frames) - *pos = This->last_pos_frames; - }else if(This->dataflow == eCapture){ + if(stream->flow == eRender){ + *pos = stream->written_frames - stream->held_frames; + if(*pos < stream->last_pos_frames) + *pos = stream->last_pos_frames; + }else if(stream->flow == eCapture){ audio_buf_info bi; UINT32 held; - if(ioctl(This->fd, SNDCTL_DSP_GETISPACE, &bi) < 0){ + if(ioctl(stream->fd, SNDCTL_DSP_GETISPACE, &bi) < 0){ TRACE("GETISPACE failed: %d (%s)\n", errno, strerror(errno)); held = 0; }else{ if(bi.bytes <= bi.fragsize) held = 0; else - held = bi.bytes / This->fmt->nBlockAlign; + held = bi.bytes / stream->fmt->nBlockAlign; } - *pos = This->written_frames + held; + *pos = stream->written_frames + held; } - This->last_pos_frames = *pos; + stream->last_pos_frames = *pos; TRACE("returning: %s\n", wine_dbgstr_longlong(*pos)); - if(This->share == AUDCLNT_SHAREMODE_SHARED) - *pos *= This->fmt->nBlockAlign; + if(stream->share == AUDCLNT_SHAREMODE_SHARED) + *pos *= stream->fmt->nBlockAlign; LeaveCriticalSection(&This->lock); @@ -2340,7 +2359,7 @@ static HRESULT WINAPI AudioSessionControl_GetState(IAudioSessionControl2 *iface, LIST_FOR_EACH_ENTRY(client, &This->session->clients, ACImpl, entry){ EnterCriticalSection(&client->lock); - if(client->playing){ + if(client->stream->playing){ *state = AudioSessionStateActive; LeaveCriticalSection(&client->lock); LeaveCriticalSection(&g_sessions_lock); diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 1a80794f150..f498609898a 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -18,6 +18,25 @@ #include "mmdeviceapi.h" +struct oss_stream +{ + WAVEFORMATEX *fmt; + EDataFlow flow; + UINT flags; + AUDCLNT_SHAREMODE share; + HANDLE event; + + int fd; + + BOOL playing; + UINT64 written_frames, last_pos_frames; + UINT32 period_us, period_frames, bufsize_frames, held_frames, tmp_buffer_frames, in_oss_frames; + UINT32 oss_bufsize_bytes, lcl_offs_frames; /* offs into local_buffer where valid data starts */ + + BYTE *local_buffer, *tmp_buffer; + INT32 getbuf_last; /* <0 when using tmp_buffer */ +}; + /* From <dlls/mmdevapi/mmdevapi.h> */ enum DriverPriority { -- 2.25.1

2 1

[PATCH 3/8] wineoss: Use the global lock to lock the session.
by Huw Davies April 11, 2022

April 11, 2022

Mainly for simplicity. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmdevdrv.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index eb0ab7b8fc7..af49c88e6cf 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -81,8 +81,6 @@ typedef struct _AudioSession { float *channel_vols; BOOL mute; - CRITICAL_SECTION lock; - struct list entry; } AudioSession; @@ -835,9 +833,6 @@ static AudioSession *create_session(const GUID *guid, IMMDevice *device, list_add_head(&g_sessions, &ret->entry); - InitializeCriticalSection(&ret->lock); - ret->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": AudioSession.lock"); - session_init_vols(ret, num_channels); ret->master_vol = 1.f; @@ -2565,13 +2560,13 @@ static HRESULT WINAPI SimpleAudioVolume_SetMasterVolume( if(context) FIXME("Notifications not supported yet\n"); - EnterCriticalSection(&session->lock); + EnterCriticalSection(&g_sessions_lock); session->master_vol = level; TRACE("OSS doesn't support setting volume\n"); - LeaveCriticalSection(&session->lock); + LeaveCriticalSection(&g_sessions_lock); return S_OK; } @@ -2600,11 +2595,11 @@ static HRESULT WINAPI SimpleAudioVolume_SetMute(ISimpleAudioVolume *iface, TRACE("(%p)->(%u, %s)\n", session, mute, debugstr_guid(context)); - EnterCriticalSection(&session->lock); + EnterCriticalSection(&g_sessions_lock); session->mute = mute; - LeaveCriticalSection(&session->lock); + LeaveCriticalSection(&g_sessions_lock); return S_OK; } @@ -2856,13 +2851,13 @@ static HRESULT WINAPI ChannelAudioVolume_SetChannelVolume( if(context) FIXME("Notifications not supported yet\n"); - EnterCriticalSection(&session->lock); + EnterCriticalSection(&g_sessions_lock); session->channel_vols[index] = level; TRACE("OSS doesn't support setting volume\n"); - LeaveCriticalSection(&session->lock); + LeaveCriticalSection(&g_sessions_lock); return S_OK; } @@ -2906,14 +2901,14 @@ static HRESULT WINAPI ChannelAudioVolume_SetAllVolumes( if(context) FIXME("Notifications not supported yet\n"); - EnterCriticalSection(&session->lock); + EnterCriticalSection(&g_sessions_lock); for(i = 0; i < count; ++i) session->channel_vols[i] = levels[i]; TRACE("OSS doesn't support setting volume\n"); - LeaveCriticalSection(&session->lock); + LeaveCriticalSection(&g_sessions_lock); return S_OK; } -- 2.25.1

2 1

[PATCH 2/8] wineoss: Dynamically size the devnode array.
by Huw Davies April 11, 2022

April 11, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmdevdrv.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 5b6addef0f7..eb0ab7b8fc7 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -121,7 +121,6 @@ struct ACImpl { int fd; oss_audioinfo ai; - char devnode[OSS_DEVNODE_SIZE]; BOOL initted, playing; UINT64 written_frames, last_pos_frames; @@ -138,6 +137,9 @@ struct ACImpl { AudioSessionWrapper *session_wrapper; struct list entry; + + /* Keep at end */ + char devnode[0]; }; typedef struct _SessionMgr { @@ -445,6 +447,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, ACImpl *This; const OSSDevice *oss_dev; HRESULT hr; + int len; TRACE("%s %p %p\n", debugstr_guid(guid), dev, out); @@ -453,8 +456,8 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, WARN("Unknown GUID: %s\n", debugstr_guid(guid)); return AUDCLNT_E_DEVICE_INVALIDATED; } - - This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ACImpl)); + len = strlen(oss_dev->devnode); + This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, offsetof(ACImpl, devnode[len + 1])); if(!This) return E_OUTOFMEMORY; -- 2.25.1

2 1

[PATCH 1/8] wineoss: Explicitly store the channel count in the client.
by Huw Davies April 11, 2022

April 11, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmdevdrv.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index fd35a439c5a..5b6addef0f7 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -117,6 +117,7 @@ struct ACImpl { AUDCLNT_SHAREMODE share; HANDLE event; float *vols; + UINT32 channel_count; int fd; oss_audioinfo ai; @@ -970,7 +971,8 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, return E_OUTOFMEMORY; } - This->vols = HeapAlloc(GetProcessHeap(), 0, fmt->nChannels * sizeof(float)); + This->channel_count = fmt->nChannels; + This->vols = HeapAlloc(GetProcessHeap(), 0, This->channel_count * sizeof(float)); if(!This->vols){ CoTaskMemFree(This->fmt); This->fmt = NULL; @@ -979,14 +981,14 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, return E_OUTOFMEMORY; } - for(i = 0; i < fmt->nChannels; ++i) + for(i = 0; i < This->channel_count; ++i) This->vols[i] = 1.f; This->share = mode; This->flags = flags; This->oss_bufsize_bytes = 0; - hr = get_audio_session(sessionguid, This->parent, fmt->nChannels, + hr = get_audio_session(sessionguid, This->parent, This->channel_count, &This->session); if(FAILED(hr)){ HeapFree(GetProcessHeap(), 0, This->vols); @@ -2674,7 +2676,7 @@ static HRESULT WINAPI AudioStreamVolume_GetChannelCount( if(!out) return E_POINTER; - *out = This->fmt->nChannels; + *out = This->channel_count; return S_OK; } @@ -2689,7 +2691,7 @@ static HRESULT WINAPI AudioStreamVolume_SetChannelVolume( if(level < 0.f || level > 1.f) return E_INVALIDARG; - if(index >= This->fmt->nChannels) + if(index >= This->channel_count) return E_INVALIDARG; EnterCriticalSection(&This->lock); @@ -2713,7 +2715,7 @@ static HRESULT WINAPI AudioStreamVolume_GetChannelVolume( if(!level) return E_POINTER; - if(index >= This->fmt->nChannels) + if(index >= This->channel_count) return E_INVALIDARG; *level = This->vols[index]; @@ -2732,7 +2734,7 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( if(!levels) return E_POINTER; - if(count != This->fmt->nChannels) + if(count != This->channel_count) return E_INVALIDARG; EnterCriticalSection(&This->lock); @@ -2758,7 +2760,7 @@ static HRESULT WINAPI AudioStreamVolume_GetAllVolumes( if(!levels) return E_POINTER; - if(count != This->fmt->nChannels) + if(count != This->channel_count) return E_INVALIDARG; EnterCriticalSection(&This->lock); -- 2.25.1

2 1

[website] German translation for WWN issue 414
by Julian Rüger April 11, 2022

April 11, 2022

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 7.4
by Julian Rüger April 11, 2022

April 11, 2022

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for WWN issue 413
by Julian Rüger April 11, 2022

April 11, 2022

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH vkd3d] vkd3d-shader/hlsl: Ensure that SM4 endif has 0 source registers.
by Francisco Casas April 11, 2022

April 11, 2022

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_sm4.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 872118c1..6a2b52cb 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1854,28 +1854,29 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, static void write_sm4_if(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_if *iff) { struct sm4_instruction instr = { .opcode = VKD3D_SM4_OP_IF | VKD3D_SM4_CONDITIONAL_NZ, .src_count = 1, }; assert(iff->condition.node->data_type->dimx == 1); sm4_src_from_node(&instr.srcs[0], iff->condition.node, VKD3DSP_WRITEMASK_ALL); write_sm4_instruction(buffer, &instr); write_sm4_block(ctx, buffer, &iff->then_instrs); if (!list_empty(&iff->else_instrs.instrs)) { instr.opcode = VKD3D_SM4_OP_ELSE; instr.src_count = 0; write_sm4_instruction(buffer, &instr); write_sm4_block(ctx, buffer, &iff->else_instrs); } instr.opcode = VKD3D_SM4_OP_ENDIF; + instr.src_count = 0; write_sm4_instruction(buffer, &instr); } -- 2.25.1

4 4

[PATCH 1/3] urlmon: Add basic implementation of MapBrowserEmulationModeToUserAgent.
by Gabriel Ivăncescu April 11, 2022

April 11, 2022

This is necessary for mshtml's navigator userAgent to work properly, since some apps expect it. The second argument seems to be output pointer that gets allocated (by CoTaskMemAlloc, or something compatible with it), but the first argument seems to be a pointer to an unknown struct, which makes it almost impossible to guess reliably what it does by just inspecting its behavior... Thankfully, it seems only the first DWORD field is necessary for this. Changing it returns the user agent for that given mode, if the rest is zeros. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Unfortunately I was not able to find a public structure that starts with such a field in urlmon. Sending these to get some feedback if there's a better way... dlls/urlmon/session.c | 40 +++++++++++++++++++++++++++++ dlls/urlmon/tests/misc.c | 53 +++++++++++++++++++++++++++++++++++++++ dlls/urlmon/urlmon.spec | 2 +- dlls/urlmon/urlmon_main.c | 10 -------- 4 files changed, 94 insertions(+), 11 deletions(-) diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index 052444d..671d74d 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -504,6 +504,7 @@ static BOOL get_url_encoding(HKEY root, DWORD *encoding) } static LPWSTR user_agent; +static BOOL user_agent_set; static size_t obtain_user_agent(unsigned int version, WCHAR *ret, size_t size) { @@ -710,6 +711,7 @@ HRESULT WINAPI UrlMkSetSessionOption(DWORD dwOption, LPVOID pBuffer, DWORD dwBuf heap_free(user_agent); user_agent = new_user_agent; + user_agent_set = TRUE; update_user_agent(user_agent); LeaveCriticalSection(&session_cs); @@ -748,6 +750,44 @@ HRESULT WINAPI ObtainUserAgentString(DWORD option, char *ret, DWORD *ret_size) return hres; } +/*********************************************************************** + * MapBrowserEmulationModeToUserAgent (URLMON.445) + * Undocumented, added in IE8 + */ +HRESULT WINAPI MapBrowserEmulationModeToUserAgent(const void *arg, WCHAR **ret) +{ + DWORD size, version; + const WCHAR *ua; + WCHAR buf[1024]; + + FIXME("%p %p\n", arg, ret); + + if(user_agent_set) { + /* Native ignores first arg if custom user agent has been set, doesn't crash even if NULL */ + size = (wcslen(user_agent) + 1) * sizeof(WCHAR); + ua = user_agent; + }else { + *ret = NULL; + + /* First arg seems to be a pointer to a structure of unknown size, and crashes + if it's too small (or filled with arbitrary values from the stack). For our + purposes, we only check first field which seems to be the requested version. */ + version = *(DWORD*)arg; + if(version == 5) + version = 7; + if(version < 7 || version > 11) + return E_FAIL; + + size = obtain_user_agent(version, buf, ARRAY_SIZE(buf)) * sizeof(WCHAR); + ua = buf; + } + + if(!(*ret = CoTaskMemAlloc(size))) + return E_OUTOFMEMORY; + memcpy(*ret, ua, size); + return S_OK; +} + void free_session(void) { name_space *ns_iter, *ns_last; diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 0575a43..72b3442 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -83,6 +83,7 @@ static HRESULT (WINAPI *pCompareSecurityIds)(BYTE*,DWORD,BYTE*,DWORD,DWORD); static HRESULT (WINAPI *pCoInternetIsFeatureEnabled)(INTERNETFEATURELIST,DWORD); static HRESULT (WINAPI *pCoInternetSetFeatureEnabled)(INTERNETFEATURELIST,DWORD,BOOL); static HRESULT (WINAPI *pIEInstallScope)(DWORD*); +static HRESULT (WINAPI *pMapBrowserEmulationModeToUserAgent)(const void*,WCHAR**); static WCHAR *a2co(const char *str) { @@ -2721,6 +2722,55 @@ static void test_bsc_marshaling(void) TerminateThread(thread, 0); } +static void test_MapBrowserEmulationModeToUserAgent(BOOL custom_ua) +{ + /* Undocumented structure of unknown size, crashes if it's too small (with random values from stack) */ + struct + { + DWORD version; + char unknown[252]; + } arg; + static char test_str[] = "test"; + const char *custom_ua_msg = ""; + HRESULT hres; + unsigned i; + WCHAR *ua; + + if(!pMapBrowserEmulationModeToUserAgent) { + win_skip("MapBrowserEmulationModeToUserAgent not available\n"); + return; + } + memset(&arg, 0, sizeof(arg)); + + if(custom_ua) { + hres = UrlMkSetSessionOption(URLMON_OPTION_USERAGENT, test_str, sizeof(test_str), 0); + ok(hres == S_OK, "UrlMkSetSessionOption failed: %08lx\n", hres); + custom_ua_msg = " (with custom ua)"; + } + + for(i = 0; i < 12; i++) { + arg.version = i; + ua = (WCHAR*)0xdeadbeef; + hres = pMapBrowserEmulationModeToUserAgent(&arg, &ua); + ok(hres == (i == 5 || i >= 7 || custom_ua ? S_OK : E_FAIL), + "[%d] MapBrowserEmulationModeToUserAgent%s returned %08lx\n", i, custom_ua_msg, hres); + if(hres != S_OK) + ok(ua == NULL, "[%d] ua%s = %p\n", i, custom_ua_msg, ua); + else { + char buf[1024]; + DWORD size = sizeof(buf); + WCHAR *ua2; + + hres = pObtainUserAgentString(custom_ua ? 0 : i, buf, &size); + ok(hres == S_OK, "[%d] ObtainUserAgentString%s failed: %08lx\n", i, custom_ua_msg, hres); + ua2 = a2co(buf); + ok(!lstrcmpW(ua, ua2), "[%d] ua%s = %s, expected %s\n", i, custom_ua_msg, wine_dbgstr_w(ua), wine_dbgstr_w(ua2)); + CoTaskMemFree(ua2); + CoTaskMemFree(ua); + } + } +} + START_TEST(misc) { HMODULE hurlmon; @@ -2745,6 +2795,7 @@ START_TEST(misc) pCoInternetIsFeatureEnabled = (void*) GetProcAddress(hurlmon, "CoInternetIsFeatureEnabled"); pCoInternetSetFeatureEnabled = (void*) GetProcAddress(hurlmon, "CoInternetSetFeatureEnabled"); pIEInstallScope = (void*) GetProcAddress(hurlmon, "IEInstallScope"); + pMapBrowserEmulationModeToUserAgent = (void*) GetProcAddress(hurlmon, (const char*)445); if (!pCoInternetCompareUrl || !pCoInternetGetSecurityUrl || !pCoInternetGetSession || !pCoInternetParseUrl || !pCompareSecurityIds) { @@ -2757,6 +2808,7 @@ START_TEST(misc) if(argc <= 2 || strcmp(argv[2], "internet_features")) { register_protocols(); + test_MapBrowserEmulationModeToUserAgent(FALSE); test_CreateFormatEnum(); test_RegisterFormatEnumerator(); test_CoInternetParseUrl(); @@ -2773,6 +2825,7 @@ START_TEST(misc) test_MkParseDisplayNameEx(); test_IsValidURL(); test_bsc_marshaling(); + test_MapBrowserEmulationModeToUserAgent(TRUE); } test_internet_features(); diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index ea3cd38..2fda69e 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -110,6 +110,6 @@ 410 stdcall @(long long) LogSqmBits 423 stdcall @(long long long long) LogSqmUXCommandOffsetInternal 444 stdcall @(long long long) MapUriToBrowserEmulationState -445 stdcall @(long long) MapBrowserEmulationModeToUserAgent +445 stdcall @(ptr ptr) MapBrowserEmulationModeToUserAgent 446 stdcall @(long) CoInternetGetBrowserProfile 455 stdcall @() FlushUrlmonZonesCache diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index b540313..56c2257 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -791,16 +791,6 @@ int WINAPI MapUriToBrowserEmulationState(DWORD unk1, DWORD unk2, DWORD unk3) return 0; } -/*********************************************************************** - * MapBrowserEmulationModeToUserAgent (URLMON.445) - * Undocumented, added in IE8 - */ -int WINAPI MapBrowserEmulationModeToUserAgent(DWORD unk1, DWORD unk2) -{ - FIXME("stub: %ld %ld\n", unk1, unk2); - return 0; -} - /*********************************************************************** * CoInternetGetBrowserProfile (URLMON.446) * Undocumented, added in IE8 -- 2.34.1

3 5

[PATCH] configure: Mark CROSSCC precious.
by Stefan Dösinger April 11, 2022

April 11, 2022

So that configure remembers e.g. ccache for building PE files. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- One cache to rule them all, one hash to find them, one cache to bring them all and in .ccache bind them. In the land of $HOME where the disk is full. I probably spent more time making fun about "precious" than figuring out all this autoconf stuff, so maybe a better solution is needed. --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index 6cbc0a61be1..a941a148d0a 100644 --- a/configure.ac +++ b/configure.ac @@ -860,6 +860,7 @@ enable_wineandroid_drv=${enable_wineandroid_drv:-no} enable_winemac_drv=${enable_winemac_drv:-no} dnl Check for cross compiler to build test programs +AC_ARG_VAR(CROSSCC, "Cross compiler for PE files") AC_SUBST(CROSSTARGET) if test "x$with_mingw" != xno then -- 2.35.1

1 0

[PATCH v3 0/4] Console support & CreateProcess
by Eric Pouech April 11, 2022

April 11, 2022

The following series is the result of work from - Torge Matties, Jacek Caban and myself - and went through various convergence, merges, rewrite and improvements (especially patch #2 for various authors) it provides: - support for CREATE_NO_WINDOW flag in CreateProcess - a solution for regression introduced in f034084d49b354811096524d472ae5172ac1cebf (when a Wine initial process isn't attached to a unix console, it can generates lots new console window creation, with unwanted side effects) - with the correspondings non regression tests Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- Eric Pouech (4): dlls/kernel32/tests: Add more CreateProcess console management tests. dlls/{ntdll, kernel*}: Add support for CREATE_NO_WINDOW flag in CreateProcess. dlls/{ntdll,kernel*}: provide a pseudo console environment for initial CUI processes not tied to an Unix tty dlls/kernel32/tests: added tests for CreateProcess on a shell_no_window console dlls/kernel32/tests/console.c | 126 ++++++++++++++++++++++++++++++---- dlls/kernelbase/console.c | 44 +++++++++--- dlls/kernelbase/process.c | 11 +-- dlls/ntdll/unix/env.c | 2 + dlls/ntdll/unix/process.c | 2 + include/wine/condrv.h | 6 +- programs/conhost/conhost.c | 11 ++- programs/conhost/conhost.h | 1 + server/process.c | 4 +- 9 files changed, 172 insertions(+), 35 deletions(-)

4 13

[PATCH] win32u: Avoid iterating over a NULL window list when broadcasting.
by Alexandros Frantzis April 11, 2022

April 11, 2022

Signed-off-by: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> --- dlls/win32u/message.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 46c42188d70..9479595ae53 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -2508,9 +2508,11 @@ static BOOL is_message_broadcastable( UINT msg ) */ static BOOL broadcast_message( struct send_message_info *info, DWORD_PTR *res_ptr ) { - if (is_message_broadcastable( info->msg )) + HWND *list; + + if (is_message_broadcastable( info->msg ) && + (list = list_window_children( 0, get_desktop_window(), NULL, 0 ))) { - HWND *list = list_window_children( 0, get_desktop_window(), NULL, 0 ); int i; for (i = 0; list[i]; i++) -- 2.35.1

2 1

[PATCH 1/6] winex11: Directly use ntdll for registry access in setup_options.
by Jacek Caban April 11, 2022

April 11, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/x11drv.h | 16 ++++- dlls/winex11.drv/x11drv_main.c | 118 ++++++++++++++++++++++++++++----- dlls/winex11.drv/xim.c | 13 ++-- 3 files changed, 124 insertions(+), 23 deletions(-)

3 3

[PATCH] mf: Implement MFCreateNetSchemePlugin().
by Nikolay Sivov April 11, 2022

April 11, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/main.c | 10 ++++++++++ dlls/mf/mf.spec | 2 +- dlls/mf/tests/mf.c | 23 +++++++++++++++++++++++ include/mfidl.idl | 1 + 4 files changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/mf/main.c b/dlls/mf/main.c index 6b1d9293c8a..55e071d23f4 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -1419,3 +1419,13 @@ HRESULT WINAPI MFRequireProtectedEnvironment(IMFPresentationDescriptor *pd) return protected ? S_OK : S_FALSE; } + +/*********************************************************************** + * MFCreateNetSchemePlugin (mf.@) + */ +HRESULT WINAPI MFCreateNetSchemePlugin(REFIID riid, void **out) +{ + TRACE("%s, %p.\n", debugstr_guid(riid), out); + + return CoCreateInstance(&CLSID_NetSchemePlugin, NULL, CLSCTX_INPROC_SERVER, riid, (void **)out); +} diff --git a/dlls/mf/mf.spec b/dlls/mf/mf.spec index 8f340243fc2..162feac4b34 100644 --- a/dlls/mf/mf.spec +++ b/dlls/mf/mf.spec @@ -41,7 +41,7 @@ @ stub MFCreateMediaProcessor @ stdcall MFCreateMediaSession(ptr ptr) @ stub MFCreateNSCByteStreamPlugin -@ stub MFCreateNetSchemePlugin +@ stdcall MFCreateNetSchemePlugin(ptr ptr) @ stub MFCreatePMPHost @ stub MFCreatePMPMediaSession @ stub MFCreatePMPServer diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 31a84e47bc1..4015ca79910 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6971,6 +6971,28 @@ failed: CoUninitialize(); } +static void test_MFCreateNetSchemePlugin(void) +{ + IMFSchemeHandler *handler; + HRESULT hr; + + hr = MFCreateNetSchemePlugin(&IID_IMFSchemeHandler, (void **)&handler); + todo_wine + ok(hr == CO_E_NOTINITIALIZED, "Unexpected hr %#lx.\n", hr); + + hr = CoInitialize(NULL); + ok(hr == S_OK, "Failed to initialize, hr %#lx.\n", hr); + + hr = MFCreateNetSchemePlugin(&IID_IMFSchemeHandler, (void **)&handler); + todo_wine + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + if (SUCCEEDED(hr)) + IMFSchemeHandler_Release(handler); + + CoUninitialize(); +} + START_TEST(mf) { init_functions(); @@ -7004,6 +7026,7 @@ START_TEST(mf) test_sample_copier_output_processing(); test_MFGetTopoNodeCurrentType(); test_MFRequireProtectedEnvironment(); + test_MFCreateNetSchemePlugin(); test_wma_encoder(); test_wma_decoder(); test_h264_decoder(); diff --git a/include/mfidl.idl b/include/mfidl.idl index 7034378f585..68057de54c8 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -673,6 +673,7 @@ cpp_quote("HRESULT WINAPI MFCreateAudioRendererActivate(IMFActivate **activate); cpp_quote("HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **session);") cpp_quote("HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **bytestream);" ) cpp_quote("HRESULT WINAPI MFCreateMFByteStreamOnStreamEx(IUnknown *stream, IMFByteStream **bytestream);") +cpp_quote("HRESULT WINAPI MFCreateNetSchemePlugin(REFIID riid, void **obj);") cpp_quote("HRESULT WINAPI MFCreatePresentationClock(IMFPresentationClock **clock);") cpp_quote("HRESULT WINAPI MFCreatePresentationDescriptor(DWORD count, IMFStreamDescriptor **descriptors,") cpp_quote(" IMFPresentationDescriptor **presentation_desc);") -- 2.35.1

2 1

[PATCH 6/6] winex11: Directly use ntdll for registry access in write_registry_settings.
by Jacek Caban April 11, 2022

April 11, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/Makefile.in | 2 +- dlls/winex11.drv/settings.c | 33 +++++++++++++++++---------------- 2 files changed, 18 insertions(+), 17 deletions(-)

2 1

[PATCH 5/6] winex11: Directly use ntdll for registry access in read_registry_settings.
by Jacek Caban April 11, 2022

April 11, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/settings.c | 44 +++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 19 deletions(-)

2 1

[PATCH 4/6] winex11: Directly use ntdll for registry access in get_display_device_reg_key.
by Jacek Caban April 11, 2022

April 11, 2022

Also just open the key in write_registry_settings, it should be already created by win32u. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/settings.c | 64 ++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 33 deletions(-)

2 1

[PATCH 3/6] winex11: Directly use ntdll for registry access in X11DRV_GetICMProfile.
by Jacek Caban April 11, 2022

April 11, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/graphics.c | 32 ++++++++++++++++++++------------ dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 2 +- 3 files changed, 22 insertions(+), 13 deletions(-)

2 1

[PATCH 2/6] winex11: Directly use ntdll for registry access in create_xcursor_system_cursor.
by Jacek Caban April 11, 2022

April 11, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/mouse.c | 15 ++++++++------- dlls/winex11.drv/x11drv.h | 6 ++++++ dlls/winex11.drv/x11drv_main.c | 5 ++--- 3 files changed, 16 insertions(+), 10 deletions(-)

2 1

[PATCH] mfplat: Fix alignment used by audio buffers created with MFCreateMediaBufferFromMediaType().
by Nikolay Sivov April 11, 2022

April 11, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/buffer.c | 6 ++--- dlls/mfplat/tests/mfplat.c | 54 +++++++++++++++++++++++++++++++------- 2 files changed, 48 insertions(+), 12 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 8ea2283e24b..eada3df18ad 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -1596,6 +1596,8 @@ HRESULT WINAPI MFCreateMediaBufferFromMediaType(IMFMediaType *media_type, LONGLO if (FAILED(IMFMediaType_GetUINT32(media_type, &MF_MT_AUDIO_BLOCK_ALIGNMENT, &block_alignment))) WARN("Block alignment was not specified.\n"); + alignment = max(16, alignment); + if (block_alignment) { avg_length = 0; @@ -1610,8 +1612,6 @@ HRESULT WINAPI MFCreateMediaBufferFromMediaType(IMFMediaType *media_type, LONGLO } } - alignment = max(16, alignment); - length = buffer_get_aligned_length(avg_length + 1, alignment); length = buffer_get_aligned_length(length, block_alignment); } @@ -1620,7 +1620,7 @@ HRESULT WINAPI MFCreateMediaBufferFromMediaType(IMFMediaType *media_type, LONGLO length = max(length, min_length); - return create_1d_buffer(length, MF_1_BYTE_ALIGNMENT, buffer); + return create_1d_buffer(length, alignment - 1, buffer); } else FIXME("Major type %s is not supported.\n", debugstr_guid(&major)); diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 16d24bbff51..8d21f2ed60e 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -6057,18 +6057,21 @@ static void test_MFCreateMediaBufferFromMediaType(void) unsigned int buffer_length; } audio_tests[] = { - { 0, 0, 0, 4, 0, 20 }, - { 0, 16, 0, 4, 0, 20 }, - { 0, 0, 32, 4, 0, 36 }, - { 0, 64, 32, 4, 0, 64 }, - { 1, 0, 0, 4, 16, 36 }, - { 2, 0, 0, 4, 16, 52 }, + { 0, 0, 0, 4, 0, 20 }, + { 0, 16, 0, 4, 0, 20 }, + { 0, 0, 32, 4, 0, 36 }, + { 0, 64, 32, 4, 0, 64 }, + { 1, 0, 0, 4, 16, 36 }, + { 2, 0, 0, 4, 16, 52 }, + { 2, 0, 64, 4, 16, 68 }, + { 2, 0, 128, 4, 16,132 }, }; + IMFMediaType *media_type, *media_type2; + unsigned int i, alignment; IMFMediaBuffer *buffer; - DWORD length; + DWORD length, max; + BYTE *data; HRESULT hr; - IMFMediaType *media_type; - unsigned int i; if (!pMFCreateMediaBufferFromMediaType) { @@ -6082,9 +6085,15 @@ static void test_MFCreateMediaBufferFromMediaType(void) hr = MFCreateMediaType(&media_type); ok(hr == S_OK, "Failed to create media type, hr %#lx.\n", hr); + hr = MFCreateMediaType(&media_type2); + ok(hr == S_OK, "Failed to create media type, hr %#lx.\n", hr); + hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); ok(hr == S_OK, "Failed to set attribute, hr %#lx.\n", hr); + hr = IMFMediaType_CopyAllItems(media_type, (IMFAttributes *)media_type2); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + for (i = 0; i < ARRAY_SIZE(audio_tests); ++i) { const struct audio_buffer_test *ptr = &audio_tests[i]; @@ -6107,10 +6116,37 @@ static void test_MFCreateMediaBufferFromMediaType(void) ok(hr == S_OK, "Failed to get length, hr %#lx.\n", hr); ok(ptr->buffer_length == length, "%d: unexpected buffer length %lu, expected %u.\n", i, length, ptr->buffer_length); + alignment = ptr->min_alignment ? ptr->min_alignment - 1 : MF_16_BYTE_ALIGNMENT; + hr = IMFMediaBuffer_Lock(buffer, &data, &max, &length); + ok(hr == S_OK, "Failed to lock, hr %#lx.\n", hr); + ok(ptr->buffer_length == max && !length, "Unexpected length.\n"); + ok(!((uintptr_t)data & alignment), "%u: data at %p is misaligned.\n", i, data); + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK, "Failed to unlock, hr %#lx.\n", hr); + + IMFMediaBuffer_Release(buffer); + + /* Only major type is set. */ + hr = pMFCreateMediaBufferFromMediaType(media_type2, ptr->duration * 10000000, ptr->min_length, + ptr->min_alignment, &buffer); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IMFMediaBuffer_GetMaxLength(buffer, &length); + ok(hr == S_OK, "Failed to get length, hr %#lx.\n", hr); + ok(ptr->min_length == length, "%u: unexpected buffer length %lu, expected %u.\n", i, length, ptr->min_length); + + hr = IMFMediaBuffer_Lock(buffer, &data, &max, &length); + ok(hr == S_OK, "Failed to lock, hr %#lx.\n", hr); + ok(ptr->min_length == max && !length, "Unexpected length.\n"); + ok(!((uintptr_t)data & alignment), "%u: data at %p is misaligned.\n", i, data); + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK, "Failed to unlock, hr %#lx.\n", hr); + IMFMediaBuffer_Release(buffer); } IMFMediaType_Release(media_type); + IMFMediaType_Release(media_type2); } static void validate_media_type(IMFMediaType *mediatype, const WAVEFORMATEX *format) -- 2.35.1

1 0

[PATCH 1/5] hlink: Use CRT allocation functions.
by Nikolay Sivov April 11, 2022

April 11, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/hlink/browse_ctx.c | 15 +++++++-------- dlls/hlink/extserv.c | 29 +++++++++++++---------------- dlls/hlink/hlink_main.c | 6 +++--- dlls/hlink/hlink_private.h | 17 ----------------- dlls/hlink/link.c | 33 ++++++++++++++++----------------- 5 files changed, 39 insertions(+), 61 deletions(-) diff --git a/dlls/hlink/browse_ctx.c b/dlls/hlink/browse_ctx.c index 58a43b180fc..44db1a1fc0c 100644 --- a/dlls/hlink/browse_ctx.c +++ b/dlls/hlink/browse_ctx.c @@ -88,11 +88,11 @@ static ULONG WINAPI IHlinkBC_fnRelease (IHlinkBrowseContext* iface) { list_remove(&link->entry); IHlink_Release(link->link); - heap_free(link); + free(link); } - heap_free(This->BrowseWindowInfo); - heap_free(This); + free(This->BrowseWindowInfo); + free(This); } return ref; @@ -174,8 +174,8 @@ static HRESULT WINAPI IHlinkBC_SetBrowseWindowInfo(IHlinkBrowseContext* iface, if(!phlbwi) return E_INVALIDARG; - heap_free(This->BrowseWindowInfo); - This->BrowseWindowInfo = heap_alloc(phlbwi->cbSize); + free(This->BrowseWindowInfo); + This->BrowseWindowInfo = malloc(phlbwi->cbSize); memcpy(This->BrowseWindowInfo, phlbwi, phlbwi->cbSize); return S_OK; @@ -209,7 +209,7 @@ static HRESULT WINAPI IHlinkBC_SetInitialHlink(IHlinkBrowseContext* iface, if (!list_empty(&This->links)) return CO_E_ALREADYINITIALIZED; - link = heap_alloc(sizeof(struct link_entry)); + link = malloc(sizeof(struct link_entry)); if (!link) return E_OUTOFMEMORY; HlinkCreateFromMoniker(pimkTarget, pwzLocation, pwzFriendlyName, NULL, @@ -375,14 +375,13 @@ HRESULT HLinkBrowseContext_Constructor(IUnknown *pUnkOuter, REFIID riid, void ** if (pUnkOuter) return CLASS_E_NOAGGREGATION; - hl = heap_alloc_zero(sizeof(HlinkBCImpl)); + hl = calloc(1, sizeof(*hl)); if (!hl) return E_OUTOFMEMORY; hl->ref = 1; hl->IHlinkBrowseContext_iface.lpVtbl = &hlvt; list_init(&hl->links); - hl->current = NULL; *ppv = hl; return S_OK; diff --git a/dlls/hlink/extserv.c b/dlls/hlink/extserv.c index 7a5f62246f4..d6587ce9e79 100644 --- a/dlls/hlink/extserv.c +++ b/dlls/hlink/extserv.c @@ -89,10 +89,10 @@ static ULONG WINAPI ExtServUnk_Release(IUnknown *iface) TRACE("(%p) ref=%ld\n", This, ref); if(!ref) { - heap_free(This->username); - heap_free(This->password); - heap_free(This->headers); - heap_free(This); + free(This->username); + free(This->password); + free(This->headers); + free(This); } return ref; @@ -236,7 +236,7 @@ static HRESULT ExtServ_ImplSetAdditionalHeaders(ExtensionService* This, LPCWSTR { int len; - heap_free(This->headers); + free(This->headers); This->headers = NULL; if (!pwzAdditionalHeaders) @@ -245,11 +245,11 @@ static HRESULT ExtServ_ImplSetAdditionalHeaders(ExtensionService* This, LPCWSTR len = lstrlenW(pwzAdditionalHeaders); if(len && pwzAdditionalHeaders[len-1] != '\n' && pwzAdditionalHeaders[len-1] != '\r') { - This->headers = heap_alloc(len*sizeof(WCHAR) + sizeof(L"\r\n")); + This->headers = malloc(len*sizeof(WCHAR) + sizeof(L"\r\n")); memcpy(This->headers, pwzAdditionalHeaders, len*sizeof(WCHAR)); memcpy(This->headers+len, L"\r\n", sizeof(L"\r\n")); }else { - This->headers = hlink_strdupW(pwzAdditionalHeaders); + This->headers = wcsdup(pwzAdditionalHeaders); } return S_OK; @@ -266,12 +266,12 @@ static HRESULT WINAPI ExtServ_SetAdditionalHeaders(IExtensionServices* iface, LP static HRESULT ExtServ_ImplSetAuthenticateData(ExtensionService* This, HWND phwnd, LPCWSTR pwzUsername, LPCWSTR pwzPassword) { - heap_free(This->username); - heap_free(This->password); + free(This->username); + free(This->password); This->hwnd = phwnd; - This->username = hlink_strdupW(pwzUsername); - This->password = hlink_strdupW(pwzPassword); + This->username = wcsdup(pwzUsername); + This->password = wcsdup(pwzPassword); return S_OK; } @@ -307,17 +307,14 @@ HRESULT WINAPI HlinkCreateExtensionServices(LPCWSTR pwzAdditionalHeaders, phwnd, debugstr_w(pszUsername), debugstr_w(pszPassword), punkOuter, debugstr_guid(riid), ppv); - ret = heap_alloc(sizeof(*ret)); + if (!(ret = calloc(1, sizeof(*ret)))) + return E_OUTOFMEMORY; ret->IUnknown_inner.lpVtbl = &ExtServUnkVtbl; ret->IAuthenticate_iface.lpVtbl = &AuthenticateVtbl; ret->IHttpNegotiate_iface.lpVtbl = &HttpNegotiateVtbl; ret->IExtensionServices_iface.lpVtbl = &ExtServVtbl; ret->ref = 1; - ret->headers = NULL; - ret->hwnd = NULL; - ret->username = NULL; - ret->password = NULL; ExtServ_ImplSetAuthenticateData(ret, phwnd, pszUsername, pszPassword); ExtServ_ImplSetAdditionalHeaders(ret, pwzAdditionalHeaders); diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index 46a401824ae..e70a066bb05 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -103,7 +103,7 @@ HRESULT WINAPI HlinkCreateFromString( LPCWSTR pwzTarget, LPCWSTR pwzLocation, else { int tgt_len = hash - pwzTarget; - tgt = heap_alloc((tgt_len + 1) * sizeof(WCHAR)); + tgt = malloc((tgt_len + 1) * sizeof(WCHAR)); if (!tgt) return E_OUTOFMEMORY; memcpy(tgt, pwzTarget, tgt_len * sizeof(WCHAR)); @@ -116,7 +116,7 @@ HRESULT WINAPI HlinkCreateFromString( LPCWSTR pwzTarget, LPCWSTR pwzLocation, } else { - tgt = hlink_strdupW(pwzTarget); + tgt = wcsdup(pwzTarget); if (!tgt) return E_OUTOFMEMORY; loc = pwzLocation; @@ -130,7 +130,7 @@ HRESULT WINAPI HlinkCreateFromString( LPCWSTR pwzTarget, LPCWSTR pwzLocation, IHlink_SetStringReference(hl, HLINKSETF_TARGET | HLINKSETF_LOCATION, tgt, loc); - heap_free(tgt); + free(tgt); if (pwzFriendlyName) IHlink_SetFriendlyName(hl, pwzFriendlyName); diff --git a/dlls/hlink/hlink_private.h b/dlls/hlink/hlink_private.h index 565c264fee9..cf1befdb78f 100644 --- a/dlls/hlink/hlink_private.h +++ b/dlls/hlink/hlink_private.h @@ -27,26 +27,9 @@ #include "ole2.h" #include "hlink.h" -#include "wine/heap.h" - extern HRESULT HLink_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; extern HRESULT HLinkBrowseContext_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; -static inline LPWSTR hlink_strdupW(LPCWSTR str) -{ - LPWSTR ret = NULL; - - if(str) { - DWORD size; - - size = (lstrlenW(str)+1)*sizeof(WCHAR); - ret = heap_alloc(size); - memcpy(ret, str, size); - } - - return ret; -} - static inline LPWSTR hlink_co_strdupW(LPCWSTR str) { LPWSTR ret = NULL; diff --git a/dlls/hlink/link.c b/dlls/hlink/link.c index 46597488ab1..305f7136a44 100644 --- a/dlls/hlink/link.c +++ b/dlls/hlink/link.c @@ -169,14 +169,14 @@ static ULONG WINAPI IHlink_fnRelease (IHlink* iface) return refCount; TRACE("-- destroying IHlink (%p)\n", This); - heap_free(This->FriendlyName); - heap_free(This->TargetFrameName); - heap_free(This->Location); + free(This->FriendlyName); + free(This->TargetFrameName); + free(This->Location); if (This->Moniker) IMoniker_Release(This->Moniker); if (This->Site) IHlinkSite_Release(This->Site); - heap_free(This); + free(This); return 0; } @@ -248,8 +248,8 @@ static HRESULT WINAPI IHlink_fnSetMonikerReference( IHlink* iface, } if(rfHLSETF & HLINKSETF_LOCATION){ - heap_free(This->Location); - This->Location = hlink_strdupW( pwzLocation ); + free(This->Location); + This->Location = wcsdup( pwzLocation ); } return S_OK; @@ -310,10 +310,10 @@ static HRESULT WINAPI IHlink_fnSetStringReference(IHlink* iface, if (grfHLSETF & HLINKSETF_LOCATION) { - heap_free(This->Location); + free(This->Location); This->Location = NULL; if (pwzLocation && *pwzLocation) - This->Location = hlink_strdupW( pwzLocation ); + This->Location = wcsdup( pwzLocation ); } return S_OK; @@ -399,8 +399,8 @@ static HRESULT WINAPI IHlink_fnSetFriendlyName (IHlink *iface, TRACE("(%p) -> (%s)\n", This, debugstr_w(pwzFriendlyName)); - heap_free(This->FriendlyName); - This->FriendlyName = hlink_strdupW( pwzFriendlyName ); + free(This->FriendlyName); + This->FriendlyName = wcsdup( pwzFriendlyName ); return S_OK; } @@ -447,8 +447,8 @@ static HRESULT WINAPI IHlink_fnSetTargetFrameName(IHlink* iface, HlinkImpl *This = impl_from_IHlink(iface); TRACE("(%p)->(%s)\n", This, debugstr_w(pwzTargetFramename)); - heap_free(This->TargetFrameName); - This->TargetFrameName = hlink_strdupW( pwzTargetFramename ); + free(This->TargetFrameName); + This->TargetFrameName = wcsdup( pwzTargetFramename ); return S_OK; } @@ -767,18 +767,18 @@ static HRESULT read_hlink_string(IStream *pStm, LPWSTR *out_str) TRACE("read len %ld\n", len); - str = heap_alloc(len * sizeof(WCHAR)); + str = malloc(len * sizeof(WCHAR)); if (!str) return E_OUTOFMEMORY; hr = IStream_Read(pStm, str, len * sizeof(WCHAR), &read); if (FAILED(hr)) { - heap_free(str); + free(str); return hr; } if (read != len * sizeof(WCHAR)) { - heap_free(str); + free(str); return STG_E_READFAULT; } TRACE("read string %s\n", debugstr_w(str)); @@ -1137,8 +1137,7 @@ HRESULT HLink_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv) if (pUnkOuter) return CLASS_E_NOAGGREGATION; - hl = heap_alloc_zero(sizeof(HlinkImpl)); - if (!hl) + if (!(hl = calloc(1, sizeof(*hl)))) return E_OUTOFMEMORY; hl->ref = 1; -- 2.35.1

1 4

[PATCH 1/2] evr/mixer: Implement GetAvailableVideoProcessorModes().
by Nikolay Sivov April 11, 2022

April 11, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/mixer.c | 22 ++++++++++++++++++++-- dlls/evr/tests/evr.c | 16 ++++++++-------- 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 0b957e7b6bd..c7e3033f2d1 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -1930,9 +1930,27 @@ static ULONG WINAPI video_mixer_processor_Release(IMFVideoProcessor *iface) static HRESULT WINAPI video_mixer_processor_GetAvailableVideoProcessorModes(IMFVideoProcessor *iface, UINT *count, GUID **modes) { - FIXME("%p, %p, %p.\n", iface, count, modes); + struct video_mixer *mixer = impl_from_IMFVideoProcessor(iface); + IDirectXVideoProcessorService *service; + DXVA2_VideoDesc video_desc; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p, %p.\n", iface, count, modes); + + EnterCriticalSection(&mixer->cs); + + if (!mixer->inputs[0].media_type || !mixer->output.media_type) + hr = MF_E_TRANSFORM_TYPE_NOT_SET; + else if (SUCCEEDED(hr = video_mixer_get_processor_service(mixer, &service))) + { + video_mixer_init_dxva_videodesc(mixer->inputs[0].media_type, &video_desc); + hr = IDirectXVideoProcessorService_GetVideoProcessorDeviceGuids(service, &video_desc, count, modes); + IDirectXVideoProcessorService_Release(service); + } + + LeaveCriticalSection(&mixer->cs); + + return hr; } static HRESULT WINAPI video_mixer_processor_GetVideoProcessorCaps(IMFVideoProcessor *iface, GUID *mode, diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index ea67ff5b584..bd280836046 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -654,7 +654,6 @@ static void test_default_mixer(void) ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#lx.\n", hr); hr = IMFVideoProcessor_GetAvailableVideoProcessorModes(processor, &count, &guids); - todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#lx.\n", hr); IMFVideoProcessor_Release(processor); @@ -1071,6 +1070,9 @@ static void test_default_mixer_type_negotiation(void) hr = MFCreateVideoMixer(NULL, &IID_IDirect3DDevice9, &IID_IMFTransform, (void **)&transform); ok(hr == S_OK, "Failed to create default mixer, hr %#lx.\n", hr); + hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoProcessor, (void **)&processor); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFTransform_GetInputAvailableType(transform, 0, 0, &media_type); ok(hr == E_NOTIMPL, "Unexpected hr %#lx.\n", hr); @@ -1095,6 +1097,9 @@ static void test_default_mixer_type_negotiation(void) hr = IMFTransform_SetInputType(transform, 0, media_type, MFT_SET_TYPE_TEST_ONLY); ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#lx.\n", hr); + hr = IMFVideoProcessor_GetAvailableVideoProcessorModes(processor, &count, &guids); + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#lx.\n", hr); + /* Now try with device manager. */ window = create_window(); @@ -1282,9 +1287,6 @@ static void test_default_mixer_type_negotiation(void) IMFMediaType_Release(media_type2); IMFMediaType_Release(media_type); - hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoProcessor, (void **)&processor); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = IMFVideoProcessor_GetVideoProcessorMode(processor, &guid); todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#lx.\n", hr); @@ -1302,7 +1304,6 @@ static void test_default_mixer_type_negotiation(void) IMFMediaType_Release(media_type); hr = IMFVideoProcessor_GetAvailableVideoProcessorModes(processor, &count, &guids); - todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type); @@ -1319,10 +1320,9 @@ static void test_default_mixer_type_negotiation(void) ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); hr = IMFVideoProcessor_GetAvailableVideoProcessorModes(processor, &count, &guids); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - if (SUCCEEDED(hr)) - CoTaskMemFree(guids); + ok(count > 0 && !!guids, "Unexpected modes data.\n"); + CoTaskMemFree(guids); hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type2); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); -- 2.35.1

1 1

[PATCH] dlls/combase: use I64 width modifier for 64-bit integers
by Eric Pouech April 11, 2022

April 11, 2022

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/combase/rpc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/combase/rpc.c b/dlls/combase/rpc.c index c8401fe0cbd0..80760ca37e76 100644 --- a/dlls/combase/rpc.c +++ b/dlls/combase/rpc.c @@ -77,7 +77,7 @@ struct registered_if static inline void get_rpc_endpoint(LPWSTR endpoint, const OXID *oxid) { /* FIXME: should get endpoint from rpcss */ - wsprintfW(endpoint, L"\\pipe\\OLE_%08lx%08lx", (DWORD)(*oxid >> 32), (DWORD)*oxid); + wsprintfW(endpoint, L"\\pipe\\OLE_%016I64x", *oxid); } typedef struct

2 1

[PATCH] dlls/wininet/tests: simplify printf for 64 bit integers
by Eric Pouech April 11, 2022

April 11, 2022

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wininet/tests/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 98d1b74ca85e..80b3160820bb 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -6173,7 +6173,7 @@ static void test_large_content(int port) ok(GetLastError() == ERROR_HTTP_INVALID_HEADER, "expected ERROR_HTTP_INVALID_HEADER, got %lx\n", GetLastError()); ok(sizelen == sizeof(DWORD64), "sizelen %lu\n", sizelen); - ok(len64 == ~0, "len64 %lx%08lx\n", (DWORD)(len64 >> 32), (DWORD)len64); + ok(len64 == ~0, "len64 %I64x\n", len64); close_request(&req);

2 1

[PATCH] programs/winedbg: simplify printf for 64 bit integers
by Eric Pouech April 11, 2022

April 11, 2022

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/winedbg/memory.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index 3118637cb5ef..8321e8b028db 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -452,8 +452,7 @@ char* memory_offset_to_string(char *str, DWORD64 offset, unsigned mode) if (mode == 32) sprintf(str, "0x%08x", (unsigned int) offset); else - sprintf(str, "0x%08x%08x", (unsigned int)(offset >> 32), - (unsigned int)offset); + sprintf(str, "%#016I64x", offset); return str; }

1 0

[PATCH] dlls/ntdll/tests: simplify printf for 64 bit integers
by Eric Pouech April 11, 2022

April 11, 2022

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ntdll/tests/large_int.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/large_int.c b/dlls/ntdll/tests/large_int.c index 013a91708b9c..9635cac24ad2 100644 --- a/dlls/ntdll/tests/large_int.c +++ b/dlls/ntdll/tests/large_int.c @@ -349,9 +349,8 @@ static void one_RtlInt64ToUnicodeString_test(int test_num, const largeint2str_t } /* if */ } /* if */ ok(memcmp(unicode_string.Buffer, expected_unicode_string.Buffer, LARGE_STRI_BUFFER_LENGTH * sizeof(WCHAR)) == 0, - "(test %d): RtlInt64ToUnicodeString(0x%lx%08lx, %d, [out]) assigns string \"%s\", expected: \"%s\"\n", - test_num, (DWORD)(largeint2str->value >>32), (DWORD)largeint2str->value, largeint2str->base, - ansi_str.Buffer, expected_ansi_str.Buffer); + "(test %d): RtlInt64ToUnicodeString(0x%I64x, %d, [out]) assigns string \"%s\", expected: \"%s\"\n", + test_num, largeint2str->value, largeint2str->base, ansi_str.Buffer, expected_ansi_str.Buffer); ok(unicode_string.Length == expected_unicode_string.Length, "(test %d): RtlInt64ToUnicodeString(0x%s, %d, [out]) string has Length %d, expected: %d\n", test_num, wine_dbgstr_longlong(largeint2str->value), largeint2str->base,

1 0

[PATCH] dlls/rpcrt4: don't cast ptrdiff_t to ULONG in traces, use %I instead
by Eric Pouech April 11, 2022

April 11, 2022

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/rpcrt4/ndr_marshall.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index d0d2e19342c6..d54e6ce7d0a9 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -121,9 +121,9 @@ static inline void align_pointer_offset_clear( unsigned char **ptr, unsigned cha } #define STD_OVERFLOW_CHECK(_Msg) do { \ - TRACE("buffer=%ld/%ld\n", (ULONG)(_Msg->Buffer - (unsigned char *)_Msg->RpcMsg->Buffer), _Msg->BufferLength); \ + TRACE("buffer=%Id/%ld\n", _Msg->Buffer - (unsigned char *)_Msg->RpcMsg->Buffer, _Msg->BufferLength); \ if (_Msg->Buffer > (unsigned char *)_Msg->RpcMsg->Buffer + _Msg->BufferLength) \ - ERR("buffer overflow %ld bytes\n", (ULONG)(_Msg->Buffer - ((unsigned char *)_Msg->RpcMsg->Buffer + _Msg->BufferLength))); \ + ERR("buffer overflow %Id bytes\n", _Msg->Buffer - ((unsigned char *)_Msg->RpcMsg->Buffer + _Msg->BufferLength)); \ } while (0) #define NDR_POINTER_ID_BASE 0x20000 @@ -3629,7 +3629,7 @@ unsigned char * WINAPI NdrComplexStructMarshall(PMIDL_STUB_MESSAGE pStubMsg, /* save it for use by embedded pointer code later */ pStubMsg->PointerBufferMark = (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength; - TRACE("difference = 0x%lx\n", (ULONG)(pStubMsg->PointerBufferMark - pStubMsg->Buffer)); + TRACE("difference = 0x%Ix\n", pStubMsg->PointerBufferMark - pStubMsg->Buffer); pointer_buffer_mark_set = TRUE; /* restore the original buffer length */ @@ -3715,7 +3715,7 @@ unsigned char * WINAPI NdrComplexStructUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, /* save it for use by embedded pointer code later */ pStubMsg->PointerBufferMark = pStubMsg->Buffer; - TRACE("difference = 0x%lx\n", (ULONG)(pStubMsg->PointerBufferMark - saved_buffer)); + TRACE("difference = 0x%Ix\n", pStubMsg->PointerBufferMark - saved_buffer); pointer_buffer_mark_set = TRUE; /* restore the original buffer */ @@ -4186,7 +4186,7 @@ unsigned char * WINAPI NdrComplexArrayMarshall(PMIDL_STUB_MESSAGE pStubMsg, /* save it for use by embedded pointer code later */ pStubMsg->PointerBufferMark = (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength; - TRACE("difference = 0x%lx\n", (ULONG)(pStubMsg->Buffer - (unsigned char *)pStubMsg->RpcMsg->Buffer)); + TRACE("difference = 0x%Ix\n", pStubMsg->Buffer - (unsigned char *)pStubMsg->RpcMsg->Buffer); pointer_buffer_mark_set = TRUE; /* restore fields */ @@ -4242,7 +4242,7 @@ unsigned char * WINAPI NdrComplexArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, NdrComplexArrayMemorySize(pStubMsg, pFormat); pStubMsg->IgnoreEmbeddedPointers = saved_ignore_embedded; - TRACE("difference = 0x%lx\n", (ULONG)(pStubMsg->Buffer - saved_buffer)); + TRACE("difference = 0x%Ix\n", pStubMsg->Buffer - saved_buffer); if (!pStubMsg->PointerBufferMark) { /* save it for use by embedded pointer code later */

1 0

[PATCH] dlls/d3dxof: don't cast ptrdiff_t to ULONG in traces, use %I instead
by Eric Pouech April 11, 2022

April 11, 2022

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/d3dxof/parsing.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 8431078949f9..7688e846bf51 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -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 (%Iu) does not match decompressed file size (%u)\n", + decomp_buffer - *decomp_buffer_ptr, decomp_file_size); /* Use decompressed data */ buf->buffer = *decomp_buffer_ptr;

1 0

[PATCH v3 1/4] ntdll/tests: Add some tests for NtQueryDirectoryObject().
by Zebediah Figura April 11, 2022

April 11, 2022

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/tests/om.c | 222 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 222 insertions(+) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index a0702a580b7..b86d1e003a2 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -78,6 +78,16 @@ static NTSTATUS (WINAPI *pNtCompareObjects)(HANDLE,HANDLE); #define KEYEDEVENT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | 0x0003) #define DESKTOP_ALL_ACCESS 0x01ff +#define check_unicode_string(a, b) check_unicode_string_(__LINE__, a, b) +static void check_unicode_string_( int line, const UNICODE_STRING *string, const WCHAR *expect ) +{ + size_t len = wcslen( expect ) * sizeof(WCHAR); + + ok_(__FILE__, line)( !wcscmp( string->Buffer, expect ), "got string %s\n", debugstr_w( string->Buffer )); + ok_(__FILE__, line)( string->Length == len, "got length %u\n", string->Length ); + ok_(__FILE__, line)( string->MaximumLength == len + sizeof(WCHAR), "got max length %u\n", string->MaximumLength ); +} + static void test_case_sensitive (void) { NTSTATUS status; @@ -2500,6 +2510,217 @@ static void test_object_identity(void) pNtClose( h1 ); } +static void test_query_directory(void) +{ + static const DIRECTORY_BASIC_INFORMATION empty_info; + char buffer[200]; + DIRECTORY_BASIC_INFORMATION *info = (void *)buffer; + ULONG context, size, needed_size; + const WCHAR *name1, *name2; + HANDLE dir, child1, child2; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING string; + NTSTATUS status; + + RtlInitUnicodeString( &string, L"\\BaseNamedObjects\\winetest" ); + InitializeObjectAttributes( &attr, &string, 0, 0, NULL ); + status = NtCreateDirectoryObject( &dir, DIRECTORY_QUERY, &attr ); + ok( !status, "got %#lx\n", status ); + + context = 0xdeadbeef; + size = 0xdeadbeef; + status = NtQueryDirectoryObject( dir, info, 0, TRUE, TRUE, &context, &size ); + todo_wine ok( status == STATUS_NO_MORE_ENTRIES, "got %#lx\n", status ); + todo_wine ok( context == 0xdeadbeef, "got context %#lx\n", context ); + todo_wine ok( size == sizeof(*info) || broken(!size) /* WoW64 */, "got size %lu\n", size ); + + context = 0xdeadbeef; + size = 0xdeadbeef; + status = NtQueryDirectoryObject( dir, info, 0, FALSE, TRUE, &context, &size ); + todo_wine ok( status == STATUS_NO_MORE_ENTRIES, "got %#lx\n", status ); + todo_wine ok( context == 0xdeadbeef, "got context %#lx\n", context ); + todo_wine ok( size == sizeof(*info) || broken(!size) /* WoW64 */, "got size %lu\n", size ); + + context = 0xdeadbeef; + size = 0xdeadbeef; + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, TRUE, &context, &size ); + ok( status == STATUS_NO_MORE_ENTRIES, "got %#lx\n", status ); + todo_wine ok( context == 0xdeadbeef, "got context %#lx\n", context ); + todo_wine ok( size == sizeof(*info) || broken(!size) /* WoW64 */, "got size %lu\n", size ); + if (size == sizeof(*info)) + ok( !memcmp( &info[0], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); + + context = 0xdeadbeef; + size = 0xdeadbeef; + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), FALSE, TRUE, &context, &size ); + todo_wine ok( status == STATUS_NO_MORE_ENTRIES, "got %#lx\n", status ); + todo_wine ok( context == 0xdeadbeef, "got context %#lx\n", context ); + todo_wine ok( size == sizeof(*info) || broken(!size) /* WoW64 */, "got size %lu\n", size ); + if (size == sizeof(*info)) + ok( !memcmp( &info[0], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); + + RtlInitUnicodeString( &string, L"\\BaseNamedObjects\\winetest\\Telamon" ); + status = NtCreateMutant( &child1, GENERIC_ALL, &attr, FALSE ); + ok( !status, "got %#lx\n", status ); + + RtlInitUnicodeString( &string, L"\\BaseNamedObjects\\winetest\\Oileus" ); + status = NtCreateMutant( &child2, GENERIC_ALL, &attr, FALSE ); + ok( !status, "got %#lx\n", status ); + + context = 0xdeadbeef; + size = 0xdeadbeef; + status = NtQueryDirectoryObject( NULL, info, sizeof(buffer), TRUE, TRUE, &context, &size ); + ok( status == STATUS_INVALID_HANDLE, "got %#lx\n", status ); + todo_wine ok( context == 0xdeadbeef, "got context %#lx\n", context ); + todo_wine ok( size == 0xdeadbeef || broken(!size) /* WoW64 */, "got size %lu\n", size); + + size = 0xdeadbeef; + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, TRUE, NULL, &size ); + ok( status == STATUS_ACCESS_VIOLATION, "got %#lx\n", status ); + ok( size == 0xdeadbeef, "got size %lu\n", size); + + context = 0xdeadbeef; + size = 0xdeadbeef; + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, TRUE, &context, &size ); + ok( !status, "got %#lx\n", status ); + ok( context == 1, "got context %#lx\n", context ); + ok( size && size < sizeof(buffer), "got size %lu\n", size ); + if (!wcscmp( info[0].ObjectName.Buffer, L"Oileus" )) + { + name1 = L"Oileus"; + name2 = L"Telamon"; + } + else + { + name1 = L"Telamon"; + name2 = L"Oileus"; + } + check_unicode_string( &info[0].ObjectName, name1 ); + check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); + todo_wine + ok( !memcmp( &info[1], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); + + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, FALSE, &context, &size ); + ok( !status, "got %#lx\n", status ); + ok( context == 2, "got context %#lx\n", context ); + check_unicode_string( &info[0].ObjectName, name2 ); + check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); + todo_wine ok( !memcmp( &info[1], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); + + size = 0xdeadbeef; + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, FALSE, &context, &size ); + ok( status == STATUS_NO_MORE_ENTRIES, "got %#lx\n", status ); + ok( context == 2, "got context %#lx\n", context ); + todo_wine ok( size == sizeof(*info) || broken(!size) /* WoW64 */, "got size %lu\n", size ); + + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, TRUE, &context, &size ); + ok( !status, "got %#lx\n", status ); + ok( context == 1, "got context %#lx\n", context ); + check_unicode_string( &info[0].ObjectName, name1 ); + check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); + todo_wine ok( !memcmp( &info[1], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); + + needed_size = size; + + size = 0xdeadbeef; + context = 0xdeadbeef; + status = NtQueryDirectoryObject( dir, info, 0, TRUE, TRUE, &context, &size ); + todo_wine ok( status == STATUS_BUFFER_TOO_SMALL, "got %#lx\n", status ); + todo_wine ok( context == 0xdeadbeef, "got context %#lx\n", context ); + todo_wine ok( size == needed_size, "expected size %lu, got %lu\n", needed_size, size ); + + size = 0xdeadbeef; + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, needed_size - 1, TRUE, TRUE, &context, &size ); + todo_wine 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 ); + + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, TRUE, &context, NULL ); + ok( !status, "got %#lx\n", status ); + + context = 0; + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, FALSE, &context, &size ); + ok( !status, "got %#lx\n", status ); + ok( context == 1, "got context %#lx\n", context ); + check_unicode_string( &info[0].ObjectName, name1 ); + check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); + todo_wine ok( !memcmp( &info[1], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); + + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), FALSE, TRUE, &context, &size ); + todo_wine ok( !status, "got %#lx\n", status ); + if (!status) + { + ok( context == 2, "got context %#lx\n", context ); + check_unicode_string( &info[0].ObjectName, name1 ); + check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); + check_unicode_string( &info[1].ObjectName, name2 ); + check_unicode_string( &info[1].ObjectTypeName, L"Mutant" ); + ok( !memcmp( &info[2], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); + } + + needed_size = size; + size = 0xdeadbeef; + context = 0xdeadbeef; + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, needed_size - 1, FALSE, TRUE, &context, &size ); + todo_wine ok( status == STATUS_MORE_ENTRIES, "got %#lx\n", status ); + if (status == STATUS_MORE_ENTRIES) + { + ok( context == 1, "got context %#lx\n", context ); + ok( size > 0 && size < needed_size, "got size %lu\n", size ); + check_unicode_string( &info[0].ObjectName, name1 ); + check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); + ok( !memcmp( &info[1], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); + } + + size = 0xdeadbeef; + context = 0xdeadbeef; + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(*info), FALSE, TRUE, &context, &size ); + todo_wine ok( status == STATUS_MORE_ENTRIES + || broken(status == STATUS_BUFFER_TOO_SMALL) /* wow64 */, "got %#lx\n", status ); + if (status == STATUS_MORE_ENTRIES) + { + ok( !context, "got context %#lx\n", context ); + ok( size == sizeof(*info), "got size %lu\n", size ); + ok( !memcmp( &info[0], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); + } + + size = 0xdeadbeef; + context = 0xdeadbeef; + status = NtQueryDirectoryObject( dir, info, 0, FALSE, TRUE, &context, &size ); + todo_wine ok( status == STATUS_MORE_ENTRIES + || broken(status == STATUS_BUFFER_TOO_SMALL) /* wow64 */, "got %#lx\n", status ); + if (status == STATUS_MORE_ENTRIES) + { + ok( !context, "got context %#lx\n", context ); + ok( size == sizeof(*info), "got size %lu\n", size ); + } + + context = 1; + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), FALSE, FALSE, &context, &size ); + todo_wine ok( !status, "got %#lx\n", status ); + if (!status) + { + ok( context == 2, "got context %#lx\n", context ); + check_unicode_string( &info[0].ObjectName, name2 ); + check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); + ok( !memcmp( &info[1], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); + } + + NtClose( child1 ); + NtClose( child2 ); + NtClose( dir ); +} + START_TEST(om) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -2561,4 +2782,5 @@ START_TEST(om) test_get_next_thread(); test_globalroot(); test_object_identity(); + test_query_directory(); } -- 2.34.1

1 3

[PATCH v2 1/4] ntdll/tests: Add some tests for NtQueryDirectoryObject().
by Zebediah Figura April 11, 2022

April 11, 2022

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/tests/om.c | 211 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 211 insertions(+) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index a0702a580b7..0fc53384a89 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -78,6 +78,16 @@ static NTSTATUS (WINAPI *pNtCompareObjects)(HANDLE,HANDLE); #define KEYEDEVENT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | 0x0003) #define DESKTOP_ALL_ACCESS 0x01ff +#define check_unicode_string(a, b) check_unicode_string_(__LINE__, a, b) +static void check_unicode_string_( int line, const UNICODE_STRING *string, const WCHAR *expect ) +{ + size_t len = wcslen( expect ) * sizeof(WCHAR); + + ok_(__FILE__, line)( !wcscmp( string->Buffer, expect ), "got string %s\n", debugstr_w( string->Buffer )); + ok_(__FILE__, line)( string->Length == len, "got length %u\n", string->Length ); + ok_(__FILE__, line)( string->MaximumLength == len + sizeof(WCHAR), "got max length %u\n", string->MaximumLength ); +} + static void test_case_sensitive (void) { NTSTATUS status; @@ -2500,6 +2510,206 @@ static void test_object_identity(void) pNtClose( h1 ); } +static void test_query_directory(void) +{ + static const DIRECTORY_BASIC_INFORMATION empty_info; + char buffer[200]; + DIRECTORY_BASIC_INFORMATION *info = (void *)buffer; + ULONG context, size, needed_size; + HANDLE dir, child1, child2; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING string; + NTSTATUS status; + + RtlInitUnicodeString( &string, L"\\BaseNamedObjects\\winetest" ); + InitializeObjectAttributes( &attr, &string, 0, 0, NULL ); + status = NtCreateDirectoryObject( &dir, DIRECTORY_QUERY, &attr ); + ok( !status, "got %#lx\n", status ); + + context = 0xdeadbeef; + size = 0xdeadbeef; + status = NtQueryDirectoryObject( dir, info, 0, TRUE, TRUE, &context, &size ); + todo_wine ok( status == STATUS_NO_MORE_ENTRIES, "got %#lx\n", status ); + todo_wine ok( context == 0xdeadbeef, "got context %#lx\n", context ); + todo_wine ok( size == sizeof(*info) || broken(!size) /* WoW64 */, "got size %lu\n", size ); + + context = 0xdeadbeef; + size = 0xdeadbeef; + status = NtQueryDirectoryObject( dir, info, 0, FALSE, TRUE, &context, &size ); + todo_wine ok( status == STATUS_NO_MORE_ENTRIES, "got %#lx\n", status ); + todo_wine ok( context == 0xdeadbeef, "got context %#lx\n", context ); + todo_wine ok( size == sizeof(*info) || broken(!size) /* WoW64 */, "got size %lu\n", size ); + + context = 0xdeadbeef; + size = 0xdeadbeef; + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, TRUE, &context, &size ); + ok( status == STATUS_NO_MORE_ENTRIES, "got %#lx\n", status ); + todo_wine ok( context == 0xdeadbeef, "got context %#lx\n", context ); + todo_wine ok( size == sizeof(*info) || broken(!size) /* WoW64 */, "got size %lu\n", size ); + if (size == sizeof(*info)) + ok( !memcmp( &info[0], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); + + context = 0xdeadbeef; + size = 0xdeadbeef; + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), FALSE, TRUE, &context, &size ); + todo_wine ok( status == STATUS_NO_MORE_ENTRIES, "got %#lx\n", status ); + todo_wine ok( context == 0xdeadbeef, "got context %#lx\n", context ); + todo_wine ok( size == sizeof(*info) || broken(!size) /* WoW64 */, "got size %lu\n", size ); + if (size == sizeof(*info)) + ok( !memcmp( &info[0], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); + + RtlInitUnicodeString( &string, L"\\BaseNamedObjects\\winetest\\Telamon" ); + status = NtCreateMutant( &child1, GENERIC_ALL, &attr, FALSE ); + ok( !status, "got %#lx\n", status ); + + RtlInitUnicodeString( &string, L"\\BaseNamedObjects\\winetest\\Oileus" ); + status = NtCreateMutant( &child2, GENERIC_ALL, &attr, FALSE ); + ok( !status, "got %#lx\n", status ); + + context = 0xdeadbeef; + size = 0xdeadbeef; + status = NtQueryDirectoryObject( NULL, info, sizeof(buffer), TRUE, TRUE, &context, &size ); + ok( status == STATUS_INVALID_HANDLE, "got %#lx\n", status ); + todo_wine ok( context == 0xdeadbeef, "got context %#lx\n", context ); + todo_wine ok( size == 0xdeadbeef, "got size %lu\n", size); + + size = 0xdeadbeef; + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, TRUE, NULL, &size ); + ok( status == STATUS_ACCESS_VIOLATION, "got %#lx\n", status ); + ok( size == 0xdeadbeef, "got size %lu\n", size); + + context = 0xdeadbeef; + size = 0xdeadbeef; + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, TRUE, &context, &size ); + ok( !status, "got %#lx\n", status ); + ok( context == 1, "got context %#lx\n", context ); + ok( size && size < sizeof(buffer), "got size %lu\n", size ); + check_unicode_string( &info[0].ObjectName, L"Oileus" ); + check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); + todo_wine + ok( !memcmp( &info[1], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); + + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, FALSE, &context, &size ); + ok( !status, "got %#lx\n", status ); + ok( context == 2, "got context %#lx\n", context ); + check_unicode_string( &info[0].ObjectName, L"Telamon" ); + check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); + todo_wine ok( !memcmp( &info[1], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); + + size = 0xdeadbeef; + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, FALSE, &context, &size ); + ok( status == STATUS_NO_MORE_ENTRIES, "got %#lx\n", status ); + ok( context == 2, "got context %#lx\n", context ); + todo_wine ok( size == sizeof(*info) || broken(!size) /* WoW64 */, "got size %lu\n", size ); + + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, TRUE, &context, &size ); + ok( !status, "got %#lx\n", status ); + ok( context == 1, "got context %#lx\n", context ); + check_unicode_string( &info[0].ObjectName, L"Oileus" ); + check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); + todo_wine ok( !memcmp( &info[1], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); + + needed_size = size; + + size = 0xdeadbeef; + context = 0xdeadbeef; + status = NtQueryDirectoryObject( dir, info, 0, TRUE, TRUE, &context, &size ); + todo_wine ok( status == STATUS_BUFFER_TOO_SMALL, "got %#lx\n", status ); + todo_wine ok( context == 0xdeadbeef, "got context %#lx\n", context ); + todo_wine ok( size == needed_size, "expected size %lu, got %lu\n", needed_size, size ); + + size = 0xdeadbeef; + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, needed_size - 1, TRUE, TRUE, &context, &size ); + todo_wine 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 ); + + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, TRUE, &context, NULL ); + ok( !status, "got %#lx\n", status ); + + context = 0; + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, FALSE, &context, &size ); + ok( !status, "got %#lx\n", status ); + ok( context == 1, "got context %#lx\n", context ); + check_unicode_string( &info[0].ObjectName, L"Oileus" ); + check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); + todo_wine ok( !memcmp( &info[1], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); + + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), FALSE, TRUE, &context, &size ); + todo_wine ok( !status, "got %#lx\n", status ); + if (!status) + { + ok( context == 2, "got context %#lx\n", context ); + check_unicode_string( &info[0].ObjectName, L"Oileus" ); + check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); + check_unicode_string( &info[1].ObjectName, L"Telamon" ); + check_unicode_string( &info[1].ObjectTypeName, L"Mutant" ); + ok( !memcmp( &info[2], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); + } + + needed_size = size; + size = 0xdeadbeef; + context = 0xdeadbeef; + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, needed_size - 1, FALSE, TRUE, &context, &size ); + todo_wine ok( status == STATUS_MORE_ENTRIES, "got %#lx\n", status ); + if (status == STATUS_MORE_ENTRIES) + { + ok( context == 1, "got context %#lx\n", context ); + ok( size > 0 && size < needed_size, "got size %lu\n", size ); + check_unicode_string( &info[0].ObjectName, L"Oileus" ); + check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); + ok( !memcmp( &info[1], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); + } + + size = 0xdeadbeef; + context = 0xdeadbeef; + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(*info), FALSE, TRUE, &context, &size ); + todo_wine ok( status == STATUS_MORE_ENTRIES + || broken(status == STATUS_BUFFER_TOO_SMALL) /* wow64 */, "got %#lx\n", status ); + if (status == STATUS_MORE_ENTRIES) + { + ok( !context, "got context %#lx\n", context ); + ok( size == sizeof(*info), "got size %lu\n", size ); + ok( !memcmp( &info[0], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); + } + + size = 0xdeadbeef; + context = 0xdeadbeef; + status = NtQueryDirectoryObject( dir, info, 0, FALSE, TRUE, &context, &size ); + todo_wine ok( status == STATUS_MORE_ENTRIES + || broken(status == STATUS_BUFFER_TOO_SMALL) /* wow64 */, "got %#lx\n", status ); + if (status == STATUS_MORE_ENTRIES) + { + ok( !context, "got context %#lx\n", context ); + ok( size == sizeof(*info), "got size %lu\n", size ); + } + + context = 1; + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), FALSE, FALSE, &context, &size ); + todo_wine ok( !status, "got %#lx\n", status ); + if (!status) + { + ok( context == 2, "got context %#lx\n", context ); + check_unicode_string( &info[0].ObjectName, L"Telamon" ); + check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); + ok( !memcmp( &info[1], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); + } + + NtClose( child1 ); + NtClose( child2 ); + NtClose( dir ); +} + START_TEST(om) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -2561,4 +2771,5 @@ START_TEST(om) test_get_next_thread(); test_globalroot(); test_object_identity(); + test_query_directory(); } -- 2.34.1

2 7

[PATCH] user32: use SWP_NOACTIVATE flag when resizing etched static control
by Rafał Harabień April 10, 2022

April 10, 2022

Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/user32/static.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/static.c b/dlls/user32/static.c index e81e553f7d8..3c9b67b20ac 100644 --- a/dlls/user32/static.c +++ b/dlls/user32/static.c @@ -426,7 +426,7 @@ LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam rc.right = rc.left; AdjustWindowRectEx(&rc, full_style, FALSE, GetWindowLongW(hwnd, GWL_EXSTYLE)); NtUserSetWindowPos( hwnd, NULL, 0, 0, rc.right - rc.left, rc.bottom - rc.top, - SWP_NOMOVE | SWP_NOZORDER ); + SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER ); } switch (style) { -- 2.25.1

4 5

[PATCH] windowscodecs: pceltFetched is optional in IWICEnumMetadataItem.
by Esme Povirk April 9, 2022

April 9, 2022

Spotted by Eric Pouech. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/windowscodecs/metadatahandler.c | 4 ++++ dlls/windowscodecs/tests/metadata.c | 15 +++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c index b0b682b6d9b..5bcca0f58c6 100644 --- a/dlls/windowscodecs/metadatahandler.c +++ b/dlls/windowscodecs/metadatahandler.c @@ -491,9 +491,13 @@ static HRESULT WINAPI MetadataHandlerEnum_Next(IWICEnumMetadataItem *iface, ULONG new_index; HRESULT hr=S_FALSE; ULONG i; + ULONG fetched; TRACE("(%p,%li)\n", iface, celt); + if (!pceltFetched) + pceltFetched = &fetched; + EnterCriticalSection(&This->parent->lock); if (This->index >= This->parent->item_count) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 2ec9eb645e8..57d8e2b1bea 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -303,6 +303,21 @@ static void test_metadata_unknown(void) ok(hr == S_FALSE, "Next failed, hr=%lx\n", hr); ok(items_returned == 0, "unexpected item count %li\n", items_returned); + hr = IWICEnumMetadataItem_Reset(enumerator); + ok(hr == S_OK, "Reset failed, hr=%lx\n", hr); + + hr = IWICEnumMetadataItem_Next(enumerator, 1, &schema, &id, NULL, NULL); + ok(hr == S_OK, "Next failed, hr=%lx\n", hr); + + if (hr == S_OK) + { + ok(schema.vt == VT_EMPTY, "unexpected vt: %i\n", schema.vt); + ok(id.vt == VT_EMPTY, "unexpected vt: %i\n", id.vt); + + PropVariantClear(&schema); + PropVariantClear(&id); + } + IWICEnumMetadataItem_Release(enumerator); } -- 2.32.0

1 0

[PATCH] gdiplus: Accept newer version in OpenType header.
by Esme Povirk April 9, 2022

April 9, 2022

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- Supersedes 232113. dlls/gdiplus/font.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 6529f94bc1f..57849733a9c 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -106,7 +106,7 @@ typedef struct #define GET_BE_DWORD(x) (x) #else #define GET_BE_WORD(x) MAKEWORD(HIBYTE(x), LOBYTE(x)) -#define GET_BE_DWORD(x) MAKELONG(GET_BE_WORD(HIWORD(x)), GET_BE_WORD(LOWORD(x))); +#define GET_BE_DWORD(x) MAKELONG(GET_BE_WORD(HIWORD(x)), GET_BE_WORD(LOWORD(x))) #endif #define MS_MAKE_TAG(ch0, ch1, ch2, ch3) \ @@ -1150,14 +1150,16 @@ GpStatus WINGDIPAPI GdipPrivateAddFontFile(GpFontCollection *collection, GDIPCON #define NAME_ID_FULL_FONT_NAME 4 typedef struct { - USHORT major_version; - USHORT minor_version; + ULONG version; USHORT tables_no; USHORT search_range; USHORT entry_selector; USHORT range_shift; } tt_header; +#define TT_HEADER_VERSION_1 0x00010000 +#define TT_HEADER_VERSION_CFF 0x4f54544f + typedef struct { char tag[4]; /* table name */ ULONG check_sum; /* Check sum */ @@ -1402,7 +1404,8 @@ static WCHAR *load_ttf_name_id( const BYTE *mem, DWORD_PTR size, DWORD id ) header = (const tt_header*)mem; count = GET_BE_WORD(header->tables_no); - if (GET_BE_WORD(header->major_version) != 1 || GET_BE_WORD(header->minor_version) != 0) + if (GET_BE_DWORD(header->version) != TT_HEADER_VERSION_1 && + GET_BE_DWORD(header->version) != TT_HEADER_VERSION_CFF) return NULL; pos = sizeof(*header); -- 2.32.0

1 0

[PATCH v3] include: Add some math declarations.
by Daniel Lehman April 9, 2022

April 9, 2022

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- v3: remove incorrect declarations and other unavailable functions v2: correct some declarations --- include/msvcrt/math.h | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index da07303bcd9..97ae6dfe240 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -69,12 +69,16 @@ _ACRTIMP double __cdecl fabs(double); _ACRTIMP double __cdecl ldexp(double, int); _ACRTIMP double __cdecl frexp(double, int*); _ACRTIMP double __cdecl modf(double, double*); +_ACRTIMP double __cdecl fdim(double, double); _ACRTIMP double __cdecl fmod(double, double); _ACRTIMP double __cdecl fmin(double, double); _ACRTIMP double __cdecl fmax(double, double); _ACRTIMP double __cdecl erf(double); +_ACRTIMP double __cdecl remainder(double, double); _ACRTIMP double __cdecl remquo(double, double, int*); _ACRTIMP float __cdecl remquof(float, float, int*); +_ACRTIMP double __cdecl lgamma(double); +_ACRTIMP double __cdecl tgamma(double); _ACRTIMP double __cdecl _hypot(double, double); _ACRTIMP double __cdecl _j0(double); @@ -86,18 +90,31 @@ _ACRTIMP double __cdecl _yn(int, double); _ACRTIMP double __cdecl cbrt(double); _ACRTIMP double __cdecl exp2(double); +_ACRTIMP double __cdecl expm1(double); +_ACRTIMP double __cdecl log1p(double); _ACRTIMP double __cdecl log2(double); +_ACRTIMP double __cdecl logb(double); _ACRTIMP double __cdecl rint(double); _ACRTIMP double __cdecl round(double); _ACRTIMP double __cdecl trunc(double); _ACRTIMP float __cdecl cbrtf(float); _ACRTIMP float __cdecl exp2f(float); +_ACRTIMP float __cdecl expm1f(float); +_ACRTIMP float __cdecl log1pf(float); _ACRTIMP float __cdecl log2f(float); +_ACRTIMP float __cdecl logbf(float); _ACRTIMP float __cdecl rintf(float); _ACRTIMP float __cdecl roundf(float); _ACRTIMP float __cdecl truncf(float); +_ACRTIMP int __cdecl ilogb(double); +_ACRTIMP int __cdecl ilogbf(float); + +_ACRTIMP long long __cdecl llrint(double); +_ACRTIMP long long __cdecl llrintf(float); +_ACRTIMP long long __cdecl llround(double); +_ACRTIMP long long __cdecl llroundf(float); _ACRTIMP __msvcrt_long __cdecl lrint(double); _ACRTIMP __msvcrt_long __cdecl lrintf(float); _ACRTIMP __msvcrt_long __cdecl lround(double); @@ -105,6 +122,8 @@ _ACRTIMP __msvcrt_long __cdecl lroundf(float); _ACRTIMP double __cdecl scalbn(double,int); _ACRTIMP float __cdecl scalbnf(float,int); +_ACRTIMP double __cdecl scalbln(double,__msvcrt_long); +_ACRTIMP float __cdecl scalblnf(float,__msvcrt_long); _ACRTIMP double __cdecl _copysign (double, double); _ACRTIMP double __cdecl _chgsign (double); @@ -115,6 +134,8 @@ _ACRTIMP int __cdecl _finite(double); _ACRTIMP int __cdecl _isnan(double); _ACRTIMP int __cdecl _fpclass(double); +_ACRTIMP double __cdecl nextafter(double, double); + #ifndef __i386__ _ACRTIMP float __cdecl sinf(float); @@ -199,15 +220,20 @@ _ACRTIMP float __cdecl _logbf(float); _ACRTIMP float __cdecl acoshf(float); _ACRTIMP float __cdecl asinhf(float); _ACRTIMP float __cdecl atanhf(float); +_ACRTIMP float __cdecl erff(float); +_ACRTIMP float __cdecl fdimf(float, float); +_ACRTIMP float __cdecl fmaxf(float, float); +_ACRTIMP float __cdecl fminf(float, float); +_ACRTIMP float __cdecl lgammaf(float); +_ACRTIMP float __cdecl nextafterf(float, float); +_ACRTIMP float __cdecl remainderf(float, float); +_ACRTIMP float __cdecl tgammaf(float); #else static inline float _chgsignf(float x) { return _chgsign(x); } static inline float _copysignf(float x, float y) { return _copysign(x, y); } static inline float _logbf(float x) { return _logb(x); } -static inline float acoshf(float x) { return acosh(x); } -static inline float asinhf(float x) { return asinh(x); } -static inline float atanhf(float x) { return atanh(x); } #endif -- 2.25.1

3 3

[PATCH] user32/tests: remove duplicated SS_*RECT static control tests
by Rafał Harabień April 9, 2022

April 9, 2022

Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/user32/tests/static.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/user32/tests/static.c b/dlls/user32/tests/static.c index a5af3315865..09e399990cd 100644 --- a/dlls/user32/tests/static.c +++ b/dlls/user32/tests/static.c @@ -344,8 +344,6 @@ START_TEST(static) test_updates(SS_OWNERDRAW); test_updates(SS_BITMAP); test_updates(SS_BITMAP | SS_CENTERIMAGE); - test_updates(SS_BLACKRECT); - test_updates(SS_WHITERECT); test_updates(SS_ETCHEDHORZ); test_updates(SS_ETCHEDVERT); test_updates(SS_ETCHEDFRAME); -- 2.25.1

1 0

[v3 PATCH 1/2] mfreadwrite/reader: Make the stream sample allocator callback own a reference to the source reader.
by Nikolay Sivov April 9, 2022

April 9, 2022

From: Giovanni Mascellani <gmascellani(a)codeweavers.com> The stream sample allocator callback NotifyRelease() method assumes that the source reader is valid. Therefore it must own a reference to it, otherwise it might get called while the source reader is being destroyed, causing a crash. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfreadwrite/reader.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index bdf2e7f5a6f..2d3da19db10 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -2282,12 +2282,14 @@ static HRESULT WINAPI stream_sample_allocator_cb_QueryInterface(IMFVideoSampleAl static ULONG WINAPI stream_sample_allocator_cb_AddRef(IMFVideoSampleAllocatorNotify *iface) { - return 2; + struct media_stream *stream = impl_stream_from_IMFVideoSampleAllocatorNotify(iface); + return source_reader_addref(stream->reader); } static ULONG WINAPI stream_sample_allocator_cb_Release(IMFVideoSampleAllocatorNotify *iface) { - return 1; + struct media_stream *stream = impl_stream_from_IMFVideoSampleAllocatorNotify(iface); + return source_reader_release(stream->reader); } static HRESULT WINAPI stream_sample_allocator_cb_NotifyRelease(IMFVideoSampleAllocatorNotify *iface) -- 2.35.1

1 1

[PATCH] dlls/rtqwork: trace 64-bit integers with I64 width modifier
by Eric Pouech April 9, 2022

April 9, 2022

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/rtworkq/queue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rtworkq/queue.c b/dlls/rtworkq/queue.c index 35ba1e28d03c..d6c28ca45660 100644 --- a/dlls/rtworkq/queue.c +++ b/dlls/rtworkq/queue.c @@ -875,7 +875,7 @@ static HRESULT queue_cancel_item(struct queue *queue, RTWQWORKITEM_KEY key) else if ((key & SCHEDULED_ITEM_KEY_MASK) == SCHEDULED_ITEM_KEY_MASK) CloseThreadpoolTimer(item->u.timer_object); else - WARN("Unknown item key mask %#lx.\n", (DWORD)key); + WARN("Unknown item key mask %#I64x.\n", key); queue_release_pending_item(item); hr = S_OK; break;

2 1

[PATCH] gdiplus: Accept newer version in OpenType header.
by Esme Povirk April 9, 2022

April 9, 2022

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- Chrono Cross: The Radical Dreamers Edition loads a font like this. dlls/gdiplus/font.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 6529f94bc1f..0e864068c52 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -1402,7 +1402,8 @@ static WCHAR *load_ttf_name_id( const BYTE *mem, DWORD_PTR size, DWORD id ) header = (const tt_header*)mem; count = GET_BE_WORD(header->tables_no); - if (GET_BE_WORD(header->major_version) != 1 || GET_BE_WORD(header->minor_version) != 0) + if ((GET_BE_WORD(header->major_version) != 1 || GET_BE_WORD(header->minor_version) != 0) + && (GET_BE_WORD(header->major_version) != 0x4f54 || GET_BE_WORD(header->minor_version) != 0x544f)) return NULL; pos = sizeof(*header); -- 2.32.0

2 1

[PATCH] include: Avoid a C++ keyword for RegisterUserApiHook().
by Zhiyi Zhang April 9, 2022

April 9, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52787 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/hook.c | 10 +++++----- include/winuser.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index 6dc8c571c0c..e6db8590934 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -502,16 +502,16 @@ BOOL WINAPI IsWinEventHookInstalled(DWORD dwEvent) } /* Undocumented RegisterUserApiHook() */ -BOOL WINAPI RegisterUserApiHook(const struct user_api_hook *new, struct user_api_hook *old) +BOOL WINAPI RegisterUserApiHook(const struct user_api_hook *new_hook, struct user_api_hook *old_hook) { - if (!new) + if (!new_hook) return FALSE; USER_Lock(); - hooked_user_api = *new; + hooked_user_api = *new_hook; user_api = &hooked_user_api; - if (old) - *old = original_user_api; + if (old_hook) + *old_hook = original_user_api; USER_Unlock(); return TRUE; } diff --git a/include/winuser.h b/include/winuser.h index bb585efd16d..4f79face860 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4444,7 +4444,7 @@ struct user_api_hook LRESULT (WINAPI *pScrollBarWndProc)(HWND, UINT, WPARAM, LPARAM, BOOL); }; -WINUSERAPI BOOL WINAPI RegisterUserApiHook(const struct user_api_hook *new, struct user_api_hook *old); +WINUSERAPI BOOL WINAPI RegisterUserApiHook(const struct user_api_hook *new_hook, struct user_api_hook *old_hook); WINUSERAPI void WINAPI UnregisterUserApiHook(void); #endif -- 2.32.0

2 1

Wine staging 7.6 release
by Alistair Leslie-Hughes April 9, 2022

April 9, 2022

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 7.6 (560 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * None Added: * None Updated: * None Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH v3] chakra: Add stub dll.
by Mohamad Al-Jaf April 8, 2022

April 8, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52741 Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v3: - Use the default implementations for DllRegisterServer and DllUnregisterServer. --- configure.ac | 1 + dlls/chakra/Makefile.in | 5 ++ dlls/chakra/chakra.spec | 160 ++++++++++++++++++++++++++++++++++++++++ dlls/chakra/version.rc | 26 +++++++ 4 files changed, 192 insertions(+) create mode 100644 dlls/chakra/Makefile.in create mode 100644 dlls/chakra/chakra.spec create mode 100644 dlls/chakra/version.rc diff --git a/configure.ac b/configure.ac index e509b232d11..f9ac5e45ed4 100644 --- a/configure.ac +++ b/configure.ac @@ -2372,6 +2372,7 @@ WINE_CONFIG_MAKEFILE(dlls/capi2032) WINE_CONFIG_MAKEFILE(dlls/cards) WINE_CONFIG_MAKEFILE(dlls/cdosys) WINE_CONFIG_MAKEFILE(dlls/cfgmgr32) +WINE_CONFIG_MAKEFILE(dlls/chakra) WINE_CONFIG_MAKEFILE(dlls/clusapi) WINE_CONFIG_MAKEFILE(dlls/cng.sys) WINE_CONFIG_MAKEFILE(dlls/combase) diff --git a/dlls/chakra/Makefile.in b/dlls/chakra/Makefile.in new file mode 100644 index 00000000000..7ca3e00c6d7 --- /dev/null +++ b/dlls/chakra/Makefile.in @@ -0,0 +1,5 @@ +MODULE = chakra.dll + +EXTRADLLFLAGS = -Wb,--prefer-native + +RC_SRCS = version.rc diff --git a/dlls/chakra/chakra.spec b/dlls/chakra/chakra.spec new file mode 100644 index 00000000000..90e176ddf85 --- /dev/null +++ b/dlls/chakra/chakra.spec @@ -0,0 +1,160 @@ +@ stub JsProjectWinRTNamespace +@ stub JsSetProjectionEnqueueCallback +@ stub CreateChakraEngine +@ stub DumpDiagInfo +@ stub JsDiscardBackgroundParse +@ stub JsInitializeJITServer +@ stub JsQueueBackgroundParse +@ stub MemProtectHeapAddRootSection +@ stub MemProtectHeapCollect +@ stub MemProtectHeapCreate +@ stub MemProtectHeapDestroy +@ stub MemProtectHeapDisableCollection +@ stub MemProtectHeapIsValidObject +@ stub MemProtectHeapMemSize +@ stub MemProtectHeapNotifyCurrentThreadDetach +@ stub MemProtectHeapProtectCurrentThread +@ stub MemProtectHeapRemoveRootSection +@ stub MemProtectHeapReportHeapSize +@ stub MemProtectHeapRootAlloc +@ stub MemProtectHeapRootAllocLeaf +@ stub MemProtectHeapRootRealloc +@ stub MemProtectHeapRootReallocLeaf +@ stub MemProtectHeapSynchronizeWithCollector +@ stub MemProtectHeapUnprotectCurrentThread +@ stub MemProtectHeapUnrootAndZero +@ stub RecyclerNativeHeapAddExternalMemoryUsage +@ stub RecyclerNativeHeapAllocLeaf +@ stub RecyclerNativeHeapAllocLeafFinalized +@ stub RecyclerNativeHeapAllocTraced +@ stub RecyclerNativeHeapAllocTracedFinalized +@ stub RecyclerNativeHeapCollectGarbageInThread +@ stub RecyclerNativeHeapCreateWeakReference +@ stub RecyclerNativeHeapGetRealAddressFromInterior +@ stub RecyclerNativeHeapGetStrongReference +@ stub RecyclerNativeHeapHasWeakReferenceCleanupOccurred +@ stub RecyclerNativeHeapRootAddRef +@ stub RecyclerNativeHeapRootRelease +@ stdcall -private DllCanUnloadNow() +@ stub DllGetClassObject +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() +@ stub JsAddRef +@ stub JsBoolToBoolean +@ stub JsBooleanToBool +@ stub JsCallFunction +@ stub JsCollectGarbage +@ stub JsConstructObject +@ stub JsConvertValueToBoolean +@ stub JsConvertValueToNumber +@ stub JsConvertValueToObject +@ stub JsConvertValueToString +@ stub JsCreateArray +@ stub JsCreateArrayBuffer +@ stub JsCreateContext +@ stub JsCreateDataView +@ stub JsCreateError +@ stub JsCreateExternalArrayBuffer +@ stub JsCreateExternalObject +@ stub JsCreateFunction +@ stub JsCreateNamedFunction +@ stub JsCreateObject +@ stub JsCreateRangeError +@ stub JsCreateReferenceError +@ stub JsCreateRuntime +@ stub JsCreateSymbol +@ stub JsCreateSyntaxError +@ stub JsCreateThreadService +@ stub JsCreateTypeError +@ stub JsCreateTypedArray +@ stub JsCreateURIError +@ stub JsDefineProperty +@ stub JsDeleteIndexedProperty +@ stub JsDeleteProperty +@ stub JsDisableRuntimeExecution +@ stub JsDisposeRuntime +@ stub JsDoubleToNumber +@ stub JsEnableRuntimeExecution +@ stub JsEnumerateHeap +@ stub JsEquals +@ stub JsGetAndClearException +@ stub JsGetArrayBufferStorage +@ stub JsGetContextData +@ stub JsGetContextOfObject +@ stub JsGetCurrentContext +@ stub JsGetDataViewStorage +@ stub JsGetExtensionAllowed +@ stub JsGetExternalData +@ stub JsGetFalseValue +@ stub JsGetGlobalObject +@ stub JsGetIndexedPropertiesExternalData +@ stub JsGetIndexedProperty +@ stub JsGetNullValue +@ stub JsGetOwnPropertyDescriptor +@ stub JsGetOwnPropertyNames +@ stub JsGetOwnPropertySymbols +@ stub JsGetProperty +@ stub JsGetPropertyIdFromName +@ stub JsGetPropertyIdFromSymbol +@ stub JsGetPropertyIdType +@ stub JsGetPropertyNameFromId +@ stub JsGetPrototype +@ stub JsGetRuntime +@ stub JsGetRuntimeMemoryLimit +@ stub JsGetRuntimeMemoryUsage +@ stub JsGetStringLength +@ stub JsGetSymbolFromPropertyId +@ stub JsGetTrueValue +@ stub JsGetTypedArrayInfo +@ stub JsGetTypedArrayStorage +@ stub JsGetUndefinedValue +@ stub JsGetValueType +@ stub JsHasException +@ stub JsHasExternalData +@ stub JsHasIndexedPropertiesExternalData +@ stub JsHasIndexedProperty +@ stub JsHasProperty +@ stub JsIdle +@ stub JsInspectableToObject +@ stub JsInstanceOf +@ stub JsIntToNumber +@ stub JsIsEnumeratingHeap +@ stub JsIsRuntimeExecutionDisabled +@ stub JsNumberToDouble +@ stub JsNumberToInt +@ stub JsObjectToInspectable +@ stub JsParseScript +@ stub JsParseScriptWithAttributes +@ stub JsParseSerializedScript +@ stub JsParseSerializedScriptWithCallback +@ stub JsPointerToString +@ stub JsPreventExtension +@ stub JsRelease +@ stub JsRunScript +@ stub JsRunSerializedScript +@ stub JsRunSerializedScriptWithCallback +@ stub JsSerializeScript +@ stub JsSetContextData +@ stub JsSetCurrentContext +@ stub JsSetException +@ stub JsSetExternalData +@ stub JsSetIndexedPropertiesToExternalData +@ stub JsSetIndexedProperty +@ stub JsSetObjectBeforeCollectCallback +@ stub JsSetPromiseContinuationCallback +@ stub JsSetProperty +@ stub JsSetPrototype +@ stub JsSetRuntimeBeforeCollectCallback +@ stub JsSetRuntimeMemoryAllocationCallback +@ stub JsSetRuntimeMemoryLimit +@ stub JsStartDebugging +@ stub JsStartProfiling +@ stub JsStopProfiling +@ stub JsStrictEquals +@ stub JsStringToPointer +@ stub JsValueToVariant +@ stub JsVarAddRef +@ stub JsVarRelease +@ stub JsVarToExtension +@ stub JsVarToScriptDirect +@ stub JsVariantToValue diff --git a/dlls/chakra/version.rc b/dlls/chakra/version.rc new file mode 100644 index 00000000000..a73bf2bc5ad --- /dev/null +++ b/dlls/chakra/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2022 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine chakra" +#define WINE_FILENAME_STR "chakra.dll" +#define WINE_FILEVERSION 11,0,22000,348 +#define WINE_FILEVERSION_STR "11.0.22000.348" +#define WINE_PRODUCTVERSION 11,00,22000,348 +#define WINE_PRODUCTVERSION_STR "11.00.22000.348" + +#include "wine/wine_common_ver.rc" -- 2.35.1

3 6

[PATCH] diasymreader: Use default DllCanUnloadNow implementation.
by Mohamad Al-Jaf April 8, 2022

April 8, 2022

Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- dlls/diasymreader/diasymreader.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/diasymreader/diasymreader.spec b/dlls/diasymreader/diasymreader.spec index 63644e07fd4..ec18371bba8 100644 --- a/dlls/diasymreader/diasymreader.spec +++ b/dlls/diasymreader/diasymreader.spec @@ -1,5 +1,5 @@ @ stub CreateNGenPdbWriter -@ stub DllCanUnloadNow +@ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stub DllGetClassObjectInternal @ stdcall -private DllRegisterServer() -- 2.35.1

3 5

[PATCH] qcap/filewriter: Avoid casting to DWORD in an ERR message.
by Zebediah Figura April 8, 2022

April 8, 2022

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- This supersedes 232052. dlls/qcap/filewriter.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/qcap/filewriter.c b/dlls/qcap/filewriter.c index 43f6274ea8d..bc63abcb8cb 100644 --- a/dlls/qcap/filewriter.c +++ b/dlls/qcap/filewriter.c @@ -68,26 +68,27 @@ static HRESULT WINAPI file_writer_sink_receive(struct strmbase_sink *iface, IMed struct file_writer *filter = impl_from_strmbase_pin(&iface->pin); REFERENCE_TIME start, stop; LARGE_INTEGER offset; + DWORD size, ret_size; HRESULT hr; - DWORD size; BYTE *data; if ((hr = IMediaSample_GetTime(sample, &start, &stop)) != S_OK) ERR("Failed to get sample time, hr %#lx.\n", hr); + size = stop - start; if ((hr = IMediaSample_GetPointer(sample, &data)) != S_OK) ERR("Failed to get sample pointer, hr %#lx.\n", hr); offset.QuadPart = start; if (!SetFilePointerEx(filter->file, offset, NULL, FILE_BEGIN) - || !WriteFile(filter->file, data, stop - start, &size, NULL)) + || !WriteFile(filter->file, data, size, &ret_size, NULL)) { ERR("Failed to write file, error %lu.\n", GetLastError()); return HRESULT_FROM_WIN32(hr); } - if (size != stop - start) - ERR("Short write, %lu/%lu.\n", size, (DWORD)(stop - start)); + if (ret_size != size) + ERR("Short write, %lu/%lu.\n", ret_size, size); return S_OK; } -- 2.35.1

1 0

[PATCH 1/4] winegstreamer: Use WG_MAJOR_TYPE_UNKNOWN to mark a stream that should not be forced into a certain format.
by Zebediah Figura April 8, 2022

April 8, 2022

Instead of checking the enabled state. The reasoning here is that we would like to keep the stream enabled—that is, buffer samples instead of discarding them—even when the client is not yet reading samples from it, so that we can avoid wasting CPU power in decoding. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/wg_format.c | 2 +- dlls/winegstreamer/wg_parser.c | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/winegstreamer/wg_format.c b/dlls/winegstreamer/wg_format.c index b4455a6e6d0..84163f1e5d7 100644 --- a/dlls/winegstreamer/wg_format.c +++ b/dlls/winegstreamer/wg_format.c @@ -495,7 +495,7 @@ GstCaps *wg_format_to_caps(const struct wg_format *format) switch (format->major_type) { case WG_MAJOR_TYPE_UNKNOWN: - return NULL; + return gst_caps_new_any(); case WG_MAJOR_TYPE_WMA: return wg_format_to_caps_wma(format); case WG_MAJOR_TYPE_H264: diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index e7a60ec158a..9b3a5ca796d 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -254,6 +254,7 @@ static NTSTATUS wg_parser_stream_disable(void *args) pthread_mutex_lock(&parser->mutex); stream->enabled = false; + stream->current_format.major_type = WG_MAJOR_TYPE_UNKNOWN; pthread_mutex_unlock(&parser->mutex); pthread_cond_signal(&stream->event_empty_cond); return S_OK; @@ -601,12 +602,7 @@ static gboolean sink_query_cb(GstPad *pad, GstObject *parent, GstQuery *query) gst_query_parse_caps(query, &filter); pthread_mutex_lock(&parser->mutex); - - if (stream->enabled) - caps = wg_format_to_caps(&stream->current_format); - else - caps = gst_caps_new_any(); - + caps = wg_format_to_caps(&stream->current_format); pthread_mutex_unlock(&parser->mutex); if (!caps) @@ -636,7 +632,7 @@ static gboolean sink_query_cb(GstPad *pad, GstObject *parent, GstQuery *query) pthread_mutex_lock(&parser->mutex); - if (!stream->enabled) + if (stream->current_format.major_type == WG_MAJOR_TYPE_UNKNOWN) { pthread_mutex_unlock(&parser->mutex); gst_query_set_accept_caps_result(query, TRUE); @@ -689,6 +685,7 @@ static struct wg_parser_stream *create_stream(struct wg_parser *parser) gst_segment_init(&stream->segment, GST_FORMAT_UNDEFINED); stream->parser = parser; + stream->current_format.major_type = WG_MAJOR_TYPE_UNKNOWN; pthread_cond_init(&stream->event_cond, NULL); pthread_cond_init(&stream->event_empty_cond, NULL); -- 2.35.1

1 3

[PATCH v3 1/2] riched20/tests: Add tests for IRichEditOleCallback_QueryInsertObject.
by Jinoh Kang April 8, 2022

April 8, 2022

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- Notes: v1 -> v2: - remove unused typedef storage class specifier from struct IRichEditOleCallbackImpl definition (thanks huw) - remove Hungarian notation from struct fields and callback params (thanks huw) v2 -> v3: - Substitute pointer typedef names (LP*) with actual pointer to object type - Fix brace style in struct declaration - Rename RIchEditOleCallbackImpl to reobjcb_obj - Obey 120 chars-per-line limit dlls/riched20/tests/richole.c | 266 ++++++++++++++++++++++++++++++++-- 1 file changed, 255 insertions(+), 11 deletions(-) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 24284a24484..65c07162421 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -33,6 +33,185 @@ #include <tom.h> #include <wine/test.h> +#define EXPECT_TODO_WINE 0x80000000UL + +struct reolecb_obj +{ + IRichEditOleCallback IRichEditOleCallback_iface; + LONG ref; + int line; + + ULONG expect_queryinsertobject; + + const CLSID *clsid; + IStorage *stg; + LONG cp; + HRESULT queryinsertobject_result; +}; + +static inline struct reolecb_obj *impl_from_IRichEditOleCallback(IRichEditOleCallback *iface) +{ + return CONTAINING_RECORD(iface, struct reolecb_obj, IRichEditOleCallback_iface); +} + +static HRESULT STDMETHODCALLTYPE reolecb_obj_QueryInterface(IRichEditOleCallback *iface, REFIID riid, void **obj) +{ + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IRichEditOleCallback)) { + IRichEditOleCallback_AddRef(iface); + *obj = iface; + return S_OK; + } + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE reolecb_obj_AddRef(IRichEditOleCallback *iface) +{ + struct reolecb_obj *This = impl_from_IRichEditOleCallback(iface); + ULONG ref = InterlockedIncrement(&This->ref); + return ref; +} + +static ULONG STDMETHODCALLTYPE reolecb_obj_Release(IRichEditOleCallback *iface) +{ + struct reolecb_obj *This = impl_from_IRichEditOleCallback(iface); + ULONG ref = InterlockedDecrement(&This->ref); + if (!ref) free(This); + return ref; +} + +static HRESULT STDMETHODCALLTYPE reolecb_obj_GetNewStorage(IRichEditOleCallback *iface, IStorage **stg) +{ + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE reolecb_obj_GetInPlaceContext(IRichEditOleCallback *iface, + IOleInPlaceFrame **frame, + IOleInPlaceUIWindow **doc, + OLEINPLACEFRAMEINFO *frame_info) +{ + return E_INVALIDARG; +} + +static HRESULT STDMETHODCALLTYPE reolecb_obj_ShowContainerUI(IRichEditOleCallback *iface, BOOL show) +{ + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE reolecb_obj_QueryInsertObject(IRichEditOleCallback *iface, CLSID *clsid, + IStorage *stg, LONG cp) +{ + struct reolecb_obj *This = impl_from_IRichEditOleCallback(iface); + ULONG expect = This->expect_queryinsertobject; + + todo_wine_if(expect & EXPECT_TODO_WINE) + ok_(__FILE__,This->line)( expect & ~EXPECT_TODO_WINE, + "unexpected call to IRichEditOleCallback_QueryInsertObject\n"); + if (!(expect & ~EXPECT_TODO_WINE)) return S_OK; + This->expect_queryinsertobject--; + + if (This->clsid && clsid) + ok_(__FILE__,This->line)( IsEqualGUID(This->clsid, clsid), + "QueryInsertObject clsid expected %s, got %s\n", + wine_dbgstr_guid( This->clsid ), wine_dbgstr_guid( clsid )); + else + ok_(__FILE__,This->line)( This->clsid == clsid, + "QueryInsertObject clsid expected %p, got %p\n", This->clsid, clsid ); + ok_(__FILE__,This->line)( This->stg == stg, "QueryInsertObject stg expected %p, got %p\n", This->stg, stg ); + ok_(__FILE__,This->line)( This->cp == cp, "QueryInsertObject cp expected %ld, got %ld\n", This->cp, cp ); + return This->queryinsertobject_result; +} + +static HRESULT STDMETHODCALLTYPE reolecb_obj_DeleteObject(IRichEditOleCallback *iface, IOleObject *oleobj) +{ + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE reolecb_obj_QueryAcceptData(IRichEditOleCallback *iface, IDataObject *dataobj, + CLIPFORMAT *cf_format, DWORD reco, BOOL really, + HGLOBAL metapict) +{ + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE reolecb_obj_ContextSensitiveHelp(IRichEditOleCallback *iface, BOOL enter_mode) +{ + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE reolecb_obj_GetClipboardData(IRichEditOleCallback *iface, CHARRANGE *chrg, + DWORD reco, IDataObject **dataobj) +{ + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE reolecb_obj_GetDragDropEffect(IRichEditOleCallback *iface, BOOL drag, + DWORD key_state, DWORD *effect) +{ + if (effect) *effect = DROPEFFECT_COPY; + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE reolecb_obj_GetContextMenu(IRichEditOleCallback *iface, WORD seltype, + IOleObject *oleobj, CHARRANGE *chrg, HMENU *hmenu) +{ + return E_NOTIMPL; +} + +static const struct IRichEditOleCallbackVtbl reolecb_obj_Vtbl = { + reolecb_obj_QueryInterface, + reolecb_obj_AddRef, + reolecb_obj_Release, + reolecb_obj_GetNewStorage, + reolecb_obj_GetInPlaceContext, + reolecb_obj_ShowContainerUI, + reolecb_obj_QueryInsertObject, + reolecb_obj_DeleteObject, + reolecb_obj_QueryAcceptData, + reolecb_obj_ContextSensitiveHelp, + reolecb_obj_GetClipboardData, + reolecb_obj_GetDragDropEffect, + reolecb_obj_GetContextMenu, +}; + +static HRESULT reolecb_obj_Create(struct reolecb_obj **objptr) +{ + struct reolecb_obj *obj; + + obj = calloc(sizeof(struct reolecb_obj), 1); + if (!obj) return E_OUTOFMEMORY; + + obj->IRichEditOleCallback_iface.lpVtbl = &reolecb_obj_Vtbl; + obj->ref = 1; + + *objptr = obj; + return S_OK; +} + +static void olecb_expect_QueryInsertObject(struct reolecb_obj *This, int line, ULONG expect, + const CLSID *clsid, IStorage *stg, LONG cp, HRESULT result) +{ + if (!This) return; + + This->line = line; + This->expect_queryinsertobject = expect; + This->clsid = clsid; + This->stg = stg; + This->cp = cp; + This->queryinsertobject_result = result; +} + +static void olecb_check_QueryInsertObject(struct reolecb_obj *This, int line) +{ + if (!This) return; + + todo_wine_if(This->expect_queryinsertobject & EXPECT_TODO_WINE) + ok( !(This->expect_queryinsertobject & ~EXPECT_TODO_WINE), + "expected IRichEditOleCallback_QueryInsertObject to be called\n" ); + + olecb_expect_QueryInsertObject(This, 0, 0, NULL, NULL, 0, S_OK); +} + static HMODULE hmoduleRichEdit; DEFINE_GUID(GUID_NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); @@ -3233,21 +3412,26 @@ static void _check_reobject_struct(IRichEditOle *reole, LONG index, DWORD flags, ok_(__FILE__,line)(reobj.dwUser == user, "got wrong user-defined value.\n"); } -#define INSERT_REOBJECT(reole,reobj,cp,user) \ - _insert_reobject(reole, reobj, cp, user, __LINE__) -static void _insert_reobject(IRichEditOle *reole, REOBJECT *reobj, LONG cp, DWORD user, int line) +#define INSERT_REOBJECT(callback,reole,reobj,cp,user) \ + _insert_reobject(callback, reole, reobj, cp, user, __LINE__) +static void _insert_reobject(struct reolecb_obj *callback, IRichEditOle *reole, + REOBJECT *reobj, LONG cp, DWORD user, int line) { IOleClientSite *clientsite; HRESULT hr; + + olecb_expect_QueryInsertObject(callback, line, EXPECT_TODO_WINE | 1, + &CLSID_NULL, NULL, REO_CP_SELECTION /* cp overriden */, S_OK); hr = IRichEditOle_GetClientSite(reole, &clientsite); ok_(__FILE__,line)(hr == S_OK, "IRichEditOle_GetClientSite got hr %#lx.\n", hr); fill_reobject_struct(reobj, cp, NULL, NULL, clientsite, 10, 10, DVASPECT_CONTENT, 0, user); hr = IRichEditOle_InsertObject(reole, reobj); ok_(__FILE__,line)(hr == S_OK, "IRichEditOle_InsertObject got hr %#lx.\n", hr); IOleClientSite_Release(clientsite); + olecb_check_QueryInsertObject(callback, line); } -static void test_InsertObject(void) +static void subtest_InsertObject(struct reolecb_obj *callback) { static CHAR test_text1[] = "abcdefg"; IRichEditOle *reole = NULL; @@ -3271,6 +3455,12 @@ static void test_InsertObject(void) BSTR bstr; create_interfaces(&hwnd, &reole, &doc, &selection); + if (callback) + { + LRESULT sendres = SendMessageA(hwnd, EM_SETOLECALLBACK, 0, (LPARAM)&callback->IRichEditOleCallback_iface); + ok( !!sendres, "EM_SETOLECALLBACK should succeed\n" ); + } + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)test_text1); hr = IRichEditOle_InsertObject(reole, NULL); @@ -3278,22 +3468,48 @@ static void test_InsertObject(void) /* insert object1 in (0, 1)*/ SendMessageA(hwnd, EM_SETSEL, 0, 1); - INSERT_REOBJECT(reole, &reo1, REO_CP_SELECTION, 1); + INSERT_REOBJECT(callback, reole, &reo1, REO_CP_SELECTION, 1); count = IRichEditOle_GetObjectCount(reole); ok(count == 1, "got wrong object count: %ld\n", count); /* insert object2 in (2, 3)*/ SendMessageA(hwnd, EM_SETSEL, 2, 3); - INSERT_REOBJECT(reole, &reo2, REO_CP_SELECTION, 2); + INSERT_REOBJECT(callback, reole, &reo2, REO_CP_SELECTION, 2); count = IRichEditOle_GetObjectCount(reole); ok(count == 2, "got wrong object count: %ld\n", count); /* insert object3 in (1, 2)*/ SendMessageA(hwnd, EM_SETSEL, 1, 2); - INSERT_REOBJECT(reole, &reo3, REO_CP_SELECTION, 3); + INSERT_REOBJECT(callback, reole, &reo3, REO_CP_SELECTION, 3); count = IRichEditOle_GetObjectCount(reole); ok(count == 3, "got wrong object count: %ld\n", count); + if (callback) + { + IOleClientSite *clientsite; + REOBJECT reobj; + + /* (fail to) insert object1 in (3, 4)*/ + SendMessageA(hwnd, EM_SETSEL, 3, 4); + + hr = IRichEditOle_GetClientSite(reole, &clientsite); + ok(hr == S_OK, "IRichEditOle_GetClientSite got hr %#lx.\n", hr); + + olecb_expect_QueryInsertObject(callback, __LINE__, EXPECT_TODO_WINE | 1, + &CLSID_NULL, NULL, REO_CP_SELECTION, S_FALSE); + fill_reobject_struct(&reobj, REO_CP_SELECTION, NULL, NULL, clientsite, 10, 10, DVASPECT_CONTENT, 0, 0); + hr = IRichEditOle_InsertObject(reole, &reobj); + todo_wine + ok(hr == S_FALSE, "IRichEditOle_InsertObject got hr %#lx.\n", hr); + olecb_check_QueryInsertObject(callback, __LINE__); + + IOleClientSite_Release(clientsite); + + count = IRichEditOle_GetObjectCount(reole); + todo_wine + ok(count == 3, "got wrong object count: %ld\n", count); + } + /* tests below show that order of rebject (from 0 to 2) is: reo1,reo3,reo2 */ CHECK_REOBJECT_STRUCT(reole, 0, REO_GETOBJ_ALL_INTERFACES, 0, 0, NULL, NULL, reo1.polesite, 1); CHECK_REOBJECT_STRUCT(reole, 1, REO_GETOBJ_ALL_INTERFACES, 0, 1, NULL, NULL, reo3.polesite, 3); @@ -3371,8 +3587,8 @@ static void test_InsertObject(void) SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)test_text1); /* "abc|d|efg" */ - INSERT_REOBJECT(reole, &reo1, 3, 1); - INSERT_REOBJECT(reole, &reo2, 5, 2); + INSERT_REOBJECT(callback, reole, &reo1, 3, 1); + INSERT_REOBJECT(callback, reole, &reo2, 5, 2); SendMessageW(hwnd, EM_SETSEL, 2, 3); result = SendMessageW(hwnd, EM_SELECTIONTYPE, 0, 0); @@ -3473,8 +3689,8 @@ static void test_InsertObject(void) ok(!result, "Got result %lx.\n", result); /* "abc|d|efg" */ SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)test_text1); - INSERT_REOBJECT(reole, &reo1, 3, 1); - INSERT_REOBJECT(reole, &reo2, 5, 2); + INSERT_REOBJECT(callback, reole, &reo1, 3, 1); + INSERT_REOBJECT(callback, reole, &reo2, 5, 2); expected_string = L"abc d efg"; charrange.cpMin = 0; @@ -3551,9 +3767,37 @@ static void test_InsertObject(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); todo_wine ok(result == 0xfffc, "Got char: %lc\n", (WCHAR)result); + if (callback) + { + LRESULT sendres = SendMessageA(hwnd, EM_SETOLECALLBACK, 0, 0); + ok( !!sendres, "EM_SETOLECALLBACK should succeed\n" ); + } + release_interfaces(&hwnd, &reole, &doc, &selection); } +static void test_InsertObject(void) +{ + struct reolecb_obj *callback; + HRESULT hr; + ULONG ref; + + subtest_InsertObject(NULL); + + hr = reolecb_obj_Create(&callback); + ok(SUCCEEDED(hr), "reolecb_obj_Create returned %#lx\n", hr); + if (SUCCEEDED(hr)) + { + subtest_InsertObject(callback); + ref = IRichEditOleCallback_Release(&callback->IRichEditOleCallback_iface); + ok(ref == 0, "expected IRichEditOleCallback recount to be 0, got %lu\n", ref); + } + else + { + skip("cannot test InsertObject with callback\n"); + } +} + static void test_GetStoryLength(void) { static const CHAR test_text1[] = "TestSomeText"; -- 2.34.1

2 3

[PATCH v2 1/5] kernel32/tests: Add invalid pointer heap validation tests.
by Rémi Bernon April 8, 2022

April 8, 2022

Adding commented-out crashing tests to make it obvious that they were tested and that HeapFree or HeapReAlloc don't validate pointers. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Fix spurious todo_wine success on 32bit. dlls/kernel32/tests/heap.c | 45 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 6f85ecc6425..190e83cc208 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -78,6 +78,7 @@ struct heap static void test_HeapCreate(void) { + static const BYTE buffer[512] = {0}; SIZE_T alloc_size = 0x8000 * sizeof(void *), size, i; BYTE *ptr, *ptr1, *ptrs[128]; HANDLE heap, heap1; @@ -107,12 +108,49 @@ static void test_HeapCreate(void) ret = HeapFree( heap, 0, NULL ); ok( ret, "HeapFree failed, error %lu\n", GetLastError() ); +#if 0 /* crashes */ + SetLastError( 0xdeadbeef ); + ret = HeapFree( heap, 0, (void *)0xdeadbe00 ); + ok( !ret, "HeapFree succeeded\n" ); + ok( GetLastError() == ERROR_NOACCESS, "got error %lu\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ptr = (BYTE *)((UINT_PTR)buffer & ~63) + 64; + ret = HeapFree( heap, 0, ptr ); + ok( !ret, "HeapFree succeeded\n" ); + ok( GetLastError() == 0xdeadbeef, "got error %lu\n", GetLastError() ); +#endif SetLastError( 0xdeadbeef ); ptr = HeapReAlloc( heap, 0, NULL, 1 ); ok( !ptr, "HeapReAlloc succeeded\n" ); todo_wine ok( GetLastError() == NO_ERROR, "got error %lu\n", GetLastError() ); +#if 0 /* crashes */ + SetLastError( 0xdeadbeef ); + ptr1 = HeapReAlloc( heap, 0, (void *)0xdeadbe00, 1 ); + ok( !ptr1, "HeapReAlloc succeeded\n" ); + ok( GetLastError() == ERROR_NOACCESS, "got error %lu\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ptr = (BYTE *)((UINT_PTR)buffer & ~63) + 64; + ptr1 = HeapReAlloc( heap, 0, ptr, 1 ); + ok( !ptr1, "HeapReAlloc succeeded\n" ); + ok( GetLastError() == 0xdeadbeef, "got error %lu\n", GetLastError() ); +#endif + + SetLastError( 0xdeadbeef ); + ret = HeapValidate( heap, 0, NULL ); + ok( ret, "HeapValidate failed, error %lu\n", GetLastError() ); + ok( GetLastError() == 0xdeadbeef, "got error %lu\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = HeapValidate( heap, 0, (void *)0xdeadbe00 ); + ok( !ret, "HeapValidate succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_NOACCESS, "got error %lu\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ptr = (BYTE *)((UINT_PTR)buffer & ~63) + 64; + ret = HeapValidate( heap, 0, ptr ); + ok( !ret, "HeapValidate succeeded\n" ); + ok( GetLastError() == 0xdeadbeef, "got error %lu\n", GetLastError() ); ptr = HeapAlloc( heap, 0, 0 ); ok( !!ptr, "HeapAlloc failed, error %lu\n", GetLastError() ); @@ -122,8 +160,14 @@ static void test_HeapCreate(void) ok( !ptr1, "HeapReAlloc succeeded\n" ); ptr1 = pHeapReAlloc( heap, 0, ptr, ~(SIZE_T)0 ); ok( !ptr1, "HeapReAlloc succeeded\n" ); + ret = HeapValidate( heap, 0, ptr ); + ok( ret, "HeapValidate failed, error %lu\n", GetLastError() ); ret = HeapFree( heap, 0, ptr ); ok( ret, "HeapFree failed, error %lu\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = HeapValidate( heap, 0, ptr ); + ok( !ret, "HeapValidate succeeded\n" ); + ok( GetLastError() == 0xdeadbeef, "got error %lu\n", GetLastError() ); ptr = pHeapAlloc( heap, 0, ~(SIZE_T)0 ); ok( !ptr, "HeapAlloc succeeded\n" ); @@ -247,6 +291,7 @@ static void test_HeapCreate(void) ptr1 = HeapReAlloc( heap, HEAP_REALLOC_IN_PLACE_ONLY, ptr, 2 * alloc_size ); todo_wine ok( ptr1 != ptr, "HeapReAlloc HEAP_REALLOC_IN_PLACE_ONLY succeeded\n" ); + todo_wine ok( GetLastError() == ERROR_NOT_ENOUGH_MEMORY, "got error %lu\n", GetLastError() ); ret = HeapFree( heap, 0, ptr1 ); -- 2.35.1

1 4

[PATCH v2 1/2] mfreadwrite/reader: Make the stream sample allocator callback own a reference to the source reader.
by Giovanni Mascellani April 8, 2022

April 8, 2022

The stream sample allocator callback NotifyRelease() method assumes that the source reader is valid. Therefore it must own a reference to it, otherwise it might get called while the source reader is being destroyed, causing a crash. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/mfreadwrite/reader.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index bdf2e7f5a6f..2d3da19db10 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -2282,12 +2282,14 @@ static HRESULT WINAPI stream_sample_allocator_cb_QueryInterface(IMFVideoSampleAl static ULONG WINAPI stream_sample_allocator_cb_AddRef(IMFVideoSampleAllocatorNotify *iface) { - return 2; + struct media_stream *stream = impl_stream_from_IMFVideoSampleAllocatorNotify(iface); + return source_reader_addref(stream->reader); } static ULONG WINAPI stream_sample_allocator_cb_Release(IMFVideoSampleAllocatorNotify *iface) { - return 1; + struct media_stream *stream = impl_stream_from_IMFVideoSampleAllocatorNotify(iface); + return source_reader_release(stream->reader); } static HRESULT WINAPI stream_sample_allocator_cb_NotifyRelease(IMFVideoSampleAllocatorNotify *iface) -- 2.35.1

1 1