September 2021 - Wine-Commits

Piotr Caban : oleacc: Remove WINAPI from accessible_create internal type.
by Alexandre Julliard Sept. 20, 2021

Sept. 20, 2021

Module: wine Branch: master Commit: aa63f9c9405fc089e5c82559f0513e8a79f2fbf9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa63f9c9405fc089e5c82559… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 20 18:03:46 2021 +0200 oleacc: Remove WINAPI from accessible_create internal type. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index beceb2ff1fb..db9f646988c 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -37,7 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(oleacc); static const WCHAR lresult_atom_prefix[] = {'w','i','n','e','_','o','l','e','a','c','c',':'}; -typedef HRESULT (WINAPI *accessible_create)(HWND, const IID*, void**); +typedef HRESULT (*accessible_create)(HWND, const IID*, void**); extern HRESULT WINAPI OLEACC_DllGetClassObject(REFCLSID, REFIID, void**) DECLSPEC_HIDDEN; extern BOOL WINAPI OLEACC_DllMain(HINSTANCE, DWORD, void*) DECLSPEC_HIDDEN;

1 0

Piotr Caban : oleacc: Add Window_OleWindow_GetWindow implementation.
by Alexandre Julliard Sept. 20, 2021

Sept. 20, 2021

Module: wine Branch: master Commit: 3e3a2be891fb583f2f1e298033c2a3da31af659e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e3a2be891fb583f2f1e2980… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 20 18:03:36 2021 +0200 oleacc: Add Window_OleWindow_GetWindow implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/tests/main.c | 12 ++++++------ dlls/oleacc/window.c | 12 +++++++++--- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 180113b29f9..7d1c376bc25 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -1039,8 +1039,8 @@ static void test_default_client_accessible_object(void) hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IOleWindow, (void**)&ow); ok(hr == S_OK, "got %x\n", hr); hr = IOleWindow_GetWindow(ow, &hwnd2); - todo_wine ok(hr == S_OK, "got %x\n", hr); - todo_wine ok(btn == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, btn); + ok(hr == S_OK, "got %x\n", hr); + ok(btn == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, btn); IOleWindow_Release(ow); hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IAccessible, (void**)&win); @@ -1064,8 +1064,8 @@ static void test_default_client_accessible_object(void) hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IOleWindow, (void**)&ow); ok(hr == S_OK, "got %x\n", hr); hr = IOleWindow_GetWindow(ow, &hwnd2); - todo_wine ok(hr == S_OK, "got %x\n", hr); - todo_wine ok(chld == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, chld); + ok(hr == S_OK, "got %x\n", hr); + ok(chld == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, chld); IOleWindow_Release(ow); hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IAccessible, (void**)&win); @@ -1088,8 +1088,8 @@ static void test_default_client_accessible_object(void) hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IOleWindow, (void**)&ow); ok(hr == S_OK, "got %x\n", hr); hr = IOleWindow_GetWindow(ow, &hwnd2); - todo_wine ok(hr == S_OK, "got %x\n", hr); - todo_wine ok(chld2 == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, chld2); + ok(hr == S_OK, "got %x\n", hr); + ok(chld2 == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, chld2); IOleWindow_Release(ow); hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IAccessible, (void**)&win); diff --git a/dlls/oleacc/window.c b/dlls/oleacc/window.c index 5957d49ef1f..387ed4bc9f7 100644 --- a/dlls/oleacc/window.c +++ b/dlls/oleacc/window.c @@ -31,6 +31,8 @@ typedef struct { IEnumVARIANT IEnumVARIANT_iface; LONG ref; + + HWND hwnd; } Window; static inline Window* impl_from_Window(IAccessible *iface) @@ -327,11 +329,14 @@ static ULONG WINAPI Window_OleWindow_Release(IOleWindow *iface) return IAccessible_Release(&This->IAccessible_iface); } -static HRESULT WINAPI Window_OleWindow_GetWindow(IOleWindow *iface, HWND *phwnd) +static HRESULT WINAPI Window_OleWindow_GetWindow(IOleWindow *iface, HWND *hwnd) { Window *This = impl_from_Window_OleWindow(iface); - FIXME("(%p)->(%p)\n", This, phwnd); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, hwnd); + + *hwnd = This->hwnd; + return S_OK; } static HRESULT WINAPI Window_OleWindow_ContextSensitiveHelp(IOleWindow *iface, BOOL fEnterMode) @@ -427,6 +432,7 @@ HRESULT create_window_object(HWND hwnd, const IID *iid, void **obj) window->IOleWindow_iface.lpVtbl = &WindowOleWindowVtbl; window->IEnumVARIANT_iface.lpVtbl = &WindowEnumVARIANTVtbl; window->ref = 1; + window->hwnd = hwnd; hres = IAccessible_QueryInterface(&window->IAccessible_iface, iid, obj); IAccessible_Release(&window->IAccessible_iface);

1 0

Zebediah Figura : winegcc: Correctly put the -munix manual section in its own paragraph.
by Alexandre Julliard Sept. 20, 2021

Sept. 20, 2021

Module: wine Branch: master Commit: 37ceea6451920e82b5a8c28d27dee1fb7f2c0229 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37ceea6451920e82b5a8c28d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Sep 19 22:13:24 2021 -0500 winegcc: Correctly put the -munix manual section in its own paragraph. Use a style consistent with the rest of the file. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.man.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/winegcc/winegcc.man.in b/tools/winegcc/winegcc.man.in index 831a98323cf..87c1496fd18 100644 --- a/tools/winegcc/winegcc.man.in +++ b/tools/winegcc/winegcc.man.in @@ -59,9 +59,8 @@ Set the default entry point of the application to be the Unicode This option adds -lgdi32, -lcomdlg32, and -lshell32 to the list of default libraries, and passes '--subsystem windows' to winebuild to build graphical applications. -.B \-munix +.IP \fB-munix\fR Set when building the Unix counterpart of a builtin module. -.TP .IP \fB-nodefaultlibs\fR Do not use the standard system libraries when linking. These include at a minimum -lkernel32, -luser32, -ladvapi32, and

1 0

Nikolay Sivov : ole32/tests: Add a test for IBindCtx::GetRunningObjectTable().
by Alexandre Julliard Sept. 20, 2021

Sept. 20, 2021

Module: wine Branch: master Commit: dd18a63b520b949259444d174c54b81f264432e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd18a63b520b949259444d17… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 20 13:08:44 2021 +0300 ole32/tests: Add a test for IBindCtx::GetRunningObjectTable(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/moniker.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 550ba802cfa..df4b5c7bc88 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -3240,6 +3240,7 @@ static void test_pointer_moniker(void) static void test_bind_context(void) { + IRunningObjectTable *rot, *rot2; HRESULT hr; IBindCtx *pBindCtx; IEnumString *pEnumString; @@ -3260,6 +3261,18 @@ static void test_bind_context(void) hr = CreateBindCtx(0, &pBindCtx); ok_ole_success(hr, "CreateBindCtx"); + hr = IBindCtx_GetRunningObjectTable(pBindCtx, NULL); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + + hr = IBindCtx_GetRunningObjectTable(pBindCtx, &rot); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = GetRunningObjectTable(0, &rot2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rot == rot2, "Unexpected ROT instance.\n"); + IRunningObjectTable_Release(rot); + IRunningObjectTable_Release(rot2); + bind_opts.cbStruct = -1; hr = IBindCtx_GetBindOptions(pBindCtx, (BIND_OPTS *)&bind_opts); ok_ole_success(hr, "IBindCtx_GetBindOptions");

1 0

Nikolay Sivov : ole32: Remove explicit type check in CommonPrefixWith() for item moniker.
by Alexandre Julliard Sept. 20, 2021

Sept. 20, 2021

Module: wine Branch: master Commit: 828a0ae6ea5ba2429a6954cb5e4e4c4c37bca063 URL: https://source.winehq.org/git/wine.git/?a=commit;h=828a0ae6ea5ba2429a6954cb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 20 13:08:46 2021 +0300 ole32: Remove explicit type check in CommonPrefixWith() for item moniker. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/itemmoniker.c | 28 ++++++++-------------------- dlls/ole32/tests/moniker.c | 30 +++++++++++++++++++++++++++++- 2 files changed, 37 insertions(+), 21 deletions(-) diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c index 786d183d598..c42cc75c224 100644 --- a/dlls/ole32/itemmoniker.c +++ b/dlls/ole32/itemmoniker.c @@ -753,31 +753,19 @@ static HRESULT WINAPI ItemMonikerImpl_Inverse(IMoniker* iface,IMoniker** ppmk) return CreateAntiMoniker(ppmk); } -/****************************************************************************** - * ItemMoniker_CommonPrefixWith - ******************************************************************************/ -static HRESULT WINAPI ItemMonikerImpl_CommonPrefixWith(IMoniker* iface,IMoniker* pmkOther,IMoniker** ppmkPrefix) +static HRESULT WINAPI ItemMonikerImpl_CommonPrefixWith(IMoniker *iface, IMoniker *other, + IMoniker **prefix) { - DWORD mkSys; - - TRACE("(%p,%p)\n", pmkOther, ppmkPrefix); - - IMoniker_IsSystemMoniker(pmkOther,&mkSys); - /* If the other moniker is an item moniker that is equal to this moniker, this method sets *ppmkPrefix */ - /* to this moniker and returns MK_S_US */ - - if((mkSys==MKSYS_ITEMMONIKER) && (IMoniker_IsEqual(iface,pmkOther)==S_OK) ){ - - *ppmkPrefix=iface; + TRACE("%p, %p, %p\n", iface, other, prefix); + if (IMoniker_IsEqual(iface, other) == S_OK) + { + *prefix = iface; IMoniker_AddRef(iface); - return MK_S_US; } - else - /* otherwise, the method calls the MonikerCommonPrefixWith function. This function correctly handles */ - /* the case where the other moniker is a generic composite. */ - return MonikerCommonPrefixWith(iface,pmkOther,ppmkPrefix); + + return MonikerCommonPrefixWith(iface, other, prefix); } /****************************************************************************** diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index df4b5c7bc88..b584f370d70 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -2276,7 +2276,7 @@ static void test_item_moniker(void) "Moniker_IsRunning", NULL }; - IMoniker *moniker, *moniker2, *reduced, *anti, *inverse; + IMoniker *moniker, *moniker2, *moniker3, *reduced, *anti, *inverse; DWORD i, hash, eaten, cookie; HRESULT hr; IBindCtx *bindctx; @@ -2611,6 +2611,34 @@ todo_wine IMoniker_Release(anti); IMoniker_Release(moniker); + + /* CommonPrefixWith */ + hr = CreateItemMoniker(L"!", L"Item", &moniker); + ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr); + hr = CreateItemMoniker(L"#", L"Item", &moniker2); + ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr); + + hr = IMoniker_CommonPrefixWith(moniker, moniker2, &moniker3); + ok(hr == MK_S_US, "Unexpected hr %#x.\n", hr); + ok(moniker3 == moniker, "Unexpected object.\n"); + IMoniker_Release(moniker3); + + IMoniker_Release(moniker2); + + hr = CreateItemMoniker(L"!", L"Item2", &moniker2); + ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr); + + moniker3 = (void *)0xdeadbeef; + hr = IMoniker_CommonPrefixWith(moniker, moniker2, &moniker3); +todo_wine +{ + ok(hr == MK_E_NOPREFIX, "Unexpected hr %#x.\n", hr); + ok(!moniker3, "Unexpected object.\n"); +} + + IMoniker_Release(moniker2); + + IMoniker_Release(moniker); } static void stream_write_dword(IStream *stream, DWORD value)

1 0

Nikolay Sivov : ole32: Remove unnecessary helpers to create/destroy bind context.
by Alexandre Julliard Sept. 20, 2021

Sept. 20, 2021

Module: wine Branch: master Commit: 1a6659e8e40dcb779a540bc8a6bbbc4beb2cfb5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a6659e8e40dcb779a540bc8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 20 13:08:45 2021 +0300 ole32: Remove unnecessary helpers to create/destroy bind context. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/bindctx.c | 111 +++++++++++++-------------------------------------- 1 file changed, 27 insertions(+), 84 deletions(-) diff --git a/dlls/ole32/bindctx.c b/dlls/ole32/bindctx.c index 24229568f18..261c6b01c67 100644 --- a/dlls/ole32/bindctx.c +++ b/dlls/ole32/bindctx.c @@ -30,6 +30,7 @@ #include "objbase.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); @@ -112,41 +113,21 @@ static ULONG WINAPI BindCtxImpl_AddRef(IBindCtx* iface) return InterlockedIncrement(&This->ref); } -/****************************************************************************** - * BindCtx_Destroy (local function) - *******************************************************************************/ -static HRESULT BindCtxImpl_Destroy(BindCtxImpl* This) -{ - TRACE("(%p)\n",This); - - /* free the table space memory */ - HeapFree(GetProcessHeap(),0,This->bindCtxTable); - - /* free the bindctx structure */ - HeapFree(GetProcessHeap(),0,This); - - return S_OK; -} - -/****************************************************************************** - * BindCtx_Release - ******************************************************************************/ static ULONG WINAPI BindCtxImpl_Release(IBindCtx* iface) { - BindCtxImpl *This = impl_from_IBindCtx(iface); - ULONG ref; + BindCtxImpl *context = impl_from_IBindCtx(iface); + ULONG refcount = InterlockedDecrement(&context->ref); - TRACE("(%p)\n",This); + TRACE("%p refcount %d.\n", iface, refcount); - ref = InterlockedDecrement(&This->ref); - if (ref == 0) + if (!refcount) { - /* release all registered objects */ - BindCtxImpl_ReleaseBoundObjects(&This->IBindCtx_iface); - - BindCtxImpl_Destroy(This); + BindCtxImpl_ReleaseBoundObjects(&context->IBindCtx_iface); + heap_free(context->bindCtxTable); + heap_free(context); } - return ref; + + return refcount; } @@ -487,8 +468,6 @@ static HRESULT BindCtxImpl_ExpandTable(BindCtxImpl *This) return S_OK; } - -/* Virtual function table for the BindCtx class. */ static const IBindCtxVtbl VT_BindCtxImpl = { BindCtxImpl_QueryInterface, @@ -506,74 +485,38 @@ static const IBindCtxVtbl VT_BindCtxImpl = BindCtxImpl_RevokeObjectParam }; -/****************************************************************************** - * BindCtx_Construct (local function) - *******************************************************************************/ -static HRESULT BindCtxImpl_Construct(BindCtxImpl* This) -{ - TRACE("(%p)\n",This); - - /* Initialize the virtual function table.*/ - This->IBindCtx_iface.lpVtbl = &VT_BindCtxImpl; - This->ref = 0; - - memset(&This->options, 0, sizeof(This->options)); - This->options.cbStruct = sizeof(This->options); - This->options.grfMode = STGM_READWRITE; - This->options.dwClassContext = CLSCTX_SERVER; - This->options.locale = GetThreadLocale(); - - /* Initialize the bindctx table */ - This->bindCtxTableSize=0; - This->bindCtxTableLastIndex=0; - This->bindCtxTable = NULL; - - return S_OK; -} - /****************************************************************************** * CreateBindCtx (OLE32.@) - * - * Creates a bind context. A bind context encompasses information and options - * used when binding to a moniker. - * - * PARAMS - * reserved [I] Reserved. Set to 0. - * ppbc [O] Address that receives the bind context object. - * - * RETURNS - * Success: S_OK. - * Failure: Any HRESULT code. */ -HRESULT WINAPI CreateBindCtx(DWORD reserved, LPBC * ppbc) +HRESULT WINAPI CreateBindCtx(DWORD reserved, IBindCtx **bind_context) { - BindCtxImpl* newBindCtx; - HRESULT hr; + BindCtxImpl *object; - TRACE("(%d,%p)\n",reserved,ppbc); + TRACE("%#x, %p\n", reserved, bind_context); - if (!ppbc) return E_INVALIDARG; + if (!bind_context) return E_INVALIDARG; - *ppbc = NULL; + *bind_context = NULL; - if (reserved != 0) + if (reserved) { - ERR("reserved should be 0, not 0x%x\n", reserved); + WARN("reserved should be 0, not 0x%x\n", reserved); return E_INVALIDARG; } - newBindCtx = HeapAlloc(GetProcessHeap(), 0, sizeof(BindCtxImpl)); - if (newBindCtx == 0) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; - hr = BindCtxImpl_Construct(newBindCtx); - if (FAILED(hr)) - { - HeapFree(GetProcessHeap(),0,newBindCtx); - return hr; - } + object->IBindCtx_iface.lpVtbl = &VT_BindCtxImpl; + object->ref = 1; + object->options.cbStruct = sizeof(object->options); + object->options.grfMode = STGM_READWRITE; + object->options.dwClassContext = CLSCTX_SERVER; + object->options.locale = GetThreadLocale(); - return BindCtxImpl_QueryInterface(&newBindCtx->IBindCtx_iface,&IID_IBindCtx,(void**)ppbc); + *bind_context = &object->IBindCtx_iface; + + return S_OK; } /******************************************************************************

1 0

Jacek Caban : gdi32: Move CreateScalableFontResourceW to text.c.
by Alexandre Julliard Sept. 20, 2021

Sept. 20, 2021

Module: wine Branch: master Commit: 0d35d2aa19d562dea8b62405fba01a37d0daf7a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d35d2aa19d562dea8b62405… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 20 13:14:14 2021 +0200 gdi32: Move CreateScalableFontResourceW to text.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 248 +--------------------------------------------- dlls/gdi32/gdi_private.h | 2 + dlls/gdi32/text.c | 251 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 257 insertions(+), 244 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0d35d2aa19d562dea8b6…

1 0

Jacek Caban : gdi32: Move load_script_name call to EnumFontFamiliesExW.
by Alexandre Julliard Sept. 20, 2021

Sept. 20, 2021

Module: wine Branch: master Commit: c5d71400546706f9fa38275a629ec1a8c8fc9b07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5d71400546706f9fa38275a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 20 13:13:47 2021 +0200 gdi32: Move load_script_name call to EnumFontFamiliesExW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 32 ++++---------------------------- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/text.c | 25 +++++++++++++++++++++++++ 3 files changed, 31 insertions(+), 28 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 839244545cb..95a6bad3b92 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -32,7 +32,6 @@ #include "winternl.h" #include "winreg.h" #include "ntgdi_private.h" -#include "resource.h" #include "wine/exception.h" #include "wine/heap.h" #include "wine/rbtree.h" @@ -2589,29 +2588,6 @@ struct enum_charset DWORD script; }; -static int load_script_name( UINT id, WCHAR buffer[LF_FACESIZE] ) -{ - HRSRC rsrc; - HGLOBAL hMem; - WCHAR *p; - int i; - - id += IDS_FIRST_SCRIPT; - rsrc = FindResourceW( gdi32_module, (LPCWSTR)(ULONG_PTR)((id >> 4) + 1), (LPCWSTR)6 /*RT_STRING*/ ); - if (!rsrc) return 0; - hMem = LoadResource( gdi32_module, rsrc ); - if (!hMem) return 0; - - p = LockResource( hMem ); - id &= 0x000f; - while (id--) p += *p + 1; - - i = min(LF_FACESIZE - 1, *p); - memcpy(buffer, p + 1, i * sizeof(WCHAR)); - buffer[i] = 0; - return i; -} - static BOOL is_complex_script_ansi_cp( UINT ansi_cp ) { return (ansi_cp == 874 /* Thai */ @@ -2678,7 +2654,7 @@ static DWORD create_enum_charset_list(DWORD charset, struct enum_charset *list) { list->mask = ~mask; list->charset = DEFAULT_CHARSET; - list->script = IDS_OTHER - IDS_FIRST_SCRIPT; + list->script = 33; /* other */ list++; } } @@ -2834,7 +2810,7 @@ static BOOL enum_face_charsets( const struct gdi_font_family *family, struct gdi if (face->fs.fsCsb[0] == 0) /* OEM */ { elf.elfLogFont.lfCharSet = ntm.ntmTm.tmCharSet = OEM_CHARSET; - load_script_name( IDS_OEM_DOS - IDS_FIRST_SCRIPT, elf.elfScript ); + elf.elfScript[0] = 32; i = count; /* break out of loop after enumeration */ } else @@ -2843,8 +2819,8 @@ static BOOL enum_face_charsets( const struct gdi_font_family *family, struct gdi /* use the DEFAULT_CHARSET case only if no other charset is present */ if (list[i].charset == DEFAULT_CHARSET && (face->fs.fsCsb[0] & ~list[i].mask)) continue; elf.elfLogFont.lfCharSet = ntm.ntmTm.tmCharSet = list[i].charset; - load_script_name( list[i].script, elf.elfScript ); - if (!elf.elfScript[0]) FIXME("Unknown elfscript for id %u\n", list[i].script); + /* caller may fill elfScript with the actual string, see load_script_name */ + elf.elfScript[0] = list[i].script; } TRACE( "face %s full %s style %s charset = %d type %d script %s it %d weight %d ntmflags %08x\n", debugstr_w(elf.elfLogFont.lfFaceName), debugstr_w(elf.elfFullName), debugstr_w(elf.elfStyle), diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 238ae3b7de1..cf09cf85ad4 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -299,4 +299,6 @@ static inline int get_dib_info_size( const BITMAPINFO *info, UINT coloruse ) return FIELD_OFFSET( BITMAPINFO, bmiColors[info->bmiHeader.biClrUsed] ); } +extern HMODULE gdi32_module DECLSPEC_HIDDEN; + #endif /* __WINE_GDI_PRIVATE_H */ diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index 4037eaa4b65..641c15aab70 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -54,6 +54,7 @@ #include "usp10.h" #include "wine/debug.h" #include "gdi_private.h" +#include "resource.h" WINE_DEFAULT_DEBUG_CHANNEL(bidi); @@ -2037,6 +2038,29 @@ BOOL WINAPI GdiRealizationInfo( HDC hdc, struct realization_info *info ) return TRUE; } +static void load_script_name( UINT id, WCHAR buffer[LF_FACESIZE] ) +{ + HRSRC rsrc; + HGLOBAL hMem; + WCHAR *p; + int i; + + id += IDS_FIRST_SCRIPT; + buffer[0] = 0; + rsrc = FindResourceW( gdi32_module, (LPCWSTR)(ULONG_PTR)((id >> 4) + 1), (LPCWSTR)6 /*RT_STRING*/ ); + if (!rsrc) return; + hMem = LoadResource( gdi32_module, rsrc ); + if (!hMem) return; + + p = LockResource( hMem ); + id &= 0x000f; + while (id--) p += *p + 1; + + i = min( LF_FACESIZE - 1, *p ); + memcpy( buffer, p + 1, i * sizeof(WCHAR) ); + buffer[i] = 0; +} + /*********************************************************************** * EnumFontFamiliesExW (GDI32.@) */ @@ -2072,6 +2096,7 @@ INT WINAPI EnumFontFamiliesExW( HDC hdc, LOGFONTW *lf, FONTENUMPROCW efproc, count /= sizeof(*entries); for (i = 0; ret && i < count; i++) { + load_script_name( entries[i].lf.elfScript[0], entries[i].lf.elfScript ); ret = efproc( (const LOGFONTW *)&entries[i].lf, (const TEXTMETRICW *)&entries[i].tm, entries[i].type, lparam ); }

1 0

Nikolay Sivov : ole32/tests: Get rid of some global variables in moniker tests.
by Alexandre Julliard Sept. 20, 2021

Sept. 20, 2021

Module: wine Branch: master Commit: 9253ef3963f90808da5ed8b0d7e7f635525c5239 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9253ef3963f90808da5ed8b0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 20 13:08:43 2021 +0300 ole32/tests: Get rid of some global variables in moniker tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/moniker.c | 223 +++++++++++++++++++++++---------------------- 1 file changed, 113 insertions(+), 110 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9253ef3963f90808da5e…

1 0

Alexandre Julliard : makefiles: Link with the full library name for Unix library imports.
by Alexandre Julliard Sept. 20, 2021

Sept. 20, 2021

Module: wine Branch: master Commit: eda25a58c5e886bde89cce6b05c299646a0a667e URL: https://source.winehq.org/git/wine.git/?a=commit;h=eda25a58c5e886bde89cce6b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 20 15:30:27 2021 +0200 makefiles: Link with the full library name for Unix library imports. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index acc3dc67e25..7a3b55421aa 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2111,6 +2111,18 @@ static const char *get_static_lib( const struct makefile *make, const char *name } +/******************************************************************* + * get_native_unix_lib + */ +static const char *get_native_unix_lib( const struct makefile *make, const char *name ) +{ + if (!make->unixlib) return NULL; + if (strncmp( make->unixlib, name, strlen(name) )) return NULL; + if (make->unixlib[strlen(name)] != '.') return NULL; + return obj_dir_path( make, make->unixlib ); +} + + /******************************************************************* * get_parent_makefile */ @@ -2162,13 +2174,15 @@ static int needs_implib_symlink( const struct makefile *make ) /******************************************************************* * add_unix_libraries */ -static struct strarray add_unix_libraries( const struct makefile *make, struct strarray *deps ) +static struct strarray add_unix_libraries( const struct makefile *make, struct strarray *deps, + int native_unix ) { struct strarray ret = empty_strarray; struct strarray all_libs = empty_strarray; unsigned int i, j; strarray_add( &all_libs, "-lwine_port" ); + if (native_unix && strcmp( make->module, "ntdll.dll" )) strarray_add( &all_libs, "-lntdll" ); strarray_addall( &all_libs, get_expanded_make_var_array( make, "EXTRALIBS" )); strarray_addall( &all_libs, libs ); @@ -2182,6 +2196,9 @@ static struct strarray add_unix_libraries( const struct makefile *make, struct s for (j = 0; j < subdirs.count; j++) if ((lib = get_static_lib( submakes[j], name ))) break; + if (!lib && native_unix) + for (j = 0; j < subdirs.count; j++) + if ((lib = get_native_unix_lib( submakes[j], name ))) break; } if (lib) @@ -3325,7 +3342,7 @@ static void output_module( struct makefile *make ) } else if (*dll_ext) { - if (!make->use_msvcrt) strarray_addall( &all_libs, add_unix_libraries( make, &dep_libs )); + if (!make->use_msvcrt) strarray_addall( &all_libs, add_unix_libraries( make, &dep_libs, 0 )); for (i = 0; i < make->delayimports.count; i++) strarray_add( &all_libs, strmake( "-Wl,-delayload,%s%s", make->delayimports.str[i], strchr( make->delayimports.str[i], '.' ) ? "" : ".dll" )); @@ -3339,7 +3356,7 @@ static void output_module( struct makefile *make ) } else { - strarray_addall( &all_libs, add_unix_libraries( make, &dep_libs )); + strarray_addall( &all_libs, add_unix_libraries( make, &dep_libs, 0 )); strarray_add( &make->all_targets, make->module ); add_install_rule( make, make->module, make->module, strmake( "p$(%s)/%s", spec_file ? "dlldir" : "bindir", make->module )); @@ -3376,15 +3393,7 @@ static void output_module( struct makefile *make ) struct strarray extra_libs = get_expanded_make_var_array( make, "EXTRALIBS" ); int native_unix_lib = strarray_exists( &extra_libs, "-Wl,--subsystem,unixlib" ); - if (native_unix_lib) - { - if (strcmp( make->module, "ntdll.dll" )) - { - strarray_add( &unix_libs, "-lntdll" ); - strarray_add( &unix_deps, obj_dir_path( top_makefile, "dlls/ntdll/ntdll.so" )); - } - } - else + if (!native_unix_lib) { struct strarray unix_imports = empty_strarray; @@ -3399,7 +3408,7 @@ static void output_module( struct makefile *make ) strarray_addall( &unix_libs, add_import_libs( make, &unix_deps, unix_imports, 0, 1 )); } - strarray_addall( &unix_libs, add_unix_libraries( make, &unix_deps )); + strarray_addall( &unix_libs, add_unix_libraries( make, &unix_deps, native_unix_lib )); strarray_add( &make->all_targets, make->unixlib ); add_install_rule( make, make->module, make->unixlib, strmake( "p%s/%s", so_dir, make->unixlib )); @@ -3546,7 +3555,7 @@ static void output_shared_lib( struct makefile *make ) strarray_addall( &dep_libs, get_local_dependencies( make, basename, make->in_files )); strarray_addall( &all_libs, get_expanded_file_local_var( make, basename, "LDFLAGS" )); - strarray_addall( &all_libs, add_unix_libraries( make, &dep_libs )); + strarray_addall( &all_libs, add_unix_libraries( make, &dep_libs, 0 )); output( "%s:", obj_dir_path( make, make->sharedlib )); output_filenames_obj_dir( make, make->object_files ); @@ -3660,7 +3669,7 @@ static void output_programs( struct makefile *make ) if (!objs.count) objs = make->object_files; if (!strarray_exists( &all_libs, "-nodefaultlibs" )) - strarray_addall( &all_libs, add_unix_libraries( make, &deps )); + strarray_addall( &all_libs, add_unix_libraries( make, &deps, 0 )); output( "%s:", obj_dir_path( make, program ) ); output_filenames_obj_dir( make, objs );

1 0