August 2019 - Wine-Commits - list.winehq.org

Jacek Caban : msvcrt: Export __p__iob only on i386.
by Alexandre Julliard Aug. 8, 2019

Aug. 8, 2019

Module: wine Branch: master Commit: 8445055b7272996290d675be5f202521f01317ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=8445055b7272996290d675be… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 8 18:27:26 2019 +0200 msvcrt: Export __p__iob only on i386. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt20/msvcrt20.spec | 2 +- dlls/msvcrt40/msvcrt40.spec | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index eb40249..3fc18d2 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -280,7 +280,7 @@ @ cdecl __p__dstbias() MSVCRT___p__dstbias @ cdecl __p__environ() MSVCRT___p__environ @ cdecl __p__fmode() MSVCRT___p__fmode -@ cdecl __p__iob() __iob_func +@ cdecl -arch=i386 __p__iob() __iob_func @ stub __p__mbcasemap() @ cdecl __p__mbctype() @ stub __p__osplatform diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 4ec0af1..e6f0841 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -259,7 +259,7 @@ @ cdecl -arch=win32 __p__environ() MSVCRT___p__environ @ stub -arch=win32 __p__fileinfo() @ cdecl -arch=win32 __p__fmode() MSVCRT___p__fmode -@ cdecl __p__iob() __iob_func +@ cdecl -arch=i386 __p__iob() __iob_func @ stub -arch=win32 __p__mbcasemap() @ cdecl -arch=win32 __p__mbctype() @ cdecl -arch=win32 __p__osver() diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index b3bea65..002966a 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -820,7 +820,7 @@ @ cdecl -arch=win32 __p__daylight() msvcrt.__p__daylight @ cdecl -arch=win32 __p__environ() msvcrt.__p__environ @ cdecl -arch=win32 __p__fmode() msvcrt.__p__fmode -@ cdecl __p__iob() msvcrt.__p__iob +@ cdecl -arch=i386 __p__iob() msvcrt.__p__iob @ cdecl -arch=win32 __p__mbctype() msvcrt.__p__mbctype @ cdecl -arch=win32 __p__osver() msvcrt.__p__osver @ cdecl -arch=win32 __p__pctype() msvcrt.__p__pctype diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index a8ca862..bb2ad19 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -899,7 +899,7 @@ @ cdecl -arch=win32 __p__dstbias() msvcrt.__p__dstbias @ cdecl -arch=win32 __p__environ() msvcrt.__p__environ @ cdecl -arch=win32 __p__fmode() msvcrt.__p__fmode -@ cdecl __p__iob() msvcrt.__p__iob +@ cdecl -arch=i386 __p__iob() msvcrt.__p__iob @ cdecl -arch=win32 __p__mbctype() msvcrt.__p__mbctype @ cdecl -arch=win32 __p__osver() msvcrt.__p__osver @ cdecl -arch=win32 __p__pctype() msvcrt.__p__pctype

1 0

Jacek Caban : msvcrt: Use __iob_func instead of __p__iob in __acrt_iob_func implementation.
by Alexandre Julliard Aug. 8, 2019

Aug. 8, 2019

Module: wine Branch: master Commit: a0c424b111ff4365df77134d2fb96cbf45f22f50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0c424b111ff4365df77134d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 8 18:27:19 2019 +0200 msvcrt: Use __iob_func instead of __p__iob in __acrt_iob_func implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr70/msvcr70.spec | 4 ++-- dlls/msvcr71/msvcr71.spec | 4 ++-- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/file.c | 5 +++-- dlls/msvcrt/iob.c | 7 ++++--- dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrtd/msvcrtd.spec | 2 +- 11 files changed, 24 insertions(+), 22 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index c578176..cf4d6d4 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -594,7 +594,7 @@ @ stub __get_tlsindex @ cdecl __getmainargs(ptr ptr ptr long ptr) @ extern __initenv MSVCRT___initenv -@ cdecl __iob_func() __p__iob +@ cdecl __iob_func() @ cdecl __isascii(long) MSVCRT___isascii @ cdecl __iscsym(long) MSVCRT___iscsym @ cdecl __iscsymf(long) MSVCRT___iscsymf @@ -636,7 +636,7 @@ @ cdecl __p__dstbias() MSVCRT___p__dstbias @ cdecl __p__environ() MSVCRT___p__environ @ cdecl __p__fmode() MSVCRT___p__fmode -@ cdecl __p__iob() +@ cdecl __p__iob() __iob_func @ stub __p__mbcasemap() @ cdecl __p__mbctype() @ cdecl __p__pctype() MSVCRT___p__pctype diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 144ff1d..410aae4 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -942,7 +942,7 @@ @ stub __get_tlsindex @ cdecl __getmainargs(ptr ptr ptr long ptr) @ extern __initenv MSVCRT___initenv -@ cdecl __iob_func() __p__iob +@ cdecl __iob_func() @ cdecl __isascii(long) MSVCRT___isascii @ cdecl __iscsym(long) MSVCRT___iscsym @ cdecl __iscsymf(long) MSVCRT___iscsymf @@ -985,7 +985,7 @@ @ cdecl __p__dstbias() MSVCRT___p__dstbias @ cdecl __p__environ() MSVCRT___p__environ @ cdecl __p__fmode() MSVCRT___p__fmode -@ cdecl __p__iob() +@ cdecl __p__iob() __iob_func @ stub __p__mbcasemap() @ cdecl __p__mbctype() @ cdecl __p__pctype() MSVCRT___p__pctype diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 469bc01..171cfd27 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -932,7 +932,7 @@ @ stub __get_tlsindex @ cdecl __getmainargs(ptr ptr ptr long ptr) @ extern __initenv MSVCRT___initenv -@ cdecl __iob_func() __p__iob +@ cdecl __iob_func() @ cdecl __isascii(long) MSVCRT___isascii @ cdecl __iscsym(long) MSVCRT___iscsym @ cdecl __iscsymf(long) MSVCRT___iscsymf @@ -975,7 +975,7 @@ @ cdecl __p__dstbias() MSVCRT___p__dstbias @ cdecl __p__environ() MSVCRT___p__environ @ cdecl __p__fmode() MSVCRT___p__fmode -@ cdecl __p__iob() +@ cdecl __p__iob() __iob_func @ stub __p__mbcasemap() @ cdecl __p__mbctype() @ cdecl __p__pctype() MSVCRT___p__pctype diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 06ced5e..1fefdaa 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -151,7 +151,7 @@ @ cdecl __fpecode() @ cdecl __getmainargs(ptr ptr ptr long ptr) @ extern __initenv MSVCRT___initenv -@ cdecl __iob_func() __p__iob +@ cdecl __iob_func() @ cdecl __isascii(long) MSVCRT___isascii @ cdecl __iscsym(long) MSVCRT___iscsym @ cdecl __iscsymf(long) MSVCRT___iscsymf @@ -175,7 +175,7 @@ @ cdecl __p__environ() MSVCRT___p__environ @ stub __p__fileinfo() @ cdecl __p__fmode() MSVCRT___p__fmode -@ cdecl __p__iob() +@ cdecl __p__iob() __iob_func @ stub __p__mbcasemap() @ cdecl __p__mbctype() @ cdecl __p__osver() diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index b5980b5..7f4f35a 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -146,7 +146,7 @@ @ cdecl __fpecode() @ cdecl __getmainargs(ptr ptr ptr long ptr) @ extern __initenv MSVCRT___initenv -@ cdecl __iob_func() __p__iob +@ cdecl __iob_func() @ cdecl __isascii(long) MSVCRT___isascii @ cdecl __iscsym(long) MSVCRT___iscsym @ cdecl __iscsymf(long) MSVCRT___iscsymf @@ -170,7 +170,7 @@ @ cdecl __p__environ() MSVCRT___p__environ @ stub __p__fileinfo() @ cdecl __p__fmode() MSVCRT___p__fmode -@ cdecl __p__iob() +@ cdecl __p__iob() __iob_func @ stub __p__mbcasemap() @ cdecl __p__mbctype() @ cdecl __p__osver() diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 717d02a..eb40249 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -233,7 +233,7 @@ @ stub __get_tlsindex @ cdecl __getmainargs(ptr ptr ptr long ptr) @ extern __initenv MSVCRT___initenv -@ cdecl __iob_func() __p__iob +@ cdecl __iob_func() @ cdecl __isascii(long) MSVCRT___isascii @ cdecl __iscsym(long) MSVCRT___iscsym @ cdecl __iscsymf(long) MSVCRT___iscsymf @@ -280,7 +280,7 @@ @ cdecl __p__dstbias() MSVCRT___p__dstbias @ cdecl __p__environ() MSVCRT___p__environ @ cdecl __p__fmode() MSVCRT___p__fmode -@ cdecl __p__iob() +@ cdecl __p__iob() __iob_func @ stub __p__mbcasemap() @ cdecl __p__mbctype() @ stub __p__osplatform diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 7a2ce05..4050f42 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -222,7 +222,7 @@ @ stub __get_tlsindex @ cdecl __getmainargs(ptr ptr ptr long ptr) @ extern __initenv MSVCRT___initenv -@ cdecl __iob_func() __p__iob +@ cdecl __iob_func() @ cdecl __isascii(long) MSVCRT___isascii @ cdecl __iscsym(long) MSVCRT___iscsym @ cdecl __iscsymf(long) MSVCRT___iscsymf @@ -269,7 +269,7 @@ @ cdecl __p__dstbias() MSVCRT___p__dstbias @ cdecl __p__environ() MSVCRT___p__environ @ cdecl __p__fmode() MSVCRT___p__fmode -@ cdecl __p__iob() +@ cdecl __p__iob() __iob_func @ stub __p__mbcasemap() @ cdecl __p__mbctype() @ cdecl __p__pctype() MSVCRT___p__pctype diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 8f91ca9..b5b51fc 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -780,9 +780,10 @@ static int msvcrt_int_to_base32_w(int num, MSVCRT_wchar_t *str) } /********************************************************************* - * __p__iob (MSVCRT.@) + * __iob_func (MSVCRT.@) */ -MSVCRT_FILE * CDECL __p__iob(void) +#undef __iob_func +MSVCRT_FILE * CDECL __iob_func(void) { return &MSVCRT__iob[0]; } diff --git a/dlls/msvcrt/iob.c b/dlls/msvcrt/iob.c index c02913b..5d289f6 100644 --- a/dlls/msvcrt/iob.c +++ b/dlls/msvcrt/iob.c @@ -18,21 +18,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* this function is part of the import lib for compatibility with the Mingw runtime */ +/* this function is part of the import lib for compatibility with ucrt runtime */ #if 0 #pragma makedep implib #endif #include "msvcrt.h" -extern MSVCRT_FILE * CDECL __p__iob(void); +#undef __iob_func +extern MSVCRT_FILE * CDECL __iob_func(void); /********************************************************************* * __acrt_iob_func(UCRTBASE.@) */ MSVCRT_FILE * CDECL __acrt_iob_func(unsigned idx) { - return __p__iob() + idx; + return __iob_func() + idx; } #ifdef __i386__ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index ed1e72c..4ec0af1 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -214,7 +214,7 @@ @ stub __get_app_type @ cdecl __getmainargs(ptr ptr ptr long ptr) @ extern __initenv MSVCRT___initenv -@ cdecl __iob_func() __p__iob +@ cdecl __iob_func() @ cdecl __isascii(long) MSVCRT___isascii @ cdecl __iscsym(long) MSVCRT___iscsym @ cdecl __iscsymf(long) MSVCRT___iscsymf @@ -259,7 +259,7 @@ @ cdecl -arch=win32 __p__environ() MSVCRT___p__environ @ stub -arch=win32 __p__fileinfo() @ cdecl -arch=win32 __p__fmode() MSVCRT___p__fmode -@ cdecl __p__iob() +@ cdecl __p__iob() __iob_func @ stub -arch=win32 __p__mbcasemap() @ cdecl -arch=win32 __p__mbctype() @ cdecl -arch=win32 __p__osver() diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index debd4d0..4a0238e 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -167,7 +167,7 @@ @ cdecl __p__environ() MSVCRT___p__environ @ stub __p__fileinfo() @ cdecl __p__fmode() MSVCRT___p__fmode -@ cdecl __p__iob() +@ cdecl __p__iob() __iob_func @ stub __p__mbcasemap() @ cdecl __p__mbctype() @ cdecl __p__osver()

1 0

Francois Gouget : jscript: Add a trailing '\n' to a WARN() message.
by Alexandre Julliard Aug. 8, 2019

Aug. 8, 2019

Module: wine Branch: master Commit: bb62fe7f512bedbb6f66674caae96ac97daa78f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb62fe7f512bedbb6f66674c… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 8 15:26:12 2019 +0200 jscript: Add a trailing '\n' to a WARN() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/enumerator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/enumerator.c b/dlls/jscript/enumerator.c index bbd8d53..5f5b135 100644 --- a/dlls/jscript/enumerator.c +++ b/dlls/jscript/enumerator.c @@ -73,7 +73,7 @@ static inline HRESULT enumvar_get_next_item(EnumeratorInstance *This) VariantClear(&nextitem); if (FAILED(hres)) { - WARN("failed to convert jsval to variant!"); + WARN("failed to convert jsval to variant!\n"); This->item = jsval_undefined(); return hres; }

1 0

Vincent Povirk : mscoree: Add diagnostic CorGetSvc stub.
by Alexandre Julliard Aug. 8, 2019

Aug. 8, 2019

Module: wine Branch: master Commit: 6e3d68b14120563fd584fe9c5a27885f51e7ae66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e3d68b14120563fd584fe9c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Aug 8 13:58:37 2019 -0500 mscoree: Add diagnostic CorGetSvc stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45449 Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/mscoree.spec | 2 +- dlls/mscoree/mscoree_main.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/mscoree/mscoree.spec b/dlls/mscoree/mscoree.spec index ec4668b..7fa68bf 100644 --- a/dlls/mscoree/mscoree.spec +++ b/dlls/mscoree/mscoree.spec @@ -24,7 +24,7 @@ @ stdcall CorBindToRuntimeHost(wstr wstr wstr ptr long ptr ptr ptr) @ stub CorDllMainWorker @ stdcall CorExitProcess(long) -@ stub CorGetSvc +@ stdcall CorGetSvc(ptr) @ stdcall CorIsLatestSvc(ptr ptr) @ stub CorMarkThreadInThreadPool @ stub CorTickleSvc diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index af0321a..81fe561 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -319,6 +319,13 @@ HRESULT WINAPI CorIsLatestSvc(int *unk1, int *unk2) return S_OK; } +HRESULT WINAPI CorGetSvc(void *unk) +{ + ERR_(winediag)("If this function is called, it is likely the result of a broken .NET installation\n"); + + return E_NOTIMPL; +} + HRESULT WINAPI GetRequestedRuntimeInfo(LPCWSTR pExe, LPCWSTR pwszVersion, LPCWSTR pConfigurationFile, DWORD startupFlags, DWORD runtimeInfoFlags, LPWSTR pDirectory, DWORD dwDirectory, DWORD *dwDirectoryLength, LPWSTR pVersion, DWORD cchBuffer, DWORD *dwlength)

1 0

Francois Gouget : ntdll: Add a trailing '\n' to a TRACE().
by Alexandre Julliard Aug. 8, 2019

Aug. 8, 2019

Module: wine Branch: master Commit: cc9ce65d963ebcc0469fef4bbe58b6931a607b39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc9ce65d963ebcc0469fef4b… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 8 15:25:19 2019 +0200 ntdll: Add a trailing '\n' to a TRACE(). Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 9441230..886d697 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -4470,7 +4470,7 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, ULONG i; USHORT num_entries = 0; - TRACE( "(%u, %u, %p, %p)", skip, count, buffer, hash ); + TRACE( "(%u, %u, %p, %p)\n", skip, count, buffer, hash ); RtlCaptureContext( &context ); dispatch.TargetIp = 0;

1 0

Francois Gouget : wlanapi/tests: Spelling fixes in ok() messages.
by Alexandre Julliard Aug. 8, 2019

Aug. 8, 2019

Module: wine Branch: master Commit: a3d0cf036c7d3b8bb6f928820adc723bb86c6b46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3d0cf036c7d3b8bb6f92882… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 8 15:22:45 2019 +0200 wlanapi/tests: Spelling fixes in ok() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wlanapi/tests/wlanapi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wlanapi/tests/wlanapi.c b/dlls/wlanapi/tests/wlanapi.c index cab5cf6..55ac21e 100644 --- a/dlls/wlanapi/tests/wlanapi.c +++ b/dlls/wlanapi/tests/wlanapi.c @@ -36,17 +36,17 @@ static void test_WlanOpenHandle(void) if (!is_xp) /* the results in XP differ completely from all other versions */ { ok(ret == ERROR_NOT_SUPPORTED, "Expected 50, got %d\n", ret); - ok(neg_version == 0xdeadbeef, "neg_vesion changed\n"); + ok(neg_version == 0xdeadbeef, "neg_version changed\n"); ok(handle == bad_handle, "handle changed\n"); ret = WlanOpenHandle(10, NULL, &neg_version, &handle); ok(ret == ERROR_NOT_SUPPORTED, "Expected 50, got %d\n", ret); - ok(neg_version == 0xdeadbeef, "neg_vesion changed\n"); + ok(neg_version == 0xdeadbeef, "neg_version changed\n"); ok(handle == bad_handle, "handle changed\n"); /* reserved parameter must not be used */ ret = WlanOpenHandle(1, &reserved, &neg_version, &handle); ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); - ok(neg_version == 0xdeadbeef, "neg_vesion changed\n"); + ok(neg_version == 0xdeadbeef, "neg_version changed\n"); ok(handle == bad_handle, "handle changed\n"); /* invalid parameters */ @@ -55,7 +55,7 @@ static void test_WlanOpenHandle(void) ok(handle == bad_handle, "bad handle\n"); ret = WlanOpenHandle(1, NULL, &neg_version, NULL); ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); - ok(neg_version == 0xdeadbeef, "neg_vesion changed\n"); + ok(neg_version == 0xdeadbeef, "neg_version changed\n"); } else {

1 0

Francois Gouget : winex11.drv: A spelling fix and slight rewording in a comment.
by Alexandre Julliard Aug. 8, 2019

Aug. 8, 2019

Module: wine Branch: master Commit: 66873d5fec583b11582a8c7a21985214a436a586 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66873d5fec583b11582a8c7a… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 8 15:21:54 2019 +0200 winex11.drv: A spelling fix and slight rewording in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 435c0b8..a0f8489 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -233,7 +233,7 @@ static BOOL X11DRV_InitAdapter(HKEY video_hkey, INT video_index, INT gpu_index, RegCreateKeyExW(HKEY_CURRENT_CONFIG, adapter_keyW, 0, NULL, REG_OPTION_VOLATILE, KEY_WRITE, NULL, &hkey, NULL); /* Write GPU instance path so that we can find the GPU instance via adapters quickly. Another way is trying to match - * them via the GUID in Device Paramters/VideoID, but it would required enumrating all GPU instances */ + * them via the GUID in Device Parameters/VideoID, but it would require enumerating all GPU instances */ sprintfW(bufferW, gpu_instance_fmtW, gpu->vendor_id, gpu->device_id, gpu->subsys_id, gpu->revision_id, gpu_index); if (RegSetValueExW(hkey, gpu_idW, 0, REG_SZ, (const BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR))) goto done;

1 0

Francois Gouget : advpack: A spelling fix in a comment.
by Alexandre Julliard Aug. 8, 2019

Aug. 8, 2019

Module: wine Branch: master Commit: 529a45515b2eff3a55a1edf7841daf681d709f8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=529a45515b2eff3a55a1edf7… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 8 15:21:32 2019 +0200 advpack: A spelling fix in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advpack/install.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index 860abee..70dc4d7 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -492,7 +492,7 @@ static HRESULT install_init(LPCWSTR inf_filename, LPCWSTR install_sec, lstrcatW(info->inf_path, backslash); lstrcatW(info->inf_path, info->inf_filename); - /* RunSetupCommand opens unmodifed filename parameter */ + /* RunSetupCommand opens unmodified filename parameter */ if (flags & RSC_FLAG_INF) path = inf_filename; else

1 0

Francois Gouget : dplayx: A spelling fix in a FIXME() message.
by Alexandre Julliard Aug. 8, 2019

Aug. 8, 2019

Module: wine Branch: master Commit: 22558e1d187d5a76daf076d8a50048b79d9b99ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=22558e1d187d5a76daf076d8… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 8 15:20:20 2019 +0200 dplayx: A spelling fix in a FIXME() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dplayx/dplaysp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dplayx/dplaysp.c b/dlls/dplayx/dplaysp.c index 43938e8..53be88e 100644 --- a/dlls/dplayx/dplaysp.c +++ b/dlls/dplayx/dplaysp.c @@ -466,7 +466,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_HandleMessage( IDirectPlaySP *iface, voi { LPDPMSG_CHAT msg = lpMsg; - FIXME( "DPSYS_CHAT not implemeneted\n" ); + FIXME( "DPSYS_CHAT not implemented\n" ); break; }

1 0

Francois Gouget : ntdll/tests: A spelling fix in a comment.
by Alexandre Julliard Aug. 8, 2019

Aug. 8, 2019

Module: wine Branch: master Commit: 4392ee399e017538554b881614cb254a391d3eb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4392ee399e017538554b8816… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 8 15:17:49 2019 +0200 ntdll/tests: A spelling fix in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 8448bab..a70f19b 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -1404,7 +1404,7 @@ static void test_completion(void) port = CreateIoCompletionPort(client, NULL, 0xdeadbeef, 0); ok(port != NULL, "CreateIoCompletionPort failed, error %u\n", GetLastError()); - /* skipping completion on succcess: handle is signaled */ + /* skipping completion on success: handle is signaled */ info.Flags = FILE_SKIP_COMPLETION_PORT_ON_SUCCESS; status = pNtSetInformationFile(client, &io, &info, sizeof(info), FileIoCompletionNotificationInformation); ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status);

1 0