August 2021 - Wine-commits - list.winehq.org

Jacek Caban : gdi32: Use ntgdi names for a few more font functions.
by Alexandre Julliard 30 Aug '21

30 Aug '21

Module: wine Branch: master Commit: e7814627be0faeff062d78112fca5b7068a873a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7814627be0faeff062d7811… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 30 13:54:30 2021 +0200 gdi32: Use ntgdi names for a few more font functions. 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 | 43 +++++++++++++++++-------------------------- dlls/gdi32/gdi32.spec | 12 ++++++------ dlls/gdi32/ntgdi_private.h | 20 -------------------- include/ntgdi.h | 34 ++++++++++++++++++++++++++++++++++ 4 files changed, 57 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e7814627be0faeff062d…

1 0

Piotr Caban : concrt140: Avoid forwarding to msvcp120 by duplicating msvcp90/details.c.
by Alexandre Julliard 30 Aug '21

30 Aug '21

Module: wine Branch: master Commit: 05235df044157f23174860aa27680eec3aa960bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=05235df044157f23174860aa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Aug 28 19:28:18 2021 +0200 concrt140: Avoid forwarding to msvcp120 by duplicating msvcp90/details.c. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/Makefile.in | 3 +- dlls/concrt140/concrt140.c | 64 ++- dlls/concrt140/concrt140.spec | 110 ++-- dlls/concrt140/details.c | 1112 +++++++++++++++++++++++++++++++++++++++++ dlls/concrt140/details.h | 35 ++ dlls/msvcp90/details.c | 2 + 6 files changed, 1264 insertions(+), 62 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=05235df044157f231748…

1 0

Zebediah Figura : shlwapi/tests: Use the public definition of DATABLOCK_HEADER.
by Alexandre Julliard 30 Aug '21

30 Aug '21

Module: wine Branch: master Commit: cc588ac8b1c21974044b80995a81ccdbd9e251e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc588ac8b1c21974044b8099… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Aug 28 17:10:45 2021 -0500 shlwapi/tests: Use the public definition of DATABLOCK_HEADER. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/clist.c | 121 +++++++++++++++++++++------------------------ 1 file changed, 57 insertions(+), 64 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cc588ac8b1c21974044b…

1 0

Zebediah Figura : shlwapi/tests: Use Wine names for ordinal functions.
by Alexandre Julliard 30 Aug '21

30 Aug '21

Module: wine Branch: master Commit: 00df0edb15dfc87178e977c370d0f9c184c5c372 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00df0edb15dfc87178e977c3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Aug 28 17:10:46 2021 -0500 shlwapi/tests: Use Wine names for ordinal functions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/clist.c | 153 ++++++++++++++++++++++----------------------- dlls/shlwapi/tests/clsid.c | 27 ++++---- 2 files changed, 88 insertions(+), 92 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=00df0edb15dfc87178e9…

1 0

Hermès Bélusca-Maïto : shlwapi: SHAddDataBlock() returns BOOL, not HRESULT.
by Alexandre Julliard 30 Aug '21

30 Aug '21

Module: wine Branch: master Commit: 2b37b075a6924cb1d4c6c0b7de59ff3c51dcf9eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b37b075a6924cb1d4c6c0b7… Author: Hermès Bélusca-Maïto <hermes.belusca(a)sfr.fr> Date: Sat Aug 28 17:10:47 2021 -0500 shlwapi: SHAddDataBlock() returns BOOL, not HRESULT. Signed-off-by: Hermès Bélusca-Maïto <hermes.belusca(a)sfr.fr> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/clist.c | 10 +++++----- dlls/shlwapi/tests/clist.c | 20 +++++++++++--------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/dlls/shlwapi/clist.c b/dlls/shlwapi/clist.c index 52bee37c9e4..47bd8d7392f 100644 --- a/dlls/shlwapi/clist.c +++ b/dlls/shlwapi/clist.c @@ -65,7 +65,7 @@ static inline LPDATABLOCK_HEADER NextItem(LPDBLIST lpList) * the call returns S_OK but does not actually add the element. * See SHWriteDataBlockList. */ -HRESULT WINAPI SHAddDataBlock(LPDBLIST* lppList, const DATABLOCK_HEADER *lpNewItem) +BOOL WINAPI SHAddDataBlock(LPDBLIST* lppList, const DATABLOCK_HEADER *lpNewItem) { LPDATABLOCK_HEADER lpInsertAt = NULL; ULONG ulSize; @@ -73,11 +73,11 @@ HRESULT WINAPI SHAddDataBlock(LPDBLIST* lppList, const DATABLOCK_HEADER *lpNewIt TRACE("(%p,%p)\n", lppList, lpNewItem); if(!lppList || !lpNewItem ) - return E_INVALIDARG; + return FALSE; if (lpNewItem->cbSize < sizeof(DATABLOCK_HEADER) || lpNewItem->dwSignature == CLIST_ID_CONTAINER) - return S_OK; + return FALSE; ulSize = lpNewItem->cbSize; @@ -134,9 +134,9 @@ HRESULT WINAPI SHAddDataBlock(LPDBLIST* lppList, const DATABLOCK_HEADER *lpNewIt lpInsertAt = NextItem(lpInsertAt); lpInsertAt->cbSize = 0; - return lpNewItem->cbSize; + return TRUE; } - return S_OK; + return FALSE; } /************************************************************************* diff --git a/dlls/shlwapi/tests/clist.c b/dlls/shlwapi/tests/clist.c index 8c63f31af7b..0c914d608e5 100644 --- a/dlls/shlwapi/tests/clist.c +++ b/dlls/shlwapi/tests/clist.c @@ -289,6 +289,7 @@ static void test_CList(void) DATABLOCK_HEADER *inserted; BYTE buff[64]; unsigned int i; + BOOL ret; if (!pSHWriteDataBlockList || !pSHReadDataBlockList || !pSHFreeDataBlockList || !pSHAddDataBlock || !pSHRemoveDataBlock || !pSHFindDataBlock) @@ -304,10 +305,10 @@ static void test_CList(void) for (i = 0; i < item->cbSize; i++) buff[sizeof(DATABLOCK_HEADER) + i] = i * 2; - hRet = pSHAddDataBlock(&list, inserted); - ok(hRet > S_OK, "failed list add\n"); + ret = pSHAddDataBlock(&list, inserted); + ok(ret == TRUE, "got %d\n", ret); - if (hRet > S_OK) + if (ret == TRUE) { ok(list && list->cbSize, "item not added\n"); @@ -381,10 +382,11 @@ static void test_CList(void) inserted->cbSize = sizeof(DATABLOCK_HEADER) - 1; inserted->dwSignature = 33; - /* The call succeeds but the item is not inserted, except on some early - * versions which return failure. Wine behaves like later versions. - */ - pSHAddDataBlock(&list, inserted); + ret = pSHAddDataBlock(NULL, inserted); + ok(!ret, "got %d\n", ret); + + ret = pSHAddDataBlock(&list, inserted); + ok(!ret, "got %d\n", ret); inserted = pSHFindDataBlock(list, 33); ok(inserted == NULL, "inserted bad element size\n"); @@ -393,8 +395,8 @@ static void test_CList(void) inserted->cbSize = 44; inserted->dwSignature = ~0U; - /* See comment above, some early versions fail this call */ - pSHAddDataBlock(&list, inserted); + ret = pSHAddDataBlock(&list, inserted); + ok(!ret, "got %d\n", ret); item = clist_items;

1 0

Esme Povirk : mscoree: Always base the config file path on the main exe.
by Alexandre Julliard 30 Aug '21

30 Aug '21

Module: wine Branch: master Commit: 052113c0b6d076019e9e2ba5e0641caed68d041d URL: https://source.winehq.org/git/wine.git/?a=commit;h=052113c0b6d076019e9e2ba5… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Aug 27 15:20:25 2021 -0500 mscoree: Always base the config file path on the main exe. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/corruntimehost.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 51522c57d83..d47492b7d4d 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -137,7 +137,7 @@ static void domain_restore(MonoDomain *prev_domain) static HRESULT RuntimeHost_GetDefaultDomain(RuntimeHost *This, const WCHAR *config_path, MonoDomain **result) { - WCHAR config_dir[MAX_PATH]; + WCHAR exe_config[MAX_PATH]; WCHAR base_dir[MAX_PATH]; char *base_dirA, *config_pathA, *slash; HRESULT res=S_OK; @@ -151,18 +151,10 @@ static HRESULT RuntimeHost_GetDefaultDomain(RuntimeHost *This, const WCHAR *conf if (!config_path) { - DWORD len = ARRAY_SIZE(config_dir); + GetModuleFileNameW(NULL, exe_config, MAX_PATH); + lstrcatW(exe_config, L".config"); - static const WCHAR machine_configW[] = {'\\','C','O','N','F','I','G','\\','m','a','c','h','i','n','e','.','c','o','n','f','i','g',0}; - - res = ICLRRuntimeInfo_GetRuntimeDirectory(&This->version->ICLRRuntimeInfo_iface, - config_dir, &len); - if (FAILED(res)) - goto end; - - lstrcatW(config_dir, machine_configW); - - config_path = config_dir; + config_path = exe_config; } config_pathA = WtoA(config_path);

1 0

Michael Stefaniuc : dbghelp: Remove superfluous casts to self.
by Alexandre Julliard 30 Aug '21

30 Aug '21

Module: wine Branch: master Commit: e1e761d55fd3b5143ff3b10541006a04bdf8f64e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1e761d55fd3b5143ff3b105… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Aug 27 22:46:36 2021 +0200 dbghelp: Remove superfluous casts to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 2 +- dlls/dbghelp/module.c | 2 +- dlls/dbghelp/pe_module.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 53274c4f597..ad9f5ec4fdf 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -3167,7 +3167,7 @@ static ULONG_PTR eval_expression(const struct module* module, struct cpu_stack_w case 1: stack[sp] = *(unsigned char*)&tmp; break; case 2: stack[sp] = *(unsigned short*)&tmp; break; case 4: stack[sp] = *(unsigned int*)&tmp; break; - case 8: stack[sp] = *(ULONG_PTR*)&tmp; break; /* FIXME: won't work on 32bit platform */ + case 8: stack[sp] = tmp; break; /* FIXME: won't work on 32bit platform */ default: FIXME("Unknown size for deref 0x%lx\n", sz); } break; diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 247aadcef0e..0a4d3c0b145 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -677,7 +677,7 @@ BOOL image_check_alternate(struct image_file_map* fmap, const struct module* mod const char* dbg_link; found = TRUE; - dbg_link = (const char*)image_map_section(&debuglink_sect); + dbg_link = image_map_section(&debuglink_sect); if (dbg_link != IMAGE_NO_MAP) { /* The content of a debug link section is: diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 5849b33a244..f0ca20e5e4f 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -428,7 +428,7 @@ static BOOL pe_load_coff_symbol_table(struct module* module) if (!fmap->u.pe.ntheader.FileHeader.PointerToSymbolTable || !numsym) return TRUE; if (!(mapping = pe_map_full(fmap, NULL))) return FALSE; - isym = (const IMAGE_SYMBOL*)((const char*)mapping + fmap->u.pe.ntheader.FileHeader.PointerToSymbolTable); + isym = (const IMAGE_SYMBOL*)(mapping + fmap->u.pe.ntheader.FileHeader.PointerToSymbolTable); /* FIXME: no way to get strtable size */ strtable = (const char*)&isym[numsym]; sect = IMAGE_FIRST_SECTION(RtlImageNtHeader((HMODULE)mapping));

1 0

Michael Stefaniuc : riched20/tests: Don't cast NULL.
by Alexandre Julliard 30 Aug '21

30 Aug '21

Module: wine Branch: master Commit: b701c3df99fbd6d4df7eaa11327bb11db95d8676 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b701c3df99fbd6d4df7eaa11… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Aug 27 22:46:37 2021 +0200 riched20/tests: Don't cast NULL. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/richole.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index d5a9844b1fc..9449c6b58cc 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -3323,7 +3323,7 @@ static void test_InsertObject(void) received_reo.polesite = (IOleClientSite *)0xdeadbeef; hr = IRichEditOle_GetObject(reole, 2, &received_reo, REO_GETOBJ_NO_INTERFACES); ok(hr == S_OK, "IRichEditOle_GetObject failed: 0x%08x\n", hr); - ok(received_reo.polesite == (IOleClientSite *)NULL, "Got wrong site interface.\n"); + ok(received_reo.polesite == NULL, "Got wrong site interface.\n"); CHECK_REOBJECT_STRUCT(reole, REO_IOB_USE_CP, REO_GETOBJ_ALL_INTERFACES, 0, NULL, NULL, reo1.polesite, 1); CHECK_REOBJECT_STRUCT(reole, REO_IOB_USE_CP, REO_GETOBJ_ALL_INTERFACES, 1, NULL, NULL, reo3.polesite, 3);

1 0

Nikolay Sivov : comctl32/listview: Remove description headers from Edit box helpers.
by Alexandre Julliard 30 Aug '21

30 Aug '21

Module: wine Branch: master Commit: 8df5e1bc5c72e4ea660d0af15572daf156bf6747 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8df5e1bc5c72e4ea660d0af1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 29 13:45:29 2021 +0300 comctl32/listview: Remove description headers from Edit box helpers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 63 ------------------------------------------------ 1 file changed, 63 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 8cbfee834ce..41e3db5f9be 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -5966,20 +5966,6 @@ cleanup: return res; } -/*** - * DESCRIPTION: - * Subclassed edit control windproc function - * - * PARAMETER(S): - * [I] hwnd : the edit window handle - * [I] uMsg : the message that is to be processed - * [I] wParam : first message parameter - * [I] lParam : second message parameter - * [I] isW : TRUE if input is Unicode - * - * RETURN: - * Zero. - */ static LRESULT EditLblWndProcT(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL isW) { LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongPtrW(GetParent(hwnd), 0); @@ -6022,52 +6008,16 @@ static LRESULT EditLblWndProcT(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPara return 0; } -/*** - * DESCRIPTION: - * Subclassed edit control Unicode windproc function - * - * PARAMETER(S): - * [I] hwnd : the edit window handle - * [I] uMsg : the message that is to be processed - * [I] wParam : first message parameter - * [I] lParam : second message parameter - * - * RETURN: - */ static LRESULT CALLBACK EditLblWndProcW(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { return EditLblWndProcT(hwnd, uMsg, wParam, lParam, TRUE); } -/*** - * DESCRIPTION: - * Subclassed edit control ANSI windproc function - * - * PARAMETER(S): - * [I] hwnd : the edit window handle - * [I] uMsg : the message that is to be processed - * [I] wParam : first message parameter - * [I] lParam : second message parameter - * - * RETURN: - */ static LRESULT CALLBACK EditLblWndProcA(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { return EditLblWndProcT(hwnd, uMsg, wParam, lParam, FALSE); } -/*** - * DESCRIPTION: - * Creates a subclassed edit control - * - * PARAMETER(S): - * [I] infoPtr : valid pointer to the listview structure - * [I] text : initial text for the edit - * [I] style : the window style - * [I] isW : TRUE if input is Unicode - * - * RETURN: - */ static HWND CreateEditLabelT(LISTVIEW_INFO *infoPtr, LPCWSTR text, BOOL isW) { static const DWORD style = WS_CHILDWINDOW|WS_CLIPSIBLINGS|ES_LEFT|ES_AUTOHSCROLL|WS_BORDER|WS_VISIBLE; @@ -6094,19 +6044,6 @@ static HWND CreateEditLabelT(LISTVIEW_INFO *infoPtr, LPCWSTR text, BOOL isW) return hedit; } -/*** - * DESCRIPTION: - * Begin in place editing of specified list view item - * - * PARAMETER(S): - * [I] infoPtr : valid pointer to the listview structure - * [I] nItem : item index - * [I] isW : TRUE if it's a Unicode req, FALSE if ASCII - * - * RETURN: - * SUCCESS : TRUE - * FAILURE : FALSE - */ static HWND LISTVIEW_EditLabelT(LISTVIEW_INFO *infoPtr, INT nItem, BOOL isW) { WCHAR disptextW[DISP_TEXT_SIZE] = { 0 };

1 0

Michael Stefaniuc : dhtmled.ocx: Forward ConnectionPoint_Release() to a release method.
by Alexandre Julliard 30 Aug '21

30 Aug '21

Module: wine Branch: master Commit: 8756ae39632cba6d6548d4c1e4eaa21e98353813 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8756ae39632cba6d6548d4c1… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Aug 29 14:00:16 2021 +0200 dhtmled.ocx: Forward ConnectionPoint_Release() to a release method. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dhtmled.ocx/edit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dhtmled.ocx/edit.c b/dlls/dhtmled.ocx/edit.c index 9e08a4f5c95..226fc7856ed 100644 --- a/dlls/dhtmled.ocx/edit.c +++ b/dlls/dhtmled.ocx/edit.c @@ -1647,7 +1647,7 @@ static ULONG WINAPI ConnectionPoint_AddRef(IConnectionPoint *iface) static ULONG WINAPI ConnectionPoint_Release(IConnectionPoint *iface) { ConnectionPoint *This = impl_from_IConnectionPoint(iface); - return IConnectionPointContainer_AddRef(&This->dhed->IConnectionPointContainer_iface); + return IConnectionPointContainer_Release(&This->dhed->IConnectionPointContainer_iface); } static HRESULT WINAPI ConnectionPoint_GetConnectionInterface(IConnectionPoint *iface, IID *iid)

1 0