- Wine-Devel - list.winehq.org

[PATCH] qmgr: Use CRT allocation functions.
by Nikolay Sivov April 7, 2022

April 7, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/qmgr/enum_files.c | 11 +++++----- dlls/qmgr/enum_jobs.c | 11 +++++----- dlls/qmgr/file.c | 23 ++++++++----------- dlls/qmgr/job.c | 50 ++++++++++++++++++++---------------------- dlls/qmgr/qmgr.h | 7 ------ 5 files changed, 43 insertions(+), 59 deletions(-) diff --git a/dlls/qmgr/enum_files.c b/dlls/qmgr/enum_files.c index 92834c6bd3b..a7a26da60c9 100644 --- a/dlls/qmgr/enum_files.c +++ b/dlls/qmgr/enum_files.c @@ -76,8 +76,8 @@ static ULONG WINAPI EnumBackgroundCopyFiles_Release(IEnumBackgroundCopyFiles *if { for(i = 0; i < This->numFiles; i++) IBackgroundCopyFile2_Release(This->files[i]); - HeapFree(GetProcessHeap(), 0, This->files); - HeapFree(GetProcessHeap(), 0, This); + free(This->files); + free(This); } return ref; @@ -188,7 +188,7 @@ HRESULT EnumBackgroundCopyFilesConstructor(BackgroundCopyJobImpl *job, IEnumBack TRACE("%p, %p)\n", job, enum_files); - This = HeapAlloc(GetProcessHeap(), 0, sizeof *This); + This = malloc(sizeof(*This)); if (!This) return E_OUTOFMEMORY; @@ -202,12 +202,11 @@ HRESULT EnumBackgroundCopyFilesConstructor(BackgroundCopyJobImpl *job, IEnumBack This->files = NULL; if (This->numFiles > 0) { - This->files = HeapAlloc(GetProcessHeap(), 0, - This->numFiles * sizeof This->files[0]); + This->files = malloc(This->numFiles * sizeof This->files[0]); if (!This->files) { LeaveCriticalSection(&job->cs); - HeapFree(GetProcessHeap(), 0, This); + free(This); return E_OUTOFMEMORY; } } diff --git a/dlls/qmgr/enum_jobs.c b/dlls/qmgr/enum_jobs.c index 00d8ea52b4f..d31303ab1fc 100644 --- a/dlls/qmgr/enum_jobs.c +++ b/dlls/qmgr/enum_jobs.c @@ -76,8 +76,8 @@ static ULONG WINAPI EnumBackgroundCopyJobs_Release(IEnumBackgroundCopyJobs *ifac if (ref == 0) { for(i = 0; i < This->numJobs; i++) IBackgroundCopyJob4_Release(This->jobs[i]); - HeapFree(GetProcessHeap(), 0, This->jobs); - HeapFree(GetProcessHeap(), 0, This); + free(This->jobs); + free(This); } return ref; @@ -182,7 +182,7 @@ HRESULT enum_copy_job_create(BackgroundCopyManagerImpl *qmgr, IEnumBackgroundCop TRACE("%p, %p)\n", qmgr, enumjob); - This = HeapAlloc(GetProcessHeap(), 0, sizeof *This); + This = malloc(sizeof(*This)); if (!This) return E_OUTOFMEMORY; This->IEnumBackgroundCopyJobs_iface.lpVtbl = &EnumBackgroundCopyJobsVtbl; @@ -196,12 +196,11 @@ HRESULT enum_copy_job_create(BackgroundCopyManagerImpl *qmgr, IEnumBackgroundCop if (0 < This->numJobs) { - This->jobs = HeapAlloc(GetProcessHeap(), 0, - This->numJobs * sizeof *This->jobs); + This->jobs = malloc(This->numJobs * sizeof *This->jobs); if (!This->jobs) { LeaveCriticalSection(&qmgr->cs); - HeapFree(GetProcessHeap(), 0, This); + free(This); return E_OUTOFMEMORY; } } diff --git a/dlls/qmgr/file.c b/dlls/qmgr/file.c index 339354d59c0..c82344a51a8 100644 --- a/dlls/qmgr/file.c +++ b/dlls/qmgr/file.c @@ -82,9 +82,9 @@ static ULONG WINAPI BackgroundCopyFile_Release( if (ref == 0) { IBackgroundCopyJob4_Release(&file->owner->IBackgroundCopyJob4_iface); - HeapFree(GetProcessHeap(), 0, file->info.LocalName); - HeapFree(GetProcessHeap(), 0, file->info.RemoteName); - HeapFree(GetProcessHeap(), 0, file); + free(file->info.LocalName); + free(file->info.RemoteName); + free(file); } return ref; @@ -167,34 +167,29 @@ HRESULT BackgroundCopyFileConstructor(BackgroundCopyJobImpl *owner, TRACE("(%s, %s, %p)\n", debugstr_w(remoteName), debugstr_w(localName), file); - This = HeapAlloc(GetProcessHeap(), 0, sizeof *This); + This = calloc(1, sizeof(*This)); if (!This) return E_OUTOFMEMORY; - This->info.RemoteName = strdupW(remoteName); + This->info.RemoteName = wcsdup(remoteName); if (!This->info.RemoteName) { - HeapFree(GetProcessHeap(), 0, This); + free(This); return E_OUTOFMEMORY; } - This->info.LocalName = strdupW(localName); + This->info.LocalName = wcsdup(localName); if (!This->info.LocalName) { - HeapFree(GetProcessHeap(), 0, This->info.RemoteName); - HeapFree(GetProcessHeap(), 0, This); + free(This->info.RemoteName); + free(This); return E_OUTOFMEMORY; } This->IBackgroundCopyFile2_iface.lpVtbl = &BackgroundCopyFile2Vtbl; This->ref = 1; - This->fileProgress.BytesTotal = BG_SIZE_UNKNOWN; - This->fileProgress.BytesTransferred = 0; - This->fileProgress.Completed = FALSE; This->owner = owner; - This->read_size = 0; - This->tempFileName[0] = 0; IBackgroundCopyJob4_AddRef(&owner->IBackgroundCopyJob4_iface); *file = This; diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index 2b8572465ad..233d894b3ea 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -99,7 +99,7 @@ static ULONG WINAPI copy_error_Release( if (!refs) { if (error->file) IBackgroundCopyFile2_Release(error->file); - HeapFree(GetProcessHeap(), 0, error); + free(error); } return refs; } @@ -189,7 +189,7 @@ static HRESULT create_copy_error( TRACE("context %u code %08lx file %p\n", context, code, file); - if (!(error = HeapAlloc(GetProcessHeap(), 0, sizeof(*error) ))) return E_OUTOFMEMORY; + if (!(error = malloc(sizeof(*error) ))) return E_OUTOFMEMORY; error->IBackgroundCopyError_iface.lpVtbl = &copy_error_vtbl; error->refs = 1; error->context = context; @@ -262,22 +262,22 @@ static ULONG WINAPI BackgroundCopyJob_Release(IBackgroundCopyJob4 *iface) DeleteCriticalSection(&job->cs); if (job->callback) IBackgroundCopyCallback2_Release(job->callback); - HeapFree(GetProcessHeap(), 0, job->displayName); - HeapFree(GetProcessHeap(), 0, job->description); - HeapFree(GetProcessHeap(), 0, job->http_options.headers); + free(job->displayName); + free(job->description); + free(job->http_options.headers); for (i = 0; i < BG_AUTH_TARGET_PROXY; i++) { for (j = 0; j < BG_AUTH_SCHEME_PASSPORT; j++) { BG_AUTH_CREDENTIALS *cred = &job->http_options.creds[i][j]; - HeapFree(GetProcessHeap(), 0, cred->Credentials.Basic.UserName); - HeapFree(GetProcessHeap(), 0, cred->Credentials.Basic.Password); + free(cred->Credentials.Basic.UserName); + free(cred->Credentials.Basic.Password); } } CloseHandle(job->wait); CloseHandle(job->cancel); CloseHandle(job->done); - HeapFree(GetProcessHeap(), 0, job); + free(job); } return ref; @@ -578,10 +578,8 @@ static HRESULT WINAPI BackgroundCopyJob_SetDescription(IBackgroundCopyJob4 *ifac } else { - HeapFree(GetProcessHeap(), 0, job->description); - if ((job->description = HeapAlloc(GetProcessHeap(), 0, (len+1)*sizeof(WCHAR)))) - lstrcpyW(job->description, desc); - else + free(job->description); + if (!(job->description = wcsdup(desc))) hr = E_OUTOFMEMORY; } @@ -803,13 +801,13 @@ static HRESULT WINAPI BackgroundCopyJob_SetCredentials(IBackgroundCopyJob4 *ifac if (cred->Credentials.Basic.UserName) { - HeapFree(GetProcessHeap(), 0, new_cred->Credentials.Basic.UserName); - new_cred->Credentials.Basic.UserName = strdupW(cred->Credentials.Basic.UserName); + free(new_cred->Credentials.Basic.UserName); + new_cred->Credentials.Basic.UserName = wcsdup(cred->Credentials.Basic.UserName); } if (cred->Credentials.Basic.Password) { - HeapFree(GetProcessHeap(), 0, new_cred->Credentials.Basic.Password); - new_cred->Credentials.Basic.Password = strdupW(cred->Credentials.Basic.Password); + free(new_cred->Credentials.Basic.Password); + new_cred->Credentials.Basic.Password = wcsdup(cred->Credentials.Basic.Password); } LeaveCriticalSection(&job->cs); @@ -834,9 +832,9 @@ static HRESULT WINAPI BackgroundCopyJob_RemoveCredentials( EnterCriticalSection(&job->cs); new_cred->Target = new_cred->Scheme = 0; - HeapFree(GetProcessHeap(), 0, new_cred->Credentials.Basic.UserName); + free(new_cred->Credentials.Basic.UserName); new_cred->Credentials.Basic.UserName = NULL; - HeapFree(GetProcessHeap(), 0, new_cred->Credentials.Basic.Password); + free(new_cred->Credentials.Basic.Password); new_cred->Credentials.Basic.Password = NULL; LeaveCriticalSection(&job->cs); @@ -1047,18 +1045,18 @@ static HRESULT WINAPI http_options_SetCustomHeaders( if (RequestHeaders) { - WCHAR *headers = strdupW(RequestHeaders); + WCHAR *headers = wcsdup(RequestHeaders); if (!headers) { LeaveCriticalSection(&job->cs); return E_OUTOFMEMORY; } - HeapFree(GetProcessHeap(), 0, job->http_options.headers); + free(job->http_options.headers); job->http_options.headers = headers; } else { - HeapFree(GetProcessHeap(), 0, job->http_options.headers); + free(job->http_options.headers); job->http_options.headers = NULL; } @@ -1140,7 +1138,7 @@ HRESULT BackgroundCopyJobConstructor(LPCWSTR displayName, BG_JOB_TYPE type, GUID TRACE("(%s,%d,%p)\n", debugstr_w(displayName), type, job); - This = HeapAlloc(GetProcessHeap(), 0, sizeof *This); + This = malloc(sizeof(*This)); if (!This) return E_OUTOFMEMORY; @@ -1152,12 +1150,12 @@ HRESULT BackgroundCopyJobConstructor(LPCWSTR displayName, BG_JOB_TYPE type, GUID This->ref = 1; This->type = type; - This->displayName = strdupW(displayName); + This->displayName = wcsdup(displayName); if (!This->displayName) { This->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->cs); - HeapFree(GetProcessHeap(), 0, This); + free(This); return E_OUTOFMEMORY; } @@ -1166,8 +1164,8 @@ HRESULT BackgroundCopyJobConstructor(LPCWSTR displayName, BG_JOB_TYPE type, GUID { This->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->cs); - HeapFree(GetProcessHeap(), 0, This->displayName); - HeapFree(GetProcessHeap(), 0, This); + free(This->displayName); + free(This); return hr; } *job_id = This->jobId; diff --git a/dlls/qmgr/qmgr.h b/dlls/qmgr/qmgr.h index de808049ea3..8d9ccae73ff 100644 --- a/dlls/qmgr/qmgr.h +++ b/dlls/qmgr/qmgr.h @@ -115,13 +115,6 @@ BOOL processFile(BackgroundCopyFileImpl *file, BackgroundCopyJobImpl *job) DECLS BOOL transitionJobState(BackgroundCopyJobImpl *job, BG_JOB_STATE from, BG_JOB_STATE to) DECLSPEC_HIDDEN; /* Little helper functions */ -static inline WCHAR *strdupW(const WCHAR *src) -{ - WCHAR *dst = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(src) + 1) * sizeof(WCHAR)); - if (dst) lstrcpyW(dst, src); - return dst; -} - static inline WCHAR *co_strdupW(const WCHAR *src) { WCHAR *dst = CoTaskMemAlloc((lstrlenW(src) + 1) * sizeof(WCHAR)); -- 2.35.1

1 0

[PATCH] localui/tests: Use CRT allocation functions.
by Nikolay Sivov April 7, 2022

April 7, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/localui/tests/localui.c | 35 ++++++++--------------------------- 1 file changed, 8 insertions(+), 27 deletions(-) diff --git a/dlls/localui/tests/localui.c b/dlls/localui/tests/localui.c index 28cecaabd50..b504bd870f7 100644 --- a/dlls/localui/tests/localui.c +++ b/dlls/localui/tests/localui.c @@ -69,7 +69,7 @@ static PORT_INFO_2W * find_portinfo2(LPCWSTR pPort) return NULL; } ok(!res, "EnumPorts succeeded: got %ld\n", res); - pi_buffer = HeapAlloc(GetProcessHeap(), 0, pi_needed); + pi_buffer = malloc(pi_needed); res = EnumPortsW(NULL, 2, pi_buffer, pi_needed, &pi_needed, &pi_numports); ok(res == 1, "EnumPorts failed: got %ld\n", res); } @@ -105,21 +105,6 @@ static LPCSTR load_functions(void) return NULL; } -/* ########################### - * strdupW [internal] - */ - -static LPWSTR strdupW(LPCWSTR strW) -{ - LPWSTR ptr; - - ptr = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(strW) + 1) * sizeof(WCHAR)); - if (ptr) { - lstrcpyW(ptr, strW); - } - return ptr; -} - /* ########################### */ static void test_AddPortUI(void) @@ -267,7 +252,6 @@ START_TEST(localui) DWORD numentries; PORT_INFO_2W * pi2; WCHAR bufferW[16]; - CHAR bufferA[16]; DWORD id; /* localui.dll does not exist before w2k */ @@ -302,29 +286,26 @@ START_TEST(localui) /* "LPT1:" - "LPT9:" */ while (((lpt_present == NULL) || (lpt_absent == NULL)) && id < 9) { id++; - sprintf(bufferA, "LPT%lu:", id); - MultiByteToWideChar( CP_ACP, 0, bufferA, -1, bufferW, ARRAY_SIZE(bufferW)); + swprintf(bufferW, ARRAY_SIZE(bufferW), L"LPT%lu:", id); pi2 = find_portinfo2(bufferW); if (pi2 && (lpt_present == NULL)) lpt_present = pi2; - if (!pi2 && (lpt_absent == NULL)) lpt_absent = strdupW(bufferW); + if (!pi2 && (lpt_absent == NULL)) lpt_absent = wcsdup(bufferW); } id = 0; /* "COM1:" - "COM9:" */ while (((com_present == NULL) || (com_absent == NULL)) && id < 9) { id++; - sprintf(bufferA, "COM%lu:", id); - MultiByteToWideChar( CP_ACP, 0, bufferA, -1, bufferW, ARRAY_SIZE(bufferW)); + swprintf(bufferW, ARRAY_SIZE(bufferW), L"COM%lu:", id); pi2 = find_portinfo2(bufferW); if (pi2 && (com_present == NULL)) com_present = pi2; - if (!pi2 && (com_absent == NULL)) com_absent = strdupW(bufferW); + if (!pi2 && (com_absent == NULL)) com_absent = wcsdup(bufferW); } test_AddPortUI(); test_ConfigurePortUI(); - /* cleanup */ - HeapFree(GetProcessHeap(), 0, lpt_absent); - HeapFree(GetProcessHeap(), 0, com_absent); - HeapFree(GetProcessHeap(), 0, pi_buffer); + free(lpt_absent); + free(com_absent); + free(pi_buffer); } -- 2.35.1

1 0

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

April 7, 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) dlls/riched20/tests/richole.c | 247 ++++++++++++++++++++++++++++++++-- 1 file changed, 236 insertions(+), 11 deletions(-) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 24284a24484..fce4e74285d 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -33,6 +33,169 @@ #include <tom.h> #include <wine/test.h> +#define EXPECT_TODO_WINE 0x80000000UL + +struct IRichEditOleCallbackImpl { + IRichEditOleCallback IRichEditOleCallback_iface; + LONG ref; + int line; + + ULONG expect_queryinsertobject; + + const CLSID *clsid; + LPSTORAGE stg; + LONG cp; + HRESULT queryinsertobject_result; +}; + +static inline struct IRichEditOleCallbackImpl *impl_from_IRichEditOleCallback(IRichEditOleCallback *iface) +{ + return CONTAINING_RECORD(iface, struct IRichEditOleCallbackImpl, IRichEditOleCallback_iface); +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_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 RichEditOleCallbackImpl_AddRef(IRichEditOleCallback *iface) +{ + struct IRichEditOleCallbackImpl *This = impl_from_IRichEditOleCallback(iface); + ULONG ref = InterlockedIncrement(&This->ref); + return ref; +} + +static ULONG STDMETHODCALLTYPE RichEditOleCallbackImpl_Release(IRichEditOleCallback *iface) +{ + struct IRichEditOleCallbackImpl *This = impl_from_IRichEditOleCallback(iface); + ULONG ref = InterlockedDecrement(&This->ref); + if (!ref) free(This); + return ref; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_GetNewStorage(IRichEditOleCallback *iface, LPSTORAGE *stg) +{ + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_GetInPlaceContext(IRichEditOleCallback *iface, LPOLEINPLACEFRAME *frame, LPOLEINPLACEUIWINDOW *doc, LPOLEINPLACEFRAMEINFO frame_info) +{ + return E_INVALIDARG; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_ShowContainerUI(IRichEditOleCallback *iface, BOOL show) +{ + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_QueryInsertObject(IRichEditOleCallback *iface, LPCLSID clsid, LPSTORAGE stg, LONG cp) +{ + struct IRichEditOleCallbackImpl *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 RichEditOleCallbackImpl_DeleteObject(IRichEditOleCallback *iface, LPOLEOBJECT oleobj) +{ + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_QueryAcceptData(IRichEditOleCallback *iface, LPDATAOBJECT dataobj, CLIPFORMAT *cf_format, DWORD reco, BOOL really, HGLOBAL metapict) +{ + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_ContextSensitiveHelp(IRichEditOleCallback *iface, BOOL enter_mode) +{ + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_GetClipboardData(IRichEditOleCallback *iface, CHARRANGE *chrg, DWORD reco, LPDATAOBJECT *dataobj) +{ + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_GetDragDropEffect(IRichEditOleCallback *iface, BOOL drag, DWORD key_state, LPDWORD effect) +{ + if (effect) *effect = DROPEFFECT_COPY; + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_GetContextMenu(IRichEditOleCallback *iface, WORD seltype, LPOLEOBJECT oleobj, CHARRANGE *chrg, HMENU *hmenu) +{ + return E_NOTIMPL; +} + +static const struct IRichEditOleCallbackVtbl RichEditOleCallbackImpl_Vtbl = { + RichEditOleCallbackImpl_QueryInterface, + RichEditOleCallbackImpl_AddRef, + RichEditOleCallbackImpl_Release, + RichEditOleCallbackImpl_GetNewStorage, + RichEditOleCallbackImpl_GetInPlaceContext, + RichEditOleCallbackImpl_ShowContainerUI, + RichEditOleCallbackImpl_QueryInsertObject, + RichEditOleCallbackImpl_DeleteObject, + RichEditOleCallbackImpl_QueryAcceptData, + RichEditOleCallbackImpl_ContextSensitiveHelp, + RichEditOleCallbackImpl_GetClipboardData, + RichEditOleCallbackImpl_GetDragDropEffect, + RichEditOleCallbackImpl_GetContextMenu, +}; + +static HRESULT RichEditOleCallbackImpl_Create(struct IRichEditOleCallbackImpl **objptr) +{ + struct IRichEditOleCallbackImpl *obj; + + obj = calloc(sizeof(struct IRichEditOleCallbackImpl), 1); + if (!obj) return E_OUTOFMEMORY; + + obj->IRichEditOleCallback_iface.lpVtbl = &RichEditOleCallbackImpl_Vtbl; + obj->ref = 1; + + *objptr = obj; + return S_OK; +} + +static void olecb_expect_QueryInsertObject(struct IRichEditOleCallbackImpl *This, int line, ULONG expect, const CLSID *clsid, LPSTORAGE 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 IRichEditOleCallbackImpl *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 +3396,24 @@ 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 IRichEditOleCallbackImpl *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 IRichEditOleCallbackImpl *callback) { static CHAR test_text1[] = "abcdefg"; IRichEditOle *reole = NULL; @@ -3271,6 +3437,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 +3450,47 @@ 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 +3568,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 +3670,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 +3748,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 IRichEditOleCallbackImpl *callback; + HRESULT hr; + ULONG ref; + + subtest_InsertObject(NULL); + + hr = RichEditOleCallbackImpl_Create(&callback); + ok(SUCCEEDED(hr), "RichEditOleCallbackImpl_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 2

[PATCH 1/2] user32/tests: Test NUMCOLORS for display DCs.
by Zhiyi Zhang April 7, 2022

April 7, 2022

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/monitor.c | 79 ++++++++++++++++++++++++++++++++++++- 1 file changed, 78 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index d0d4ff1f324..1d88afafb18 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -2193,8 +2193,10 @@ static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_ static void test_display_dc(void) { static const INT bpps[] = {1, 4, 8, 16, 24, 32}; + unsigned char buffer[sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)]; + BITMAPINFO *bmi = (BITMAPINFO *)buffer; + INT count, old_count, i, bpp, value; HBITMAP hbitmap, old_hbitmap; - INT count, old_count, i, bpp; DWORD device_idx, mode_idx; DEVMODEA dm, dm2, dm3; DISPLAY_DEVICEA dd; @@ -2247,6 +2249,81 @@ static void test_display_dc(void) winetest_pop_context(); } + /* Test selecting a DIB of a different depth into a display compatible DC */ + for (i = 0; i < ARRAY_SIZE(bpps); ++i) + { + winetest_push_context("bpp %d", bpps[i]); + + mem_dc = CreateCompatibleDC(hdc); + memset(buffer, 0, sizeof(buffer)); + bmi->bmiHeader.biSize = sizeof(bmi->bmiHeader); + bmi->bmiHeader.biWidth = dm.dmPelsWidth; + bmi->bmiHeader.biHeight = dm.dmPelsHeight; + bmi->bmiHeader.biBitCount = bpps[i]; + bmi->bmiHeader.biPlanes = 1; + bmi->bmiHeader.biCompression = BI_RGB; + hbitmap = CreateDIBSection(hdc, bmi, DIB_RGB_COLORS, NULL, NULL, 0); + ok(!!hbitmap, "CreateDIBSection failed, error %ld.\n", GetLastError()); + old_hbitmap = SelectObject(mem_dc, hbitmap); + ok(!!old_hbitmap, "Failed to select bitmap.\n"); + + value = GetDeviceCaps(mem_dc, BITSPIXEL); + ok(value == 32, "Expected 32, got %d.\n", value); + value = GetDeviceCaps(mem_dc, NUMCOLORS); + ok(value == -1, "Expected -1, got %d.\n", value); + + SelectObject(mem_dc, old_hbitmap); + DeleteObject(hbitmap); + DeleteDC(mem_dc); + + winetest_pop_context(); + } + + /* Test NUMCOLORS for display DCs */ + for (i = 0; i < ARRAY_SIZE(bpps); ++i) + { + winetest_push_context("bpp %d", bpps[i]); + + memset(&dm2, 0, sizeof(dm2)); + dm2.dmSize = sizeof(dm2); + for (mode_idx = 0; EnumDisplaySettingsA(NULL, mode_idx, &dm2); ++mode_idx) + { + if (dm2.dmBitsPerPel == bpps[i]) + break; + } + if (dm2.dmBitsPerPel != bpps[i]) + { + skip("%d-bit display mode not found.\n", bpps[i]); + winetest_pop_context(); + continue; + } + + res = ChangeDisplaySettingsExA(NULL, &dm2, NULL, CDS_RESET, NULL); + /* Win8 TestBots */ + ok(res == DISP_CHANGE_SUCCESSFUL || broken(res == DISP_CHANGE_FAILED), + "ChangeDisplaySettingsExA returned unexpected %ld.\n", res); + if (res == DISP_CHANGE_SUCCESSFUL) + { + value = GetDeviceCaps(hdc, BITSPIXEL); + ok(value == (bpps[i] == 4 ? 1 : bpps[i]), "Expected %d, got %d.\n", + (bpps[i] == 4 ? 1 : bpps[i]), value); + + value = GetDeviceCaps(hdc, NUMCOLORS); + if (bpps[i] > 8 || (bpps[i] == 8 && LOBYTE(LOWORD(GetVersion())) >= 6)) + todo_wine_if(bpps[i] == 8 && LOBYTE(LOWORD(GetVersion())) >= 6) + ok(value == -1, "Expected -1, got %d.\n", value); + else if (bpps[i] == 8 && LOBYTE(LOWORD(GetVersion())) < 6) + ok(value > 16 && value <= 256, "Got %d.\n", value); + else + ok(value == 1 << bpps[i], "Expected %d, got %d.\n", 1 << bpps[i], value); + + res = ChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA returned unexpected %ld.\n", + res); + } + winetest_pop_context(); + } + /* Test selecting a DDB of the same color depth into a display compatible DC */ mem_dc = CreateCompatibleDC(hdc); bpp = GetDeviceCaps(mem_dc, BITSPIXEL); -- 2.32.0

2 1

[PATCH v2] combase/tests: Add some RoGetActivationFactory tests with manifest.
by Rémi Bernon April 7, 2022

April 7, 2022

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Add broken results for older w10 versions which did not support the activatableClass manifest entry. dlls/combase/tests/Makefile.in | 7 +- dlls/combase/tests/combase.manifest | 15 ++ dlls/combase/tests/combase.rc | 22 +++ dlls/combase/tests/roapi.c | 59 ++++++++ dlls/combase/tests/wine.combase.test.c | 159 ++++++++++++++++++++++ dlls/combase/tests/wine.combase.test.spec | 3 + 6 files changed, 263 insertions(+), 2 deletions(-) create mode 100644 dlls/combase/tests/combase.manifest create mode 100644 dlls/combase/tests/combase.rc create mode 100644 dlls/combase/tests/wine.combase.test.c create mode 100644 dlls/combase/tests/wine.combase.test.spec diff --git a/dlls/combase/tests/Makefile.in b/dlls/combase/tests/Makefile.in index 1c3d77725b3..99c036b78d9 100644 --- a/dlls/combase/tests/Makefile.in +++ b/dlls/combase/tests/Makefile.in @@ -1,6 +1,9 @@ TESTDLL = combase.dll IMPORTS = combase -C_SRCS = \ +SOURCES = \ roapi.c \ - string.c + string.c \ + combase.rc \ + wine.combase.test.c \ + wine.combase.test.spec diff --git a/dlls/combase/tests/combase.manifest b/dlls/combase/tests/combase.manifest new file mode 100644 index 00000000000..72f3ac915e0 --- /dev/null +++ b/dlls/combase/tests/combase.manifest @@ -0,0 +1,15 @@ +<?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.combase.test" + version="1.0.0.0" + processorArchitecture="*" + /> +<description>Wine combase test suite</description> +<file name="wine.combase.test.dll"> + <activatableClass name="Wine.Test.Missing" threadingModel="both" xmlns="urn:schemas-microsoft-com:winrt.v1"/> + <activatableClass name="Wine.Test.Class" threadingModel="both" xmlns="urn:schemas-microsoft-com:winrt.v1"/> + <activatableClass name="Wine.Test.Trusted" threadingModel="both" xmlns="urn:schemas-microsoft-com:winrt.v1"/> +</file> +</assembly> diff --git a/dlls/combase/tests/combase.rc b/dlls/combase/tests/combase.rc new file mode 100644 index 00000000000..865bf703d5c --- /dev/null +++ b/dlls/combase/tests/combase.rc @@ -0,0 +1,22 @@ +/* + * Copyright 2022 Rémi Bernon for CodeWeavers + * + * 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 "winuser.h" + +/* @makedep: combase.manifest */ +1 RT_MANIFEST combase.manifest diff --git a/dlls/combase/tests/roapi.c b/dlls/combase/tests/roapi.c index b1ac15a08cb..579b1502797 100644 --- a/dlls/combase/tests/roapi.c +++ b/dlls/combase/tests/roapi.c @@ -28,12 +28,31 @@ #include "wine/test.h" +static void load_resource(const WCHAR *filename) +{ + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + file = CreateFileW(filename, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "failed to create %s, error %lu\n", debugstr_w(filename), GetLastError()); + + res = FindResourceW(NULL, filename, L"TESTDLL"); + ok(res != 0, "couldn't find resource\n"); + ptr = LockResource(LoadResource(GetModuleHandleW(NULL), res)); + WriteFile(file, ptr, SizeofResource(GetModuleHandleW(NULL), res), &written, NULL); + ok(written == SizeofResource(GetModuleHandleW(NULL), res), "couldn't write resource\n"); + CloseHandle(file); +} + static void test_ActivationFactories(void) { HRESULT hr; HSTRING str, str2; IActivationFactory *factory = NULL; IInspectable *inspect = NULL; + ULONG ref; hr = WindowsCreateString(L"Windows.Data.Xml.Dom.XmlDocument", ARRAY_SIZE(L"Windows.Data.Xml.Dom.XmlDocument") - 1, &str); @@ -63,10 +82,50 @@ static void test_ActivationFactories(void) WindowsDeleteString(str2); WindowsDeleteString(str); + + hr = WindowsCreateString(L"Wine.Test.Missing", ARRAY_SIZE(L"Wine.Test.Missing") - 1, &str); + ok(hr == S_OK, "WindowsCreateString returned %#lx.\n", hr); + hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); + ok(hr == REGDB_E_CLASSNOTREG, "RoGetActivationFactory returned %#lx.\n", hr); + ok(factory == NULL, "got factory %p.\n", factory); + WindowsDeleteString(str); + hr = WindowsCreateString(L"Wine.Test.Class", ARRAY_SIZE(L"Wine.Test.Class") - 1, &str); + ok(hr == S_OK, "WindowsCreateString returned %#lx.\n", hr); + hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); + todo_wine + ok(hr == E_NOTIMPL || broken(hr == REGDB_E_CLASSNOTREG) /* <= w1064v1809 */, + "RoGetActivationFactory returned %#lx.\n", hr); + ok(factory == NULL, "got factory %p.\n", factory); + WindowsDeleteString(str); + hr = WindowsCreateString(L"Wine.Test.Trusted", ARRAY_SIZE(L"Wine.Test.Trusted") - 1, &str); + ok(hr == S_OK, "WindowsCreateString returned %#lx.\n", hr); + hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); + todo_wine + ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG) /* <= w1064v1809 */, + "RoGetActivationFactory returned %#lx.\n", hr); + if (hr == REGDB_E_CLASSNOTREG) + ok(!factory, "got factory %p.\n", factory); + else + { + todo_wine + ok(!!factory, "got factory %p.\n", factory); + } + if (!factory) ref = 0; + else ref = IActivationFactory_Release(factory); + ok(ref == 0, "Release returned %lu\n", ref); + WindowsDeleteString(str); + RoUninitialize(); } START_TEST(roapi) { + BOOL ret; + + load_resource(L"wine.combase.test.dll"); + test_ActivationFactories(); + + ret = DeleteFileW(L"wine.combase.test.dll"); + ok(ret, "Failed to delete file, error %lu\n", GetLastError()); } diff --git a/dlls/combase/tests/wine.combase.test.c b/dlls/combase/tests/wine.combase.test.c new file mode 100644 index 00000000000..e6171c6c6e7 --- /dev/null +++ b/dlls/combase/tests/wine.combase.test.c @@ -0,0 +1,159 @@ +/* + * Copyright 2022 Rémi Bernon for CodeWeavers + * + * 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 <stddef.h> + +#define COBJMACROS +#include "windef.h" +#include "winbase.h" + +#include "initguid.h" +#include "inspectable.h" +#include "roapi.h" +#include "winstring.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(combase); + +struct factory +{ + IActivationFactory IActivationFactory_iface; + LONG ref; + BOOL trusted; +}; + +static inline struct factory *impl_from_IActivationFactory(IActivationFactory *iface) +{ + return CONTAINING_RECORD(iface, struct factory, IActivationFactory_iface); +} + +static HRESULT WINAPI factory_QueryInterface(IActivationFactory *iface, REFIID iid, void **out) +{ + struct factory *impl = impl_from_IActivationFactory(iface); + + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) + || IsEqualGUID(iid, &IID_IInspectable) + || IsEqualGUID(iid, &IID_IAgileObject) + || IsEqualGUID(iid, &IID_IActivationFactory)) + { + IInspectable_AddRef((*out = &impl->IActivationFactory_iface)); + return S_OK; + } + + FIXME("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI factory_AddRef(IActivationFactory *iface) +{ + struct factory *impl = impl_from_IActivationFactory(iface); + ULONG ref = InterlockedIncrement(&impl->ref); + TRACE("iface %p increasing refcount to %lu.\n", iface, ref); + return ref; +} + +static ULONG WINAPI factory_Release(IActivationFactory *iface) +{ + struct factory *impl = impl_from_IActivationFactory(iface); + ULONG ref = InterlockedDecrement(&impl->ref); + TRACE("iface %p decreasing refcount to %lu.\n", iface, ref); + return ref; +} + +static HRESULT WINAPI factory_GetIids(IActivationFactory *iface, ULONG *iid_count, IID **iids) +{ + FIXME("iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids); + return E_NOTIMPL; +} + +static HRESULT WINAPI factory_GetRuntimeClassName(IActivationFactory *iface, HSTRING *class_name) +{ + FIXME("iface %p, class_name %p stub!\n", iface, class_name); + return E_NOTIMPL; +} + +static HRESULT WINAPI factory_GetTrustLevel(IActivationFactory *iface, TrustLevel *trust_level) +{ + struct factory *impl = impl_from_IActivationFactory(iface); + + FIXME("iface %p, trust_level %p stub!\n", iface, trust_level); + + if (!impl->trusted) return E_NOTIMPL; + + *trust_level = BaseTrust; + return S_OK; +} + +static HRESULT WINAPI factory_ActivateInstance(IActivationFactory *iface, IInspectable **instance) +{ + FIXME("iface %p, instance %p stub!\n", iface, instance); + return E_NOTIMPL; +} + +static const struct IActivationFactoryVtbl factory_vtbl = +{ + factory_QueryInterface, + factory_AddRef, + factory_Release, + /* IInspectable methods */ + factory_GetIids, + factory_GetRuntimeClassName, + factory_GetTrustLevel, + /* IActivationFactory methods */ + factory_ActivateInstance, +}; + +static struct factory class_factory = {{&factory_vtbl}, 0}; +static struct factory trusted_factory = {{&factory_vtbl}, 0, TRUE}; + +HRESULT WINAPI DllCanUnloadNow(void) +{ + FIXME("stub!\n"); + return S_OK; +} + +HRESULT WINAPI DllGetActivationFactory(HSTRING classid, IActivationFactory **factory) +{ + const WCHAR *buffer = WindowsGetStringRawBuffer(classid, NULL); + + FIXME("class %s, factory %p stub!\n", debugstr_w(buffer), factory); + + if (!wcscmp(buffer, L"Wine.Test.Class")) + { + IActivationFactory_AddRef((*factory = &class_factory.IActivationFactory_iface)); + return S_OK; + } + if (!wcscmp(buffer, L"Wine.Test.Trusted")) + { + IActivationFactory_AddRef((*factory = &trusted_factory.IActivationFactory_iface)); + return S_OK; + } + + return REGDB_E_CLASSNOTREG; +} + +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, void **out) +{ + FIXME("clsid %s, riid %s, out %p stub!\n", debugstr_guid(clsid), debugstr_guid(riid), out); + return CLASS_E_CLASSNOTAVAILABLE; +} diff --git a/dlls/combase/tests/wine.combase.test.spec b/dlls/combase/tests/wine.combase.test.spec new file mode 100644 index 00000000000..20a8bfa98ea --- /dev/null +++ b/dlls/combase/tests/wine.combase.test.spec @@ -0,0 +1,3 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetActivationFactory(ptr ptr) +@ stdcall -private DllGetClassObject(ptr ptr ptr) -- 2.35.1

2 1

[PATCH] dlls/iphlpapi: don't cast SIZE_T to DWORD in trace, use %I instead
by Eric Pouech April 7, 2022

April 7, 2022

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/iphlpapi/iphlpapi_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index afc400d26c1c..0bd7cdc06c89 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -4183,7 +4183,7 @@ DWORD WINAPI ConvertInterfaceLuidToAlias( const NET_LUID *luid, WCHAR *alias, SI DWORD err; IF_COUNTED_STRING name; - TRACE( "(%p %p %lu)\n", luid, alias, (DWORD)len ); + TRACE( "(%p %p %Iu)\n", luid, alias, len ); if (!luid || !alias) return ERROR_INVALID_PARAMETER; @@ -4243,7 +4243,7 @@ DWORD WINAPI ConvertInterfaceLuidToNameA(const NET_LUID *luid, char *name, SIZE_ DWORD err; WCHAR nameW[IF_MAX_STRING_SIZE + 1]; - TRACE( "(%p %p %lu)\n", luid, name, (DWORD)len ); + TRACE( "(%p %p %Iu)\n", luid, name, len ); if (!luid) return ERROR_INVALID_PARAMETER; if (!name || !len) return ERROR_NOT_ENOUGH_MEMORY; @@ -4283,7 +4283,7 @@ DWORD WINAPI ConvertInterfaceLuidToNameW(const NET_LUID *luid, WCHAR *name, SIZE const WCHAR *prefix = NULL; WCHAR buf[IF_MAX_STRING_SIZE + 1]; - TRACE( "(%p %p %lu)\n", luid, name, (DWORD)len ); + TRACE( "(%p %p %Iu)\n", luid, name, len ); if (!luid || !name) return ERROR_INVALID_PARAMETER;

2 1

[PATCH] dlls/schedvc: don't cast size_t to DWORD in trace, use %I instead
by Eric Pouech April 7, 2022

April 7, 2022

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/schedsvc/atsvc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index 0a47e37089bc..e8ea1b25c6f7 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -491,8 +491,8 @@ static BOOL load_job_data(const char *data, DWORD size, struct job_t *info) data += sizeof(USHORT) + data_size; /* Trigger Data */ - TRACE("trigger_offset %04x, triggers end at %04lx\n", fixed->trigger_offset, - (DWORD)(fixed->trigger_offset + sizeof(USHORT) + info->trigger_count * sizeof(TASK_TRIGGER))); + TRACE("trigger_offset %04x, triggers end at %04Ix\n", fixed->trigger_offset, + fixed->trigger_offset + sizeof(USHORT) + info->trigger_count * sizeof(TASK_TRIGGER)); info->trigger_count = *(const USHORT *)data; TRACE("trigger_count %u\n", info->trigger_count);

1 0

[PATCH] dlls/mstask: don't cast size_t to DWORD in trace, use %I instead
by Eric Pouech April 7, 2022

April 7, 2022

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/mstask/task.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 23e9af7f0f37..72592b27c094 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -1396,8 +1396,8 @@ static HRESULT load_job_data(TaskImpl *This, BYTE *data, DWORD size) data += sizeof(USHORT) + data_size; /* Trigger Data */ - TRACE("trigger_offset %04x, triggers end at %04lx\n", fixed->trigger_offset, - (DWORD)(fixed->trigger_offset + sizeof(USHORT) + trigger_count * sizeof(TASK_TRIGGER))); + TRACE("trigger_offset %04x, triggers end at %04Ix\n", fixed->trigger_offset, + fixed->trigger_offset + sizeof(USHORT) + trigger_count * sizeof(TASK_TRIGGER)); task_trigger = (TASK_TRIGGER *)(data + sizeof(USHORT));

1 0

[PATCH] msvcrt: SSE2 implementation of memcmp for x86_64.
by Jan Sikorski April 7, 2022

April 7, 2022

Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- It's about 13x faster on my machine than the byte version. memcmp performance is important to wined3d, where it's used to find pipelines in the cache, and the keys are pretty big. --- dlls/msvcrt/string.c | 46 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 3b352ac0bf2..66761e7a282 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -34,6 +34,10 @@ #include "wine/asm.h" #include "wine/debug.h" +#ifdef __x86_64__ +#include <immintrin.h> +#endif + WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); /********************************************************************* @@ -2675,11 +2679,52 @@ int CDECL I10_OUTPUT(MSVCRT__LDOUBLE ld80, int prec, int flag, struct _I10_OUTPU } #undef I10_OUTPUT_MAX_PREC +#ifdef __x86_64__ +static int sse2_memcmp(const void *p1, const void *p2, size_t size) +{ + const unsigned char *first = p1, *second = p2; + size_t remainder = size & 0xf; + size_t size_16 = size / 16; + uint16_t mask; + DWORD index; + + while (size_16-- > 0) + { + __m128i value_1 = _mm_loadu_si128((__m128i *)first); + __m128i value_2 = _mm_loadu_si128((__m128i *)second); + __m128i compare = _mm_cmpeq_epi8(value_1, value_2); + if ((mask = ~_mm_movemask_epi8(compare))) + { + _BitScanForward(&index, mask); + if (first[index] < second[index]) return -1; + else return 1; + } + + first += 16; + second += 16; + } + + while (remainder-- > 0) + { + if (*first < *second) return -1; + if (*first > *second) return 1; + + first++; + second++; + } + + return 0; +} +#endif + /********************************************************************* * memcmp (MSVCRT.@) */ int __cdecl memcmp(const void *ptr1, const void *ptr2, size_t n) { +#ifdef __x86_64__ + return sse2_memcmp(ptr1, ptr2, n); +#else const unsigned char *p1, *p2; for (p1 = ptr1, p2 = ptr2; n; n--, p1++, p2++) @@ -2688,6 +2733,7 @@ int __cdecl memcmp(const void *ptr1, const void *ptr2, size_t n) if (*p1 > *p2) return 1; } return 0; +#endif } #if defined(__i386__) || defined(__x86_64__) -- 2.32.0

7 16

[PATCH v4 1/2] ncrypt: Implement NCryptIsAlgSupported.
by Mohamad Al-Jaf April 7, 2022

April 7, 2022

Microsoft Edge calls this function expecting an implementation. With this, Internet browsing works. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v3: - Retrieve a list using bitwise operation in BCryptEnumAlgorithms. - Use proper NTSTATUS. v4: - Return NTE_NOT_SUPPORTED for BCRYPT_RSA_SIGN_ALGORITHM after checking for bad flags. Sorry, I only realized to test this behavior after submitting the patch. I thought there would be no point in checking if the flags are bad if the algorithm isn't even supported to begin with. --- dlls/ncrypt/main.c | 44 +++++++++++++++++++++++++++++++++++++++-- dlls/ncrypt/ncrypt.spec | 2 +- include/ncrypt.h | 1 + 3 files changed, 44 insertions(+), 3 deletions(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index e12284e0867..10cec633269 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -416,8 +416,48 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H SECURITY_STATUS WINAPI NCryptIsAlgSupported(NCRYPT_PROV_HANDLE provider, const WCHAR *algid, DWORD flags) { - FIXME("(%#Ix, %s, %#lx): stub\n", provider, wine_dbgstr_w(algid), flags); - return NTE_NOT_SUPPORTED; + static const ULONG supported = BCRYPT_CIPHER_OPERATION |\ + BCRYPT_ASYMMETRIC_ENCRYPTION_OPERATION |\ + BCRYPT_SIGNATURE_OPERATION |\ + BCRYPT_SECRET_AGREEMENT_OPERATION; + BCRYPT_ALGORITHM_IDENTIFIER *list; + ULONG i, count; + NTSTATUS status; + + TRACE("(%#Ix, %s, %#lx)\n", provider, wine_dbgstr_w(algid), flags); + + if (!provider) return NTE_INVALID_HANDLE; + if (!algid) return HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER); + if (flags == NCRYPT_SILENT_FLAG) + { + FIXME("Silent flag not implemented\n"); + } + else if (flags) + { + WARN("Invalid flags %#lx\n", flags); + return NTE_BAD_FLAGS; + } + if (!lstrcmpiW(BCRYPT_RSA_SIGN_ALGORITHM, algid)) return NTE_NOT_SUPPORTED; + + status = BCryptEnumAlgorithms(supported, &count, &list, 0); + if (status != STATUS_SUCCESS) + { + ERR("Error retrieving algorithm list %#lx\n", status); + return map_ntstatus(status); + } + + status = STATUS_NOT_SUPPORTED; + for (i = 0; i < count; i++) + { + if (!lstrcmpiW(list[i].pszName, algid)) + { + status = STATUS_SUCCESS; + break; + } + } + + BCryptFreeBuffer(list); + return map_ntstatus(status); } BOOL WINAPI NCryptIsKeyHandle(NCRYPT_KEY_HANDLE hKey) diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index bb914616373..60b367260d5 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -77,7 +77,7 @@ @ stdcall NCryptGetProperty(ptr wstr ptr long ptr long) @ stub NCryptGetProtectionDescriptorInfo @ stdcall NCryptImportKey(long long wstr ptr ptr ptr long long) -@ stub NCryptIsAlgSupported(long wstr long) +@ stdcall NCryptIsAlgSupported(long wstr long) @ stdcall NCryptIsKeyHandle(long) @ stub NCryptKeyDerivation @ stub NCryptNotifyChangeKey diff --git a/include/ncrypt.h b/include/ncrypt.h index c09a1ec8676..18198fdc5bb 100644 --- a/include/ncrypt.h +++ b/include/ncrypt.h @@ -118,6 +118,7 @@ SECURITY_STATUS WINAPI NCryptFreeObject(NCRYPT_HANDLE); SECURITY_STATUS WINAPI NCryptGetProperty(NCRYPT_HANDLE, const WCHAR *, BYTE *, DWORD, DWORD *, DWORD); SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE, NCRYPT_KEY_HANDLE, const WCHAR *, NCryptBufferDesc *, NCRYPT_KEY_HANDLE *, BYTE *, DWORD, DWORD); +SECURITY_STATUS WINAPI NCryptIsAlgSupported(NCRYPT_PROV_HANDLE, const WCHAR *, DWORD); SECURITY_STATUS WINAPI NCryptOpenKey(NCRYPT_PROV_HANDLE, NCRYPT_KEY_HANDLE *, const WCHAR *, DWORD, DWORD); SECURITY_STATUS WINAPI NCryptOpenStorageProvider(NCRYPT_PROV_HANDLE *, const WCHAR *, DWORD); SECURITY_STATUS WINAPI NCryptSetProperty(NCRYPT_HANDLE, const WCHAR *, BYTE *, DWORD, DWORD); -- 2.35.1

1 1