September 2020 - Wine-Commits

Haoyang Chen : gdiplus: Implement GdipEnumerateMetafileSrcRectDestRect.
by Alexandre Julliard Sept. 18, 2020

Sept. 18, 2020

Module: wine Branch: master Commit: bccd754966437213979d44c57da5bc684872dff8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bccd754966437213979d44c5… Author: Haoyang Chen <chenhaoyang(a)uniontech.com> Date: Fri Sep 18 10:53:22 2020 +0800 gdiplus: Implement GdipEnumerateMetafileSrcRectDestRect. Signed-off-by: Haoyang Chen <chenhaoyang(a)uniontech.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/metafile.c | 18 ++++++++++++++++++ include/gdiplusflat.h | 3 +++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index a722ab7b23..bda8bd56a3 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -200,7 +200,7 @@ 200 stub GdipEnumerateMetafileSrcRectDestPointI 201 stdcall GdipEnumerateMetafileSrcRectDestPoints(ptr ptr ptr long ptr long ptr ptr ptr) 202 stub GdipEnumerateMetafileSrcRectDestPointsI -203 stub GdipEnumerateMetafileSrcRectDestRect +203 stdcall GdipEnumerateMetafileSrcRectDestRect(ptr ptr ptr ptr long ptr ptr ptr) 204 stub GdipEnumerateMetafileSrcRectDestRectI 205 stdcall GdipFillClosedCurve2(ptr ptr ptr long float long) 206 stdcall GdipFillClosedCurve2I(ptr ptr ptr long float long) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 350642e020..e52932da11 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -3777,6 +3777,24 @@ GpStatus WINGDIPAPI GdipEnumerateMetafileSrcRectDestPoints(GpGraphics *graphics, return stat; } +GpStatus WINGDIPAPI GdipEnumerateMetafileSrcRectDestRect( GpGraphics *graphics, + GDIPCONST GpMetafile *metafile, GDIPCONST GpRectF *dest, + GDIPCONST GpRectF *src, Unit srcUnit, EnumerateMetafileProc callback, + VOID *cb_data, GDIPCONST GpImageAttributes *attrs) +{ + GpPointF points[3]; + + if (!graphics || !metafile || !dest) return InvalidParameter; + + points[0].X = points[2].X = dest->X; + points[0].Y = points[1].Y = dest->Y; + points[1].X = dest->X + dest->Width; + points[2].Y = dest->Y + dest->Height; + + return GdipEnumerateMetafileSrcRectDestPoints(graphics, metafile, points, 3, + src, srcUnit, callback, cb_data, attrs); +} + GpStatus WINGDIPAPI GdipEnumerateMetafileDestRect(GpGraphics *graphics, GDIPCONST GpMetafile *metafile, GDIPCONST GpRectF *dest, EnumerateMetafileProc callback, VOID *cb_data, GDIPCONST GpImageAttributes *attrs) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 1526ce0338..5c9600ed30 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -220,6 +220,9 @@ GpStatus WINGDIPAPI GdipEnumerateMetafileDestRectI(GpGraphics*,GDIPCONST GpMetaf GpStatus WINGDIPAPI GdipEnumerateMetafileSrcRectDestPoints(GpGraphics*, GDIPCONST GpMetafile*,GDIPCONST GpPointF*,INT,GDIPCONST GpRectF*,Unit, EnumerateMetafileProc,VOID*,GDIPCONST GpImageAttributes*); +GpStatus WINGDIPAPI GdipEnumerateMetafileSrcRectDestRect( GpGraphics*, GDIPCONST GpMetafile*, + GDIPCONST GpRectF* , GDIPCONST GpRectF*, Unit, EnumerateMetafileProc, VOID*, + GDIPCONST GpImageAttributes*); GpStatus WINGDIPAPI GdipFillClosedCurve2(GpGraphics*,GpBrush*,GDIPCONST GpPointF*,INT, REAL,GpFillMode); GpStatus WINGDIPAPI GdipFillClosedCurve2I(GpGraphics*,GpBrush*,GDIPCONST GpPoint*,INT,

1 0

Kevin Puetz : oleaut32/tests: Cover GetVarDesc in test_dump_typelib.
by Alexandre Julliard Sept. 18, 2020

Sept. 18, 2020

Module: wine Branch: master Commit: 434a6444c3f0518bbba7be9284e7389a72a7ba8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=434a6444c3f0518bbba7be92… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Thu Sep 17 18:24:19 2020 -0500 oleaut32/tests: Cover GetVarDesc 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 | 491 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 447 insertions(+), 44 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=434a6444c3f0518bbba7…

1 0

Piotr Caban : msvcrt: Use default user locale when only codepage is passed to setlocale.
by Alexandre Julliard Sept. 18, 2020

Sept. 18, 2020

Module: wine Branch: master Commit: dc117553905c1b779ef083aa7418d169cd180a3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc117553905c1b779ef083aa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 18 15:52:54 2020 +0200 msvcrt: Use default user locale when only codepage is passed to setlocale. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 172 +++++++++++++++++++++------------------------------ 1 file changed, 71 insertions(+), 101 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 9a10ceabc4..7562f70eb0 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -176,18 +176,17 @@ static void remap_synonym(char *name) } /* Note: Flags are weighted in order of matching importance */ -#define FOUND_SNAME 0x8 -#define FOUND_LANGUAGE 0x4 -#define FOUND_COUNTRY 0x2 -#define FOUND_CODEPAGE 0x1 +#define FOUND_SNAME 0x4 +#define FOUND_LANGUAGE 0x2 +#define FOUND_COUNTRY 0x1 typedef struct { char search_language[MAX_ELEM_LEN]; char search_country[MAX_ELEM_LEN]; - char search_codepage[MAX_ELEM_LEN]; DWORD found_codepage; unsigned int match_flags; LANGID found_lang_id; + BOOL allow_sname; } locale_search_t; #define CONTINUE_LOOKING TRUE @@ -226,8 +225,7 @@ find_best_locale_proc(HMODULE hModule, LPCSTR type, LPCSTR name, WORD LangID, LO return CONTINUE_LOOKING; #if _MSVCR_VER >= 110 - if (!res->search_country[0] && !res->search_codepage[0] && - compare_info(lcid,LOCALE_SNAME,buff,res->search_language, TRUE)) + if (res->allow_sname && compare_info(lcid,LOCALE_SNAME,buff,res->search_language, TRUE)) { TRACE(":Found locale: %s->%s\n", res->search_language, buff); res->match_flags = FOUND_SNAME; @@ -262,27 +260,14 @@ find_best_locale_proc(HMODULE hModule, LPCSTR type, LPCSTR name, WORD LangID, LO return CONTINUE_LOOKING; } - /* Check codepage */ - if (compare_info(lcid,LOCALE_IDEFAULTCODEPAGE,buff,res->search_codepage, TRUE) || - (compare_info(lcid,LOCALE_IDEFAULTANSICODEPAGE,buff,res->search_codepage, TRUE))) - { - TRACE("Found codepage:%s->%s\n", res->search_codepage, buff); - flags |= FOUND_CODEPAGE; - res->found_codepage = atoi(res->search_codepage); - } - else if (!flags && (res->match_flags & FOUND_CODEPAGE)) - { - return CONTINUE_LOOKING; - } - if (flags > res->match_flags) { /* Found a better match than previously */ res->match_flags = flags; res->found_lang_id = LangID; } - if ((flags & (FOUND_LANGUAGE | FOUND_COUNTRY | FOUND_CODEPAGE)) == - (FOUND_LANGUAGE | FOUND_COUNTRY | FOUND_CODEPAGE)) + if ((flags & (FOUND_LANGUAGE | FOUND_COUNTRY)) == + (FOUND_LANGUAGE | FOUND_COUNTRY)) { TRACE(":found exact locale match\n"); return STOP_LOOKING; @@ -290,15 +275,14 @@ find_best_locale_proc(HMODULE hModule, LPCSTR type, LPCSTR name, WORD LangID, LO return CONTINUE_LOOKING; } -extern int atoi(const char *); - /* Internal: Find the LCID for a locale specification */ LCID MSVCRT_locale_to_LCID(const char *locale, unsigned short *codepage, BOOL *sname) { thread_data_t *data = msvcrt_get_thread_data(); - LCID lcid; - locale_search_t search; const char *cp, *region; + BOOL is_sname = FALSE; + DWORD locale_cp; + LCID lcid; if (!strcmp(locale, data->cached_locale)) { if (codepage) @@ -308,88 +292,84 @@ LCID MSVCRT_locale_to_LCID(const char *locale, unsigned short *codepage, BOOL *s return data->cached_lcid; } - memset(&search, 0, sizeof(locale_search_t)); - cp = strchr(locale, '.'); region = strchr(locale, '_'); - lstrcpynA(search.search_language, locale, MAX_ELEM_LEN); - if(region) { - lstrcpynA(search.search_country, region+1, MAX_ELEM_LEN); - if(region-locale < MAX_ELEM_LEN) - search.search_language[region-locale] = '\0'; - } else - search.search_country[0] = '\0'; - - if(cp) { - lstrcpynA(search.search_codepage, cp+1, MAX_ELEM_LEN); - if(region && cp-region-1<MAX_ELEM_LEN) - search.search_country[cp-region-1] = '\0'; - if(cp-locale < MAX_ELEM_LEN) - search.search_language[cp-locale] = '\0'; - } else - search.search_codepage[0] = '\0'; + if(!locale[0] || (cp == locale && !region)) { + lcid = GetUserDefaultLCID(); + } else { + locale_search_t search; + + memset(&search, 0, sizeof(locale_search_t)); + lstrcpynA(search.search_language, locale, MAX_ELEM_LEN); + if(region) { + lstrcpynA(search.search_country, region+1, MAX_ELEM_LEN); + if(region-locale < MAX_ELEM_LEN) + search.search_language[region-locale] = '\0'; + } else + search.search_country[0] = '\0'; + + if(cp) { + if(region && cp-region-1<MAX_ELEM_LEN) + search.search_country[cp-region-1] = '\0'; + if(cp-locale < MAX_ELEM_LEN) + search.search_language[cp-locale] = '\0'; + } + + if(!cp && !region) + { + remap_synonym(search.search_language); + search.allow_sname = TRUE; + } - if(!search.search_country[0] && !search.search_codepage[0]) - remap_synonym(search.search_language); + if(!MSVCRT__stricmp(search.search_country, "China")) + strcpy(search.search_country, "People's Republic of China"); - if(!MSVCRT__stricmp(search.search_country, "China")) - strcpy(search.search_country, "People's Republic of China"); + EnumResourceLanguagesA(GetModuleHandleA("KERNEL32"), (LPSTR)RT_STRING, + (LPCSTR)LOCALE_ILANGUAGE,find_best_locale_proc, + (LONG_PTR)&search); - EnumResourceLanguagesA(GetModuleHandleA("KERNEL32"), (LPSTR)RT_STRING, - (LPCSTR)LOCALE_ILANGUAGE,find_best_locale_proc, - (LONG_PTR)&search); + if (!search.match_flags) + return -1; - if (!search.match_flags) - return -1; + /* If we were given something that didn't match, fail */ + if (search.search_language[0] && !(search.match_flags & (FOUND_SNAME | FOUND_LANGUAGE))) + return -1; + if (search.search_country[0] && !(search.match_flags & FOUND_COUNTRY)) + return -1; + + lcid = MAKELCID(search.found_lang_id, SORT_DEFAULT); + is_sname = (search.match_flags & FOUND_SNAME) != 0; + } - /* If we were given something that didn't match, fail */ - if (search.search_language[0] && !(search.match_flags & (FOUND_SNAME | FOUND_LANGUAGE))) + /* Obtain code page */ + if (!cp || !cp[1] || !MSVCRT__strnicmp(cp, ".ACP", 4)) { + GetLocaleInfoW(lcid, LOCALE_IDEFAULTANSICODEPAGE | LOCALE_RETURN_NUMBER, + (WCHAR *)&locale_cp, sizeof(DWORD)/sizeof(WCHAR)); + if (!locale_cp) + locale_cp = GetACP(); + } else if (!MSVCRT__strnicmp(cp, ".OCP", 4)) { + GetLocaleInfoW(lcid, LOCALE_IDEFAULTCODEPAGE | LOCALE_RETURN_NUMBER, + (WCHAR *)&locale_cp, sizeof(DWORD)/sizeof(WCHAR)); + } else { + locale_cp = atoi(cp + 1); + } + if (!IsValidCodePage(locale_cp)) return -1; - if (search.search_country[0] && !(search.match_flags & FOUND_COUNTRY)) + + if (!locale_cp) return -1; - lcid = MAKELCID(search.found_lang_id, SORT_DEFAULT); - - /* Populate partial locale, translating LCID to locale string elements */ - if (!(search.match_flags & FOUND_CODEPAGE)) { - /* Even if a codepage is not enumerated for a locale - * it can be set if valid */ - if (search.search_codepage[0]) { - search.found_codepage = atoi(search.search_codepage); - if (!IsValidCodePage(atoi(search.search_codepage))) - { - /* Special codepage values: OEM & ANSI */ - if (!MSVCRT__stricmp(search.search_codepage,"OCP")) { - GetLocaleInfoW(lcid, LOCALE_IDEFAULTCODEPAGE | LOCALE_RETURN_NUMBER, - (WCHAR *)&search.found_codepage, sizeof(DWORD)/sizeof(WCHAR)); - } else if (!MSVCRT__stricmp(search.search_codepage,"ACP")) { - GetLocaleInfoW(lcid, LOCALE_IDEFAULTANSICODEPAGE | LOCALE_RETURN_NUMBER, - (WCHAR *)&search.found_codepage, sizeof(DWORD)/sizeof(WCHAR)); - } else - return -1; - if (!search.found_codepage) - return -1; - } - } else { - /* Prefer ANSI codepages if present */ - GetLocaleInfoW(lcid, LOCALE_IDEFAULTANSICODEPAGE | LOCALE_RETURN_NUMBER, - (WCHAR *)&search.found_codepage, sizeof(DWORD)/sizeof(WCHAR)); - if (!search.found_codepage) - GetLocaleInfoW(lcid, LOCALE_IDEFAULTCODEPAGE | LOCALE_RETURN_NUMBER, - (WCHAR *)&search.found_codepage, sizeof(DWORD)/sizeof(WCHAR)); - } - } if (codepage) - *codepage = search.found_codepage; + *codepage = locale_cp; if (sname) - *sname = (search.match_flags & FOUND_SNAME) != 0; + *sname = is_sname; if (strlen(locale) < sizeof(data->cached_locale)) { strcpy(data->cached_locale, locale); data->cached_lcid = lcid; - data->cached_cp = codepage ? *codepage : search.found_codepage; - data->cached_sname = (search.match_flags & FOUND_SNAME) != 0; + data->cached_cp = locale_cp; + data->cached_sname = is_sname; } return lcid; @@ -1129,16 +1109,6 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, if(locale[0]=='C' && !locale[1]) { lcid[0] = 0; cp[0] = CP_ACP; - } else if(!locale[0]) { - lcid[0] = GetSystemDefaultLCID(); - GetLocaleInfoA(lcid[0], LOCALE_IDEFAULTANSICODEPAGE - |LOCALE_NOUSEROVERRIDE, buf, sizeof(buf)); - cp[0] = atoi(buf); - - for(i=1; i<6; i++) { - lcid[i] = lcid[0]; - cp[i] = cp[0]; - } } else if (locale[0] == 'L' && locale[1] == 'C' && locale[2] == '_') { const char *p;

1 0

Nikolay Sivov : dxva2: Return some static render target formats.
by Alexandre Julliard Sept. 18, 2020

Sept. 18, 2020

Module: wine Branch: master Commit: 97136a8707412614b4a0266d402674bfb3b6e111 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97136a8707412614b4a0266d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 18 17:25:15 2020 +0300 dxva2: Return some static render target formats. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxva2/main.c | 18 +++++++++++++++++- dlls/dxva2/tests/Makefile.in | 2 +- dlls/dxva2/tests/dxva2.c | 23 ++++++++++++++++++++++- 3 files changed, 40 insertions(+), 3 deletions(-) diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index 22a35c4fbb..6ebc4f0018 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -195,7 +195,23 @@ static HRESULT WINAPI device_manager_processor_service_GetVideoProcessorRenderTa IDirectXVideoProcessorService *iface, REFGUID deviceguid, const DXVA2_VideoDesc *video_desc, UINT *count, D3DFORMAT **formats) { - FIXME("%p, %s, %p, %p, %p.\n", iface, debugstr_guid(deviceguid), video_desc, count, formats); + TRACE("%p, %s, %p, %p, %p.\n", iface, debugstr_guid(deviceguid), video_desc, count, formats); + + if (IsEqualGUID(deviceguid, &DXVA2_VideoProcSoftwareDevice)) + { + /* FIXME: filter some input formats */ + + if (!(*formats = CoTaskMemAlloc(2 * sizeof(**formats)))) + return E_OUTOFMEMORY; + + *count = 2; + (*formats)[0] = D3DFMT_X8R8G8B8; + (*formats)[1] = D3DFMT_A8R8G8B8; + + return S_OK; + } + else + FIXME("Unsupported device %s.\n", debugstr_guid(deviceguid)); return E_NOTIMPL; } diff --git a/dlls/dxva2/tests/Makefile.in b/dlls/dxva2/tests/Makefile.in index c86c5ab42f..ccd03940a2 100644 --- a/dlls/dxva2/tests/Makefile.in +++ b/dlls/dxva2/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = dxva2.dll -IMPORTS = dxva2 user32 d3d9 +IMPORTS = dxva2 user32 d3d9 ole32 C_SRCS = \ dxva2.c diff --git a/dlls/dxva2/tests/dxva2.c b/dlls/dxva2/tests/dxva2.c index 58b0231420..f5b28ed3f8 100644 --- a/dlls/dxva2/tests/dxva2.c +++ b/dlls/dxva2/tests/dxva2.c @@ -82,13 +82,16 @@ static void test_device_manager(void) IDirectXVideoProcessorService *processor_service; IDirectXVideoAccelerationService *accel_service; IDirect3DDevice9 *device, *device2, *device3; + IDirectXVideoProcessorService *proc_service; IDirect3DDeviceManager9 *manager; IDirect3DSurface9 *surfaces[2]; + DXVA2_VideoDesc video_desc; int refcount, refcount2; HANDLE handle, handle1; + D3DFORMAT *formats; + UINT token, count; IDirect3D9 *d3d; HWND window; - UINT token; HRESULT hr; RECT rect; @@ -297,6 +300,24 @@ static void test_device_manager(void) IDirectXVideoAccelerationService_Release(accel_service); + /* RT formats. */ + hr = DXVA2CreateVideoService(device, &IID_IDirectXVideoProcessorService, (void **)&proc_service); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + memset(&video_desc, 0, sizeof(video_desc)); + video_desc.SampleWidth = 64; + video_desc.SampleHeight = 64; + video_desc.Format = D3DFMT_A8R8G8B8; + + count = 0; + hr = IDirectXVideoProcessorService_GetVideoProcessorRenderTargets(proc_service, &DXVA2_VideoProcSoftwareDevice, + &video_desc, &count, &formats); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(count, "Unexpected format count %u.\n", count); + CoTaskMemFree(formats); + + IDirectXVideoProcessorService_Release(proc_service); + hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : evr/mixer: Fix error handling in output types collection helper.
by Alexandre Julliard Sept. 18, 2020

Sept. 18, 2020

Module: wine Branch: master Commit: 305aaec8773a7cbd0fdd4d12c5e0210e9cb5f33d URL: https://source.winehq.org/git/wine.git/?a=commit;h=305aaec8773a7cbd0fdd4d12… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 18 17:25:16 2020 +0300 evr/mixer: Fix error handling in output types collection helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 6 +++++- dlls/evr/tests/evr.c | 1 - 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 710e20815a..e19520fa7e 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -604,6 +604,7 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const if (!(ptr = heap_realloc(rt_formats, (count + format_count) * sizeof(*rt_formats)))) { hr = E_OUTOFMEMORY; + count = 0; CoTaskMemFree(formats); break; } @@ -641,12 +642,15 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const mixer->output.type_count = count; } else + { hr = E_OUTOFMEMORY; + count = 0; + } } heap_free(rt_formats); - return hr; + return count ? S_OK : hr; } static HRESULT WINAPI video_mixer_transform_SetInputType(IMFTransform *iface, DWORD id, IMFMediaType *media_type, DWORD flags) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 3e2675497a..bf33051d6e 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -893,7 +893,6 @@ static void test_default_mixer_type_negotiation(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFTransform_SetInputType(transform, 0, (IMFMediaType *)video_type, 0); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type);

1 0

Piotr Caban : msvcrt: Fix console detection in _write.
by Alexandre Julliard Sept. 18, 2020

Sept. 18, 2020

Module: wine Branch: master Commit: 155e2b2c3e4d9e87474caec2a3d1ea64d714cff0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=155e2b2c3e4d9e87474caec2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 18 17:15:08 2020 +0200 msvcrt: Fix console detection in _write. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 602fe6d1df..9d5f19cfbc 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3447,7 +3447,7 @@ int CDECL MSVCRT__write(int fd, const void* buf, unsigned int count) ioinfo *info = get_ioinfo(fd); HANDLE hand = info->handle; DWORD num_written, i; - BOOL console; + BOOL console = FALSE; if (hand == INVALID_HANDLE_VALUE || fd == MSVCRT_NO_CONSOLE_FD) { @@ -3482,7 +3482,7 @@ int CDECL MSVCRT__write(int fd, const void* buf, unsigned int count) return num_written; } - console = MSVCRT__isatty(fd); + if (MSVCRT__isatty(fd)) console = VerifyConsoleIoHandle(hand); for (i = 0; i < count;) { const char *s = buf;

1 0

Paul Gofman : msvcrt/tests: Test .{O|A}CP locale string.
by Alexandre Julliard Sept. 18, 2020

Sept. 18, 2020

Module: wine Branch: master Commit: e6a42874a2bf345c41f94a5c78c5b81510e667d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6a42874a2bf345c41f94a5c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Sep 18 15:53:06 2020 +0200 msvcrt/tests: Test .{O|A}CP locale string. Used by Marvel's Avengers. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/locale.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index 08abac00be..e0bafe3a0d 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -45,6 +45,8 @@ static void test_setlocale(void) "LC_MONETARY=Greek_Greece.1253;LC_NUMERIC=Polish_Poland.1250;LC_TIME=C"; char *ret, buf[100]; + char *ptr; + int len; ret = setlocale(20, "C"); ok(ret == NULL, "ret = %s\n", ret); @@ -612,6 +614,27 @@ static void test_setlocale(void) ok(!strcmp(ret, buf), "ret = %s, expected %s\n", ret, buf); } + GetLocaleInfoA(GetUserDefaultLCID(), LOCALE_IDEFAULTCODEPAGE, buf, sizeof(buf)); + if(IsValidCodePage(atoi(buf))) { + ret = setlocale(LC_ALL, ".OCP"); + ok(ret != NULL, "ret == NULL\n"); + ptr = strchr(ret, '.'); + ok(ptr && !strcmp(ptr + 1, buf), "ret %s, buf %s.\n", ret, buf); + } + + len = GetLocaleInfoA(GetUserDefaultLCID(), LOCALE_IDEFAULTANSICODEPAGE, buf, sizeof(buf)) - 1; + if(buf[0] == '0' && !buf[1]) + len = sprintf(buf, "%d", GetACP()); + ret = setlocale(LC_ALL, ".ACP"); + ok(ret != NULL, "ret == NULL\n"); + ptr = strchr(ret, '.'); + ok(ptr && !strncmp(ptr + 1, buf, len), "ret %s, buf %s.\n", ret, buf); + + ret = setlocale(LC_ALL, ".1250"); + ok(ret != NULL, "ret == NULL\n"); + ptr = strchr(ret, '.'); + ok(ptr && !strcmp(ptr, ".1250"), "ret %s, buf %s.\n", ret, buf); + ret = setlocale(LC_ALL, "English_United States.UTF8"); ok(ret == NULL, "ret != NULL\n");

1 0

Kevin Puetz : oleaut32/tests: Reformat test_dump_typelib.
by Alexandre Julliard Sept. 18, 2020

Sept. 18, 2020

Module: wine Branch: master Commit: e556df2db5fb92316a67c8573fca9fbaf452c5c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e556df2db5fb92316a67c857… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Thu Sep 17 18:24:16 2020 -0500 oleaut32/tests: Reformat test_dump_typelib. Always print initializer for funcs[] array, even when empty Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/typelib.c | 99 +++++++++++++++++++++++++++---------------- 1 file changed, 62 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e556df2db5fb92316a67…

1 0

Alexandre Julliard : makefiles: Don't use default imports for Unix libraries.
by Alexandre Julliard Sept. 18, 2020

Sept. 18, 2020

Module: wine Branch: master Commit: c670df976c10e29e095dc0b0113669800b0dd0cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=c670df976c10e29e095dc0b0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 18 15:03:08 2020 +0200 makefiles: Don't use default imports for Unix libraries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 21 +++++++-------------- tools/winegcc/winegcc.c | 2 +- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index c065b2b0f1..b7c26492eb 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2219,11 +2219,7 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra const char *lib = NULL; /* skip module's own importlib, its object files will be linked directly */ - if (make->importlib && !strcmp( make->importlib, imports.str[i] )) - { - if (!is_unix) continue; - if (strarray_exists( &make->extradllflags, "-nodefaultlibs" )) continue; - } + if (make->importlib && !strcmp( make->importlib, imports.str[i] )) continue; for (j = 0; j < subdirs.count; j++) { @@ -3325,6 +3321,7 @@ static void output_module( struct makefile *make ) if (make->unixobj_files.count) { + struct strarray unix_imports = empty_strarray; struct strarray unix_libs = empty_strarray; struct strarray unix_deps = empty_strarray; char *ext, *unix_lib = xmalloc( strlen( make->module ) + strlen( dll_ext ) + 1 ); @@ -3332,15 +3329,11 @@ static void output_module( struct makefile *make ) if ((ext = get_extension( unix_lib ))) *ext = 0; strcat( unix_lib, dll_ext ); - if (make->importlib) - { - struct strarray imp = empty_strarray; - strarray_add( &imp, make->importlib ); - strarray_addall( &unix_libs, add_import_libs( make, &unix_deps, imp, 1, 1 )); - } - strarray_addall( &unix_libs, add_import_libs( make, &unix_deps, make->delayimports, 1, 1 )); - strarray_addall( &unix_libs, add_import_libs( make, &unix_deps, make->imports, 0, 1 )); - add_import_libs( make, &unix_deps, get_default_imports( make ), 0, 1 ); /* dependencies only */ + if (!strarray_exists( &make->extradllflags, "-nodefaultlibs" )) + strarray_add( &unix_imports, "ntdll" ); + strarray_add( &unix_imports, "winecrt0" ); + + 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_add( &make->all_targets, unix_lib ); diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index bbb44ff614..ca45f9bdad 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1219,7 +1219,7 @@ static void build(struct options* opts) add_library(opts, lib_dirs, files, "user32"); } - if (!opts->nodefaultlibs) + if (!opts->nodefaultlibs && !opts->unix_lib) { add_library(opts, lib_dirs, files, "winecrt0"); if (opts->use_msvcrt)

1 0

Alexandre Julliard : makefiles: Only add default libraries for Unix builds.
by Alexandre Julliard Sept. 18, 2020

Sept. 18, 2020

Module: wine Branch: master Commit: c73ae99ff49944e3f544dd901628538984f85c4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c73ae99ff49944e3f544dd90… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 18 15:02:00 2020 +0200 makefiles: Only add default libraries for Unix builds. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 7fe2c4daf5..c065b2b0f1 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2168,21 +2168,17 @@ static int needs_implib_symlink( const struct makefile *make ) /******************************************************************* - * add_default_libraries + * add_unix_libraries */ -static struct strarray add_default_libraries( const struct makefile *make, struct strarray *deps, - int add_unix_libs ) +static struct strarray add_unix_libraries( const struct makefile *make, struct strarray *deps ) { struct strarray ret = empty_strarray; struct strarray all_libs = empty_strarray; unsigned int i, j; - if (add_unix_libs) - { - strarray_add( &all_libs, "-lwine_port" ); - strarray_addall( &all_libs, get_expanded_make_var_array( make, "EXTRALIBS" )); - strarray_addall( &all_libs, libs ); - } + strarray_add( &all_libs, "-lwine_port" ); + strarray_addall( &all_libs, get_expanded_make_var_array( make, "EXTRALIBS" )); + strarray_addall( &all_libs, libs ); for (i = 0; i < all_libs.count; i++) { @@ -3283,7 +3279,7 @@ static void output_module( struct makefile *make ) } else if (*dll_ext) { - strarray_addall( &all_libs, add_default_libraries( make, &dep_libs, !make->use_msvcrt )); + if (!make->use_msvcrt) strarray_addall( &all_libs, add_unix_libraries( make, &dep_libs )); 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" )); @@ -3297,7 +3293,7 @@ static void output_module( struct makefile *make ) } else { - strarray_addall( &all_libs, add_default_libraries( make, &dep_libs, 1 )); + strarray_addall( &all_libs, add_unix_libraries( make, &dep_libs )); 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 )); @@ -3345,7 +3341,7 @@ static void output_module( struct makefile *make ) strarray_addall( &unix_libs, add_import_libs( make, &unix_deps, make->delayimports, 1, 1 )); strarray_addall( &unix_libs, add_import_libs( make, &unix_deps, make->imports, 0, 1 )); add_import_libs( make, &unix_deps, get_default_imports( make ), 0, 1 ); /* dependencies only */ - strarray_addall( &unix_libs, add_default_libraries( make, &unix_deps, 1 )); + strarray_addall( &unix_libs, add_unix_libraries( make, &unix_deps )); strarray_add( &make->all_targets, unix_lib ); add_install_rule( make, make->module, unix_lib, strmake( "p$(dlldir)/%s", unix_lib )); @@ -3490,7 +3486,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_default_libraries( make, &dep_libs, 1 )); + strarray_addall( &all_libs, add_unix_libraries( make, &dep_libs )); output( "%s:", obj_dir_path( make, make->sharedlib )); output_filenames_obj_dir( make, make->object_files ); @@ -3602,7 +3598,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_default_libraries( make, &deps, 1 )); + strarray_addall( &all_libs, add_unix_libraries( make, &deps )); output( "%s:", obj_dir_path( make, program ) ); output_filenames_obj_dir( make, objs );

1 0