- Wine-Devel - list.winehq.org

[tools] testbot/cgi: PageBase::*Cookies() do not take a $Page parameter.
by Francois Gouget March 28, 2022

March 28, 2022

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/Page.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index 85e94b379..014324f60 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -220,14 +220,14 @@ sub UnsetCookies($) { my ($self) = @_; - $self->{PageBase}->UnsetCookies($self); + $self->{PageBase}->UnsetCookies(); } sub SetCookies($) { my ($self) = @_; - $self->{PageBase}->SetCookies($self); + $self->{PageBase}->SetCookies(); } sub GetCurrentSession($) -- 2.30.2

1 0

[tools] testbot/cgi: Remove the Page parameter from PageBase's Redirect().
by Francois Gouget March 28, 2022

March 28, 2022

PageBase::Redirect() does not use the Page parameter and there is no reason for it to need that parameter since it has $self->{Request} and thus can already get any relevant HTTP request information. CheckSecurePage() only has a $Page parameter in order to pass it to Redirect() and the CheckSecurePage() callers never provide the $Page parameter anyway. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/Page.pm | 2 +- testbot/lib/WineTestBot/CGI/PageBase.pm | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index d5988803c..85e94b379 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -248,7 +248,7 @@ sub Redirect($$) { my ($self, $Location) = @_; - return $self->{PageBase}->Redirect($self, $Location); + return $self->{PageBase}->Redirect($Location); } diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index 6d94ae967..aa90245cf 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -92,7 +92,7 @@ sub new($$$$@) ! $Session->User->HasRole($RequiredRole)) { my $LoginURL = "/Login.pl?Target=" . uri_escape($ENV{"REQUEST_URI"}); - exit($self->Redirect($Page, MakeSecureURL($LoginURL))); + exit($self->Redirect(MakeSecureURL($LoginURL))); } } @@ -253,9 +253,9 @@ sub SessionActive($) return !1; } -sub Redirect($$$) +sub Redirect($$) { - my ($self, $Page, $Location) = @_; + my ($self, $Location) = @_; $self->SetCookies(); if (substr($Location, 0, 4) ne "http") @@ -278,13 +278,13 @@ sub Redirect($$$) return 0; # a suitable exit code } -sub CheckSecurePage($$) +sub CheckSecurePage($) { - my ($self, $Page) = @_; + my ($self) = @_; if ($UseSSL && ! SecureConnection()) { - exit($self->Redirect($Page, MakeSecureURL($ENV{"REQUEST_URI"}))); + exit($self->Redirect(MakeSecureURL($ENV{"REQUEST_URI"}))); } } -- 2.30.2

1 0

[PATCH] wined3d: Return the correct length from config_list_get_value().
by Henri Verbeet March 28, 2022

March 28, 2022

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/wined3d_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 524dc7508f9..4f50e8aeb7d 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -171,7 +171,7 @@ static const char *config_list_get_value(const char *string, const char *key, si if (is_option_separator(prev_char) && *p == '=') { if ((end = strpbrk(p + 1, ",;"))) - *len = end - p + 1; + *len = end - (p + 1); else *len = strlen(p + 1); return p + 1; -- 2.30.2

1 0

[PATCH] mf/session: Trace seek position in Start().
by Nikolay Sivov March 28, 2022

March 28, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/mf_private.h | 34 ++++++++++++++++++++++++++++++++++ dlls/mf/session.c | 2 +- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/mf/mf_private.h b/dlls/mf/mf_private.h index db6f101cd6d..6f28c93aea3 100644 --- a/dlls/mf/mf_private.h +++ b/dlls/mf/mf_private.h @@ -79,6 +79,40 @@ static inline const char *debugstr_time(LONGLONG time) return wine_dbg_sprintf("%s", rev); } +static inline const char *debugstr_propvar(const PROPVARIANT *v) +{ + if (!v) + return "(null)"; + + switch (v->vt) + { + case VT_EMPTY: + return wine_dbg_sprintf("%p {VT_EMPTY}", v); + case VT_NULL: + return wine_dbg_sprintf("%p {VT_NULL}", v); + case VT_UI4: + return wine_dbg_sprintf("%p {VT_UI4: %ld}", v, v->ulVal); + case VT_UI8: + return wine_dbg_sprintf("%p {VT_UI8: %s}", v, wine_dbgstr_longlong(v->uhVal.QuadPart)); + case VT_I8: + return wine_dbg_sprintf("%p {VT_I8: %s}", v, wine_dbgstr_longlong(v->hVal.QuadPart)); + case VT_R4: + return wine_dbg_sprintf("%p {VT_R4: %.8e}", v, v->fltVal); + case VT_R8: + return wine_dbg_sprintf("%p {VT_R8: %lf}", v, v->dblVal); + case VT_CLSID: + return wine_dbg_sprintf("%p {VT_CLSID: %s}", v, wine_dbgstr_guid(v->puuid)); + case VT_LPWSTR: + return wine_dbg_sprintf("%p {VT_LPWSTR: %s}", v, wine_dbgstr_w(v->pwszVal)); + case VT_VECTOR | VT_UI1: + return wine_dbg_sprintf("%p {VT_VECTOR|VT_UI1: %p}", v, v->caub.pElems); + case VT_UNKNOWN: + return wine_dbg_sprintf("%p {VT_UNKNOWN: %p}", v, v->punkVal); + default: + return wine_dbg_sprintf("%p {vt %#x}", v, v->vt); + } +} + extern BOOL mf_is_sample_copier_transform(IMFTransform *transform) DECLSPEC_HIDDEN; extern BOOL mf_is_sar_sink(IMFMediaSink *sink) DECLSPEC_HIDDEN; extern HRESULT topology_node_get_object(IMFTopologyNode *node, REFIID riid, void **obj) DECLSPEC_HIDDEN; diff --git a/dlls/mf/session.c b/dlls/mf/session.c index e4a54b1c6de..1ef84f5d272 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -2011,7 +2011,7 @@ static HRESULT WINAPI mfsession_Start(IMFMediaSession *iface, const GUID *format struct session_op *op; HRESULT hr; - TRACE("%p, %s, %p.\n", iface, debugstr_guid(format), start_position); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(format), debugstr_propvar(start_position)); if (!start_position) return E_POINTER; -- 2.35.1

1 0

[PATCH] dbgeng: Use CRT allocation functions.
by Nikolay Sivov March 28, 2022

March 28, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dbgeng/dbgeng.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/dbgeng/dbgeng.c b/dlls/dbgeng/dbgeng.c index 880b6f03b43..1439cedfeb3 100644 --- a/dlls/dbgeng/dbgeng.c +++ b/dlls/dbgeng/dbgeng.c @@ -31,7 +31,6 @@ #include "dbgeng.h" #include "wine/debug.h" -#include "wine/heap.h" #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(dbgeng); @@ -149,12 +148,12 @@ static HRESULT debug_target_init_modules_info(struct target_process *target) count = needed / sizeof(HMODULE); - if (!(modules = heap_alloc(count * sizeof(*modules)))) + if (!(modules = calloc(count, sizeof(*modules)))) return E_OUTOFMEMORY; - if (!(target->modules.info = heap_alloc_zero(count * sizeof(*target->modules.info)))) + if (!(target->modules.info = calloc(count, sizeof(*target->modules.info)))) { - heap_free(modules); + free(modules); return E_OUTOFMEMORY; } @@ -179,7 +178,7 @@ static HRESULT debug_target_init_modules_info(struct target_process *target) target->cpu_type = debug_target_get_module_machine(target, modules[0]); - heap_free(modules); + free(modules); target->modules.loaded = count; target->modules.unloaded = 0; /* FIXME */ @@ -331,8 +330,8 @@ static ULONG STDMETHODCALLTYPE debugclient_AddRef(IDebugClient7 *iface) static void debug_target_free(struct target_process *target) { - heap_free(target->modules.info); - heap_free(target); + free(target->modules.info); + free(target); } static ULONG STDMETHODCALLTYPE debugclient_Release(IDebugClient7 *iface) @@ -353,7 +352,7 @@ static ULONG STDMETHODCALLTYPE debugclient_Release(IDebugClient7 *iface) } if (debug_client->event_callbacks) debug_client->event_callbacks->lpVtbl->Release(debug_client->event_callbacks); - heap_free(debug_client); + free(debug_client); } return refcount; @@ -443,7 +442,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_AttachProcess(IDebugClient7 *iface, return E_NOTIMPL; } - if (!(process = heap_alloc_zero(sizeof(*process)))) + if (!(process = calloc(1, sizeof(*process)))) return E_OUTOFMEMORY; process->pid = pid; @@ -1900,7 +1899,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleVersionInformation(IDebug if (!(size = GetFileVersionInfoSizeA(info->image_name, &handle))) return E_FAIL; - if (!(version_info = heap_alloc(size))) + if (!(version_info = malloc(size))) return E_OUTOFMEMORY; if (GetFileVersionInfoA(info->image_name, handle, size, version_info)) @@ -1921,7 +1920,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleVersionInformation(IDebug } } - heap_free(version_info); + free(version_info); return hr; } @@ -4033,8 +4032,7 @@ HRESULT WINAPI DebugCreate(REFIID riid, void **obj) TRACE("%s, %p.\n", debugstr_guid(riid), obj); - debug_client = heap_alloc_zero(sizeof(*debug_client)); - if (!debug_client) + if (!(debug_client = calloc(1, sizeof(*debug_client)))) return E_OUTOFMEMORY; debug_client->IDebugClient_iface.lpVtbl = &debugclientvtbl; -- 2.35.1

1 0

[PATCH 1/2] browseui: Use CRT memory allocation functions.
by Nikolay Sivov March 28, 2022

March 28, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/browseui/aclmulti.c | 30 ++++++++++------------- dlls/browseui/aclsource.c | 13 ++-------- dlls/browseui/browseui_main.c | 5 ++-- dlls/browseui/compcatcachedaemon.c | 7 ++---- dlls/browseui/progressdlg.c | 38 ++++++++++-------------------- 5 files changed, 31 insertions(+), 62 deletions(-) diff --git a/dlls/browseui/aclmulti.c b/dlls/browseui/aclmulti.c index a41cb810369..47547cdd1e1 100644 --- a/dlls/browseui/aclmulti.c +++ b/dlls/browseui/aclmulti.c @@ -34,8 +34,6 @@ #include "shlguid.h" #include "shlobj.h" -#include "wine/heap.h" - #include "browseui.h" WINE_DEFAULT_DEBUG_CHANNEL(browseui); @@ -80,17 +78,6 @@ static void release_obj(struct ACLMultiSublist *obj) IACList_Release(obj->pACL); } -static void ACLMulti_Destructor(ACLMulti *This) -{ - int i; - TRACE("destroying %p\n", This); - for (i = 0; i < This->nObjs; i++) - release_obj(&This->objs[i]); - heap_free(This->objs); - heap_free(This); - BROWSEUI_refCount--; -} - static HRESULT WINAPI ACLMulti_QueryInterface(IEnumString *iface, REFIID iid, LPVOID *ppvOut) { ACLMulti *This = impl_from_IEnumString(iface); @@ -129,10 +116,18 @@ static ULONG WINAPI ACLMulti_Release(IEnumString *iface) { ACLMulti *This = impl_from_IEnumString(iface); ULONG ret; + int i; ret = InterlockedDecrement(&This->refCount); if (ret == 0) - ACLMulti_Destructor(This); + { + for (i = 0; i < This->nObjs; i++) + release_obj(&This->objs[i]); + free(This->objs); + free(This); + BROWSEUI_refCount--; + } + return ret; } @@ -224,7 +219,7 @@ static HRESULT WINAPI ACLMulti_Append(IObjMgr *iface, IUnknown *obj) if (obj == NULL) return E_FAIL; - This->objs = heap_realloc(This->objs, sizeof(This->objs[0]) * (This->nObjs+1)); + This->objs = realloc(This->objs, sizeof(This->objs[0]) * (This->nObjs+1)); This->objs[This->nObjs].punk = obj; IUnknown_AddRef(obj); if (FAILED(IUnknown_QueryInterface(obj, &IID_IEnumString, (LPVOID *)&This->objs[This->nObjs].pEnum))) @@ -247,7 +242,7 @@ static HRESULT WINAPI ACLMulti_Remove(IObjMgr *iface, IUnknown *obj) release_obj(&This->objs[i]); memmove(&This->objs[i], &This->objs[i+1], (This->nObjs-i-1)*sizeof(struct ACLMultiSublist)); This->nObjs--; - This->objs = heap_realloc(This->objs, sizeof(This->objs[0]) * This->nObjs); + This->objs = realloc(This->objs, sizeof(This->objs[0]) * This->nObjs); return S_OK; } @@ -313,8 +308,7 @@ HRESULT ACLMulti_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) if (pUnkOuter) return CLASS_E_NOAGGREGATION; - This = heap_alloc_zero(sizeof(ACLMulti)); - if (This == NULL) + if (!(This = calloc(1, sizeof(ACLMulti)))) return E_OUTOFMEMORY; This->IEnumString_iface.lpVtbl = &ACLMultiVtbl; diff --git a/dlls/browseui/aclsource.c b/dlls/browseui/aclsource.c index 4412ca38003..72bf323c62e 100644 --- a/dlls/browseui/aclsource.c +++ b/dlls/browseui/aclsource.c @@ -34,8 +34,6 @@ #include "shlguid.h" #include "shlobj.h" -#include "wine/heap.h" - #include "browseui.h" WINE_DEFAULT_DEBUG_CHANNEL(browseui); @@ -57,12 +55,6 @@ static inline ACLShellSource *impl_from_IEnumString(IEnumString *iface) return CONTAINING_RECORD(iface, ACLShellSource, IEnumString_iface); } -static void ACLShellSource_Destructor(ACLShellSource *This) -{ - TRACE("destroying %p\n", This); - heap_free(This); -} - static HRESULT WINAPI ACLShellSource_QueryInterface(IEnumString *iface, REFIID iid, LPVOID *ppvOut) { ACLShellSource *This = impl_from_IEnumString(iface); @@ -106,7 +98,7 @@ static ULONG WINAPI ACLShellSource_Release(IEnumString *iface) TRACE("(%p)->(%lu)\n", This, ref); if (ref == 0) - ACLShellSource_Destructor(This); + free(This); return ref; } @@ -205,8 +197,7 @@ HRESULT ACLShellSource_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) if (pUnkOuter) return CLASS_E_NOAGGREGATION; - This = heap_alloc_zero(sizeof(ACLShellSource)); - if (This == NULL) + if (!(This = calloc(1, sizeof(*This)))) return E_OUTOFMEMORY; This->IEnumString_iface.lpVtbl = &ACLShellSourceVtbl; diff --git a/dlls/browseui/browseui_main.c b/dlls/browseui/browseui_main.c index b6962b30f26..6d089725d3c 100644 --- a/dlls/browseui/browseui_main.c +++ b/dlls/browseui/browseui_main.c @@ -32,7 +32,6 @@ #include "shlguid.h" #include "rpcproxy.h" -#include "wine/heap.h" #include "browseui.h" #include "initguid.h" @@ -72,7 +71,7 @@ static inline ClassFactory *impl_from_IClassFactory(IClassFactory *iface) static void ClassFactory_Destructor(ClassFactory *This) { TRACE("Destroying class factory %p\n", This); - heap_free(This); + free(This); InterlockedDecrement(&BROWSEUI_refCount); } @@ -147,7 +146,7 @@ static const IClassFactoryVtbl ClassFactoryVtbl = { static HRESULT ClassFactory_Constructor(LPFNCONSTRUCTOR ctor, LPVOID *ppvOut) { - ClassFactory *This = heap_alloc(sizeof(ClassFactory)); + ClassFactory *This = malloc(sizeof(*This)); This->IClassFactory_iface.lpVtbl = &ClassFactoryVtbl; This->ref = 1; This->ctor = ctor; diff --git a/dlls/browseui/compcatcachedaemon.c b/dlls/browseui/compcatcachedaemon.c index 6de0d87ef38..f7a5e4b449f 100644 --- a/dlls/browseui/compcatcachedaemon.c +++ b/dlls/browseui/compcatcachedaemon.c @@ -34,8 +34,6 @@ #include "shlguid.h" #include "shlobj.h" -#include "wine/heap.h" - #include "browseui.h" #include "resids.h" @@ -57,7 +55,7 @@ static void CompCatCacheDaemon_Destructor(CompCatCacheDaemon *This) TRACE("destroying %p\n", This); This->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->cs); - heap_free(This); + free(This); InterlockedDecrement(&BROWSEUI_refCount); } @@ -146,8 +144,7 @@ HRESULT CompCatCacheDaemon_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) if (pUnkOuter) return CLASS_E_NOAGGREGATION; - This = heap_alloc(sizeof(CompCatCacheDaemon)); - if (This == NULL) + if (!(This = calloc(1, sizeof(*This)))) return E_OUTOFMEMORY; This->IRunnableTask_iface.lpVtbl = &CompCatCacheDaemonVtbl; diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index dc0fe813f68..11a973034fa 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -34,8 +34,6 @@ #include "shlguid.h" #include "shlobj.h" -#include "wine/heap.h" - #include "browseui.h" #include "resids.h" @@ -88,17 +86,8 @@ static inline ProgressDialog *impl_from_IOleWindow(IOleWindow *iface) static void set_buffer(LPWSTR *buffer, LPCWSTR string) { - IMalloc *malloc; - ULONG cb; - - if (string == NULL) - string = L""; - CoGetMalloc(MEMCTX_TASK, &malloc); - - cb = (lstrlenW(string) + 1)*sizeof(WCHAR); - if (*buffer == NULL || cb > IMalloc_GetSize(malloc, *buffer)) - *buffer = IMalloc_Realloc(malloc, *buffer, cb); - memcpy(*buffer, string, cb); + free(*buffer); + *buffer = wcsdup(string ? string : L""); } struct create_params @@ -114,7 +103,7 @@ static LPWSTR load_string(HINSTANCE hInstance, UINT uiResourceId) LPWSTR ret; LoadStringW(hInstance, uiResourceId, string, ARRAY_SIZE(string)); - ret = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(string) + 1) * sizeof(WCHAR)); + ret = malloc((lstrlenW(string) + 1) * sizeof(WCHAR)); lstrcpyW(ret, string); return ret; } @@ -277,17 +266,17 @@ static void ProgressDialog_Destructor(ProgressDialog *This) TRACE("destroying %p\n", This); if (This->hwnd) end_dialog(This); - for (i = 0; i < 3; i++) - heap_free(This->lines[i]); - heap_free(This->cancelMsg); - heap_free(This->title); - for (i = 0; i < 2; i++) - heap_free(This->remainingMsg[i]); - for (i = 0; i < 3; i++) - heap_free(This->timeMsg[i]); + for (i = 0; i < ARRAY_SIZE(This->lines); i++) + free(This->lines[i]); + free(This->cancelMsg); + free(This->title); + for (i = 0; i < ARRAY_SIZE(This->remainingMsg); i++) + free(This->remainingMsg[i]); + for (i = 0; i < ARRAY_SIZE(This->timeMsg); i++) + free(This->timeMsg[i]); This->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->cs); - heap_free(This); + free(This); InterlockedDecrement(&BROWSEUI_refCount); } @@ -635,8 +624,7 @@ HRESULT ProgressDialog_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) if (pUnkOuter) return CLASS_E_NOAGGREGATION; - This = heap_alloc_zero(sizeof(ProgressDialog)); - if (This == NULL) + if (!(This = calloc(1, sizeof(*This)))) return E_OUTOFMEMORY; This->IProgressDialog_iface.lpVtbl = &ProgressDialogVtbl; -- 2.35.1

1 1

[PATCH] kernel32/tests: Remove GlobalMemoryStatus loop and relax the checks.
by Rémi Bernon March 28, 2022

March 28, 2022

The test is a bit too strict in some case on Windows, relaxing it like it was initially is probably fine now that the counters are correct. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernel32/tests/heap.c | 41 +++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index f3a64dbab0b..f6fb95cdddd 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -1495,21 +1495,17 @@ static void test_GlobalMemoryStatus(void) GlobalMemoryStatus( &mem ); ok( GetLastError() == 0xdeadbeef, "got error %lu\n", GetLastError() ); - do - { - status = NtQuerySystemInformation( SystemBasicInformation, &basic_info, sizeof(basic_info), NULL ); - ok( !status, "NtQuerySystemInformation returned %#lx\n", status ); - status = NtQuerySystemInformation( SystemPerformanceInformation, perf_info, sizeof(buffer), NULL ); - ok( !status, "NtQuerySystemInformation returned %#lx\n", status ); - status = NtQueryInformationProcess( GetCurrentProcess(), ProcessVmCounters, &vmc, sizeof(vmc), NULL ); - ok( !status, "NtQueryInformationProcess returned %#lx\n", status ); - mem.dwLength = sizeof(MEMORYSTATUS); - GlobalMemoryStatus( &mem ); - memex.dwLength = sizeof(MEMORYSTATUSEX); - ret = GlobalMemoryStatusEx( &memex ); - ok( ret, "GlobalMemoryStatusEx succeeded\n" ); - } while (memex.ullAvailPhys != (ULONGLONG)perf_info->AvailablePages * basic_info.PageSize || - mem.dwAvailPhys != min( ~(SIZE_T)0 >> 1, memex.ullAvailPhys )); + status = NtQuerySystemInformation( SystemBasicInformation, &basic_info, sizeof(basic_info), NULL ); + ok( !status, "NtQuerySystemInformation returned %#lx\n", status ); + status = NtQuerySystemInformation( SystemPerformanceInformation, perf_info, sizeof(buffer), NULL ); + ok( !status, "NtQuerySystemInformation returned %#lx\n", status ); + status = NtQueryInformationProcess( GetCurrentProcess(), ProcessVmCounters, &vmc, sizeof(vmc), NULL ); + ok( !status, "NtQueryInformationProcess returned %#lx\n", status ); + mem.dwLength = sizeof(MEMORYSTATUS); + GlobalMemoryStatus( &mem ); + memex.dwLength = sizeof(MEMORYSTATUSEX); + ret = GlobalMemoryStatusEx( &memex ); + ok( ret, "GlobalMemoryStatusEx succeeded\n" ); ok( basic_info.PageSize, "got 0 PageSize\n" ); ok( basic_info.MmNumberOfPhysicalPages, "got 0 MmNumberOfPhysicalPages\n" ); @@ -1528,27 +1524,30 @@ static void test_GlobalMemoryStatus(void) expect.ullAvailVirtual = expect.ullTotalVirtual - (ULONGLONG)vmc.WorkingSetSize /* approximate */; expect.ullAvailExtendedVirtual = 0; +/* allow some variability, info sources are not always in sync */ +#define IS_WITHIN_RANGE(a, b) (((a) - (b) + (256 * basic_info.PageSize)) <= (512 * basic_info.PageSize)) + ok( memex.dwMemoryLoad == expect.dwMemoryLoad, "got dwMemoryLoad %lu\n", memex.dwMemoryLoad ); ok( memex.ullTotalPhys == expect.ullTotalPhys, "got ullTotalPhys %#I64x\n", memex.ullTotalPhys ); - ok( memex.ullAvailPhys == expect.ullAvailPhys, "got ullAvailPhys %#I64x\n", memex.ullAvailPhys ); + ok( IS_WITHIN_RANGE( memex.ullAvailPhys, expect.ullAvailPhys ), "got ullAvailPhys %#I64x\n", memex.ullAvailPhys ); ok( memex.ullTotalPageFile == expect.ullTotalPageFile, "got ullTotalPageFile %#I64x\n", memex.ullTotalPageFile ); - /* allow some variability, page file is not always in sync on Windows */ - ok( memex.ullAvailPageFile - expect.ullAvailPageFile + 32 * basic_info.PageSize <= 64 * basic_info.PageSize, - "got ullAvailPageFile %#I64x\n", memex.ullAvailPageFile ); + ok( IS_WITHIN_RANGE( memex.ullAvailPageFile, expect.ullAvailPageFile ), "got ullAvailPageFile %#I64x\n", memex.ullAvailPageFile ); ok( memex.ullTotalVirtual == expect.ullTotalVirtual, "got ullTotalVirtual %#I64x\n", memex.ullTotalVirtual ); ok( memex.ullAvailVirtual <= expect.ullAvailVirtual, "got ullAvailVirtual %#I64x\n", memex.ullAvailVirtual ); ok( memex.ullAvailExtendedVirtual == 0, "got ullAvailExtendedVirtual %#I64x\n", memex.ullAvailExtendedVirtual ); ok( mem.dwMemoryLoad == memex.dwMemoryLoad, "got dwMemoryLoad %lu\n", mem.dwMemoryLoad ); ok( mem.dwTotalPhys == min( ~(SIZE_T)0 >> 1, memex.ullTotalPhys ), "got dwTotalPhys %#Ix\n", mem.dwTotalPhys ); - ok( mem.dwAvailPhys == min( ~(SIZE_T)0 >> 1, memex.ullAvailPhys ), "got dwAvailPhys %#Ix\n", mem.dwAvailPhys ); + ok( IS_WITHIN_RANGE( mem.dwAvailPhys, min( ~(SIZE_T)0 >> 1, memex.ullAvailPhys ) ), "got dwAvailPhys %#Ix\n", mem.dwAvailPhys ); #ifndef _WIN64 todo_wine_if(memex.ullTotalPageFile > 0xfff7ffff) #endif ok( mem.dwTotalPageFile == min( ~(SIZE_T)0, memex.ullTotalPageFile ), "got dwTotalPageFile %#Ix\n", mem.dwTotalPageFile ); - ok( mem.dwAvailPageFile == min( ~(SIZE_T)0, memex.ullAvailPageFile ), "got dwAvailPageFile %#Ix\n", mem.dwAvailPageFile ); + ok( IS_WITHIN_RANGE( mem.dwAvailPageFile, min( ~(SIZE_T)0, memex.ullAvailPageFile ) ), "got dwAvailPageFile %#Ix\n", mem.dwAvailPageFile ); ok( mem.dwTotalVirtual == memex.ullTotalVirtual, "got dwTotalVirtual %#Ix\n", mem.dwTotalVirtual ); ok( mem.dwAvailVirtual == memex.ullAvailVirtual, "got dwAvailVirtual %#Ix\n", mem.dwAvailVirtual ); + +#undef IS_WITHIN_RANGE } START_TEST(heap) -- 2.35.1

1 0

[PATCH v3 1/5] winegstreamer: Implement H264 decoder GetInputStreamInfo.
by Rémi Bernon March 28, 2022

March 28, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v3: * Retitle PATCH 3, clear format struct, avoid unnecessary cast, use enum values. * Add a comment to PATCH 4. dlls/mf/tests/mf.c | 6 ------ dlls/winegstreamer/h264_decoder.c | 16 ++++++++++++++-- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index e58d8278b82..6563ca81b29 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6790,17 +6790,11 @@ static void test_h264_decoder(void) flags = MFT_INPUT_STREAM_WHOLE_SAMPLES | MFT_INPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER | MFT_INPUT_STREAM_FIXED_SAMPLE_SIZE; memset(&input_info, 0xcd, sizeof(input_info)); hr = IMFTransform_GetInputStreamInfo(transform, 0, &input_info); - todo_wine ok(hr == S_OK, "GetInputStreamInfo returned %#lx\n", hr); - todo_wine ok(input_info.hnsMaxLatency == 0, "got hnsMaxLatency %s\n", wine_dbgstr_longlong(input_info.hnsMaxLatency)); - todo_wine ok(input_info.dwFlags == flags, "got dwFlags %#lx\n", input_info.dwFlags); - todo_wine ok(input_info.cbSize == 0x1000, "got cbSize %lu\n", input_info.cbSize); - todo_wine ok(input_info.cbMaxLookahead == 0, "got cbMaxLookahead %#lx\n", input_info.cbMaxLookahead); - todo_wine ok(input_info.cbAlignment == 0, "got cbAlignment %#lx\n", input_info.cbAlignment); flags = MFT_OUTPUT_STREAM_WHOLE_SAMPLES | MFT_OUTPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER | MFT_OUTPUT_STREAM_FIXED_SAMPLE_SIZE; diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c index 2f4b42ed101..f24b07ef496 100644 --- a/dlls/winegstreamer/h264_decoder.c +++ b/dlls/winegstreamer/h264_decoder.c @@ -217,8 +217,20 @@ static HRESULT WINAPI transform_GetStreamIDs(IMFTransform *iface, DWORD input_si static HRESULT WINAPI transform_GetInputStreamInfo(IMFTransform *iface, DWORD id, MFT_INPUT_STREAM_INFO *info) { - FIXME("iface %p, id %#lx, info %p stub!\n", iface, id, info); - return E_NOTIMPL; + struct h264_decoder *decoder = impl_from_IMFTransform(iface); + + TRACE("iface %p, id %#lx, info %p.\n", iface, id, info); + + if (!decoder->input_type) + return MF_E_TRANSFORM_TYPE_NOT_SET; + + info->hnsMaxLatency = 0; + info->dwFlags = MFT_INPUT_STREAM_WHOLE_SAMPLES | MFT_INPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER | MFT_INPUT_STREAM_FIXED_SAMPLE_SIZE; + info->cbSize = 0x1000; + info->cbMaxLookahead = 0; + info->cbAlignment = 0; + + return S_OK; } static HRESULT WINAPI transform_GetOutputStreamInfo(IMFTransform *iface, DWORD id, MFT_OUTPUT_STREAM_INFO *info) -- 2.35.1

3 12

[PATCH v2 1/5] kernel32/tests: Use 0xdeadbeef directly instead of a custom define.
by Rémi Bernon March 28, 2022

March 28, 2022

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Add the broken results to the right patches. dlls/kernel32/tests/heap.c | 110 ++++++++++++++++++------------------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 6efe4da4634..a95e863486d 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -30,8 +30,6 @@ #include "winternl.h" #include "wine/test.h" -#define MAGIC_DEAD 0xdeadbeef - /* some undocumented flags (names are made up) */ #define HEAP_PAGE_ALLOCS 0x01000000 #define HEAP_VALIDATE 0x10000000 @@ -160,83 +158,84 @@ static void test_heap(void) /* GlobalLock / GlobalUnlock with a valid handle */ gbl = GlobalAlloc(GMEM_MOVEABLE, 256); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); mem = GlobalLock(gbl); /* #1 */ ok(mem != NULL, "returned %p with %ld (expected '!= NULL')\n", mem, GetLastError()); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); flags = GlobalFlags(gbl); ok( flags == 1, "returned 0x%04x with %ld (expected '0x0001')\n", flags, GetLastError()); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); msecond = GlobalLock(gbl); /* #2 */ ok( msecond == mem, "returned %p with %ld (expected '%p')\n", msecond, GetLastError(), mem); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); flags = GlobalFlags(gbl); ok( flags == 2, "returned 0x%04x with %ld (expected '0x0002')\n", flags, GetLastError()); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); res = GlobalUnlock(gbl); /* #1 */ ok(res, "returned %ld with %ld (expected '!= 0')\n", res, GetLastError()); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); flags = GlobalFlags(gbl); ok( flags , "returned 0x%04x with %ld (expected '!= 0')\n", flags, GetLastError()); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); res = GlobalUnlock(gbl); /* #0 */ /* NT: ERROR_SUCCESS (documented on MSDN), 9x: untouched */ - ok(!res && ((GetLastError() == ERROR_SUCCESS) || (GetLastError() == MAGIC_DEAD)), + ok( !res && ((GetLastError() == ERROR_SUCCESS) || (GetLastError() == 0xdeadbeef)), "returned %ld with %ld (expected '0' with: ERROR_SUCCESS or " - "MAGIC_DEAD)\n", res, GetLastError()); - SetLastError(MAGIC_DEAD); + "0xdeadbeef)\n", + res, GetLastError() ); + SetLastError( 0xdeadbeef ); flags = GlobalFlags(gbl); ok( !flags , "returned 0x%04x with %ld (expected '0')\n", flags, GetLastError()); /* Unlock an already unlocked Handle */ - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); res = GlobalUnlock(gbl); /* NT: ERROR_NOT_LOCKED, 9x: untouched */ - ok( !res && - ((GetLastError() == ERROR_NOT_LOCKED) || (GetLastError() == MAGIC_DEAD)), + ok( !res && ((GetLastError() == ERROR_NOT_LOCKED) || (GetLastError() == 0xdeadbeef)), "returned %ld with %ld (expected '0' with: ERROR_NOT_LOCKED or " - "MAGIC_DEAD)\n", res, GetLastError()); + "0xdeadbeef)\n", + res, GetLastError() ); GlobalFree(gbl); /* invalid handles are caught in windows: */ - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); hsecond = GlobalFree(gbl); /* invalid handle: free memory twice */ ok( (hsecond == gbl) && (GetLastError() == ERROR_INVALID_HANDLE), "returned %p with 0x%08lx (expected %p with ERROR_INVALID_HANDLE)\n", hsecond, GetLastError(), gbl); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); hsecond = GlobalFree(LongToHandle(0xdeadbeef)); /* bogus handle */ ok( (hsecond == LongToHandle(0xdeadbeef)) && (GetLastError() == ERROR_INVALID_HANDLE), "returned %p with 0x%08lx (expected %p with ERROR_INVALID_HANDLE)\n", hsecond, GetLastError(), LongToHandle(0xdeadbeef)); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); hsecond = GlobalFree(LongToHandle(0xdeadbee0)); /* bogus pointer */ ok( (hsecond == LongToHandle(0xdeadbee0)) && ((GetLastError() == ERROR_INVALID_HANDLE) || broken(GetLastError() == ERROR_NOACCESS) /* wvista+ */), "returned %p with 0x%08lx (expected %p with ERROR_NOACCESS)\n", hsecond, GetLastError(), LongToHandle(0xdeadbee0)); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); flags = GlobalFlags(gbl); ok( (flags == GMEM_INVALID_HANDLE) && (GetLastError() == ERROR_INVALID_HANDLE), "returned 0x%04x with 0x%08lx (expected GMEM_INVALID_HANDLE with " "ERROR_INVALID_HANDLE)\n", flags, GetLastError()); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); size = GlobalSize(gbl); ok( (size == 0) && (GetLastError() == ERROR_INVALID_HANDLE), "returned %Id with 0x%08lx (expected '0' with ERROR_INVALID_HANDLE)\n", size, GetLastError()); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); mem = GlobalLock(gbl); ok( (mem == NULL) && (GetLastError() == ERROR_INVALID_HANDLE), "returned %p with 0x%08lx (expected NULL with ERROR_INVALID_HANDLE)\n", @@ -246,7 +245,7 @@ static void test_heap(void) Win9x and wine return FALSE with ERROR_INVALID_HANDLE, but on NT 3.51 and XPsp2, TRUE with ERROR_INVALID_HANDLE is returned. The similar Test for LocalUnlock() works on all Systems */ - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); res = GlobalUnlock(gbl); ok(GetLastError() == ERROR_INVALID_HANDLE, "returned %ld with %ld (expected ERROR_INVALID_HANDLE)\n", @@ -261,7 +260,7 @@ static void test_heap(void) /* invalid free */ if (sizeof(void *) != 8) /* crashes on 64-bit */ { - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); mem = GlobalFree(gbl); ok(mem == gbl || broken(mem == NULL) /* nt4 */, "Expected gbl, got %p\n", mem); if (mem == gbl) @@ -273,7 +272,7 @@ static void test_heap(void) /* GMEM_FIXED block expands in place only without flags */ for (size = 1; size <= max_size; size <<= 1) { gbl = GlobalAlloc(GMEM_FIXED, init_size); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); hsecond = GlobalReAlloc(gbl, size + init_size, 0); ok(hsecond == gbl || (hsecond == NULL && GetLastError() == ERROR_NOT_ENOUGH_MEMORY), "got %p with %lx (expected %p or NULL) @%Id\n", hsecond, GetLastError(), gbl, size); @@ -283,7 +282,7 @@ static void test_heap(void) /* GMEM_FIXED block can be relocated with GMEM_MOVEABLE */ for (size = 1; size <= max_size; size <<= 1) { gbl = GlobalAlloc(GMEM_FIXED, init_size); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); hsecond = GlobalReAlloc(gbl, size + init_size, GMEM_MOVEABLE); ok(hsecond != NULL, "got %p with %lx (expected non-NULL) @%Id\n", hsecond, GetLastError(), size); @@ -320,7 +319,7 @@ static void test_heap(void) /* GlobalSize on an invalid handle */ if (sizeof(void *) != 8) /* crashes on 64-bit Vista */ { - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); size = GlobalSize((HGLOBAL)0xc042); ok(size == 0, "Expected 0, got %Id\n", size); ok(GetLastError() == ERROR_INVALID_HANDLE || @@ -358,78 +357,79 @@ static void test_heap(void) /* LocalLock / LocalUnlock with a valid handle */ gbl = LocalAlloc(LMEM_MOVEABLE, 256); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); mem = LocalLock(gbl); /* #1 */ ok(mem != NULL, "returned %p with %ld (expected '!= NULL')\n", mem, GetLastError()); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); flags = LocalFlags(gbl); ok( flags == 1, "returned 0x%04x with %ld (expected '0x0001')\n", flags, GetLastError()); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); msecond = LocalLock(gbl); /* #2 */ ok( msecond == mem, "returned %p with %ld (expected '%p')\n", msecond, GetLastError(), mem); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); flags = LocalFlags(gbl); ok( flags == 2, "returned 0x%04x with %ld (expected '0x0002')\n", flags, GetLastError()); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); res = LocalUnlock(gbl); /* #1 */ ok(res, "returned %ld with %ld (expected '!= 0')\n", res, GetLastError()); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); flags = LocalFlags(gbl); ok( flags , "returned 0x%04x with %ld (expected '!= 0')\n", flags, GetLastError()); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); res = LocalUnlock(gbl); /* #0 */ /* NT: ERROR_SUCCESS (documented on MSDN), 9x: untouched */ - ok(!res && ((GetLastError() == ERROR_SUCCESS) || (GetLastError() == MAGIC_DEAD)), + ok( !res && ((GetLastError() == ERROR_SUCCESS) || (GetLastError() == 0xdeadbeef)), "returned %ld with %ld (expected '0' with: ERROR_SUCCESS or " - "MAGIC_DEAD)\n", res, GetLastError()); - SetLastError(MAGIC_DEAD); + "0xdeadbeef)\n", + res, GetLastError() ); + SetLastError( 0xdeadbeef ); flags = LocalFlags(gbl); ok( !flags , "returned 0x%04x with %ld (expected '0')\n", flags, GetLastError()); /* Unlock an already unlocked Handle */ - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); res = LocalUnlock(gbl); /* NT: ERROR_NOT_LOCKED, 9x: untouched */ - ok( !res && - ((GetLastError() == ERROR_NOT_LOCKED) || (GetLastError() == MAGIC_DEAD)), + ok( !res && ((GetLastError() == ERROR_NOT_LOCKED) || (GetLastError() == 0xdeadbeef)), "returned %ld with %ld (expected '0' with: ERROR_NOT_LOCKED or " - "MAGIC_DEAD)\n", res, GetLastError()); + "0xdeadbeef)\n", + res, GetLastError() ); LocalFree(gbl); /* invalid handles are caught in windows: */ - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); hsecond = LocalFree(gbl); /* invalid handle: free memory twice */ ok( (hsecond == gbl) && (GetLastError() == ERROR_INVALID_HANDLE), "returned %p with 0x%08lx (expected %p with ERROR_INVALID_HANDLE)\n", hsecond, GetLastError(), gbl); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); flags = LocalFlags(gbl); ok( (flags == LMEM_INVALID_HANDLE) && (GetLastError() == ERROR_INVALID_HANDLE), "returned 0x%04x with 0x%08lx (expected LMEM_INVALID_HANDLE with " "ERROR_INVALID_HANDLE)\n", flags, GetLastError()); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); size = LocalSize(gbl); ok( (size == 0) && (GetLastError() == ERROR_INVALID_HANDLE), "returned %Id with 0x%08lx (expected '0' with ERROR_INVALID_HANDLE)\n", size, GetLastError()); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); mem = LocalLock(gbl); ok( (mem == NULL) && (GetLastError() == ERROR_INVALID_HANDLE), "returned %p with 0x%08lx (expected NULL with ERROR_INVALID_HANDLE)\n", mem, GetLastError()); /* This Test works the same on all Systems (GlobalUnlock() is different) */ - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); res = LocalUnlock(gbl); ok(!res && (GetLastError() == ERROR_INVALID_HANDLE), "returned %ld with %ld (expected '0' with ERROR_INVALID_HANDLE)\n", @@ -438,7 +438,7 @@ static void test_heap(void) /* LMEM_FIXED block expands in place only without flags */ for (size = 1; size <= max_size; size <<= 1) { gbl = LocalAlloc(LMEM_FIXED, init_size); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); hsecond = LocalReAlloc(gbl, size + init_size, 0); ok(hsecond == gbl || (hsecond == NULL && GetLastError() == ERROR_NOT_ENOUGH_MEMORY), "got %p with %lx (expected %p or NULL) @%Id\n", hsecond, GetLastError(), gbl, size); @@ -448,7 +448,7 @@ static void test_heap(void) /* LMEM_FIXED memory can be relocated with LMEM_MOVEABLE */ for (size = 1; size <= max_size; size <<= 1) { gbl = LocalAlloc(LMEM_FIXED, init_size); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); hsecond = LocalReAlloc(gbl, size + init_size, LMEM_MOVEABLE); ok(hsecond != NULL, "got %p with %lx (expected non-NULL) @%Id\n", hsecond, GetLastError(), size); @@ -476,13 +476,13 @@ static void test_heap(void) /* trying to lock empty memory should give an error */ gbl = GlobalAlloc(GMEM_MOVEABLE|GMEM_ZEROINIT,0); ok(gbl != NULL, "returned NULL\n"); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); mem = GlobalLock(gbl); /* NT: ERROR_DISCARDED, 9x: untouched */ - ok( (mem == NULL) && - ((GetLastError() == ERROR_DISCARDED) || (GetLastError() == MAGIC_DEAD)), + ok( (mem == NULL) && ((GetLastError() == ERROR_DISCARDED) || (GetLastError() == 0xdeadbeef)), "returned %p with 0x%lx/%ld (expected 'NULL' with: ERROR_DISCARDED or " - "MAGIC_DEAD)\n", mem, GetLastError(), GetLastError()); + "0xdeadbeef)\n", + mem, GetLastError(), GetLastError() ); GlobalFree(gbl); @@ -825,7 +825,7 @@ static void test_obsolete_flags(void) gbl = GlobalAlloc(test_global_flags[i].flags, 4); ok(gbl != NULL, "GlobalAlloc failed\n"); - SetLastError(MAGIC_DEAD); + SetLastError( 0xdeadbeef ); resultflags = pGlobalFlags(gbl); ok( resultflags == test_global_flags[i].globalflags || -- 2.35.1

2 7

[PATCH v2 2/2] ncrypt: Implement NCryptVerifySignature.
by Hans Leidekker March 28, 2022

March 28, 2022

From: Santino Mazza <mazzasantino1206(a)gmail.com> v2: Accept any asymmetric key. Formatting. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ncrypt/main.c | 25 +++++++++++++++++++++---- dlls/ncrypt/tests/ncrypt.c | 8 +++----- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index f8fb3135f56..cc979a539d2 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -36,8 +36,11 @@ static SECURITY_STATUS map_ntstatus(NTSTATUS status) { switch (status) { - case STATUS_INVALID_HANDLE: return NTE_INVALID_HANDLE; - case NTE_BAD_DATA: return NTE_BAD_DATA; + case STATUS_INVALID_HANDLE: return NTE_INVALID_HANDLE; + case STATUS_INVALID_SIGNATURE: return NTE_BAD_SIGNATURE; + case STATUS_SUCCESS: return ERROR_SUCCESS; + case STATUS_INVALID_PARAMETER: return NTE_INVALID_PARAMETER; + case NTE_BAD_DATA: return NTE_BAD_DATA; default: FIXME("unhandled status %#lx\n", status); return NTE_INTERNAL_ERROR; @@ -458,7 +461,21 @@ SECURITY_STATUS WINAPI NCryptSetProperty(NCRYPT_HANDLE handle, const WCHAR *name SECURITY_STATUS WINAPI NCryptVerifySignature(NCRYPT_KEY_HANDLE handle, void *padding, BYTE *hash, DWORD hash_size, BYTE *signature, DWORD signature_size, DWORD flags) { - FIXME("(%#Ix, %p, %p, %lu, %p, %lu, %#lx): stub\n", handle, padding, hash, hash_size, signature, + struct object *key_object = (struct object *)handle; + + TRACE("(%#Ix, %p, %p, %lu, %p, %lu, %#lx)\n", handle, padding, hash, hash_size, signature, signature_size, flags); - return ERROR_SUCCESS; + + if (!hash_size || !signature_size) return NTE_INVALID_PARAMETER; + if (!hash || !signature) return HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER); + if (!handle || key_object->type != KEY) return NTE_INVALID_HANDLE; + + if (key_object->key.algid < RSA) + { + FIXME("Symmetric keys not supported.\n"); + return NTE_NOT_SUPPORTED; + } + + return map_ntstatus(BCryptVerifySignature(key_object->key.bcrypt_key, padding, hash, hash_size, signature, + signature_size, flags)); } diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c index e8de441876b..7fb8b2cb4c5 100644 --- a/dlls/ncrypt/tests/ncrypt.c +++ b/dlls/ncrypt/tests/ncrypt.c @@ -428,7 +428,6 @@ static void test_verify_signature(void) sizeof(signature_pkcs1_sha256), NCRYPT_PAD_PKCS1_FLAG); ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); - todo_wine { ret = NCryptVerifySignature(key, &padinfo, sha256_hash, sizeof(sha256_hash), invalid_signature, sizeof(invalid_signature), NCRYPT_PAD_PKCS1_FLAG); ok(ret == NTE_BAD_SIGNATURE, "got %#lx\n", ret); @@ -447,7 +446,7 @@ static void test_verify_signature(void) ret = NCryptVerifySignature(key, &padinfo, sha256_hash, 4, signature_pkcs1_sha256, sizeof(signature_pkcs1_sha256), NCRYPT_PAD_PKCS1_FLAG); - ok(ret == NTE_INVALID_PARAMETER, "got %#lx\n", ret); + todo_wine ok(ret == NTE_INVALID_PARAMETER, "got %#lx\n", ret); ret = NCryptVerifySignature(key, &padinfo, sha256_hash, sizeof(sha256_hash), NULL, sizeof(signature_pkcs1_sha256), NCRYPT_PAD_PKCS1_FLAG); @@ -455,13 +454,12 @@ static void test_verify_signature(void) ret = NCryptVerifySignature(key, &padinfo, sha256_hash, sizeof(sha256_hash), signature_pkcs1_sha256, 4, NCRYPT_PAD_PKCS1_FLAG); - ok(ret == NTE_INVALID_PARAMETER, "got %#lx\n", ret); + todo_wine ok(ret == NTE_INVALID_PARAMETER, "got %#lx\n", ret); invalid_padinfo.pszAlgId = BCRYPT_MD5_ALGORITHM; ret = NCryptVerifySignature(key, &invalid_padinfo, sha256_hash, sizeof(sha256_hash), signature_pkcs1_sha256, sizeof(signature_pkcs1_sha256), NCRYPT_PAD_PKCS1_FLAG); - ok(ret == NTE_INVALID_PARAMETER, "got %#lx\n", ret); - } + todo_wine ok(ret == NTE_INVALID_PARAMETER, "got %#lx\n", ret); NCryptFreeObject(key); NCryptFreeObject(prov); -- 2.30.2

1 0