May 2018 - Wine-commits - list.winehq.org

Gijs Vermeulen : compobj.dll16: Add StringFromIID.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: stable Commit: b8af106cc7c0eef8ddbbbdddfcd2f2a963010778 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8af106cc7c0eef8ddbbbddd… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sun Jan 14 23:47:36 2018 +0100 compobj.dll16: Add StringFromIID. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 85820f5e402eea8f78eba9390dae35f60f278891) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/compobj.dll16/compobj.c | 1 + dlls/compobj.dll16/compobj.dll16.spec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/compobj.dll16/compobj.c b/dlls/compobj.dll16/compobj.c index af69bf8..4eddace 100644 --- a/dlls/compobj.dll16/compobj.c +++ b/dlls/compobj.dll16/compobj.c @@ -434,6 +434,7 @@ _xmalloc16(DWORD size, SEGPTR *ptr) { /****************************************************************************** * StringFromCLSID [COMPOBJ.19] + * StringFromIID [COMPOBJ.14] * Converts a GUID into the respective string representation. * The target string is allocated using the OLE IMalloc. * diff --git a/dlls/compobj.dll16/compobj.dll16.spec b/dlls/compobj.dll16/compobj.dll16.spec index 71dba80..2ef011f 100644 --- a/dlls/compobj.dll16/compobj.dll16.spec +++ b/dlls/compobj.dll16/compobj.dll16.spec @@ -11,7 +11,7 @@ 11 stub COFREELIBRARY 12 stub COFREEALLLIBRARIES 13 pascal CoCreateInstance(ptr ptr long ptr ptr) CoCreateInstance16 -14 stub STRINGFROMIID +14 pascal StringFromIID(ptr ptr) StringFromCLSID16 15 pascal CoDisconnectObject(ptr long) CoDisconnectObject16 16 stub CORELEASEMARSHALDATA 17 pascal -ret16 CoFreeUnusedLibraries() CoFreeUnusedLibraries16

1 0

Gijs Vermeulen : ole2disp.dll16: Implement SafeArrayGet[UBound|LBound].
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: stable Commit: 61d406fd22fe74e5f83c16b9766b13348378d974 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61d406fd22fe74e5f83c16b9… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Wed Jan 17 22:34:28 2018 +0100 ole2disp.dll16: Implement SafeArrayGet[UBound|LBound]. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a9686b0037126008cd5935eb45a100095d022415) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ole2disp.dll16/ole2disp.c | 36 +++++++++++++++++++++++++++++++++ dlls/ole2disp.dll16/ole2disp.dll16.spec | 4 ++-- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/ole2disp.dll16/ole2disp.c b/dlls/ole2disp.dll16/ole2disp.c index d61b5e8..98aca3d 100644 --- a/dlls/ole2disp.dll16/ole2disp.c +++ b/dlls/ole2disp.dll16/ole2disp.c @@ -117,6 +117,42 @@ USHORT WINAPI SafeArrayGetElemsize16(SAFEARRAY16 *sa) } /****************************************************************************** + * SafeArrayGetUBound [OLE2DISP.19] + */ +HRESULT WINAPI SafeArrayGetUBound16(SAFEARRAY16 *sa, UINT16 dim, LONG *ubound) +{ + TRACE("(%p, %u, %p)\n", sa, dim, ubound); + + if (!sa) + return E_INVALIDARG16; + + if (!dim || dim > sa->cDims) + return DISP_E_BADINDEX; + + *ubound = sa->rgsabound[sa->cDims - dim].lLbound + sa->rgsabound[sa->cDims - dim].cElements - 1; + + return S_OK; +} + +/****************************************************************************** + * SafeArrayGetLBound [OLE2DISP.20] + */ +HRESULT WINAPI SafeArrayGetLBound16(SAFEARRAY16 *sa, UINT16 dim, LONG *lbound) +{ + TRACE("(%p, %u, %p)\n", sa, dim, lbound); + + if (!sa) + return E_INVALIDARG16; + + if (!dim || dim > sa->cDims) + return DISP_E_BADINDEX; + + *lbound = sa->rgsabound[sa->cDims - dim].lLbound; + + return S_OK; +} + +/****************************************************************************** * SafeArrayLock [OLE2DISP.21] */ HRESULT WINAPI SafeArrayLock16(SAFEARRAY16 *sa) diff --git a/dlls/ole2disp.dll16/ole2disp.dll16.spec b/dlls/ole2disp.dll16/ole2disp.dll16.spec index 4b8af41..7b00ac3 100644 --- a/dlls/ole2disp.dll16/ole2disp.dll16.spec +++ b/dlls/ole2disp.dll16/ole2disp.dll16.spec @@ -16,8 +16,8 @@ 16 stub SAFEARRAYDESTROY 17 pascal -ret16 SafeArrayGetDim(ptr) SafeArrayGetDim16 18 pascal -ret16 SafeArrayGetElemsize(ptr) SafeArrayGetElemsize16 -19 stub SAFEARRAYGETUBOUND -20 stub SAFEARRAYGETLBOUND +19 pascal SafeArrayGetUBound(ptr word ptr) SafeArrayGetUBound16 +20 pascal SafeArrayGetLBound(ptr word ptr) SafeArrayGetLBound16 21 pascal SafeArrayLock(ptr) SafeArrayLock16 22 pascal SafeArrayUnlock(ptr) SafeArrayUnlock16 23 pascal SafeArrayAccessData(ptr ptr) SafeArrayAccessData16

1 0

Zebediah Figura : d3dx9: Add stub for D3DXComputeNormalMap.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: stable Commit: 1937cfedb23b9aacf6f77cbda0b809be98c2b3db URL: https://source.winehq.org/git/wine.git/?a=commit;h=1937cfedb23b9aacf6f77cbd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 13 19:17:38 2018 +0100 d3dx9: Add stub for D3DXComputeNormalMap. Based on a patch by Christian Costa. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7dbcbed704ca3943109b0d417a97a9814dd5adfb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_24/d3dx9_24.spec | 2 +- dlls/d3dx9_25/d3dx9_25.spec | 2 +- dlls/d3dx9_26/d3dx9_26.spec | 2 +- dlls/d3dx9_27/d3dx9_27.spec | 2 +- dlls/d3dx9_28/d3dx9_28.spec | 2 +- dlls/d3dx9_29/d3dx9_29.spec | 2 +- dlls/d3dx9_30/d3dx9_30.spec | 2 +- dlls/d3dx9_31/d3dx9_31.spec | 2 +- dlls/d3dx9_32/d3dx9_32.spec | 2 +- dlls/d3dx9_33/d3dx9_33.spec | 2 +- dlls/d3dx9_34/d3dx9_34.spec | 2 +- dlls/d3dx9_35/d3dx9_35.spec | 2 +- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/texture.c | 9 +++++++++ dlls/d3dx9_37/d3dx9_37.spec | 2 +- dlls/d3dx9_38/d3dx9_38.spec | 2 +- dlls/d3dx9_39/d3dx9_39.spec | 2 +- dlls/d3dx9_40/d3dx9_40.spec | 2 +- dlls/d3dx9_41/d3dx9_41.spec | 2 +- dlls/d3dx9_42/d3dx9_42.spec | 2 +- dlls/d3dx9_43/d3dx9_43.spec | 2 +- 21 files changed, 29 insertions(+), 20 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1937cfedb23b9aacf6f7…

1 0

Michael Stefaniuc : include: Add generic HeapAlloc() wrappers.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: stable Commit: 802ee0be22b8114e3ad5463170e25ca403b3d473 URL: https://source.winehq.org/git/wine.git/?a=commit;h=802ee0be22b8114e3ad54631… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jan 26 20:56:14 2018 +0100 include: Add generic HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d5a897f46f6bb4acc23033571c5135f4d1835344) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/wine/heap.h | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/include/wine/heap.h b/include/wine/heap.h new file mode 100644 index 0000000..014ef61 --- /dev/null +++ b/include/wine/heap.h @@ -0,0 +1,49 @@ +/* + * Wine heap memory allocation wrappers + * + * Copyright 2006 Jacek Caban for CodeWeavers + * Copyright 2013, 2018 Michael Stefaniuc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_WINE_HEAP_H +#define __WINE_WINE_HEAP_H + +#include <windef.h> + +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(SIZE_T len) +{ + return HeapAlloc(GetProcessHeap(), 0, len); +} + +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(SIZE_T len) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); +} + +static inline void * __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, SIZE_T len) +{ + if (!mem) + return HeapAlloc(GetProcessHeap(), 0, len); + return HeapReAlloc(GetProcessHeap(), 0, mem, len); +} + +static inline void heap_free(void *mem) +{ + HeapFree(GetProcessHeap(), 0, mem); +} + +#endif /* __WINE_WINE_HEAP_H */

1 0

Zebediah Figura : explorer: Pass the full path to ParseDisplayName().
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: stable Commit: 460492f2b4ad17615cf16075b1a442677fa766af URL: https://source.winehq.org/git/wine.git/?a=commit;h=460492f2b4ad17615cf16075… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 6 10:58:24 2018 -0600 explorer: Pass the full path to ParseDisplayName(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit bd74183b1e9b443e52dedf1842c4721a54f9908e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/explorer/explorer.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index ac5bebb..c509336 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -24,6 +24,7 @@ #include "wine/unicode.h" #include "wine/debug.h" +#include "wine/heap.h" #include "explorer_private.h" #include "resource.h" @@ -631,16 +632,26 @@ static IShellFolder* get_starting_shell_folder(parameters_struct* params) { IShellFolder* desktop,*folder; LPITEMIDLIST root_pidl; + WCHAR *fullpath = NULL; HRESULT hres; + DWORD size; SHGetDesktopFolder(&desktop); if (!params->root[0]) { return desktop; } + + size = GetFullPathNameW(params->root, 0, fullpath, NULL); + if (!size) + return desktop; + fullpath = heap_alloc(size * sizeof(WCHAR)); + GetFullPathNameW(params->root, size, fullpath, NULL); + hres = IShellFolder_ParseDisplayName(desktop,NULL,NULL, - params->root,NULL, + fullpath,NULL, &root_pidl,NULL); + heap_free(fullpath); if(FAILED(hres)) {

1 0

Hans Leidekker : bcrypt: Partial implementation of BCryptImportKey and BCryptExportKey.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: stable Commit: f661e5272e5c2765814b0bf65552d938f1b3c3f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f661e5272e5c2765814b0bf6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 28 13:33:06 2018 +0100 bcrypt: Partial implementation of BCryptImportKey and BCryptExportKey. Based on a patch by Michael Müller. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c77d5c65fb0d92b1ef33d41a22f9c49abc767388) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/bcrypt/bcrypt.spec | 4 +- dlls/bcrypt/bcrypt_main.c | 143 ++++++++++++++++++++++++++++++++++++--------- dlls/bcrypt/tests/bcrypt.c | 51 ++++++++++++++++ dlls/ncrypt/ncrypt.spec | 4 +- include/bcrypt.h | 14 +++++ 5 files changed, 186 insertions(+), 30 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f661e5272e5c2765814b…

1 0

Alex Henrie : msvcrt: Compile but show an error if Bessel functions aren' t available.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: stable Commit: 202932a6f307cbba5ed77551321b8eb2204b465f URL: https://source.winehq.org/git/wine.git/?a=commit;h=202932a6f307cbba5ed77551… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Mar 2 10:02:46 2018 -0700 msvcrt: Compile but show an error if Bessel functions aren't available. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit acd2f1e59bd22197b63eb5ae4ac0d621a0b8cce0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 8 +++++++- configure.ac | 8 +++++++- dlls/msvcrt/math.c | 36 +++++++++++++++++++++++++++++++++--- include/config.h.in | 18 ++++++++++++++++++ 4 files changed, 65 insertions(+), 5 deletions(-) diff --git a/configure b/configure index f62b9e3..be6e012 100755 --- a/configure +++ b/configure @@ -17654,6 +17654,9 @@ for ac_func in \ exp2f \ expm1 \ expm1f \ + j0 \ + j1 \ + jn \ lgamma \ lgammaf \ llrint \ @@ -17678,7 +17681,10 @@ for ac_func in \ round \ roundf \ trunc \ - truncf + truncf \ + y0 \ + y1 \ + yn do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` diff --git a/configure.ac b/configure.ac index 9aa3228..3b037f9 100644 --- a/configure.ac +++ b/configure.ac @@ -2660,6 +2660,9 @@ AC_CHECK_FUNCS(\ exp2f \ expm1 \ expm1f \ + j0 \ + j1 \ + jn \ lgamma \ lgammaf \ llrint \ @@ -2684,7 +2687,10 @@ AC_CHECK_FUNCS(\ round \ roundf \ trunc \ - truncf + truncf \ + y0 \ + y1 \ + yn ) LIBS="$ac_save_LIBS" diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 9b48011..a3af78a 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1412,7 +1412,12 @@ INT CDECL MSVCRT__isnan(double num) double CDECL MSVCRT__j0(double num) { /* FIXME: errno handling */ +#ifdef HAVE_J0 return j0(num); +#else + FIXME("not implemented\n"); + return 0; +#endif } /********************************************************************* @@ -1421,7 +1426,12 @@ double CDECL MSVCRT__j0(double num) double CDECL MSVCRT__j1(double num) { /* FIXME: errno handling */ +#ifdef HAVE_J1 return j1(num); +#else + FIXME("not implemented\n"); + return 0; +#endif } /********************************************************************* @@ -1430,7 +1440,12 @@ double CDECL MSVCRT__j1(double num) double CDECL MSVCRT__jn(int n, double num) { /* FIXME: errno handling */ +#ifdef HAVE_JN return jn(n, num); +#else + FIXME("not implemented\n"); + return 0; +#endif } /********************************************************************* @@ -1440,12 +1455,17 @@ double CDECL MSVCRT__y0(double num) { double retval; if (!isfinite(num)) *MSVCRT__errno() = MSVCRT_EDOM; +#ifdef HAVE_Y0 retval = y0(num); if (MSVCRT__fpclass(retval) == MSVCRT__FPCLASS_NINF) { *MSVCRT__errno() = MSVCRT_EDOM; - retval = sqrt(-1); + retval = NAN; } +#else + FIXME("not implemented\n"); + retval = 0; +#endif return retval; } @@ -1456,12 +1476,17 @@ double CDECL MSVCRT__y1(double num) { double retval; if (!isfinite(num)) *MSVCRT__errno() = MSVCRT_EDOM; +#ifdef HAVE_Y1 retval = y1(num); if (MSVCRT__fpclass(retval) == MSVCRT__FPCLASS_NINF) { *MSVCRT__errno() = MSVCRT_EDOM; - retval = sqrt(-1); + retval = NAN; } +#else + FIXME("not implemented\n"); + retval = 0; +#endif return retval; } @@ -1472,12 +1497,17 @@ double CDECL MSVCRT__yn(int order, double num) { double retval; if (!isfinite(num)) *MSVCRT__errno() = MSVCRT_EDOM; +#ifdef HAVE_YN retval = yn(order,num); if (MSVCRT__fpclass(retval) == MSVCRT__FPCLASS_NINF) { *MSVCRT__errno() = MSVCRT_EDOM; - retval = sqrt(-1); + retval = NAN; } +#else + FIXME("not implemented\n"); + retval = 0; +#endif return retval; } diff --git a/include/config.h.in b/include/config.h.in index 9224837..551080a 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -336,6 +336,15 @@ /* Define to 1 if you have the `isnanf' function. */ #undef HAVE_ISNANF +/* Define to 1 if you have the `j0' function. */ +#undef HAVE_J0 + +/* Define to 1 if you have the `j1' function. */ +#undef HAVE_J1 + +/* Define to 1 if you have the `jn' function. */ +#undef HAVE_JN + /* Define to 1 if you have the <jpeglib.h> header file. */ #undef HAVE_JPEGLIB_H @@ -1359,6 +1368,15 @@ /* Define if Xrandr has the XRRGetScreenResources function */ #undef HAVE_XRRGETSCREENRESOURCES +/* Define to 1 if you have the `y0' function. */ +#undef HAVE_Y0 + +/* Define to 1 if you have the `y1' function. */ +#undef HAVE_Y1 + +/* Define to 1 if you have the `yn' function. */ +#undef HAVE_YN + /* Define to 1 if you have the `z' library (-lz). */ #undef HAVE_ZLIB

1 0

Andrew Wesie : ntdll: Implement NtCreateThreadEx.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: stable Commit: 11dbee29209da0c1bedf6cac9a57c278bbbc6042 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11dbee29209da0c1bedf6cac… Author: Andrew Wesie <awesie(a)gmail.com> Date: Tue Mar 6 03:10:30 2018 +0000 ntdll: Implement NtCreateThreadEx. Signed-off-by: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4fda0463237d395fbee5d955e72a7c13ed125416) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/thread.c | 17 +++++++++++++++++ include/winternl.h | 7 +++++++ 3 files changed, 25 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 27c10e1..584b5a4 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -152,6 +152,7 @@ @ stdcall NtCreateSemaphore(ptr long ptr long long) @ stdcall NtCreateSymbolicLinkObject(ptr long ptr ptr) @ stub NtCreateThread +@ stdcall NtCreateThreadEx(ptr long ptr long ptr ptr long long long long ptr) @ stdcall NtCreateTimer(ptr long ptr long) @ stub NtCreateToken # @ stub NtCreateWaitablePort diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 66beeb0..88008ad 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -522,6 +522,23 @@ static void start_thread( struct startup_info *info ) /*********************************************************************** + * NtCreateThreadEx (NTDLL.@) + */ +NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle_ptr, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr, + HANDLE process, LPTHREAD_START_ROUTINE start, void *param, + ULONG flags, ULONG zero_bits, ULONG stack_commit, + ULONG stack_reserve, void *attribute_list ) +{ + FIXME( "%p, %x, %p, %p, %p, %p, %x, %x, %x, %x, %p semi-stub!\n", handle_ptr, access, attr, + process, start, param, flags, zero_bits, stack_commit, stack_reserve, attribute_list ); + + return RtlCreateUserThread( process, NULL, flags & THREAD_CREATE_FLAGS_CREATE_SUSPENDED, + NULL, stack_reserve, stack_commit, (PRTL_THREAD_START_ROUTINE)start, + param, handle_ptr, NULL ); +} + + +/*********************************************************************** * RtlCreateUserThread (NTDLL.@) */ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, const SECURITY_DESCRIPTOR *descr, diff --git a/include/winternl.h b/include/winternl.h index 21353d8..24cf15c 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2149,6 +2149,13 @@ typedef struct _SYSTEM_MODULE_INFORMATION SYSTEM_MODULE Modules[1]; /* FIXME: should be Modules[0] */ } SYSTEM_MODULE_INFORMATION, *PSYSTEM_MODULE_INFORMATION; +#define THREAD_CREATE_FLAGS_CREATE_SUSPENDED 0x00000001 +#define THREAD_CREATE_FLAGS_SKIP_THREAD_ATTACH 0x00000002 +#define THREAD_CREATE_FLAGS_HIDE_FROM_DEBUGGER 0x00000004 +#define THREAD_CREATE_FLAGS_HAS_SECURITY_DESCRIPTOR 0x00000010 +#define THREAD_CREATE_FLAGS_ACCESS_CHECK_IN_TARGET 0x00000020 +#define THREAD_CREATE_FLAGS_INITIAL_THREAD 0x00000080 + /*********************************************************************** * Function declarations */

1 0

Alexandre Julliard : ntdll: Avoid pushl %esp instruction in RtlUnwind prolog.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: stable Commit: bf25842dd2317c4b89f1585fcb298da6edf6fe5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf25842dd2317c4b89f1585f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 9 13:47:01 2018 -0600 ntdll: Avoid pushl %esp instruction in RtlUnwind prolog. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 342e2cabd21c5a836683ac30e260ec4944eeac6b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/signal_i386.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index dcca0f5..79d6e32 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2762,7 +2762,9 @@ __ASM_STDCALL_FUNC( RtlUnwind, 16, "movl %esp,%ebp\n\t" __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") "leal -(0x2cc+8)(%esp),%esp\n\t" /* sizeof(CONTEXT) + alignment */ - "pushl %esp\n\t" /* context */ + "pushl %eax\n\t" + "leal 4(%esp),%eax\n\t" /* context */ + "xchgl %eax,(%esp)\n\t" "call " __ASM_NAME("RtlCaptureContext") __ASM_STDCALL(4) "\n\t" "leal 24(%ebp),%eax\n\t" "movl %eax,0xc4(%esp)\n\t" /* context->Esp */

1 0

Louis Lenders : ntdll: Match NtAllocateUuids signature to Windows 2000 instead of NT4.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: stable Commit: ad7bdbd4866c0c27167cdb614e036058225cd3ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad7bdbd4866c0c27167cdb61… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Sun Mar 11 21:09:48 2018 -0600 ntdll: Match NtAllocateUuids signature to Windows 2000 instead of NT4. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e24af9660aa202d5885171f55e1dd371f57fc15d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/om.c | 9 +++------ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/winternl.h | 2 +- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 584b5a4..5c5365d 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -111,7 +111,7 @@ @ stdcall NtAlertThread(long) @ stdcall NtAllocateLocallyUniqueId(ptr) # @ stub NtAllocateUserPhysicalPages -@ stdcall NtAllocateUuids(ptr ptr ptr) +@ stdcall NtAllocateUuids(ptr ptr ptr ptr) @ stdcall NtAllocateVirtualMemory(long ptr long ptr long long) @ stdcall NtAreMappedFilesTheSame(ptr ptr) @ stdcall NtAssignProcessToJobObject(long long) @@ -1040,7 +1040,7 @@ @ stdcall -private ZwAlertThread(long) NtAlertThread @ stdcall -private ZwAllocateLocallyUniqueId(ptr) NtAllocateLocallyUniqueId # @ stub ZwAllocateUserPhysicalPages -@ stdcall -private ZwAllocateUuids(ptr ptr ptr) NtAllocateUuids +@ stdcall -private ZwAllocateUuids(ptr ptr ptr ptr) NtAllocateUuids @ stdcall -private ZwAllocateVirtualMemory(long ptr long ptr long long) NtAllocateVirtualMemory @ stdcall -private ZwAreMappedFilesTheSame(ptr ptr) NtAreMappedFilesTheSame @ stdcall -private ZwAssignProcessToJobObject(long long) NtAssignProcessToJobObject diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c index 1279f2b..febe5bd 100644 --- a/dlls/ntdll/om.c +++ b/dlls/ntdll/om.c @@ -688,13 +688,10 @@ NTSTATUS WINAPI NtQuerySymbolicLinkObject( HANDLE handle, PUNICODE_STRING target /****************************************************************************** * NtAllocateUuids [NTDLL.@] */ -NTSTATUS WINAPI NtAllocateUuids( - PULARGE_INTEGER Time, - PULONG Range, - PULONG Sequence) +NTSTATUS WINAPI NtAllocateUuids( ULARGE_INTEGER *time, ULONG *delta, ULONG *sequence, UCHAR *seed ) { - FIXME("(%p,%p,%p), stub.\n", Time, Range, Sequence); - return 0; + FIXME("(%p,%p,%p,%p), stub.\n", time, delta, sequence, seed); + return STATUS_SUCCESS; } /************************************************************************** diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 7f43704..24b40c3 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -740,7 +740,7 @@ @ stdcall NtAddAtom(ptr long ptr) @ stdcall NtAdjustPrivilegesToken(long long ptr long ptr ptr) @ stdcall NtAllocateLocallyUniqueId(ptr) -@ stdcall NtAllocateUuids(ptr ptr ptr) +@ stdcall NtAllocateUuids(ptr ptr ptr ptr) @ stdcall NtAllocateVirtualMemory(long ptr long ptr long long) @ stub NtBuildNumber @ stdcall NtClose(long) diff --git a/include/winternl.h b/include/winternl.h index 24cf15c..f9f3350 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2196,7 +2196,7 @@ NTSYSAPI NTSTATUS WINAPI NtAdjustPrivilegesToken(HANDLE,BOOLEAN,PTOKEN_PRIVILEG NTSYSAPI NTSTATUS WINAPI NtAlertResumeThread(HANDLE,PULONG); NTSYSAPI NTSTATUS WINAPI NtAlertThread(HANDLE ThreadHandle); NTSYSAPI NTSTATUS WINAPI NtAllocateLocallyUniqueId(PLUID lpLuid); -NTSYSAPI NTSTATUS WINAPI NtAllocateUuids(PULARGE_INTEGER,PULONG,PULONG); +NTSYSAPI NTSTATUS WINAPI NtAllocateUuids(PULARGE_INTEGER,PULONG,PULONG,PUCHAR); NTSYSAPI NTSTATUS WINAPI NtAllocateVirtualMemory(HANDLE,PVOID*,ULONG,SIZE_T*,ULONG,ULONG); NTSYSAPI NTSTATUS WINAPI NtAreMappedFilesTheSame(PVOID,PVOID); NTSYSAPI NTSTATUS WINAPI NtAssignProcessToJobObject(HANDLE,HANDLE);

1 0