November 2020 - Wine-Commits

Alexandre Julliard : msvcrt: Build with msvcrt headers.
by Alexandre Julliard Nov. 19, 2020

Nov. 19, 2020

Module: wine Branch: master Commit: 191bdeaff3676f192148e17c6369865ec94c2ba2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=191bdeaff3676f192148e17c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 19 13:28:52 2020 +0100 msvcrt: Build with msvcrt headers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/Makefile.in | 6 ++++-- dlls/crtdll/crtdll.spec | 22 +++++++++++----------- dlls/msvcr100/Makefile.in | 4 +++- dlls/msvcr100/msvcr100.spec | 22 +++++++++++----------- dlls/msvcr110/Makefile.in | 4 +++- dlls/msvcr110/msvcr110.spec | 22 +++++++++++----------- dlls/msvcr120/Makefile.in | 4 +++- dlls/msvcr120/msvcr120.spec | 22 +++++++++++----------- dlls/msvcr70/Makefile.in | 4 +++- dlls/msvcr70/msvcr70.spec | 22 +++++++++++----------- dlls/msvcr71/Makefile.in | 4 +++- dlls/msvcr71/msvcr71.spec | 22 +++++++++++----------- dlls/msvcr80/Makefile.in | 4 +++- dlls/msvcr80/msvcr80.spec | 22 +++++++++++----------- dlls/msvcr90/Makefile.in | 4 +++- dlls/msvcr90/msvcr90.spec | 22 +++++++++++----------- dlls/msvcrt/Makefile.in | 4 +++- dlls/msvcrt/cpp.c | 5 +---- dlls/msvcrt/crt_main.c | 4 ---- dlls/msvcrt/crt_wmain.c | 4 ---- dlls/msvcrt/data.c | 3 --- dlls/msvcrt/dir.c | 3 --- dlls/msvcrt/except.c | 3 --- dlls/msvcrt/except_arm.c | 3 --- dlls/msvcrt/except_arm64.c | 3 --- dlls/msvcrt/except_i386.c | 3 --- dlls/msvcrt/except_x86_64.c | 3 --- dlls/msvcrt/exit.c | 2 +- dlls/msvcrt/file.c | 5 ----- dlls/msvcrt/heap.c | 1 - dlls/msvcrt/locale.c | 4 +--- dlls/msvcrt/lock.c | 3 --- dlls/msvcrt/math.c | 9 +-------- dlls/msvcrt/mbcs.c | 2 +- dlls/msvcrt/misc.c | 4 +--- dlls/msvcrt/msvcrt.h | 1 - dlls/msvcrt/msvcrt.spec | 24 ++++++++++++------------ dlls/msvcrt/onexit.c | 1 - dlls/msvcrt/process.c | 1 - dlls/msvcrt/scheduler.c | 2 -- dlls/msvcrt/string.c | 28 ++++++++++++---------------- dlls/msvcrt/time.c | 2 -- dlls/msvcrt/undname.c | 3 --- dlls/msvcrt/wcs.c | 27 +++++++++++++-------------- dlls/msvcrtd/Makefile.in | 4 +++- dlls/msvcrtd/msvcrtd.spec | 22 +++++++++++----------- dlls/ucrtbase/Makefile.in | 4 +++- dlls/ucrtbase/ucrtbase.spec | 26 +++++++++++++------------- 48 files changed, 189 insertions(+), 234 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=191bdeaff3676f192148…

1 0

Nikolay Sivov : mf/samplegrabber: Implement IMFRateSupport.
by Alexandre Julliard Nov. 19, 2020

Nov. 19, 2020

Module: wine Branch: master Commit: 07139b0be29617bd1ba104a4c893c21185a9258c URL: https://source.winehq.org/git/wine.git/?a=commit;h=07139b0be29617bd1ba104a4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 19 15:21:40 2020 +0300 mf/samplegrabber: Implement IMFRateSupport. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/samplegrabber.c | 127 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/tests/mf.c | 66 +++++++++++++++++++++++++ 2 files changed, 193 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=07139b0be29617bd1ba1…

1 0

Zebediah Figura : quartz/tests: Test (dis)connecting while not stopped.
by Alexandre Julliard Nov. 19, 2020

Nov. 19, 2020

Module: wine Branch: master Commit: 6463f65adcf9303e5fc78ac6daa8700db9bf76a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6463f65adcf9303e5fc78ac6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 19 11:19:32 2020 -0600 quartz/tests: Test (dis)connecting while not stopped. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/avidec.c | 34 ++++++++++++++++++++++++++++++++++ dlls/quartz/tests/avisplit.c | 28 ++++++++++++++++++++++++++++ dlls/quartz/tests/dsoundrender.c | 14 ++++++++++++++ dlls/quartz/tests/filesource.c | 17 +++++++++++++++++ dlls/quartz/tests/mpegsplit.c | 28 ++++++++++++++++++++++++++++ dlls/quartz/tests/videorenderer.c | 14 ++++++++++++++ dlls/quartz/tests/vmr7.c | 10 ++++++++++ dlls/quartz/tests/vmr9.c | 10 ++++++++++ 8 files changed, 155 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6463f65adcf9303e5fc7…

1 0

Alexandre Julliard : include: Use gcc builtin for HUGE_VAL.
by Alexandre Julliard Nov. 19, 2020

Nov. 19, 2020

Module: wine Branch: master Commit: 32eae49275be2c9ffa8e92ce48ce77ca1f703d16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32eae49275be2c9ffa8e92ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 19 13:29:01 2020 +0100 include: Use gcc builtin for HUGE_VAL. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/math.h | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index a6bcbf9ada6..615f9a6bf24 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -201,21 +201,10 @@ float __cdecl _hypotf(float, float); int __cdecl _matherr(struct _exception*); double __cdecl _cabs(struct _complex); -#ifndef HUGE_VAL -# if defined(__GNUC__) && (__GNUC__ >= 3) -# define HUGE_VAL (__extension__ 0x1.0p2047) -# else -static const union { - unsigned char __c[8]; - double __d; -} __huge_val = { { 0, 0, 0, 0, 0, 0, 0xf0, 0x7f } }; -# define HUGE_VAL (__huge_val.__d) -# endif -#endif - #if (defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)))) || defined(__clang__) # define INFINITY __builtin_inff() # define NAN __builtin_nanf("") +# define HUGE_VAL __builtin_huge_val() #else static const union { unsigned int __i; @@ -223,6 +212,7 @@ static const union { } __inff = { 0x7f800000 }, __nanf = { 0x7fc00000 }; # define INFINITY (__inff.__f) # define NAN (__nanf.__f) +# define HUGE_VAL ((double)INFINITY) #endif #define FP_INFINITE 1

1 0

Michael Stefaniuc : riched20: Use wide-char string literals.
by Alexandre Julliard Nov. 19, 2020

Nov. 19, 2020

Module: wine Branch: master Commit: 60b216790193f1b6741676b55e63e71bcde8516c URL: https://source.winehq.org/git/wine.git/?a=commit;h=60b216790193f1b6741676b5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Nov 15 23:11:14 2020 +0100 riched20: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 18 ++++++------------ dlls/riched20/paint.c | 6 ++---- dlls/riched20/para.c | 15 +++++---------- dlls/riched20/richole.c | 3 +-- dlls/riched20/run.c | 3 +-- dlls/riched20/table.c | 6 ++---- 6 files changed, 17 insertions(+), 34 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 2f7383e59a1..985bcc3d573 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -244,9 +244,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); static BOOL ME_RegisterEditorClass(HINSTANCE); static BOOL ME_UpdateLinkAttribute(ME_TextEditor *editor, ME_Cursor *start, int nChars); - -static const WCHAR REListBox20W[] = {'R','E','L','i','s','t','B','o','x','2','0','W', 0}; -static const WCHAR REComboBox20W[] = {'R','E','C','o','m','b','o','B','o','x','2','0','W', 0}; static HCURSOR hLeft; BOOL me_debug = FALSE; @@ -2222,8 +2219,6 @@ static DWORD CALLBACK ME_ReadFromHGLOBALRTF(DWORD_PTR dwCookie, LPBYTE lpBuff, L return 0; } -static const WCHAR rtfW[] = {'R','i','c','h',' ','T','e','x','t',' ','F','o','r','m','a','t',0}; - static HRESULT paste_rtf(ME_TextEditor *editor, FORMATETC *fmt, STGMEDIUM *med) { EDITSTREAM es; @@ -2278,7 +2273,7 @@ static struct paste_format const WCHAR *name; } paste_formats[] = { - {{ -1, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, paste_rtf, rtfW }, + {{ -1, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, paste_rtf, L"Rich Text Format" }, {{ CF_UNICODETEXT, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, paste_text }, {{ CF_ENHMETAFILE, NULL, DVASPECT_CONTENT, -1, TYMED_ENHMF }, paste_emf }, {{ 0 }} @@ -3273,9 +3268,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) UnregisterClassA(RICHEDIT_CLASS20A, 0); UnregisterClassA("RichEdit50A", 0); if (ME_ListBoxRegistered) - UnregisterClassW(REListBox20W, 0); + UnregisterClassW(L"REListBox20W", 0); if (ME_ComboBoxRegistered) - UnregisterClassW(REComboBox20W, 0); + UnregisterClassW(L"REComboBox20W", 0); LookupCleanup(); HeapDestroy (me_heap); release_typelib(); @@ -5149,7 +5144,6 @@ int ME_GetTextW(ME_TextEditor *editor, WCHAR *buffer, int buflen, { ME_Run *run, *next_run; const WCHAR *pStart = buffer; - const WCHAR cr_lf[] = {'\r', '\n', 0}; const WCHAR *str; int nLen; @@ -5172,7 +5166,7 @@ int ME_GetTextW(ME_TextEditor *editor, WCHAR *buffer, int buflen, * also uses this function. */ srcChars -= min(nLen, srcChars); nLen = 2; - str = cr_lf; + str = L"\r\n"; } else { @@ -5290,7 +5284,7 @@ LRESULT WINAPI REExtendedRegisterClass(void) { wcW.style = CS_PARENTDC | CS_DBLCLKS | CS_GLOBALCLASS; wcW.lpfnWndProc = REListWndProc; - wcW.lpszClassName = REListBox20W; + wcW.lpszClassName = L"REListBox20W"; if (RegisterClassW(&wcW)) ME_ListBoxRegistered = TRUE; } @@ -5298,7 +5292,7 @@ LRESULT WINAPI REExtendedRegisterClass(void) { wcW.style = CS_PARENTDC | CS_DBLCLKS | CS_GLOBALCLASS | CS_VREDRAW | CS_HREDRAW; wcW.lpfnWndProc = REComboWndProc; - wcW.lpszClassName = REComboBox20W; + wcW.lpszClassName = L"REComboBox20W"; if (RegisterClassW(&wcW)) ME_ComboBoxRegistered = TRUE; } diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index ffb50d5ceff..2db3a4ea2c1 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -972,10 +972,9 @@ static void draw_paragraph( ME_Context *c, ME_Paragraph *para ) } if (me_debug) { - static const WCHAR wszRowDebug[] = {'r','o','w','[','%','d',']',0}; WCHAR buf[128]; POINT pt = c->pt; - wsprintfW(buf, wszRowDebug, no); + wsprintfW( buf, L"row[%d]", no ); pt.y = 12+y; ME_DebugWrite(c->hDC, &pt, buf); } @@ -1006,12 +1005,11 @@ static void draw_paragraph( ME_Context *c, ME_Paragraph *para ) } if (me_debug) { - static const WCHAR wszRunDebug[] = {'[','%','d',':','%','x',']',' ','%','l','s',0}; WCHAR buf[2560]; POINT pt; pt.x = c->pt.x + run->pt.x; pt.y = c->pt.y + para->pt.y + run->pt.y; - wsprintfW(buf, wszRunDebug, no, p->member.run.nFlags, get_text( &p->member.run, 0 )); + wsprintfW( buf, L"[%d:%x] %ls", no, p->member.run.nFlags, get_text( &p->member.run, 0 )); ME_DebugWrite(c->hDC, &pt, buf); } break; diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index cb98218aeab..29624e6c1df 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -150,7 +150,6 @@ ME_Row *para_end_row( ME_Paragraph *para ) void ME_MakeFirstParagraph(ME_TextEditor *editor) { - static const WCHAR cr_lf[] = {'\r','\n',0}; ME_Context c; CHARFORMAT2W cf; const CHARFORMATW *host_cf; @@ -202,7 +201,7 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) } eol_len = editor->bEmulateVersion10 ? 2 : 1; - para->text = ME_MakeStringN( cr_lf, eol_len ); + para->text = ME_MakeStringN( L"\r\n", eol_len ); run = run_create( style, MERF_ENDPARA ); run->nCharOfs = 0; @@ -280,7 +279,6 @@ static ME_String *para_num_get_str( ME_Paragraph *para, WORD num ) /* max 4 Roman letters (representing '8') / decade + '(' + ')' */ ME_String *str = ME_MakeStringEmpty( 20 + 2 ); WCHAR *p; - static const WCHAR fmtW[] = {'%', 'd', 0}; static const WORD letter_base[] = { 1, 26, 26 * 26, 26 * 26 * 26 }; /* roman_base should start on a '5' not a '1', otherwise the 'total' code will need adjusting. 'N' and 'O' are what MS uses for 5000 and 10000, their version doesn't work well above 30000, @@ -309,7 +307,7 @@ static ME_String *para_num_get_str( ME_Paragraph *para, WORD num ) { case PFN_ARABIC: default: - p += swprintf( p, 20, fmtW, num ); + p += swprintf( p, 20, L"%d", num ); break; case PFN_LCLETTER: @@ -393,9 +391,6 @@ void para_num_init( ME_Context *c, ME_Paragraph *para ) { ME_Style *style; CHARFORMAT2W cf; - static const WCHAR bullet_font[] = {'S','y','m','b','o','l',0}; - static const WCHAR bullet_str[] = {0xb7, 0}; - static const WCHAR spaceW[] = {' ', 0}; SIZE sz; if (!para->fmt.wNumbering) return; @@ -409,7 +404,7 @@ void para_num_init( ME_Context *c, ME_Paragraph *para ) { cf.cbSize = sizeof(cf); cf.dwMask = CFM_FACE | CFM_CHARSET; - memcpy( cf.szFaceName, bullet_font, sizeof(bullet_font) ); + lstrcpyW( cf.szFaceName, L"Symbol" ); cf.bCharSet = SYMBOL_CHARSET; style = ME_ApplyStyle( c->editor, style, &cf ); } @@ -426,13 +421,13 @@ void para_num_init( ME_Context *c, ME_Paragraph *para ) if (para->fmt.wNumbering != PFN_BULLET) para->para_num.text = para_num_get_str( para, para_num_get_num( para ) ); else - para->para_num.text = ME_MakeStringConst( bullet_str, 1 ); + para->para_num.text = ME_MakeStringConst( L"\x00b7", 1 ); } select_style( c, para->para_num.style ); GetTextExtentPointW( c->hDC, para->para_num.text->szData, para->para_num.text->nLen, &sz ); para->para_num.width = sz.cx; - GetTextExtentPointW( c->hDC, spaceW, 1, &sz ); + GetTextExtentPointW( c->hDC, L" ", 1, &sz ); para->para_num.width += sz.cx; } diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 5d73731dedb..bedeefe9a63 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -3004,9 +3004,8 @@ static void textfont_reset_to_default(ITextFontImpl *font) font->props[id].l = GetSystemDefaultLCID(); break; case FONT_NAME: { - static const WCHAR sysW[] = {'S','y','s','t','e','m',0}; SysFreeString(font->props[id].str); - font->props[id].str = SysAllocString(sysW); + font->props[id].str = SysAllocString(L"System"); break; } case FONT_WEIGHT: diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index fdda43ba51a..e099c0be6dc 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -665,7 +665,6 @@ int ME_PointFromChar(ME_TextEditor *editor, ME_Run *pRun, int nOffset, BOOL visu SIZE ME_GetRunSizeCommon(ME_Context *c, const ME_Paragraph *para, ME_Run *run, int nLen, int startx, int *pAscent, int *pDescent) { - static const WCHAR spaceW[] = {' ',0}; SIZE size; nLen = min( nLen, run->len ); @@ -673,7 +672,7 @@ SIZE ME_GetRunSizeCommon(ME_Context *c, const ME_Paragraph *para, ME_Run *run, i if (run->nFlags & MERF_ENDPARA) { nLen = min( nLen, 1 ); - ME_GetTextExtent(c, spaceW, nLen, run->style, &size); + ME_GetTextExtent( c, L" ", nLen, run->style, &size ); } else if (para->nFlags & MEPF_COMPLEX) { diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index 0ce5a2c32c0..c3823e3b493 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -54,8 +54,6 @@ #include "editor.h" #include "rtf.h" -static const WCHAR cr_lf[] = {'\r', '\n', 0}; - static ME_Paragraph* table_insert_end_para( ME_TextEditor *editor, ME_Cursor *cursor, const WCHAR *eol_str, int eol_len, int para_flags ) { @@ -75,7 +73,7 @@ ME_Paragraph* table_insert_row_start( ME_TextEditor *editor, ME_Cursor *cursor ) { ME_Paragraph *para; - para = table_insert_end_para( editor, cursor, cr_lf, 2, MEPF_ROWSTART ); + para = table_insert_end_para( editor, cursor, L"\r\n", 2, MEPF_ROWSTART ); return para_prev( para ); } @@ -122,7 +120,7 @@ ME_Paragraph* table_insert_row_end( ME_TextEditor *editor, ME_Cursor *cursor ) { ME_Paragraph *para; - para = table_insert_end_para( editor, cursor, cr_lf, 2, MEPF_ROWEND ); + para = table_insert_end_para( editor, cursor, L"\r\n", 2, MEPF_ROWEND ); return para_prev( para ); }

1 0

Kevin Puetz : widl: Allow adding the same custdata GUID multiple times in a typelib.
by Alexandre Julliard Nov. 18, 2020

Nov. 18, 2020

Module: wine Branch: master Commit: 997439967f5646dfd0004b164fbf67f8e685ac3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=997439967f5646dfd0004b16… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Tue Nov 17 19:14:16 2020 -0600 widl: Allow adding the same custdata GUID multiple times in a typelib. e.g. using the same kind of custdata in multiple interfaces Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/write_msft.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 734bdeee695..5728f041f6f 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1263,18 +1263,25 @@ static void write_default_value(msft_typelib_t *typelib, type_t *type, expr_t *e static HRESULT set_custdata(msft_typelib_t *typelib, REFGUID guid, int vt, const void *value, int *offset) { - MSFT_GuidEntry guidentry; int guidoffset; int custoffset; int *custdata; int data_out; + int hash_key; - guidentry.guid = *guid; + hash_key = ctl2_hash_guid(guid); + guidoffset = ctl2_find_guid(typelib, hash_key, guid); + if(guidoffset == -1) { + /* add GUID that was not already present */ + MSFT_GuidEntry guidentry; + guidentry.guid = *guid; - guidentry.hreftype = -1; - guidentry.next_hash = -1; + guidentry.hreftype = -1; + guidentry.next_hash = -1; + + guidoffset = ctl2_alloc_guid(typelib, &guidentry); + } - guidoffset = ctl2_alloc_guid(typelib, &guidentry); if(vt == VT_BSTR) /* TODO midl appears to share a single reference if the same string is used as custdata in multiple places */ write_string_value(typelib, &data_out, value);

1 0

Kevin Puetz : oleaut32: Fix error handling/reporting in TLB_copy_all_custdata.
by Alexandre Julliard Nov. 18, 2020

Nov. 18, 2020

Module: wine Branch: master Commit: cd38abc455d8312ec9e13c7af5049358523032dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd38abc455d8312ec9e13c7a… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Tue Nov 17 19:14:18 2020 -0600 oleaut32: Fix error handling/reporting in TLB_copy_all_custdata. VariantCopy clears existing contents of pvargDest and thus requires it contain a valid (possibly-empty) VARIANT, not uninitialized garbage. If a failure still occurs, propgate the HRESULT to GetAll*CustData. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 989340de9c2..d04e4d2cbe2 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5288,6 +5288,7 @@ static HRESULT TLB_copy_all_custdata(const struct list *custdata_list, CUSTDATA TLBCustData *pCData; unsigned int ct; CUSTDATAITEM *cdi; + HRESULT hr = S_OK; ct = list_count(custdata_list); @@ -5300,11 +5301,13 @@ static HRESULT TLB_copy_all_custdata(const struct list *custdata_list, CUSTDATA cdi = pCustData->prgCustData; LIST_FOR_EACH_ENTRY(pCData, custdata_list, TLBCustData, entry){ cdi->guid = *TLB_get_guid_null(pCData->guid); - VariantCopy(&cdi->varValue, &pCData->data); + VariantInit(&cdi->varValue); + hr = VariantCopy(&cdi->varValue, &pCData->data); + if(FAILED(hr)) break; ++cdi; } - return S_OK; + return hr; }

1 0

Chip Davis : msvcrt: Increment refcounts for all locale data in _get_current_locale().
by Alexandre Julliard Nov. 18, 2020

Nov. 18, 2020

Module: wine Branch: master Commit: df2b13fa77172953fed6e15c65fd6380b2d2f0d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df2b13fa77172953fed6e15c… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Wed Nov 18 17:26:33 2020 +0100 msvcrt: Increment refcounts for all locale data in _get_current_locale(). Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr90/tests/msvcr90.c | 52 ++++++++++++++++++++------------------------ dlls/msvcrt/locale.c | 19 +++++++++++++--- 2 files changed, 39 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=df2b13fa77172953fed6…

1 0

Kevin Puetz : oleaut32: Load GetVarCustData from MSFT-format typelib.
by Alexandre Julliard Nov. 18, 2020

Nov. 18, 2020

Module: wine Branch: master Commit: 65d917402f43d6c061668cff811f5fd6729d5750 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65d917402f43d6c061668cff… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Tue Nov 17 19:14:19 2020 -0600 oleaut32: Load GetVarCustData from MSFT-format typelib. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/test_tlb.idl | 50 ++++++++++++- dlls/oleaut32/tests/typelib.c | 148 +++++++++++++++++++++++++++++++++++++++ dlls/oleaut32/typelib.c | 3 + 3 files changed, 200 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/test_tlb.idl b/dlls/oleaut32/tests/test_tlb.idl index b8fecc9a019..3315f151ebd 100644 --- a/dlls/oleaut32/tests/test_tlb.idl +++ b/dlls/oleaut32/tests/test_tlb.idl @@ -26,7 +26,15 @@ import "oaidl.idl"; /* needed by widl */ midl_pragma warning ( disable : 2368 ) -[uuid(8b05fe77-4a6c-4133-b9cd-8f81747af784)] +#define CUSTDATA_STRLIT c8768723-e6d2-4442-b039-92e9c82429c4 +#define CUSTDATA_NUM b481b478-a181-4eb6-b6e0-df63069e8c80 +#define CUSTDATA_HEXNUM a09d7c06-cf38-4db3-9450-10641651c35b + +[uuid(8b05fe77-4a6c-4133-b9cd-8f81747af784), +custom(CUSTDATA_STRLIT,"ITypeLib2::GetCustData"), +custom(CUSTDATA_NUM,42), +custom(CUSTDATA_HEXNUM,0x1337C0D3), +] library Test { importlib("stdole2.tlb"); @@ -170,4 +178,44 @@ library Test { interface ITestDispDual; } + + [uuid(786ee4ff-c5dd-4bf4-9578-0d22fb5369cc),custom(CUSTDATA_STRLIT,"ITypeInfo2::GetCustData interface")] + interface custdata_interface : IDispatch + { + [custom(CUSTDATA_STRLIT,"ITypeInfo2::GetFuncCustData custdata_interface::test_method")] + HRESULT test_method([in,custom(CUSTDATA_STRLIT,"ITypeInfo2::GetParamCustData custdata_interface::test_method(x)")] int x); + } + + [uuid(6ca99f5e-c86a-42ad-a5ee-5bd4c8e5553c),custom(CUSTDATA_STRLIT,"ITypeInfo2::GetCustData enum")] + enum custdata_enum { + [custom(CUSTDATA_STRLIT,"ITypeInfo2::GetVarCustData enum")] + One, + Two + }; + + [uuid(62fabe17-f733-4b09-b859-3f455dcda450),custom(CUSTDATA_STRLIT,"ITypeInfo2::GetCustData struct")] + struct custdata_struct { + [custom(CUSTDATA_STRLIT,"ITypeInfo2::GetVarCustData struct")] + int test_field; + }; + + [/* uuid(...) not allowed on union */ custom(CUSTDATA_STRLIT,"ITypeInfo2::GetCustData union")] + union custdata_union { + [custom(CUSTDATA_STRLIT,"ITypeInfo2::GetVarCustData union")] + int test_field; + }; + + [public,uuid(d58744d6-63f9-467c-87e5-c95158098b18),custom(CUSTDATA_STRLIT,"ITypeInfo2::GetCustData typedef")] + typedef custdata_interface * custdata_typedef; + + [uuid(bffc216e-2159-465a-80df-b85fd4f4f122),custom(CUSTDATA_STRLIT,"ITypeInfo2::GetCustData dispinterface")] + dispinterface custdata_dispatch + { +properties: + [id(0),custom(CUSTDATA_STRLIT,"ITypeInfo2::GetVarCustData dispinterface property")] + int test_property; +methods: + [id(1),custom(CUSTDATA_STRLIT,"ITypeInfo2::GetFuncCustData dispinterface method")] + void test_method([in,custom(CUSTDATA_STRLIT,"ITypeInfo2::GetParamCustData test_dispatch::test_method(x)")] int x); + } } diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 3c7a3bd147d..ff709ddef62 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -6130,6 +6130,154 @@ static const type_info info[] = { }, }, { /* vars */ }, +}, +{ + "custdata_interface", + "{786ee4ff-c5dd-4bf4-9578-0d22fb5369cc}", + /*kind*/ TKIND_INTERFACE, /*flags*/ TYPEFLAG_FDISPATCHABLE, /*align*/ TYPE_ALIGNMENT(custdata_interface*), /*size*/ sizeof(custdata_interface*), + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 8, /*#func*/ 1, /*#var*/ 0, + /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetCustData interface" } } }, + }, + { /* funcs */ + { + /*id*/ 0x60020000, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 7, /*#scodes*/ 0, /*flags*/ 0, + {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetFuncCustData custdata_interface::test_method" } } }, + }, + { /* params */ + {VT_INT, -1, PARAMFLAG_FIN, /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetParamCustData custdata_interface::test_method(x)" } } }, + } }, + {-1, 0, 0} + }, + { /* names */ + "test_method", + "x", + NULL, + }, + }, + }, + { /* vars */ }, +}, +{ + "custdata_enum", + "{6ca99f5e-c86a-42ad-a5ee-5bd4c8e5553c}", + /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4, + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 2, + /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetCustData enum" } } }, + }, + { /* funcs */ }, + { /* vars */ + { + /*id*/ 0x40000000, /*name*/ "One", /*flags*/ 0, /*kind*/ VAR_CONST, + { .varValue = { VT_I4, { .value_int = 0 } } }, + /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetVarCustData enum" } } }, + }, + {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + }, + { + /*id*/ 0x40000001, /*name*/ "Two", /*flags*/ 0, /*kind*/ VAR_CONST, + { .varValue = { VT_I4, { .value_int = 1 } } }, + /*#custdata*/ 0, {}, + {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + }, + }, +}, +{ + "custdata_struct", + "{62fabe17-f733-4b09-b859-3f455dcda450}", + /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(struct custdata_struct), /*size*/ sizeof(struct custdata_struct), + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 1, + /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetCustData struct" } } }, + }, + { /* funcs */ }, + { /* vars */ + { + /*id*/ 0x40000000, /*name*/ "test_field", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, + { .oInst = 0 }, + /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetVarCustData struct" } } }, + }, + {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + }, + }, +}, +{ + "custdata_union", + "{00000000-0000-0000-0000-000000000000}", + /*kind*/ TKIND_UNION, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(union custdata_union), /*size*/ sizeof(union custdata_union), + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 1, + /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetCustData union" } } }, + }, + { /* funcs */ }, + { /* vars */ + { + /*id*/ 0x40000000, /*name*/ "test_field", /*flags*/ 0, /*kind*/ VAR_PERINSTANCE, + { .oInst = 0 }, + /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetVarCustData union" } } }, + }, + {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + }, + }, +}, +{ + "custdata_typedef", + "{d58744d6-63f9-467c-87e5-c95158098b18}", + /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(custdata_typedef), /*size*/ sizeof(custdata_typedef), + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0, /*#var*/ 0, + /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetCustData typedef" } } }, + }, + { /* funcs */ }, + { /* vars */ }, +}, +{ + "custdata_dispatch", + "{bffc216e-2159-465a-80df-b85fd4f4f122}", + /*kind*/ TKIND_DISPATCH, /*flags*/ TYPEFLAG_FDISPATCHABLE, /*align*/ TYPE_ALIGNMENT(custdata_dispatch*), /*size*/ sizeof(custdata_dispatch*), + /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 7, /*#func*/ 1, /*#var*/ 1, + /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetCustData dispinterface" } } }, + }, + { /* funcs */ + { + /*id*/ 0x1, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 0, /*#scodes*/ 0, /*flags*/ 0, + {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ + /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetFuncCustData dispinterface method" } } }, + }, + { /* params */ + {VT_INT, -1, PARAMFLAG_FIN, /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetParamCustData test_dispatch::test_method(x)" } } }, + } }, + {-1, 0, 0} + }, + { /* names */ + "test_method", + "x", + NULL, + }, + }, + }, + { /* vars */ + { + /*id*/ 0x0, /*name*/ "test_property", /*flags*/ 0, /*kind*/ VAR_DISPATCH, + { /* DUMMYUNIONNAME unused*/ }, + /*#custdata*/ 1, { + { "{c8768723-e6d2-4442-b039-92e9c82429c4}", { VT_BSTR, { .value_str = "ITypeInfo2::GetVarCustData dispinterface property" } } }, + }, + {VT_INT, -1, PARAMFLAG_NONE}, /* ret */ + }, + }, } }; diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index d04e4d2cbe2..bef4f93748b 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2599,6 +2599,9 @@ static void MSFT_DoVars(TLBContext *pcx, ITypeInfoImpl *pTI, int cFuncs, if(reclength > FIELD_OFFSET(MSFT_VarRecord, HelpString)) ptvd->HelpString = MSFT_ReadString(pcx, pVarRec->HelpString); + if (reclength > FIELD_OFFSET(MSFT_VarRecord, oCustData)) + MSFT_CustData(pcx, pVarRec->oCustData, &ptvd->custdata_list); + if(reclength > FIELD_OFFSET(MSFT_VarRecord, HelpStringContext)) ptvd->HelpStringContext = pVarRec->HelpStringContext;

1 0

Kevin Puetz : oleaut32/tests: Cover Get*CustData in test_dump_typelib.
by Alexandre Julliard Nov. 18, 2020

Nov. 18, 2020

Module: wine Branch: master Commit: 8341b2550d7c9abe9d382edd2a7d065480c6de73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8341b2550d7c9abe9d382edd… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Tue Nov 17 19:14:17 2020 -0600 oleaut32/tests: Cover Get*CustData in test_dump_typelib. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/typelib.c | 275 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 267 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8341b2550d7c9abe9d38…

1 0