October 2017 - Wine-Commits

Alex Henrie : rsaenh: Use a macro to initialize the string sizes in aProvEnumAlgsEx.
by Alexandre Julliard Oct. 6, 2017

Oct. 6, 2017

Module: wine Branch: master Commit: 37c5d5adad729e0ac4c75dca95599c70e125471b URL: http://source.winehq.org/git/wine.git/?a=commit;h=37c5d5adad729e0ac4c75dca9… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Oct 5 23:34:13 2017 -0600 rsaenh: Use a macro to initialize the string sizes in aProvEnumAlgsEx. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/rsaenh.c | 174 ++++++++++++++++++++++++++------------------------- 1 file changed, 88 insertions(+), 86 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=37c5d5adad729e0ac4c75…

1 0

Alistair Leslie-Hughes : kernelbase: Add AppPolicyGetWindowingModel stub.
by Alexandre Julliard Oct. 6, 2017

Oct. 6, 2017

Module: wine Branch: master Commit: 00b57428a532c67ecb3a556b6844372ee6ee5782 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00b57428a532c67ecb3a556b6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Oct 6 00:08:58 2017 +0000 kernelbase: Add AppPolicyGetWindowingModel stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-appmodel-runtime-l1-1-2.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/main.c | 12 ++++++++++++ include/appmodel.h | 9 +++++++++ 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-appmodel-runtime-l1-1-2/api-ms-win-appmodel-runtime-l1-1-2.spec b/dlls/api-ms-win-appmodel-runtime-l1-1-2/api-ms-win-appmodel-runtime-l1-1-2.spec index 40f5f53..3c1b405 100644 --- a/dlls/api-ms-win-appmodel-runtime-l1-1-2/api-ms-win-appmodel-runtime-l1-1-2.spec +++ b/dlls/api-ms-win-appmodel-runtime-l1-1-2/api-ms-win-appmodel-runtime-l1-1-2.spec @@ -5,7 +5,7 @@ @ stdcall AppPolicyGetProcessTerminationMethod(ptr ptr) kernelbase.AppPolicyGetProcessTerminationMethod @ stdcall AppPolicyGetShowDeveloperDiagnostic(ptr ptr) kernelbase.AppPolicyGetShowDeveloperDiagnostic @ stdcall AppPolicyGetThreadInitializationType(ptr ptr) kernelbase.AppPolicyGetThreadInitializationType -@ stub AppPolicyGetWindowingModel +@ stdcall AppPolicyGetWindowingModel(ptr ptr) kernelbase.AppPolicyGetWindowingModel @ stub GetApplicationUserModelIdFromToken @ stub GetPackageFamilyNameFromToken @ stub GetPackageFullNameFromToken diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 17b84da..395b658 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -47,7 +47,7 @@ @ stdcall AppPolicyGetProcessTerminationMethod(ptr ptr) @ stdcall AppPolicyGetShowDeveloperDiagnostic(ptr ptr) @ stdcall AppPolicyGetThreadInitializationType(ptr ptr) -# @ stub AppPolicyGetWindowingModel +@ stdcall AppPolicyGetWindowingModel(ptr ptr) # @ stub AppXFreeMemory # @ stub AppXGetApplicationData # @ stub AppXGetDevelopmentMode diff --git a/dlls/kernelbase/main.c b/dlls/kernelbase/main.c index be771c2..b0a3478 100644 --- a/dlls/kernelbase/main.c +++ b/dlls/kernelbase/main.c @@ -62,6 +62,18 @@ LONG WINAPI AppPolicyGetShowDeveloperDiagnostic(HANDLE token, AppPolicyShowDevel return ERROR_SUCCESS; } +/*********************************************************************** + * AppPolicyGetWindowingModel (KERNELBASE.@) + */ +LONG WINAPI AppPolicyGetWindowingModel(HANDLE token, AppPolicyWindowingModel *policy) +{ + FIXME("%p, %p\n", token, policy); + + if(policy) + *policy = AppPolicyWindowingModel_ClassicDesktop; + + return ERROR_SUCCESS; +} /*********************************************************************** * QuirkIsEnabled3 (KERNELBASE.@) diff --git a/include/appmodel.h b/include/appmodel.h index 58d69a0..34da979 100644 --- a/include/appmodel.h +++ b/include/appmodel.h @@ -40,9 +40,18 @@ typedef enum AppPolicyShowDeveloperDiagnostic AppPolicyShowDeveloperDiagnostic_ShowUI = 1, } AppPolicyShowDeveloperDiagnostic; +typedef enum AppPolicyWindowingModel +{ + AppPolicyWindowingModel_None = 0, + AppPolicyWindowingModel_Universal = 1, + AppPolicyWindowingModel_ClassicDesktop = 2, + AppPolicyWindowingModel_ClassicPhone = 3 +} AppPolicyWindowingModel; + LONG WINAPI AppPolicyGetProcessTerminationMethod(HANDLE token, AppPolicyProcessTerminationMethod *policy); LONG WINAPI AppPolicyGetShowDeveloperDiagnostic(HANDLE token, AppPolicyShowDeveloperDiagnostic *policy); LONG WINAPI AppPolicyGetThreadInitializationType(HANDLE token, AppPolicyThreadInitializationType *policy); +LONG WINAPI AppPolicyGetWindowingModel(HANDLE processToken, AppPolicyWindowingModel *policy); #if defined(__cplusplus) }

1 0

Huw Davies : gdi32: Ignore the alpha channel for blits to DDBs too.
by Alexandre Julliard Oct. 6, 2017

Oct. 6, 2017

Module: wine Branch: master Commit: de9d2249961bfede25611cf959ac961c513bc772 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de9d2249961bfede25611cf95… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 6 13:08:47 2017 +0100 gdi32: Ignore the alpha channel for blits to DDBs too. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 1b057f7..0f21283 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -843,6 +843,7 @@ BOOL WINAPI GdiTransparentBlt( HDC hdcDest, int xDest, int yDest, int widthDest, COLORREF oldBackground; COLORREF oldForeground; int oldStretchMode; + DIBSECTION dib; if(widthDest < 0 || heightDest < 0 || widthSrc < 0 || heightSrc < 0) { TRACE("Cannot mirror\n"); @@ -857,9 +858,11 @@ BOOL WINAPI GdiTransparentBlt( HDC hdcDest, int xDest, int yDest, int widthDest, if(oldStretchMode == BLACKONWHITE || oldStretchMode == WHITEONBLACK) SetStretchBltMode(hdcSrc, COLORONCOLOR); hdcWork = CreateCompatibleDC(hdcDest); - if (GetObjectType( hdcDest ) != OBJ_MEMDC && GetDeviceCaps( hdcDest, BITSPIXEL ) == 32) + if ((GetObjectType( hdcDest ) != OBJ_MEMDC || + GetObjectW( GetCurrentObject( hdcDest, OBJ_BITMAP ), sizeof(dib), &dib ) == sizeof(BITMAP)) && + GetDeviceCaps( hdcDest, BITSPIXEL ) == 32) { - /* screen DCs are not supposed to have an alpha channel, so use a 24-bpp bitmap as copy */ + /* screen DCs or DDBs are not supposed to have an alpha channel, so use a 24-bpp bitmap as copy */ BITMAPINFO info; info.bmiHeader.biSize = sizeof(info.bmiHeader); info.bmiHeader.biWidth = widthDest;

1 0

Piotr Caban : user32: Don't invalidate ComboBox on CB_SETCURSEL message.
by Alexandre Julliard Oct. 6, 2017

Oct. 6, 2017

Module: wine Branch: master Commit: 1a114c9f4bab60463189e3ecb89766d4d2017d53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a114c9f4bab60463189e3ecb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 4 12:38:47 2017 +0200 user32: Don't invalidate ComboBox on CB_SETCURSEL message. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/combo.c | 5 +---- dlls/user32/tests/msg.c | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index ee9ce0a..149a495 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -2142,10 +2142,7 @@ LRESULT ComboWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM lPar SendMessageW(lphc->hWndLBox, LB_SETTOPINDEX, wParam, 0); /* no LBN_SELCHANGE in this case, update manually */ - if( lphc->wState & CBF_EDIT ) - CBUpdateEdit( lphc, (INT)wParam ); - else - InvalidateRect(lphc->self, &lphc->textRect, TRUE); + CBPaintText( lphc, NULL ); lphc->wState &= ~CBF_SELCHANGE; return lParam; case CB_GETLBTEXT: diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 1d34fd2..1b4f6fa 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -6937,7 +6937,7 @@ static void test_combobox_messages(void) log_all_parent_messages++; SendMessageA(combo, CB_SETCURSEL, 0, 0); log_all_parent_messages--; - ok_sequence(SetCurSelComboSeq, "CB_SETCURSEL on a ComboBox", TRUE); + ok_sequence(SetCurSelComboSeq, "CB_SETCURSEL on a ComboBox", FALSE); DestroyWindow(combo); DestroyWindow(parent);

1 0

Piotr Caban : msvcrt: Add mbsnlen_l implementation.
by Alexandre Julliard Oct. 5, 2017

Oct. 5, 2017

Module: wine Branch: master Commit: f097c2be1167ead5bd6e317fe56497b207719b83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f097c2be1167ead5bd6e317fe… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 5 19:39:25 2017 +0200 msvcrt: Add mbsnlen_l implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-multibyte-l1-1-0.spec | 6 +-- dlls/msvcr100/msvcr100.spec | 6 +-- dlls/msvcr110/msvcr110.spec | 6 +-- dlls/msvcr120/msvcr120.spec | 6 +-- dlls/msvcr80/msvcr80.spec | 6 +-- dlls/msvcr90/msvcr90.spec | 6 +-- dlls/msvcrt/mbcs.c | 61 +++++++++++++++++----- dlls/msvcrt/msvcrt.spec | 6 +-- dlls/ucrtbase/ucrtbase.spec | 6 +-- 9 files changed, 72 insertions(+), 37 deletions(-) diff --git a/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec b/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec index d0adc14..9db4f53 100644 --- a/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec +++ b/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec @@ -112,7 +112,7 @@ @ cdecl _mbsinc(str) ucrtbase._mbsinc @ stub _mbsinc_l @ cdecl _mbslen(str) ucrtbase._mbslen -@ stub _mbslen_l +@ cdecl _mbslen_l(str ptr) ucrtbase._mbslen_l @ cdecl _mbslwr(str) ucrtbase._mbslwr @ stub _mbslwr_l @ cdecl _mbslwr_s(str long) ucrtbase._mbslwr_s @@ -161,8 +161,8 @@ @ stub _mbsnicoll_l @ cdecl _mbsninc(str long) ucrtbase._mbsninc @ stub _mbsninc_l -@ stub _mbsnlen -@ stub _mbsnlen_l +@ cdecl _mbsnlen(str long) ucrtbase._mbsnlen +@ cdecl _mbsnlen_l(str long ptr) ucrtbase._mbsnlen_l @ cdecl _mbsnset(ptr long long) ucrtbase._mbsnset @ stub _mbsnset_l @ stub _mbsnset_s diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 340a41a..5c8158a 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1118,7 +1118,7 @@ @ cdecl _mbsinc(str) @ stub _mbsinc_l @ cdecl _mbslen(str) -@ stub _mbslen_l +@ cdecl _mbslen_l(str ptr) @ cdecl _mbslwr(str) @ stub _mbslwr_l @ cdecl _mbslwr_s(str long) @@ -1167,8 +1167,8 @@ @ stub _mbsnicoll_l @ cdecl _mbsninc(str long) @ stub _mbsninc_l -@ stub _mbsnlen -@ stub _mbsnlen_l +@ cdecl _mbsnlen(str long) +@ cdecl _mbsnlen_l(str long ptr) @ cdecl _mbsnset(ptr long long) @ stub _mbsnset_l @ stub _mbsnset_s diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index cc90e0c..2a7b777 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1475,7 +1475,7 @@ @ cdecl _mbsinc(str) @ stub _mbsinc_l @ cdecl _mbslen(str) -@ stub _mbslen_l +@ cdecl _mbslen_l(str ptr) @ cdecl _mbslwr(str) @ stub _mbslwr_l @ cdecl _mbslwr_s(str long) @@ -1524,8 +1524,8 @@ @ stub _mbsnicoll_l @ cdecl _mbsninc(str long) @ stub _mbsninc_l -@ stub _mbsnlen -@ stub _mbsnlen_l +@ cdecl _mbsnlen(str long) +@ cdecl _mbsnlen_l(str long ptr) @ cdecl _mbsnset(ptr long long) @ stub _mbsnset_l @ stub _mbsnset_s diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index fabe0f8..725ecb2 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1485,7 +1485,7 @@ @ cdecl _mbsinc(str) @ stub _mbsinc_l @ cdecl _mbslen(str) -@ stub _mbslen_l +@ cdecl _mbslen_l(str ptr) @ cdecl _mbslwr(str) @ stub _mbslwr_l @ cdecl _mbslwr_s(str long) @@ -1534,8 +1534,8 @@ @ stub _mbsnicoll_l @ cdecl _mbsninc(str long) @ stub _mbsninc_l -@ stub _mbsnlen -@ stub _mbsnlen_l +@ cdecl _mbsnlen(str long) +@ cdecl _mbsnlen_l(str long ptr) @ cdecl _mbsnset(ptr long long) @ stub _mbsnset_l @ stub _mbsnset_s diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index d0e9be0..d8290dd 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -790,7 +790,7 @@ @ cdecl _mbsinc(str) @ stub _mbsinc_l @ cdecl _mbslen(str) -@ stub _mbslen_l +@ cdecl _mbslen_l(str ptr) @ cdecl _mbslwr(str) @ stub _mbslwr_l @ cdecl _mbslwr_s(str long) @@ -839,8 +839,8 @@ @ stub _mbsnicoll_l @ cdecl _mbsninc(str long) @ stub _mbsninc_l -@ stub _mbsnlen -@ stub _mbsnlen_l +@ cdecl _mbsnlen(str long) +@ cdecl _mbsnlen_l(str long ptr) @ cdecl _mbsnset(ptr long long) @ stub _mbsnset_l @ stub _mbsnset_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index c3a6d2e..bfaf6f6 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -768,7 +768,7 @@ @ cdecl _mbsinc(str) @ stub _mbsinc_l @ cdecl _mbslen(str) -@ stub _mbslen_l +@ cdecl _mbslen_l(str ptr) @ cdecl _mbslwr(str) @ stub _mbslwr_l @ cdecl _mbslwr_s(str long) @@ -817,8 +817,8 @@ @ stub _mbsnicoll_l @ cdecl _mbsninc(str long) @ stub _mbsninc_l -@ stub _mbsnlen -@ stub _mbsnlen_l +@ cdecl _mbsnlen(str long) +@ cdecl _mbsnlen_l(str long ptr) @ cdecl _mbsnset(ptr long long) @ stub _mbsnset_l @ stub _mbsnset_s diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 63be805..12a7f5d 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -569,23 +569,58 @@ unsigned char* CDECL _mbsninc(const unsigned char* str, MSVCRT_size_t num) } /********************************************************************* - * _mbslen(MSVCRT.@) + * _mbsnlen_l(MSVCRT.@) */ -MSVCRT_size_t CDECL _mbslen(const unsigned char* str) +MSVCRT_size_t CDECL _mbsnlen_l(const unsigned char *str, + MSVCRT_size_t maxsize, MSVCRT__locale_t locale) { - MSVCRT_size_t len = 0; - while(*str) - { - if (_ismbblead(*str)) + MSVCRT_pthreadmbcinfo mbcinfo; + MSVCRT_size_t i = 0, len = 0; + + if(!locale) + mbcinfo = get_mbcinfo(); + else + mbcinfo = locale->mbcinfo; + + if(!mbcinfo->ismbcodepage) + return MSVCRT_strnlen((const char*)str, maxsize); + + while(i<maxsize && str[i]) { - str++; - if (!*str) /* count only full chars */ - break; + if (_ismbblead_l(str[i], locale)) + { + i++; + if (!str[i]) /* count only full chars */ + break; + } + i++; + len++; } - str++; - len++; - } - return len; + return i < maxsize ? len : maxsize; +} + +/********************************************************************* + * _mbslen(MSVCRT.@) + */ +MSVCRT_size_t CDECL _mbslen(const unsigned char* str) +{ + return _mbsnlen_l(str, -1, NULL); +} + +/********************************************************************* + * _mbslen_l(MSVCRT.@) + */ +MSVCRT_size_t CDECL _mbslen_l(const unsigned char* str, MSVCRT__locale_t locale) +{ + return _mbsnlen_l(str, -1, locale); +} + +/********************************************************************* + * _mbsnlen(MSVCRT.@) + */ +MSVCRT_size_t CDECL _mbsnlen(const unsigned char* str, MSVCRT_size_t maxsize) +{ + return _mbsnlen_l(str, maxsize, NULL); } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index e72fd7d..3c73ae2 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -737,7 +737,7 @@ @ cdecl _mbsinc(str) # stub _mbsinc_l(str ptr) @ cdecl _mbslen(str) -# stub _mbslen_l(str ptr) +@ cdecl _mbslen_l(str ptr) @ cdecl _mbslwr(str) # stub _mbslwr_l(str ptr) @ cdecl _mbslwr_s(str long) @@ -786,8 +786,8 @@ # stub _mbsnicoll_l(str str long ptr) @ cdecl _mbsninc(str long) # stub _mbsninc_l(str long ptr) -# stub _mbsnlen(str long) -# stub _mbsnlen_l(str long ptr) +@ cdecl _mbsnlen(str long) +@ cdecl _mbsnlen_l(str long ptr) @ cdecl _mbsnset(ptr long long) # stub _mbsnset_l(ptr long long ptr) # stub _mbsnset_s(ptr long long long) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 26b773c..6fc805d 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -631,7 +631,7 @@ @ cdecl _mbsinc(str) @ stub _mbsinc_l @ cdecl _mbslen(str) -@ stub _mbslen_l +@ cdecl _mbslen_l(str ptr) @ cdecl _mbslwr(str) @ stub _mbslwr_l @ cdecl _mbslwr_s(str long) @@ -680,8 +680,8 @@ @ stub _mbsnicoll_l @ cdecl _mbsninc(str long) @ stub _mbsninc_l -@ stub _mbsnlen -@ stub _mbsnlen_l +@ cdecl _mbsnlen(str long) +@ cdecl _mbsnlen_l(str long ptr) @ cdecl _mbsnset(ptr long long) @ stub _mbsnset_l @ stub _mbsnset_s

1 0

Vincent Povirk : mscoree: Mono renamed mono_trace_set_assembly.
by Alexandre Julliard Oct. 5, 2017

Oct. 5, 2017

Module: wine Branch: master Commit: bce8330f99003ec076881f0f415960e93117c896 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bce8330f99003ec076881f0f4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Oct 5 11:49:34 2017 -0500 mscoree: Mono renamed mono_trace_set_assembly. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/corruntimehost.c | 2 +- dlls/mscoree/metahost.c | 10 ++++++++-- dlls/mscoree/mscoree_private.h | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index eed96da..64f345d 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1457,7 +1457,7 @@ __int32 WINAPI _CorExeMain(void) if (assembly) { - mono_trace_set_assembly(assembly); + mono_callspec_set_assembly(assembly); exit_code = mono_jit_exec(domain, assembly, argc, argv); } diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index bf70baa..0f88b0f 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -87,6 +87,7 @@ typedef void (CDECL *MonoProfilerRuntimeShutdownBeginCallback) (MonoProfiler *pr MonoImage* (CDECL *mono_assembly_get_image)(MonoAssembly *assembly); MonoAssembly* (CDECL *mono_assembly_load_from)(MonoImage *image, const char *fname, MonoImageOpenStatus *status); MonoAssembly* (CDECL *mono_assembly_open)(const char *filename, MonoImageOpenStatus *status); +void (CDECL *mono_callspec_set_assembly)(MonoAssembly *assembly); MonoClass* (CDECL *mono_class_from_mono_type)(MonoType *type); MonoClass* (CDECL *mono_class_from_name)(MonoImage *image, const char* name_space, const char *name); MonoMethod* (CDECL *mono_class_get_method_from_name)(MonoClass *klass, const char *name, int param_count); @@ -122,7 +123,6 @@ MonoString* (CDECL *mono_string_new)(MonoDomain *domain, const char *str); static char* (CDECL *mono_stringify_assembly_name)(MonoAssemblyName *aname); MonoThread* (CDECL *mono_thread_attach)(MonoDomain *domain); void (CDECL *mono_thread_manage)(void); -void (CDECL *mono_trace_set_assembly)(MonoAssembly *assembly); void (CDECL *mono_trace_set_print_handler)(MonoPrintCallback callback); void (CDECL *mono_trace_set_printerr_handler)(MonoPrintCallback callback); @@ -224,7 +224,6 @@ static HRESULT load_mono(LPCWSTR mono_path) LOAD_MONO_FUNCTION(mono_string_new); LOAD_MONO_FUNCTION(mono_thread_attach); LOAD_MONO_FUNCTION(mono_thread_manage); - LOAD_MONO_FUNCTION(mono_trace_set_assembly); #undef LOAD_MONO_FUNCTION @@ -235,6 +234,7 @@ static HRESULT load_mono(LPCWSTR mono_path) } \ } while (0); + LOAD_OPT_MONO_FUNCTION(mono_callspec_set_assembly, NULL); LOAD_OPT_MONO_FUNCTION(mono_image_open_from_module_handle, image_open_module_handle_dummy); LOAD_OPT_MONO_FUNCTION(mono_profiler_create, NULL); LOAD_OPT_MONO_FUNCTION(mono_profiler_install, NULL); @@ -245,6 +245,12 @@ static HRESULT load_mono(LPCWSTR mono_path) #undef LOAD_OPT_MONO_FUNCTION + if (mono_callspec_set_assembly == NULL) + { + mono_callspec_set_assembly = (void*)GetProcAddress(mono_handle, "mono_trace_set_assembly"); + if (!mono_callspec_set_assembly) goto fail; + } + if (mono_profiler_create != NULL) { /* Profiler API v2 */ diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 9df41d2..3f2aa70 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -142,6 +142,7 @@ extern BOOL is_mono_started DECLSPEC_HIDDEN; extern MonoImage* (CDECL *mono_assembly_get_image)(MonoAssembly *assembly) DECLSPEC_HIDDEN; extern MonoAssembly* (CDECL *mono_assembly_load_from)(MonoImage *image, const char *fname, MonoImageOpenStatus *status) DECLSPEC_HIDDEN; extern MonoAssembly* (CDECL *mono_assembly_open)(const char *filename, MonoImageOpenStatus *status) DECLSPEC_HIDDEN; +extern void (CDECL *mono_callspec_set_assembly)(MonoAssembly *assembly) DECLSPEC_HIDDEN; extern MonoClass* (CDECL *mono_class_from_mono_type)(MonoType *type) DECLSPEC_HIDDEN; extern MonoClass* (CDECL *mono_class_from_name)(MonoImage *image, const char* name_space, const char *name) DECLSPEC_HIDDEN; extern MonoMethod* (CDECL *mono_class_get_method_from_name)(MonoClass *klass, const char *name, int param_count) DECLSPEC_HIDDEN; @@ -165,7 +166,6 @@ extern void (CDECL *mono_runtime_quit)(void) DECLSPEC_HIDDEN; extern MonoString* (CDECL *mono_string_new)(MonoDomain *domain, const char *str) DECLSPEC_HIDDEN; extern MonoThread* (CDECL *mono_thread_attach)(MonoDomain *domain) DECLSPEC_HIDDEN; extern void (CDECL *mono_thread_manage)(void) DECLSPEC_HIDDEN; -extern void (CDECL *mono_trace_set_assembly)(MonoAssembly *assembly) DECLSPEC_HIDDEN; extern void (CDECL *mono_trace_set_print_handler)(MonoPrintCallback callback) DECLSPEC_HIDDEN; extern void (CDECL *mono_trace_set_printerr_handler)(MonoPrintCallback callback) DECLSPEC_HIDDEN;

1 0

Hugh McMaster : regedit/tests: Test the importing of hex values with no data.
by Alexandre Julliard Oct. 5, 2017

Oct. 5, 2017

Module: wine Branch: master Commit: 52f686e05478d22a3488efd755223ed8560feaa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52f686e05478d22a3488efd75… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Oct 5 11:53:23 2017 +0000 regedit/tests: Test the importing of hex values with no data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 41 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index f97134e..79640a5 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -126,8 +126,11 @@ static void verify_reg_(unsigned line, HKEY hkey, const char *value, lok(type == exp_type, "got wrong type %d, expected %d\n", type, exp_type); todo_wine_if (todo & TODO_REG_SIZE) lok(size == exp_size, "got wrong size %d, expected %d\n", size, exp_size); - todo_wine_if (todo & TODO_REG_DATA) - lok(memcmp(data, exp_data, size) == 0, "got wrong data\n"); + if (exp_data) + { + todo_wine_if (todo & TODO_REG_DATA) + lok(memcmp(data, exp_data, size) == 0, "got wrong data\n"); + } } #define verify_reg_nonexist(k,n) r_verify_reg_nonexist(__LINE__,k,n) @@ -641,6 +644,23 @@ static void test_basic_import(void) verify_reg(hkey, "Wine21c", REG_EXPAND_SZ, "%PATH%", 7, 0); verify_reg(hkey, "Wine21d", REG_EXPAND_SZ, "%PATH%", 7, 0); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine22a\"=hex(1):\n" + "\"Wine22b\"=hex(2):\n" + "\"Wine22c\"=hex(3):\n" + "\"Wine22d\"=hex(4):\n" + "\"Wine22e\"=hex(7):\n" + "\"Wine22f\"=hex(100):\n" + "\"Wine22g\"=hex(abcd):\n\n"); + verify_reg(hkey, "Wine22a", REG_SZ, NULL, 0, 0); + verify_reg(hkey, "Wine22b", REG_EXPAND_SZ, NULL, 0, TODO_REG_SIZE); + verify_reg(hkey, "Wine22c", REG_BINARY, NULL, 0, 0); + verify_reg(hkey, "Wine22d", REG_DWORD, NULL, 0, 0); + verify_reg(hkey, "Wine22e", REG_MULTI_SZ, NULL, 0, TODO_REG_SIZE); + verify_reg(hkey, "Wine22f", 0x100, NULL, 0, 0); + verify_reg(hkey, "Wine22g", 0xabcd, NULL, 0, 0); + RegCloseKey(hkey); delete_key(HKEY_CURRENT_USER, KEY_BASE); @@ -1038,6 +1058,23 @@ static void test_basic_import_unicode(void) verify_reg(hkey, "Wine21c", REG_EXPAND_SZ, "%PATH%", 7, 0); verify_reg(hkey, "Wine21d", REG_EXPAND_SZ, "%PATH%", 7, 0); + exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine22a\"=hex(1):\n" + "\"Wine22b\"=hex(2):\n" + "\"Wine22c\"=hex(3):\n" + "\"Wine22d\"=hex(4):\n" + "\"Wine22e\"=hex(7):\n" + "\"Wine22f\"=hex(100):\n" + "\"Wine22g\"=hex(abcd):\n\n"); + verify_reg(hkey, "Wine22a", REG_SZ, NULL, 0, 0); + verify_reg(hkey, "Wine22b", REG_EXPAND_SZ, NULL, 0, TODO_REG_SIZE); + verify_reg(hkey, "Wine22c", REG_BINARY, NULL, 0, 0); + verify_reg(hkey, "Wine22d", REG_DWORD, NULL, 0, 0); + verify_reg(hkey, "Wine22e", REG_MULTI_SZ, NULL, 0, TODO_REG_SIZE); + verify_reg(hkey, "Wine22f", 0x100, NULL, 0, 0); + verify_reg(hkey, "Wine22g", 0xabcd, NULL, 0, 0); + RegCloseKey(hkey); delete_key(HKEY_CURRENT_USER, KEY_BASE);

1 0

Alistair Leslie-Hughes : kernelbase: Add AppPolicyGetThreadInitializationType stub.
by Alexandre Julliard Oct. 5, 2017

Oct. 5, 2017

Module: wine Branch: master Commit: 825d5c86415d9e76c92a9d533c00790efe847ae7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=825d5c86415d9e76c92a9d533… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 5 01:20:44 2017 +0000 kernelbase: Add AppPolicyGetThreadInitializationType stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-appmodel-runtime-l1-1-2.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/main.c | 13 +++++++++++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-appmodel-runtime-l1-1-2/api-ms-win-appmodel-runtime-l1-1-2.spec b/dlls/api-ms-win-appmodel-runtime-l1-1-2/api-ms-win-appmodel-runtime-l1-1-2.spec index 8ae7f0b..f98ec0e 100644 --- a/dlls/api-ms-win-appmodel-runtime-l1-1-2/api-ms-win-appmodel-runtime-l1-1-2.spec +++ b/dlls/api-ms-win-appmodel-runtime-l1-1-2/api-ms-win-appmodel-runtime-l1-1-2.spec @@ -4,7 +4,7 @@ @ stub AppPolicyGetMediaFoundationCodecLoading @ stdcall AppPolicyGetProcessTerminationMethod(ptr ptr) kernelbase.AppPolicyGetProcessTerminationMethod @ stub AppPolicyGetShowDeveloperDiagnostic -@ stub AppPolicyGetThreadInitializationType +@ stdcall AppPolicyGetThreadInitializationType(ptr ptr) kernelbase.AppPolicyGetThreadInitializationType @ stub AppPolicyGetWindowingModel @ stub GetApplicationUserModelIdFromToken @ stub GetPackageFamilyNameFromToken diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index e228497..85b2323 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -46,7 +46,7 @@ # @ stub AppPolicyGetMediaFoundationCodecLoading @ stdcall AppPolicyGetProcessTerminationMethod(ptr ptr) # @ stub AppPolicyGetShowDeveloperDiagnostic -# @ stub AppPolicyGetThreadInitializationType +@ stdcall AppPolicyGetThreadInitializationType(ptr ptr) # @ stub AppPolicyGetWindowingModel # @ stub AppXFreeMemory # @ stub AppXGetApplicationData diff --git a/dlls/kernelbase/main.c b/dlls/kernelbase/main.c index c55c2a7..ff1b2f6 100644 --- a/dlls/kernelbase/main.c +++ b/dlls/kernelbase/main.c @@ -37,6 +37,19 @@ LONG WINAPI AppPolicyGetProcessTerminationMethod(HANDLE token, AppPolicyProcessT } /*********************************************************************** + * AppPolicyGetThreadInitializationType (KERNELBASE.@) + */ +LONG WINAPI AppPolicyGetThreadInitializationType(HANDLE token, AppPolicyThreadInitializationType *policy) +{ + FIXME("%p, %p\n", token, policy); + + if(policy) + *policy = AppPolicyThreadInitializationType_None; + + return ERROR_SUCCESS; +} + +/*********************************************************************** * QuirkIsEnabled3 (KERNELBASE.@) */ BOOL WINAPI QuirkIsEnabled3(void *unk1, void *unk2)

1 0

Alistair Leslie-Hughes : kernelbase: Add AppPolicyGetProcessTerminationMethod stub.
by Alexandre Julliard Oct. 5, 2017

Oct. 5, 2017

Module: wine Branch: master Commit: ed4c5c7864ea4087f86e4cde8f2fe5385020abb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed4c5c7864ea4087f86e4cde8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 5 01:20:42 2017 +0000 kernelbase: Add AppPolicyGetProcessTerminationMethod stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-appmodel-runtime-l1-1-2.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/main.c | 16 ++++++++++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-appmodel-runtime-l1-1-2/api-ms-win-appmodel-runtime-l1-1-2.spec b/dlls/api-ms-win-appmodel-runtime-l1-1-2/api-ms-win-appmodel-runtime-l1-1-2.spec index ce38d95..8ae7f0b 100644 --- a/dlls/api-ms-win-appmodel-runtime-l1-1-2/api-ms-win-appmodel-runtime-l1-1-2.spec +++ b/dlls/api-ms-win-appmodel-runtime-l1-1-2/api-ms-win-appmodel-runtime-l1-1-2.spec @@ -2,7 +2,7 @@ @ stub AppPolicyGetCreateFileAccess @ stub AppPolicyGetLifecycleManagement @ stub AppPolicyGetMediaFoundationCodecLoading -@ stub AppPolicyGetProcessTerminationMethod +@ stdcall AppPolicyGetProcessTerminationMethod(ptr ptr) kernelbase.AppPolicyGetProcessTerminationMethod @ stub AppPolicyGetShowDeveloperDiagnostic @ stub AppPolicyGetThreadInitializationType @ stub AppPolicyGetWindowingModel diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index f508c25..e228497 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -44,7 +44,7 @@ # @ stub AppPolicyGetCreateFileAccess # @ stub AppPolicyGetLifecycleManagement # @ stub AppPolicyGetMediaFoundationCodecLoading -# @ stub AppPolicyGetProcessTerminationMethod +@ stdcall AppPolicyGetProcessTerminationMethod(ptr ptr) # @ stub AppPolicyGetShowDeveloperDiagnostic # @ stub AppPolicyGetThreadInitializationType # @ stub AppPolicyGetWindowingModel diff --git a/dlls/kernelbase/main.c b/dlls/kernelbase/main.c index 30cba3f..c55c2a7 100644 --- a/dlls/kernelbase/main.c +++ b/dlls/kernelbase/main.c @@ -16,11 +16,27 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windows.h" +#include "appmodel.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(kernelbase); /*********************************************************************** + * AppPolicyGetProcessTerminationMethod (KERNELBASE.@) + */ +LONG WINAPI AppPolicyGetProcessTerminationMethod(HANDLE token, AppPolicyProcessTerminationMethod *policy) +{ + FIXME("%p, %p\n", token, policy); + + if(policy) + *policy = AppPolicyProcessTerminationMethod_ExitProcess; + + return ERROR_SUCCESS; +} + +/*********************************************************************** * QuirkIsEnabled3 (KERNELBASE.@) */ BOOL WINAPI QuirkIsEnabled3(void *unk1, void *unk2)

1 0

Piotr Caban : msvcrt/tests: Add _mbsnlen tests.
by Alexandre Julliard Oct. 5, 2017

Oct. 5, 2017

Module: wine Branch: master Commit: f38c958ed430388950d1360bec3392ea2f1fc2b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f38c958ed430388950d1360be… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 5 19:39:29 2017 +0200 msvcrt/tests: Add _mbsnlen tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 1681001..221ee3c 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -96,6 +96,7 @@ static double (__cdecl *p__atof_l)(const char*,_locale_t); static double (__cdecl *p__strtod_l)(const char *,char**,_locale_t); static int (__cdecl *p__strnset_s)(char*,size_t,int,size_t); static int (__cdecl *p__wcsset_s)(wchar_t*,size_t,wchar_t); +static size_t (__cdecl *p__mbsnlen)(const unsigned char*, size_t); #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hMsvcrt,y) #define SET(x,y) SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y) @@ -316,6 +317,20 @@ static void test_mbcp(void) expect_eq(_mbslen(mbsonlylead), 0, int, "%d"); /* lead + NUL not counted as character */ expect_eq(_mbslen(mbstring), 4, int, "%d"); /* lead + invalid trail counted */ + if(!p__mbsnlen) { + win_skip("_mbsnlen tests\n"); + }else { + expect_eq(p__mbsnlen(mbstring, 8), 8, int, "%d"); + expect_eq(p__mbsnlen(mbstring, 9), 4, int, "%d"); + expect_eq(p__mbsnlen(mbstring, 10), 4, int, "%d"); + expect_eq(p__mbsnlen(mbsonlylead, 0), 0, int, "%d"); + expect_eq(p__mbsnlen(mbsonlylead, 1), 1, int, "%d"); + expect_eq(p__mbsnlen(mbsonlylead, 2), 0, int, "%d"); + expect_eq(p__mbsnlen(mbstring2, 7), 7, int, "%d"); + expect_eq(p__mbsnlen(mbstring2, 8), 4, int, "%d"); + expect_eq(p__mbsnlen(mbstring2, 9), 4, int, "%d"); + } + /* mbrlen */ if(!setlocale(LC_ALL, ".936") || !p_mbrlen) { win_skip("mbrlen tests\n"); @@ -3270,6 +3285,7 @@ START_TEST(string) p__strtod_l = (void*)GetProcAddress(hMsvcrt, "_strtod_l"); p__strnset_s = (void*)GetProcAddress(hMsvcrt, "_strnset_s"); p__wcsset_s = (void*)GetProcAddress(hMsvcrt, "_wcsset_s"); + p__mbsnlen = (void*)GetProcAddress(hMsvcrt, "_mbsnlen"); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */

1 0