February 2020 - Wine-Commits

Vijay Kiran Kamuju : include: Update fields of SYSTEM_TIMEOFDAY_INFORMATION.
by Alexandre Julliard Feb. 19, 2020

Feb. 19, 2020

Module: wine Branch: master Commit: 21bba871815215bc50ed8a14107f88d5698d737a URL: https://source.winehq.org/git/wine.git/?a=commit;h=21bba871815215bc50ed8a14… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Feb 1 05:09:14 2020 +0100 include: Update fields of SYSTEM_TIMEOFDAY_INFORMATION. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winternl.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/winternl.h b/include/winternl.h index 940337153d..caaeac5cd5 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1456,7 +1456,9 @@ typedef struct _SYSTEM_TIMEOFDAY_INFORMATION { LARGE_INTEGER liKeSystemTime; LARGE_INTEGER liExpTimeZoneBias; ULONG uCurrentTimeZoneId; - DWORD dwUnknown1[5]; + ULONG Reserved; + ULONGLONG BootTimeBias; + ULONGLONG SleepTimeBias; #else BYTE Reserved1[48]; #endif

1 0

Jacek Caban : include: Add corecrt_wio.h header.
by Alexandre Julliard Feb. 19, 2020

Feb. 19, 2020

Module: wine Branch: master Commit: 6b35cd2903bc9842ce54cee02caee2106625091d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b35cd2903bc9842ce54cee0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 19 12:02:18 2020 +0100 include: Add corecrt_wio.h header. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/msvcrt/corecrt_wio.h | 56 ++++++++++++++++++++++++++++++++++++++++++++ include/msvcrt/io.h | 43 +--------------------------------- include/msvcrt/wchar.h | 45 +---------------------------------- 4 files changed, 59 insertions(+), 86 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 21b4233ecd..506e5fc96a 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -425,6 +425,7 @@ SOURCES = \ msvcrt/conio.h \ msvcrt/corecrt.h \ msvcrt/corecrt_stdio_config.h \ + msvcrt/corecrt_wio.h \ msvcrt/corecrt_wstdio.h \ msvcrt/crtdbg.h \ msvcrt/crtdefs.h \ diff --git a/include/msvcrt/corecrt_wio.h b/include/msvcrt/corecrt_wio.h new file mode 100644 index 0000000000..6d4b73c915 --- /dev/null +++ b/include/msvcrt/corecrt_wio.h @@ -0,0 +1,56 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the Wine project. + */ + +#ifndef _WIO_DEFINED +#define _WIO_DEFINED + +#include <corecrt.h> + +#include <pshpack8.h> + +typedef __msvcrt_ulong _fsize_t; + +struct _wfinddata_t { + unsigned attrib; + time_t time_create; + time_t time_access; + time_t time_write; + _fsize_t size; + wchar_t name[260]; +}; + +struct _wfinddatai64_t { + unsigned attrib; + time_t time_create; + time_t time_access; + time_t time_write; + __int64 DECLSPEC_ALIGN(8) size; + wchar_t name[260]; +}; + +#ifdef __cplusplus +extern "C" { +#endif + +int __cdecl _waccess(const wchar_t*,int); +int __cdecl _wchmod(const wchar_t*,int); +int __cdecl _wcreat(const wchar_t*,int); +intptr_t __cdecl _wfindfirst(const wchar_t*,struct _wfinddata_t*); +intptr_t __cdecl _wfindfirsti64(const wchar_t*, struct _wfinddatai64_t*); +int __cdecl _wfindnext(intptr_t,struct _wfinddata_t*); +int __cdecl _wfindnexti64(intptr_t, struct _wfinddatai64_t*); +wchar_t* __cdecl _wmktemp(wchar_t*); +int WINAPIV _wopen(const wchar_t*,int,...); +int __cdecl _wrename(const wchar_t*,const wchar_t*); +int WINAPIV _wsopen(const wchar_t*,int,int,...); +int __cdecl _wunlink(const wchar_t*); + +#ifdef __cplusplus +} +#endif + +#include <poppack.h> + +#endif /* _WIO_DEFINED */ diff --git a/include/msvcrt/io.h b/include/msvcrt/io.h index 5f1891586a..b5e84490ae 100644 --- a/include/msvcrt/io.h +++ b/include/msvcrt/io.h @@ -9,6 +9,7 @@ #define __WINE_IO_H #include <corecrt.h> +#include <corecrt_wio.h> #include <pshpack8.h> @@ -21,11 +22,6 @@ #define _A_SUBDIR 0x00000010 #define _A_ARCH 0x00000020 -#ifndef _FSIZE_T_DEFINED -typedef __msvcrt_ulong _fsize_t; -#define _FSIZE_T_DEFINED -#endif - #ifndef _FINDDATA_T_DEFINED #define _FINDDATA_T_DEFINED struct _finddata_t @@ -59,27 +55,6 @@ struct _finddata64_t }; #endif /* _FINDDATA_T_DEFINED */ -#ifndef _WFINDDATA_T_DEFINED -#define _WFINDDATA_T_DEFINED -struct _wfinddata_t { - unsigned attrib; - time_t time_create; - time_t time_access; - time_t time_write; - _fsize_t size; - wchar_t name[260]; -}; - -struct _wfinddatai64_t { - unsigned attrib; - time_t time_create; - time_t time_access; - time_t time_write; - __int64 DECLSPEC_ALIGN(8) size; - wchar_t name[260]; -}; -#endif /* _WFINDDATA_T_DEFINED */ - #ifdef __cplusplus extern "C" { #endif @@ -125,22 +100,6 @@ int __cdecl _write(int,const void*,unsigned int); int __cdecl remove(const char*); int __cdecl rename(const char*,const char*); -#ifndef _WIO_DEFINED -#define _WIO_DEFINED -int __cdecl _waccess(const wchar_t*,int); -int __cdecl _wchmod(const wchar_t*,int); -int __cdecl _wcreat(const wchar_t*,int); -intptr_t __cdecl _wfindfirst(const wchar_t*,struct _wfinddata_t*); -intptr_t __cdecl _wfindfirsti64(const wchar_t*, struct _wfinddatai64_t*); -int __cdecl _wfindnext(intptr_t,struct _wfinddata_t*); -int __cdecl _wfindnexti64(intptr_t, struct _wfinddatai64_t*); -wchar_t * __cdecl _wmktemp(wchar_t*); -int WINAPIV _wopen(const wchar_t*,int,...); -int __cdecl _wrename(const wchar_t*,const wchar_t*); -int WINAPIV _wsopen(const wchar_t*,int,int,...); -int __cdecl _wunlink(const wchar_t*); -#endif /* _WIO_DEFINED */ - #ifdef __cplusplus } #endif diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index e6a5e57fd2..d5ae3561d0 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -9,6 +9,7 @@ #define __WINE_WCHAR_H #include <corecrt_wstdio.h> +#include <corecrt_wio.h> #include <string.h> #include <pshpack8.h> @@ -34,11 +35,6 @@ extern "C" { typedef int mbstate_t; -#ifndef _FSIZE_T_DEFINED -typedef __msvcrt_ulong _fsize_t; -#define _FSIZE_T_DEFINED -#endif - #ifndef _DEV_T_DEFINED typedef unsigned int _dev_t; #define _DEV_T_DEFINED @@ -69,29 +65,6 @@ struct tm { }; #endif /* _TM_DEFINED */ -#ifndef _WFINDDATA_T_DEFINED -#define _WFINDDATA_T_DEFINED - -struct _wfinddata_t { - unsigned attrib; - time_t time_create; - time_t time_access; - time_t time_write; - _fsize_t size; - wchar_t name[260]; -}; - -struct _wfinddatai64_t { - unsigned attrib; - time_t time_create; - time_t time_access; - time_t time_write; - __int64 DECLSPEC_ALIGN(8) size; - wchar_t name[260]; -}; - -#endif /* _WFINDDATA_T_DEFINED */ - #ifndef _STAT_DEFINED #define _STAT_DEFINED @@ -236,22 +209,6 @@ int __cdecl _wmkdir(const wchar_t*); int __cdecl _wrmdir(const wchar_t*); #endif /* _WDIRECT_DEFINED */ -#ifndef _WIO_DEFINED -#define _WIO_DEFINED -int __cdecl _waccess(const wchar_t*,int); -int __cdecl _wchmod(const wchar_t*,int); -int __cdecl _wcreat(const wchar_t*,int); -intptr_t __cdecl _wfindfirst(const wchar_t*,struct _wfinddata_t*); -intptr_t __cdecl _wfindfirsti64(const wchar_t*, struct _wfinddatai64_t*); -int __cdecl _wfindnext(intptr_t,struct _wfinddata_t*); -int __cdecl _wfindnexti64(intptr_t, struct _wfinddatai64_t*); -wchar_t* __cdecl _wmktemp(wchar_t*); -int WINAPIV _wopen(const wchar_t*,int,...); -int __cdecl _wrename(const wchar_t*,const wchar_t*); -int WINAPIV _wsopen(const wchar_t*,int,int,...); -int __cdecl _wunlink(const wchar_t*); -#endif /* _WIO_DEFINED */ - #ifndef _WLOCALE_DEFINED #define _WLOCALE_DEFINED wchar_t* __cdecl _wsetlocale(int,const wchar_t*);

1 0

Florian Will : gdiplus/tests: Add multi-page tiff file saving test.
by Alexandre Julliard Feb. 19, 2020

Feb. 19, 2020

Module: wine Branch: master Commit: 21b62920f6b55336bb666117b58c9d7bad4de763 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21b62920f6b55336bb666117… Author: Florian Will <florian.will(a)gmail.com> Date: Wed Feb 19 08:47:06 2020 +0100 gdiplus/tests: Add multi-page tiff file saving test. Also move the get_encoder_clsid() helper to the top of the file so it can be used by the new test. Signed-off-by: Florian Will <florian.will(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/image.c | 244 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 214 insertions(+), 30 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index d6f74050c0..01d79f08c4 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -76,6 +76,36 @@ static void expect_rawformat(REFGUID expected, GpImage *img, int line, BOOL todo expect_guid(expected, &raw, line, todo); } +static BOOL get_encoder_clsid(LPCWSTR mime, GUID *format, CLSID *clsid) +{ + GpStatus status; + UINT n_codecs, info_size, i; + ImageCodecInfo *info; + BOOL ret = FALSE; + + status = GdipGetImageEncodersSize(&n_codecs, &info_size); + expect(Ok, status); + + info = GdipAlloc(info_size); + + status = GdipGetImageEncoders(n_codecs, info_size, info); + expect(Ok, status); + + for (i = 0; i < n_codecs; i++) + { + if (!lstrcmpW(info[i].MimeType, mime)) + { + *format = info[i].FormatID; + *clsid = info[i].Clsid; + ret = TRUE; + break; + } + } + + GdipFree(info); + return ret; +} + static void test_bufferrawformat(void* buff, int size, REFGUID expected, int line, BOOL todo) { LPSTREAM stream; @@ -487,6 +517,189 @@ static void test_SavingImages(void) ok(DeleteFileA(filenameA), "Delete failed.\n"); } +static void test_SavingMultiPageTiff(void) +{ + GpStatus stat; + BOOL result; + GpBitmap *bm1 = NULL, *bm2 = NULL, *check_bm = NULL; + const REAL WIDTH = 10.0, HEIGHT = 20.0; + REAL w, h; + GUID format, tiff_clsid; + EncoderParameters params; + ULONG32 paramValue = EncoderValueFrameDimensionPage; + UINT frame_count; + static const CHAR filename1A[] = "1.tif"; + static const CHAR filename2A[] = "2.tif"; + static const WCHAR filename1[] = { '1','.','t','i','f',0 }; + static const WCHAR filename2[] = { '2','.','t','i','f',0 }; + static const WCHAR tiff_mimetype[] = { 'i','m','a','g','e','/','t','i','f','f',0 }; + + params.Count = 1; + params.Parameter[0].Guid = EncoderSaveFlag; + params.Parameter[0].Type = EncoderParameterValueTypeLong; + params.Parameter[0].NumberOfValues = 1; + params.Parameter[0].Value = &paramValue; + + stat = GdipCreateBitmapFromScan0(WIDTH, HEIGHT, 0, PixelFormat24bppRGB, NULL, &bm1); + expect(Ok, stat); + stat = GdipCreateBitmapFromScan0(2 * WIDTH, 2 * HEIGHT, 0, PixelFormat24bppRGB, NULL, &bm2); + expect(Ok, stat); + result = get_encoder_clsid(tiff_mimetype, &format, &tiff_clsid); + ok(result, "getting TIFF encoding clsid failed"); + + if (!bm1 || !bm2 || !result) + return; + + /* invalid params: NULL */ + stat = GdipSaveAdd(0, &params); + todo_wine expect(InvalidParameter, stat); + stat = GdipSaveAdd((GpImage*)bm1, 0); + todo_wine expect(InvalidParameter, stat); + + stat = GdipSaveAddImage((GpImage*)bm1, (GpImage*)bm2, 0); + todo_wine expect(InvalidParameter, stat); + stat = GdipSaveAddImage((GpImage*)bm1, 0, &params); + todo_wine expect(InvalidParameter, stat); + stat = GdipSaveAddImage(0, (GpImage*)bm2, &params); + todo_wine expect(InvalidParameter, stat); + + /* win32 error: SaveAdd() can only be called after Save() with the MultiFrame param */ + stat = GdipSaveAdd((GpImage*)bm1, &params); + todo_wine expect(Win32Error, stat); + stat = GdipSaveAddImage((GpImage*)bm1, (GpImage*)bm2, &params); + todo_wine expect(Win32Error, stat); + + stat = GdipSaveImageToFile((GpImage*)bm1, filename1, &tiff_clsid, 0); /* param not set! */ + expect(Ok, stat); + if (stat != Ok) goto cleanup; + + stat = GdipSaveAdd((GpImage*)bm1, &params); + todo_wine expect(Win32Error, stat); + stat = GdipSaveAddImage((GpImage*)bm1, (GpImage*)bm2, &params); + todo_wine expect(Win32Error, stat); + + /* win32 error: can't flush before starting the encoding process */ + paramValue = EncoderValueFlush; + stat = GdipSaveAdd((GpImage*)bm1, &params); + todo_wine expect(Win32Error, stat); + + /* win32 error: can't start encoding process through SaveAdd(), only Save() */ + paramValue = EncoderValueMultiFrame; + stat = GdipSaveAdd((GpImage*)bm1, &params); + todo_wine expect(Win32Error, stat); + + /* start encoding process: add first frame (bm1) */ + paramValue = EncoderValueMultiFrame; + stat = GdipSaveImageToFile((GpImage*)bm1, filename1, &tiff_clsid, &params); + expect(Ok, stat); + + /* re-start encoding process: add first frame (bm1), should re-create the file */ + stat = GdipSaveImageToFile((GpImage*)bm1, filename1, &tiff_clsid, &params); + expect(Ok, stat); + + /* add second frame (bm2) */ + paramValue = EncoderValueFrameDimensionPage; + stat = GdipSaveAddImage((GpImage*)bm1, (GpImage*)bm2, &params); + todo_wine expect(Ok, stat); + if (stat != Ok) goto cleanup; + + /* finish encoding process */ + paramValue = EncoderValueFlush; + stat = GdipSaveAdd((GpImage*)bm1, &params); + expect(Ok, stat); + + /* bm1 should be unchanged, only the saved file on disk has multiple frames */ + stat = GdipImageGetFrameCount((GpImage*)bm1, &FrameDimensionPage, &frame_count); + expect(Ok, stat); + expect(1, frame_count); + + /* win32 error: encoding process already finished */ + paramValue = EncoderValueFrameDimensionPage; + stat = GdipSaveAddImage((GpImage*)bm1, (GpImage*)bm2, &params); + expect(Win32Error, stat); + + stat = GdipSaveAdd((GpImage*)bm1, &params); + expect(Win32Error, stat); + + GdipDisposeImage((GpImage*)bm1); + bm1 = 0; + GdipDisposeImage((GpImage*)bm2); + bm2 = 0; + + /* re-load and check image stats */ + stat = GdipLoadImageFromFile(filename1, (GpImage**)&check_bm); + expect(Ok, stat); + + stat = GdipImageGetFrameCount((GpImage*)check_bm, &FrameDimensionPage, &frame_count); + expect(Ok, stat); + expect(2, frame_count); + if (stat != Ok || frame_count != 2) goto cleanup; + + stat = GdipGetImageDimension((GpImage*)check_bm, &w, &h); + expect(Ok, stat); + expectf(WIDTH, w); /* frame index 0: bm1 stats */ + expectf(HEIGHT, h); + + stat = GdipImageSelectActiveFrame((GpImage*)check_bm, &FrameDimensionPage, 1); + expect(Ok, stat); + + stat = GdipGetImageDimension((GpImage*)check_bm, &w, &h); + expectf(2 * WIDTH, w); /* frame index 1: bm2 stats */ + expectf(2 * HEIGHT, h); + + /* now proper API use for SaveAdd() to swap the frames in check_bm */ + paramValue = EncoderValueMultiFrame; + stat = GdipSaveImageToFile((GpImage*)check_bm, filename2, &tiff_clsid, &params); + expect(Ok, stat); /* second frame is active: bm2 */ + + stat = GdipImageSelectActiveFrame((GpImage*)check_bm, &FrameDimensionPage, 0); + expect(Ok, stat); + + paramValue = EncoderValueFrameDimensionPage; + stat = GdipSaveAdd((GpImage*)check_bm, &params); + expect(Ok, stat); /* first frame is active: bm1 */ + + paramValue = EncoderValueFlush; + stat = GdipSaveAdd((GpImage*)check_bm, &params); + expect(Ok, stat); /* flushed encoder (finished encoding process) */ + + GdipDisposeImage((GpImage*)check_bm); + check_bm = 0; + + /* re-load and check image stats */ + stat = GdipLoadImageFromFile(filename2, (GpImage**)&check_bm); + expect(Ok, stat); + + stat = GdipImageGetFrameCount((GpImage*)check_bm, &FrameDimensionPage, &frame_count); + expect(Ok, stat); + expect(2, frame_count); + + stat = GdipGetImageDimension((GpImage*)check_bm, &w, &h); + expect(Ok, stat); + expectf(2 * WIDTH, w); /* frame index 0: bm2 stats */ + expectf(2 * HEIGHT, h); + + stat = GdipImageSelectActiveFrame((GpImage*)check_bm, &FrameDimensionPage, 1); + expect(Ok, stat); + + stat = GdipGetImageDimension((GpImage*)check_bm, &w, &h); + expectf(WIDTH, w); /* frame index 1: bm1 stats */ + expectf(HEIGHT, h); + + cleanup: + if (bm1) + GdipDisposeImage((GpImage*)bm1); + if (bm2) + GdipDisposeImage((GpImage*)bm2); + ok(DeleteFileA(filename1A), "Delete 1.tif failed.\n"); + + if (check_bm) + { + GdipDisposeImage((GpImage*)check_bm); + ok(DeleteFileA(filename2A), "Delete 2.tif failed.\n"); + } +} + static void test_encoders(void) { GpStatus stat; @@ -4888,36 +5101,6 @@ static void test_CloneBitmapArea(void) GdipDisposeImage((GpImage *)bitmap); } -static BOOL get_encoder_clsid(LPCWSTR mime, GUID *format, CLSID *clsid) -{ - GpStatus status; - UINT n_codecs, info_size, i; - ImageCodecInfo *info; - BOOL ret = FALSE; - - status = GdipGetImageEncodersSize(&n_codecs, &info_size); - expect(Ok, status); - - info = GdipAlloc(info_size); - - status = GdipGetImageEncoders(n_codecs, info_size, info); - expect(Ok, status); - - for (i = 0; i < n_codecs; i++) - { - if (!lstrcmpW(info[i].MimeType, mime)) - { - *format = info[i].FormatID; - *clsid = info[i].Clsid; - ret = TRUE; - break; - } - } - - GdipFree(info); - return ret; -} - static void test_supported_encoders(void) { static const WCHAR bmp_mimetype[] = { 'i', 'm', 'a','g', 'e', '/', 'b', 'm', 'p',0 }; @@ -5700,6 +5883,7 @@ START_TEST(image) test_GdipImageGetFrameDimensionsCount(); test_LoadingImages(); test_SavingImages(); + test_SavingMultiPageTiff(); test_encoders(); test_LockBits(); test_LockBits_UserBuf();

1 0

Vincent Povirk : mscoree: Remove appdomain tracking.
by Alexandre Julliard Feb. 19, 2020

Feb. 19, 2020

Module: wine Branch: master Commit: 22e58b11a7c3b44c16a5537b9ebfd9f621fb7537 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22e58b11a7c3b44c16a5537b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Feb 19 10:11:05 2020 -0600 mscoree: Remove appdomain tracking. This didn't work correctly with multiple runtime versions. We should rely on Mono to keep track of AppDomains. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/corruntimehost.c | 73 ++++-------------------------------------- dlls/mscoree/metahost.c | 22 +++++++++++++ dlls/mscoree/mscoree_private.h | 4 +-- 3 files changed, 31 insertions(+), 68 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index a900ed6a3e..a8fc2674ac 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -127,54 +127,19 @@ static void domain_restore(MonoDomain *prev_domain) mono_domain_set(prev_domain, FALSE); } -static HRESULT RuntimeHost_AddDefaultDomain(RuntimeHost *This, MonoDomain **result) -{ - struct DomainEntry *entry; - HRESULT res=S_OK; - - EnterCriticalSection(&This->lock); - - entry = HeapAlloc(GetProcessHeap(), 0, sizeof(*entry)); - if (!entry) - { - res = E_OUTOFMEMORY; - goto end; - } - - /* FIXME: Use exe filename to name the domain? */ - entry->domain = mono_jit_init_version("mscorlib.dll", "v4.0.30319"); - - if (!entry->domain) - { - HeapFree(GetProcessHeap(), 0, entry); - res = E_FAIL; - goto end; - } - - is_mono_started = TRUE; - - list_add_tail(&This->domains, &entry->entry); - - *result = entry->domain; - -end: - LeaveCriticalSection(&This->lock); - - return res; -} - static HRESULT RuntimeHost_GetDefaultDomain(RuntimeHost *This, const WCHAR *config_path, MonoDomain **result) { WCHAR config_dir[MAX_PATH]; WCHAR base_dir[MAX_PATH]; char *base_dirA, *config_pathA, *slash; HRESULT res=S_OK; + static BOOL configured_domain; - EnterCriticalSection(&This->lock); + *result = get_root_domain(); - if (This->default_domain) goto end; + EnterCriticalSection(&This->lock); - res = RuntimeHost_AddDefaultDomain(This, &This->default_domain); + if (configured_domain) goto end; if (!config_path) { @@ -213,40 +178,20 @@ static HRESULT RuntimeHost_GetDefaultDomain(RuntimeHost *This, const WCHAR *conf *(slash + 1) = 0; TRACE("setting base_dir: %s, config_path: %s\n", base_dirA, config_pathA); - mono_domain_set_config(This->default_domain, base_dirA, config_pathA); + mono_domain_set_config(*result, base_dirA, config_pathA); HeapFree(GetProcessHeap(), 0, config_pathA); HeapFree(GetProcessHeap(), 0, base_dirA); end: - *result = This->default_domain; + + configured_domain = TRUE; LeaveCriticalSection(&This->lock); return res; } -static void RuntimeHost_DeleteDomain(RuntimeHost *This, MonoDomain *domain) -{ - struct DomainEntry *entry; - - EnterCriticalSection(&This->lock); - - LIST_FOR_EACH_ENTRY(entry, &This->domains, struct DomainEntry, entry) - { - if (entry->domain == domain) - { - list_remove(&entry->entry); - if (This->default_domain == domain) - This->default_domain = NULL; - HeapFree(GetProcessHeap(), 0, entry); - break; - } - } - - LeaveCriticalSection(&This->lock); -} - static BOOL RuntimeHost_GetMethod(MonoDomain *domain, const char *assemblyname, const char *namespace, const char *typename, const char *methodname, int arg_count, MonoMethod **method) @@ -1529,8 +1474,6 @@ __int32 WINAPI _CorExeMain(void) ERR("couldn't load %s, status=%d\n", debugstr_w(filename), status); exit_code = -1; } - - RuntimeHost_DeleteDomain(host, domain); } else exit_code = -1; @@ -1616,8 +1559,6 @@ HRESULT RuntimeHost_Construct(CLRRuntimeInfo *runtime_version, RuntimeHost** res This->ref = 1; This->version = runtime_version; - list_init(&This->domains); - This->default_domain = NULL; InitializeCriticalSection(&This->lock); This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": RuntimeHost.lock"); diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 4c1e4e97c1..3786f3afc5 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -298,6 +298,28 @@ fail: return E_FAIL; } +MonoDomain* get_root_domain(void) +{ + static MonoDomain* root_domain; + + if (root_domain != NULL) + return root_domain; + + EnterCriticalSection(&runtime_list_cs); + + if (root_domain == NULL) + { + /* FIXME: Use exe filename to name the domain? */ + root_domain = mono_jit_init_version("mscorlib.dll", "v4.0.30319"); + + is_mono_started = TRUE; + } + + LeaveCriticalSection(&runtime_list_cs); + + return root_domain; +} + static void CDECL mono_shutdown_callback_fn(MonoProfiler *prof) { is_mono_shutdown = TRUE; diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index d5f78b61f0..5b6c398761 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -76,8 +76,6 @@ struct RuntimeHost ICorRuntimeHost ICorRuntimeHost_iface; ICLRRuntimeHost ICLRRuntimeHost_iface; CLRRuntimeInfo *version; - struct list domains; - MonoDomain *default_domain; CRITICAL_SECTION lock; LONG ref; }; @@ -110,6 +108,8 @@ extern HRESULT get_runtime_info(LPCWSTR exefile, LPCWSTR version, LPCWSTR config extern BOOL get_mono_path(LPWSTR path, BOOL skip_local) DECLSPEC_HIDDEN; +extern MonoDomain* get_root_domain(void); + extern HRESULT ICLRRuntimeInfo_GetRuntimeHost(ICLRRuntimeInfo *iface, RuntimeHost **result) DECLSPEC_HIDDEN; extern HRESULT MetaDataDispenser_CreateInstance(IUnknown **ppUnk) DECLSPEC_HIDDEN;

1 0

Akihiro Sagawa : user32: Fix wsprintfW %C conversion.
by Alexandre Julliard Feb. 19, 2020

Feb. 19, 2020

Module: wine Branch: master Commit: e98dbf2e948d40775749ef549ec9a3e439823fca URL: https://source.winehq.org/git/wine.git/?a=commit;h=e98dbf2e948d40775749ef54… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Feb 19 23:21:41 2020 +0900 user32: Fix wsprintfW %C conversion. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/wsprintf.c | 6 +++--- dlls/user32/wsprintf.c | 11 +++++++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/wsprintf.c b/dlls/user32/tests/wsprintf.c index c1a8b0ad98..567ed2ff10 100644 --- a/dlls/user32/tests/wsprintf.c +++ b/dlls/user32/tests/wsprintf.c @@ -187,17 +187,17 @@ static void wsprintfWTest(void) wcA1 = my_btowc(0xA1); rc = wsprintfW(buf, L"%C", 0xA1); ok(rc == 1, "expected 1, got %d\n", rc); - todo_wine ok(buf[0] == wcA1, "expected \\x%04x, got \\x%04x\n", wcA1, buf[0]); + ok(buf[0] == wcA1, "expected \\x%04x, got \\x%04x\n", wcA1, buf[0]); rc = wsprintfW(buf, L"%C", 0x81A1); ok(rc == 1, "expected 1, got %d\n", rc); - todo_wine ok(buf[0] == wcA1, "expected \\x%04x, got \\x%04x\n", wcA1, buf[0]); + ok(buf[0] == wcA1, "expected \\x%04x, got \\x%04x\n", wcA1, buf[0]); wc99 = my_btowc(0x99); rc = wsprintfW(buf, L"%2C", 0xe199); ok(rc == 2, "expected 1, got %d\n", rc); ok(buf[0] == L' ', "expected \\x0020, got \\x%04x\n", buf[0]); - todo_wine ok(buf[1] == wc99, "expected \\x%04x, got \\x%04x\n", wc99, buf[1]); + ok(buf[1] == wc99, "expected \\x%04x, got \\x%04x\n", wc99, buf[1]); if (!GetCPInfoExW(CP_ACP, 0, &cpinfoex) || cpinfoex.MaxCharSize <= 1) { diff --git a/dlls/user32/wsprintf.c b/dlls/user32/wsprintf.c index b197b714f6..db02f06634 100644 --- a/dlls/user32/wsprintf.c +++ b/dlls/user32/wsprintf.c @@ -513,8 +513,15 @@ static INT wvsnprintfW( LPWSTR buffer, UINT maxlen, LPCWSTR spec, __ms_va_list a *p++ = argData.wchar_view; break; case WPR_CHAR: - *p++ = argData.char_view; - break; + { + WCHAR wc; + if (!IsDBCSLeadByte( (BYTE)argData.char_view ) + && MultiByteToWideChar( CP_ACP, 0, &argData.char_view, 1, &wc, 1 ) > 0) + *p++ = wc; + else + *p++ = 0; + break; + } case WPR_STRING: { LPCSTR ptr = argData.lpcstr_view;

1 0

Francois Gouget : kernel32/tests: Clarify the process's quotes handling comment.
by Alexandre Julliard Feb. 19, 2020

Feb. 19, 2020

Module: wine Branch: master Commit: eec3ad5e7c9d9dcc13043ce50719b994ea0fde93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eec3ad5e7c9d9dcc13043ce5… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 19 15:53:14 2020 +0100 kernel32/tests: Clarify the process's quotes handling comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 8dceffb59f..323f8092d7 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -919,7 +919,7 @@ static void test_CommandLine(void) startup.dwFlags = STARTF_USESHOWWINDOW; startup.wShowWindow = SW_SHOWNORMAL; - /* from François */ + /* test main()'s quotes handling */ get_file_name(resfile); sprintf(buffer, "\"%s\" tests/process.c dump \"%s\" \"a\\\"b\\\\\" c\\\" d", selfname, resfile); ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess\n");

1 0

Akihiro Sagawa : shlwapi: Fix wnsprintfW/wvnsprintfW %C conversion.
by Alexandre Julliard Feb. 19, 2020

Feb. 19, 2020

Module: wine Branch: master Commit: 850b63b65ec6eac906ac99bc1f12aa6d42d7fd08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=850b63b65ec6eac906ac99bc… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Feb 19 23:21:43 2020 +0900 shlwapi: Fix wnsprintfW/wvnsprintfW %C conversion. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/wsprintf.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/wsprintf.c b/dlls/shlwapi/wsprintf.c index baf5ea601a..dfc1488f63 100644 --- a/dlls/shlwapi/wsprintf.c +++ b/dlls/shlwapi/wsprintf.c @@ -525,8 +525,15 @@ INT WINAPI wvnsprintfW( LPWSTR buffer, INT maxlen, LPCWSTR spec, __ms_va_list ar *p++ = argData.wchar_view; break; case WPR_CHAR: - *p++ = argData.char_view; - break; + { + WCHAR wc; + if (!IsDBCSLeadByte( (BYTE)argData.char_view ) + && MultiByteToWideChar( CP_ACP, 0, &argData.char_view, 1, &wc, 1 ) > 0) + *p++ = wc; + else + *p++ = 0; + break; + } case WPR_STRING: { LPCSTR ptr = argData.lpcstr_view;

1 0

Akihiro Sagawa : user32: Add wsprintfW %C tests.
by Alexandre Julliard Feb. 19, 2020

Feb. 19, 2020

Module: wine Branch: master Commit: 20ff7ad9ee0e93a43a9e87f31b1b32cb69657c07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20ff7ad9ee0e93a43a9e87f3… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Feb 19 23:21:39 2020 +0900 user32: Add wsprintfW %C tests. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/wsprintf.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/wsprintf.c b/dlls/user32/tests/wsprintf.c index 79d2112cd2..c1a8b0ad98 100644 --- a/dlls/user32/tests/wsprintf.c +++ b/dlls/user32/tests/wsprintf.c @@ -121,11 +121,20 @@ static void wsprintfATest(void) } } +static WCHAR my_btowc(BYTE c) +{ + WCHAR wc; + if (!IsDBCSLeadByte(c) && + MultiByteToWideChar(CP_ACP, 0, (const char *)&c, 1, &wc, 1) > 0) + return wc; + return 0; +} + static void wsprintfWTest(void) { static const WCHAR stars[] = L"*\x2606\x2605"; WCHAR def_spc[] = L"*?\x2605 "; - WCHAR buf[25], fmt[25], res[25]; + WCHAR buf[25], fmt[25], res[25], wcA1, wc99; char stars_mb[8], partial00[8], partialFF[8]; const struct { const char *input; @@ -166,6 +175,30 @@ static void wsprintfWTest(void) ok(!lstrcmpW(buf, res), "%u: wrong result [%s]\n", i, wine_dbgstr_w(buf)); } + rc = wsprintfW(buf, L"%2c", L'*'); + ok(rc == 2, "expected 2, got %d\n", rc); + ok(buf[0] == L' ', "expected \\x0020, got \\x%04x\n", buf[0]); + ok(buf[1] == L'*', "expected \\x%04x, got \\x%04x\n", L'*', buf[1]); + + rc = wsprintfW(buf, L"%c", L'\x2605'); + ok(rc == 1, "expected 1, got %d\n", rc); + ok(buf[0] == L'\x2605', "expected \\x%04x, got \\x%04x\n", L'\x2605', buf[0]); + + wcA1 = my_btowc(0xA1); + rc = wsprintfW(buf, L"%C", 0xA1); + ok(rc == 1, "expected 1, got %d\n", rc); + todo_wine ok(buf[0] == wcA1, "expected \\x%04x, got \\x%04x\n", wcA1, buf[0]); + + rc = wsprintfW(buf, L"%C", 0x81A1); + ok(rc == 1, "expected 1, got %d\n", rc); + todo_wine ok(buf[0] == wcA1, "expected \\x%04x, got \\x%04x\n", wcA1, buf[0]); + + wc99 = my_btowc(0x99); + rc = wsprintfW(buf, L"%2C", 0xe199); + ok(rc == 2, "expected 1, got %d\n", rc); + ok(buf[0] == L' ', "expected \\x0020, got \\x%04x\n", buf[0]); + todo_wine ok(buf[1] == wc99, "expected \\x%04x, got \\x%04x\n", wc99, buf[1]); + if (!GetCPInfoExW(CP_ACP, 0, &cpinfoex) || cpinfoex.MaxCharSize <= 1) { skip("Multi-byte wsprintfW test isn't available for the current codepage\n");

1 0

Akihiro Sagawa : user32: Fix wsprintfA %C conversion.
by Alexandre Julliard Feb. 19, 2020

Feb. 19, 2020

Module: wine Branch: master Commit: 7cc21d03309389586d57b2317dd135febe7828c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7cc21d03309389586d57b231… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Feb 19 23:21:35 2020 +0900 user32: Fix wsprintfA %C conversion. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/wsprintf.c | 2 -- dlls/user32/wsprintf.c | 14 ++++++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/wsprintf.c b/dlls/user32/tests/wsprintf.c index 84dc0eb39b..79d2112cd2 100644 --- a/dlls/user32/tests/wsprintf.c +++ b/dlls/user32/tests/wsprintf.c @@ -111,12 +111,10 @@ static void wsprintfATest(void) memset(buf, 0x11, sizeof(buf)); rc = wsprintfA(buf, testcase[i].fmt, testcase[i].input); - todo_wine_if( i == 7 ) ok(rc == testcase[i].rc, "%u: expected %d, got %d\n", i, testcase[i].rc, rc); - todo_wine_if( i == 7 || i == 8 || i == 9 ) ok(!strcmp(buf, testcase[i].str), "%u: expected %s, got %s\n", i, wine_dbgstr_a(testcase[i].str), wine_dbgstr_an(buf, rc)); diff --git a/dlls/user32/wsprintf.c b/dlls/user32/wsprintf.c index e5e6c10dbb..b197b714f6 100644 --- a/dlls/user32/wsprintf.c +++ b/dlls/user32/wsprintf.c @@ -255,8 +255,11 @@ static UINT WPRINTF_GetLen( WPRINTF_FORMAT *format, WPRINTF_DATA *arg, switch(format->type) { case WPR_CHAR: - case WPR_WCHAR: return (format->precision = 1); + case WPR_WCHAR: + if (dst_is_wide) len = 1; + else len = WideCharToMultiByte( CP_ACP, 0, &arg->wchar_view, 1, NULL, 0, NULL, NULL ); + return (format->precision = len); case WPR_STRING: if (!arg->lpcstr_view) arg->lpcstr_view = null_stringA; if (dst_is_wide) @@ -387,7 +390,14 @@ static INT wvsnprintfA( LPSTR buffer, UINT maxlen, LPCSTR spec, __ms_va_list arg switch(format.type) { case WPR_WCHAR: - *p++ = argData.wchar_view; + { + CHAR mb[5]; + if (WideCharToMultiByte( CP_ACP, 0, &argData.wchar_view, 1, mb, sizeof(mb), NULL, NULL )) + { + memcpy( p, mb, len ); + p += len; + } + } break; case WPR_CHAR: *p++ = argData.char_view;

1 0

Akihiro Sagawa : user32/tests: Add wsprintfA %C conversion tests.
by Alexandre Julliard Feb. 19, 2020

Feb. 19, 2020

Module: wine Branch: master Commit: 3b5619a8f41be2e59d542993b75574ecee5dd49a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b5619a8f41be2e59d542993… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Feb 19 23:21:33 2020 +0900 user32/tests: Add wsprintfA %C conversion tests. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/wsprintf.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/user32/tests/wsprintf.c b/dlls/user32/tests/wsprintf.c index 3aae012cec..84dc0eb39b 100644 --- a/dlls/user32/tests/wsprintf.c +++ b/dlls/user32/tests/wsprintf.c @@ -70,6 +70,9 @@ static void wsprintfATest(void) { fffeW, "%.2S", "?", 1 }, { wineW, "%.2S", "??", 2 }, { star, "%.1s", partial, 1 }, + { (void *)0x2606, "%2C", star, 2 }, + { (void *)0xfffd, "%C", "?", 1 }, + { (void *)0xe199, "%2c", " \x99", 2 }, }; CPINFO cpinfo; unsigned int i; @@ -108,10 +111,12 @@ static void wsprintfATest(void) memset(buf, 0x11, sizeof(buf)); rc = wsprintfA(buf, testcase[i].fmt, testcase[i].input); + todo_wine_if( i == 7 ) ok(rc == testcase[i].rc, "%u: expected %d, got %d\n", i, testcase[i].rc, rc); + todo_wine_if( i == 7 || i == 8 || i == 9 ) ok(!strcmp(buf, testcase[i].str), "%u: expected %s, got %s\n", i, wine_dbgstr_a(testcase[i].str), wine_dbgstr_an(buf, rc));

1 0