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

Francois Gouget : msvcrt: A spelling fix in a comment.
by Alexandre Julliard 09 Aug '19

09 Aug '19

Module: wine Branch: master Commit: e49526e65225f84bd5b7fe5a7303b60222b35a61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e49526e65225f84bd5b7fe5a… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 8 15:23:58 2019 +0200 msvcrt: A spelling fix in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stdint.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/msvcrt/stdint.h b/include/msvcrt/stdint.h index d228071..7ecdb23 100644 --- a/include/msvcrt/stdint.h +++ b/include/msvcrt/stdint.h @@ -177,7 +177,7 @@ typedef unsigned long long uintmax_t; /* 7.18.4.1 Macros for minimum-width integer constants - Accoding to Douglas Gwyn <gwyn(a)arl.mil>: + According to Douglas Gwyn <gwyn(a)arl.mil>: "This spec was changed in ISO/IEC 9899:1999 TC1; in ISO/IEC 9899:1999 as initially published, the expansion was required to be an integer constant of precisely matching type, which

1 0

Francois Gouget : server: A spelling and slight rewording fix in a comment.
by Alexandre Julliard 09 Aug '19

09 Aug '19

Module: wine Branch: master Commit: 826aae15a2f689e53617e5bb1d9e6647715c69db URL: https://source.winehq.org/git/wine.git/?a=commit;h=826aae15a2f689e53617e5bb… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 8 15:24:18 2019 +0200 server: A spelling and slight rewording fix in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/async.c b/server/async.c index 94cac47..5486601 100644 --- a/server/async.c +++ b/server/async.c @@ -50,7 +50,7 @@ struct async struct iosb *iosb; /* I/O status block */ obj_handle_t wait_handle; /* pre-allocated wait handle */ unsigned int signaled :1; - unsigned int pending :1; /* request is succesfully queued, but pending */ + unsigned int pending :1; /* request successfully queued, but pending */ unsigned int direct_result :1;/* a flag if we're passing result directly from request instead of APC */ struct completion *completion; /* completion associated with fd */ apc_param_t comp_key; /* completion key associated with fd */

1 0

Francois Gouget : ntdll: Add a trailing '\n' to a TRACE().
by Alexandre Julliard 09 Aug '19

09 Aug '19

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 : jscript: Add a trailing '\n' to a WARN() message.
by Alexandre Julliard 09 Aug '19

09 Aug '19

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

Jacek Caban : msvcrt: Use __iob_func instead of __p__iob in __acrt_iob_func implementation.
by Alexandre Julliard 09 Aug '19

09 Aug '19

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

Jacek Caban : msvcrt: Export __p__iob only on i386.
by Alexandre Julliard 09 Aug '19

09 Aug '19

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

Vincent Povirk : mscoree: Add diagnostic CorGetSvc stub.
by Alexandre Julliard 09 Aug '19

09 Aug '19

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

Józef Kucia : winevulkan: Pull in bitmask dependencies for function parameters.
by Alexandre Julliard 09 Aug '19

09 Aug '19

Module: wine Branch: master Commit: 3b1bf387eb9ab2aa32164e494dfcb51f6ac52969 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b1bf387eb9ab2aa32164e49… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 8 11:51:37 2019 +0200 winevulkan: Pull in bitmask dependencies for function parameters. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 ++ include/wine/vulkan.h | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 2d872e2..4f1c03c 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2608,6 +2608,8 @@ class VkRegistry(object): if type_info["category"] == "struct": struct = type_info["data"] mark_struct_dependencies(struct, self.types) + elif type_info["category"] == "bitmask": + mark_bitmask_dependencies(type_info["data"], self.types) if func.is_alias(): func.alias.required = True diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index 407b7ef..66cbd99 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -754,6 +754,12 @@ typedef enum VkCommandBufferLevel VK_COMMAND_BUFFER_LEVEL_MAX_ENUM = 0x7fffffff, } VkCommandBufferLevel; +typedef enum VkCommandBufferResetFlagBits +{ + VK_COMMAND_BUFFER_RESET_RELEASE_RESOURCES_BIT = 0x00000001, + VK_COMMAND_BUFFER_RESET_FLAG_BITS_MAX_ENUM = 0x7fffffff, +} VkCommandBufferResetFlagBits; + typedef enum VkCommandBufferUsageFlagBits { VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT = 0x00000001, @@ -770,6 +776,12 @@ typedef enum VkCommandPoolCreateFlagBits VK_COMMAND_POOL_CREATE_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkCommandPoolCreateFlagBits; +typedef enum VkCommandPoolResetFlagBits +{ + VK_COMMAND_POOL_RESET_RELEASE_RESOURCES_BIT = 0x00000001, + VK_COMMAND_POOL_RESET_FLAG_BITS_MAX_ENUM = 0x7fffffff, +} VkCommandPoolResetFlagBits; + typedef enum VkCompareOp { VK_COMPARE_OP_NEVER = 0, @@ -1670,6 +1682,15 @@ typedef enum VkQueryPipelineStatisticFlagBits VK_QUERY_PIPELINE_STATISTIC_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkQueryPipelineStatisticFlagBits; +typedef enum VkQueryResultFlagBits +{ + VK_QUERY_RESULT_64_BIT = 0x00000001, + VK_QUERY_RESULT_WAIT_BIT = 0x00000002, + VK_QUERY_RESULT_WITH_AVAILABILITY_BIT = 0x00000004, + VK_QUERY_RESULT_PARTIAL_BIT = 0x00000008, + VK_QUERY_RESULT_FLAG_BITS_MAX_ENUM = 0x7fffffff, +} VkQueryResultFlagBits; + typedef enum VkQueryType { VK_QUERY_TYPE_OCCLUSION = 0, @@ -1900,6 +1921,14 @@ typedef enum VkSparseMemoryBindFlagBits VK_SPARSE_MEMORY_BIND_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkSparseMemoryBindFlagBits; +typedef enum VkStencilFaceFlagBits +{ + VK_STENCIL_FACE_FRONT_BIT = 0x00000001, + VK_STENCIL_FACE_BACK_BIT = 0x00000002, + VK_STENCIL_FRONT_AND_BACK = 0x00000003, + VK_STENCIL_FACE_FLAG_BITS_MAX_ENUM = 0x7fffffff, +} VkStencilFaceFlagBits; + typedef enum VkStencilOp { VK_STENCIL_OP_KEEP = 0,

1 0

Alexandre Julliard : kernel32: Reimplement fiber switching in assembly.
by Alexandre Julliard 09 Aug '19

09 Aug '19

Module: wine Branch: master Commit: adac42bad659c3c1234b9f5eec6496058a1b50d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=adac42bad659c3c1234b9f5e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 8 12:09:34 2019 +0200 kernel32: Reimplement fiber switching in assembly. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/fiber.c | 186 +++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 152 insertions(+), 34 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=adac42bad659c3c1234b…

1 0

Alexandre Julliard : kernel32: Move thread functions to kernelbase.
by Alexandre Julliard 09 Aug '19

09 Aug '19

Module: wine Branch: master Commit: 0116660dd80b38da8201e2156adade67fc2ae823 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0116660dd80b38da8201e215… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 8 14:25:50 2019 +0200 kernel32: Move thread functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 60 ++-- dlls/kernel32/sync.c | 9 - dlls/kernel32/thread.c | 664 ---------------------------------------- dlls/kernelbase/Makefile.in | 1 + dlls/kernelbase/kernelbase.spec | 64 ++-- dlls/kernelbase/thread.c | 495 ++++++++++++++++++++++++++++++ 6 files changed, 558 insertions(+), 735 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0116660dd80b38da8201…

1 0