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

Alexandre Julliard : kernelbase: Implement SetThreadStackGuarantee().
by Alexandre Julliard Aug. 26, 2019

Aug. 26, 2019

Module: wine Branch: master Commit: 505be3a0a2afeae3cebeaad48fc5f32e0b0336b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=505be3a0a2afeae3cebeaad4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Aug 24 10:03:51 2019 +0200 kernelbase: Implement SetThreadStackGuarantee(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/thread.c | 58 ++++++++++++++++++++++++++++++++++++++++++++ dlls/kernelbase/thread.c | 15 ++++++++++-- include/winternl.h | 4 +-- 3 files changed, 73 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 331db9b..f87f770 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -82,6 +82,7 @@ static HANDLE (WINAPI *pOpenThread)(DWORD,BOOL,DWORD); static BOOL (WINAPI *pQueueUserWorkItem)(LPTHREAD_START_ROUTINE,PVOID,ULONG); static DWORD (WINAPI *pSetThreadIdealProcessor)(HANDLE,DWORD); static BOOL (WINAPI *pSetThreadPriorityBoost)(HANDLE,BOOL); +static BOOL (WINAPI *pSetThreadStackGuarantee)(ULONG*); static BOOL (WINAPI *pRegisterWaitForSingleObject)(PHANDLE,HANDLE,WAITORTIMERCALLBACK,PVOID,ULONG,ULONG); static BOOL (WINAPI *pUnregisterWait)(HANDLE); static BOOL (WINAPI *pIsWow64Process)(HANDLE,PBOOL); @@ -1016,6 +1017,61 @@ static VOID test_GetCurrentThreadStackLimits(void) ok(high == (ULONG_PTR)NtCurrentTeb()->Tib.StackBase, "expected %p, got %lx\n", NtCurrentTeb()->Tib.StackBase, high); } +static void test_SetThreadStackGuarantee(void) +{ + ULONG size; + BOOL ret; + + if (!pSetThreadStackGuarantee) + { + win_skip("SetThreadStackGuarantee not available.\n"); + return; + } + size = 0; + ret = pSetThreadStackGuarantee( &size ); + ok( ret, "failed err %u\n", GetLastError() ); + ok( size == 0, "wrong size %u\n", size ); + ok( NtCurrentTeb()->GuaranteedStackBytes == 0, "wrong teb %u\n", + NtCurrentTeb()->GuaranteedStackBytes ); + size = 0xdeadbef; + ret = pSetThreadStackGuarantee( &size ); + ok( !ret, "succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_INVALID_ADDRESS, + "wrong error %u\n", GetLastError()); + ok( size == 0, "wrong size %u\n", size ); + ok( NtCurrentTeb()->GuaranteedStackBytes == 0, "wrong teb %u\n", + NtCurrentTeb()->GuaranteedStackBytes ); + size = 200; + ret = pSetThreadStackGuarantee( &size ); + ok( ret, "failed err %u\n", GetLastError() ); + ok( size == 0, "wrong size %u\n", size ); + ok( NtCurrentTeb()->GuaranteedStackBytes == 4096 * sizeof(void *) / 4, "wrong teb %u\n", + NtCurrentTeb()->GuaranteedStackBytes ); + size = 5000; + ret = pSetThreadStackGuarantee( &size ); + ok( ret, "failed err %u\n", GetLastError() ); + ok( size == 4096 * sizeof(void *) / 4, "wrong size %u\n", size ); + ok( NtCurrentTeb()->GuaranteedStackBytes == 8192, "wrong teb %u\n", + NtCurrentTeb()->GuaranteedStackBytes ); + size = 2000; + ret = pSetThreadStackGuarantee( &size ); + ok( ret, "failed err %u\n", GetLastError() ); + ok( size == 8192, "wrong size %u\n", size ); + ok( NtCurrentTeb()->GuaranteedStackBytes == 8192, "wrong teb %u\n", + NtCurrentTeb()->GuaranteedStackBytes ); + size = 10000; + ret = pSetThreadStackGuarantee( &size ); + ok( ret, "failed err %u\n", GetLastError() ); + ok( size == 8192, "wrong size %u\n", size ); + ok( NtCurrentTeb()->GuaranteedStackBytes == 12288, "wrong teb %u\n", + NtCurrentTeb()->GuaranteedStackBytes ); + ret = pSetThreadStackGuarantee( &size ); + ok( ret, "failed err %u\n", GetLastError() ); + ok( size == 12288, "wrong size %u\n", size ); + ok( NtCurrentTeb()->GuaranteedStackBytes == 12288, "wrong teb %u\n", + NtCurrentTeb()->GuaranteedStackBytes ); +} + static VOID test_GetThreadExitCode(void) { DWORD exitCode, threadid; @@ -2029,6 +2085,7 @@ static void init_funcs(void) X(QueueUserWorkItem); X(SetThreadIdealProcessor); X(SetThreadPriorityBoost); + X(SetThreadStackGuarantee); X(RegisterWaitForSingleObject); X(UnregisterWait); X(IsWow64Process); @@ -2110,6 +2167,7 @@ START_TEST(thread) test_CreateThread_stack(); test_thread_priority(); test_GetCurrentThreadStackLimits(); + test_SetThreadStackGuarantee(); test_GetThreadTimes(); test_thread_processor(); test_GetThreadExitCode(); diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index cf8e6be..518ea93 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -470,8 +470,19 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetThreadPriorityBoost( HANDLE thread, BOOL disabl */ BOOL WINAPI DECLSPEC_HOTPATCH SetThreadStackGuarantee( ULONG *size ) { - static int once; - if (once++ == 0) FIXME("(%p): stub\n", size); + ULONG prev_size = NtCurrentTeb()->GuaranteedStackBytes; + ULONG new_size = (*size + 4095) & ~4095; + + /* at least 2 pages on 64-bit */ + if (sizeof(void *) > sizeof(int)) new_size = max( new_size, 8192 ); + + *size = prev_size; + if (new_size >= (char *)NtCurrentTeb()->Tib.StackBase - (char *)NtCurrentTeb()->DeallocationStack) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + if (new_size > prev_size) NtCurrentTeb()->GuaranteedStackBytes = (new_size + 4095) & ~4095; return TRUE; } diff --git a/include/winternl.h b/include/winternl.h index 0ebfe8e..4715b05 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -397,8 +397,8 @@ typedef struct _TEB PVOID WinSockData; /* f6c/1738 */ ULONG GdiBatchCount; /* f70/1740 */ ULONG Spare2; /* f74/1744 */ - PVOID Spare3; /* f78/1748 */ - PVOID Spare4; /* f7c/1750 */ + ULONG GuaranteedStackBytes; /* f78/1748 */ + PVOID ReservedForPerf; /* f7c/1750 */ PVOID ReservedForOle; /* f80/1758 */ ULONG WaitingOnLoaderLock; /* f84/1760 */ PVOID Reserved5[3]; /* f88/1768 */

1 0

Jacek Caban : mscvrt: Always provide float variants of math functions in importlib on x86.
by Alexandre Julliard Aug. 26, 2019

Aug. 26, 2019

Module: wine Branch: master Commit: 0f15515cc2f6987017dd351a4e0ce5b7684d8709 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f15515cc2f6987017dd351a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Aug 25 18:49:55 2019 +0200 mscvrt: Always provide float variants of math functions in importlib on x86. We have them declared as inline wrappers around double variant in math.h, but that's not enough. clang is smart enough to optimize them back to *f variants anyway. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/Makefile.in | 1 + dlls/msvcr110/Makefile.in | 1 + dlls/msvcr120/Makefile.in | 1 + dlls/msvcr80/Makefile.in | 1 + dlls/msvcr90/Makefile.in | 1 + dlls/msvcrt/Makefile.in | 1 + dlls/msvcrt/mathf.c | 4 +++- dlls/ucrtbase/Makefile.in | 1 + 8 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/msvcr100/Makefile.in b/dlls/msvcr100/Makefile.in index e95c929..03a94f8 100644 --- a/dlls/msvcr100/Makefile.in +++ b/dlls/msvcr100/Makefile.in @@ -25,6 +25,7 @@ C_SRCS = \ lock.c \ main.c \ math.c \ + mathf.c \ mbcs.c \ misc.c \ onexit.c \ diff --git a/dlls/msvcr110/Makefile.in b/dlls/msvcr110/Makefile.in index 00928ca..c29fa23 100644 --- a/dlls/msvcr110/Makefile.in +++ b/dlls/msvcr110/Makefile.in @@ -25,6 +25,7 @@ C_SRCS = \ lock.c \ main.c \ math.c \ + mathf.c \ mbcs.c \ misc.c \ onexit.c \ diff --git a/dlls/msvcr120/Makefile.in b/dlls/msvcr120/Makefile.in index fa09d30..57b9c8a 100644 --- a/dlls/msvcr120/Makefile.in +++ b/dlls/msvcr120/Makefile.in @@ -25,6 +25,7 @@ C_SRCS = \ lock.c \ main.c \ math.c \ + mathf.c \ mbcs.c \ misc.c \ onexit.c \ diff --git a/dlls/msvcr80/Makefile.in b/dlls/msvcr80/Makefile.in index 90c43f7..a3757d4 100644 --- a/dlls/msvcr80/Makefile.in +++ b/dlls/msvcr80/Makefile.in @@ -25,6 +25,7 @@ C_SRCS = \ lock.c \ main.c \ math.c \ + mathf.c \ mbcs.c \ misc.c \ onexit.c \ diff --git a/dlls/msvcr90/Makefile.in b/dlls/msvcr90/Makefile.in index 5d644a3..d4f857d 100644 --- a/dlls/msvcr90/Makefile.in +++ b/dlls/msvcr90/Makefile.in @@ -25,6 +25,7 @@ C_SRCS = \ lock.c \ main.c \ math.c \ + mathf.c \ mbcs.c \ misc.c \ onexit.c \ diff --git a/dlls/msvcrt/Makefile.in b/dlls/msvcrt/Makefile.in index 014243c..d0237fd 100644 --- a/dlls/msvcrt/Makefile.in +++ b/dlls/msvcrt/Makefile.in @@ -24,6 +24,7 @@ C_SRCS = \ lock.c \ main.c \ math.c \ + mathf.c \ mbcs.c \ misc.c \ onexit.c \ diff --git a/dlls/msvcrt/mathf.c b/dlls/msvcrt/mathf.c index 781df2b..9f27e64 100644 --- a/dlls/msvcrt/mathf.c +++ b/dlls/msvcrt/mathf.c @@ -25,7 +25,7 @@ #include <math.h> -#if !defined(__i386__) && _MSVCR_VER > 0 && _MSVCR_VER < 80 +#if defined(__i386__) || (_MSVCR_VER > 0 && _MSVCR_VER < 80) float sinf(float x) { return sin(x); } float cosf(float x) { return cos(x); } float tanf(float x) { return tan(x); } @@ -34,4 +34,6 @@ float expf(float x) { return exp(x); } float logf(float x) { return log(x); } float powf(float x, float y) { return pow(x, y); } float sqrtf(float x) { return sqrt(x); } +float floorf(float x) { return floor(x); } +float ceilf(float x) { return ceil(x); } #endif diff --git a/dlls/ucrtbase/Makefile.in b/dlls/ucrtbase/Makefile.in index 63fcc9b..2caef7c 100644 --- a/dlls/ucrtbase/Makefile.in +++ b/dlls/ucrtbase/Makefile.in @@ -24,6 +24,7 @@ C_SRCS = \ lock.c \ main.c \ math.c \ + mathf.c \ mbcs.c \ misc.c \ printf.c \

1 0

Carlo Bramini : hhctrl.ocx: Expand environment vars in file name.
by Alexandre Julliard Aug. 26, 2019

Aug. 26, 2019

Module: wine Branch: master Commit: 9413a1980f8ac94642fd263a7fea2d2d842f93d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9413a1980f8ac94642fd263a… Author: Carlo Bramini <carlo.bramix(a)libero.it> Date: Sat Aug 24 20:50:24 2019 +0200 hhctrl.ocx: Expand environment vars in file name. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47379 Signed-off-by: Carlo Bramini <carlo_bramini(a)users.sourceforge.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hhctrl.ocx/hhctrl.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index e757167..6a98ae4 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -97,7 +97,7 @@ static const char *command_to_string(UINT command) #undef X } -static BOOL resolve_filename(const WCHAR *filename, WCHAR *fullname, DWORD buflen, WCHAR **index, WCHAR **window) +static BOOL resolve_filename(const WCHAR *env_filename, WCHAR *fullname, DWORD buflen, WCHAR **index, WCHAR **window) { const WCHAR *extra; WCHAR chm_file[MAX_PATH]; @@ -106,12 +106,25 @@ static BOOL resolve_filename(const WCHAR *filename, WCHAR *fullname, DWORD bufle static const WCHAR delimW[] = {':',':',0}; static const WCHAR delim2W[] = {'>',0}; - filename = skip_schema(filename); + DWORD env_len; + WCHAR *filename; + + env_filename = skip_schema(env_filename); /* the format is "helpFile[::/index][>window]" */ if (index) *index = NULL; if (window) *window = NULL; + env_len = ExpandEnvironmentStringsW(env_filename, NULL, 0); + if (!env_len) + return 0; + + filename = heap_alloc(env_len * sizeof(WCHAR)); + if (filename == NULL) + return 0; + + ExpandEnvironmentStringsW(env_filename, filename, env_len); + extra = wcsstr(filename, delim2W); if (extra) { @@ -140,6 +153,9 @@ static BOOL resolve_filename(const WCHAR *filename, WCHAR *fullname, DWORD bufle lstrcatW(fullname, helpW); lstrcatW(fullname, filename); } + + heap_free(filename); + return (GetFileAttributesW(fullname) != INVALID_FILE_ATTRIBUTES); }

1 0

Zebediah Figura : http.sys: Fill out unknown verbs.
by Alexandre Julliard Aug. 26, 2019

Aug. 26, 2019

Module: wine Branch: master Commit: ebca23da5ea378492b4fd07f1e556dae58df9c13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebca23da5ea378492b4fd07f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Aug 23 17:36:19 2019 -0500 http.sys: Fill out unknown verbs. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/http.sys/http.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index a41b464..7690867 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -277,6 +277,9 @@ static NTSTATUS complete_irp(struct connection *conn, IRP *irp) /* First calculate the total buffer size needed for this IRP. */ + if (conn->unk_verb_len) + irp_size += conn->unk_verb_len + 1; + TRACE("Need %u bytes, have %u.\n", irp_size, output_len); irp->IoStatus.Information = irp_size; @@ -300,6 +303,7 @@ static NTSTATUS complete_irp(struct connection *conn, IRP *irp) if (params.bits == 32) { struct http_request_32 *req = irp->AssociatedIrp.SystemBuffer; + char *buffer = irp->AssociatedIrp.SystemBuffer; offset = sizeof(*req); @@ -307,11 +311,22 @@ static NTSTATUS complete_irp(struct connection *conn, IRP *irp) req->UrlContext = conn->queue->context; req->Version = conn->version; req->Verb = conn->verb; + req->UnknownVerbLength = conn->unk_verb_len; + + if (conn->unk_verb_len) + { + req->pUnknownVerb = params.addr + offset; + memcpy(buffer + offset, conn->buffer, conn->unk_verb_len); + offset += conn->unk_verb_len; + buffer[offset++] = 0; + } + req->BytesReceived = conn->req_len; } else { struct http_request_64 *req = irp->AssociatedIrp.SystemBuffer; + char *buffer = irp->AssociatedIrp.SystemBuffer; offset = sizeof(*req); @@ -319,6 +334,16 @@ static NTSTATUS complete_irp(struct connection *conn, IRP *irp) req->UrlContext = conn->queue->context; req->Version = conn->version; req->Verb = conn->verb; + req->UnknownVerbLength = conn->unk_verb_len; + + if (conn->unk_verb_len) + { + req->pUnknownVerb = params.addr + offset; + memcpy(buffer + offset, conn->buffer, conn->unk_verb_len); + offset += conn->unk_verb_len; + buffer[offset++] = 0; + } + req->BytesReceived = conn->req_len; }

1 0

Zebediah Figura : http.sys: Stop receiving data as long as an unread request is available.
by Alexandre Julliard Aug. 26, 2019

Aug. 26, 2019

Module: wine Branch: master Commit: 20ab0dacb8dfcb3f514364c87d6ce45292d1afe0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20ab0dacb8dfcb3f514364c8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Aug 23 17:36:16 2019 -0500 http.sys: Stop receiving data as long as an unread request is available. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/http.sys/http.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index 506aefc..81f5d34 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -53,7 +53,10 @@ struct connection char *buffer; unsigned int len, size; - /* Things we already parsed out of the request header in parse_request(). */ + BOOL available; + + /* Things we already parsed out of the request header in parse_request(). + * These are valid only if "available" is TRUE. */ unsigned int req_len; HTTP_VERB verb; HTTP_VERSION version; @@ -272,6 +275,11 @@ static int parse_request(struct connection *conn) TRACE("Received a full request, length %u bytes.\n", conn->req_len); + /* Stop selecting on incoming data until a response is queued. */ + WSAEventSelect(conn->socket, request_event, FD_CLOSE); + + conn->available = TRUE; + return 1; } @@ -294,6 +302,9 @@ static void receive_data(struct connection *conn) } conn->len += len; + if (conn->available) + return; /* waiting for an HttpReceiveHttpRequest() call */ + TRACE("Received %u bytes of data.\n", len); if (!(ret = parse_request(conn)))

1 0

Alexandre Julliard : ntdll: Take stack guarantee into account when handling stack overflows.
by Alexandre Julliard Aug. 26, 2019

Aug. 26, 2019

Module: wine Branch: master Commit: 87d9fef2ae3a10f08a6a76b5e4cf542390ea3ae0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87d9fef2ae3a10f08a6a76b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Aug 24 12:24:09 2019 +0200 ntdll: Take stack guarantee into account when handling stack overflows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/signal_arm.c | 13 ++++++------- dlls/ntdll/signal_arm64.c | 13 ++++++------- dlls/ntdll/signal_i386.c | 22 +++++++++++++--------- dlls/ntdll/signal_x86_64.c | 22 +++++++++++++--------- dlls/ntdll/virtual.c | 27 +++++++++++++++++++-------- 6 files changed, 58 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=87d9fef2ae3a10f08a6a…

1 0

Jacek Caban : wine/asm.h: Quote stdcall decored symbols.
by Alexandre Julliard Aug. 26, 2019

Aug. 26, 2019

Module: wine Branch: master Commit: bdcc54c19d7356077362e7001aa9c4a08919af89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdcc54c19d7356077362e700… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Aug 25 18:50:08 2019 +0200 wine/asm.h: Quote stdcall decored symbols. LLVM can't handle @ char in non-quoted symbol names. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/asm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/asm.h b/include/wine/asm.h index 01dfdb1..66062c0 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -28,7 +28,7 @@ #endif #if defined(_WIN32) && defined(__i386__) -# define __ASM_STDCALL(name,args) __ASM_NAME(name) "@" #args +# define __ASM_STDCALL(name,args) "\"" __ASM_NAME(name) "@" #args "\"" #else # define __ASM_STDCALL(name,args) __ASM_NAME(name) #endif

1 0

Michael Müller : wuauserv: Add dummy service.
by Alexandre Julliard Aug. 26, 2019

Aug. 26, 2019

Module: wine Branch: master Commit: 451f96663d62a1c1392f75565f46f38d9ff93a2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=451f96663d62a1c1392f7556… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Aug 23 06:07:40 2019 +0000 wuauserv: Add dummy service. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=37781 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + loader/wine.inf.in | 11 +++++ programs/wuauserv/Makefile.in | 6 +++ programs/wuauserv/main.c | 104 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 124 insertions(+) diff --git a/configure b/configure index c64dc5a..450cb4f 100755 --- a/configure +++ b/configure @@ -1791,6 +1791,7 @@ enable_wmplayer enable_wordpad enable_write enable_wscript +enable_wuauserv enable_wusa enable_xcopy enable_server @@ -20960,6 +20961,7 @@ wine_fn_config_makefile programs/wordpad enable_wordpad wine_fn_config_makefile programs/write enable_write wine_fn_config_makefile programs/wscript enable_wscript wine_fn_config_makefile programs/wscript/tests enable_tests +wine_fn_config_makefile programs/wuauserv enable_wuauserv wine_fn_config_makefile programs/wusa enable_wusa wine_fn_config_makefile programs/xcopy enable_xcopy wine_fn_config_makefile programs/xcopy/tests enable_tests diff --git a/configure.ac b/configure.ac index 0d0ba2f..df652e8 100644 --- a/configure.ac +++ b/configure.ac @@ -3942,6 +3942,7 @@ WINE_CONFIG_MAKEFILE(programs/wordpad) WINE_CONFIG_MAKEFILE(programs/write) WINE_CONFIG_MAKEFILE(programs/wscript) WINE_CONFIG_MAKEFILE(programs/wscript/tests) +WINE_CONFIG_MAKEFILE(programs/wuauserv) WINE_CONFIG_MAKEFILE(programs/wusa) WINE_CONFIG_MAKEFILE(programs/xcopy) WINE_CONFIG_MAKEFILE(programs/xcopy/tests) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index e835466..3ddda8d 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -133,6 +133,7 @@ AddService=FontCache,0,FontCacheService AddService=Schedule,0,TaskSchedulerService AddService=WineBus,0,WineBusService AddService=Winmgmt,0,WinmgmtService +AddService=wuauserv,0,wuauService [DefaultInstall.NT.Services] AddService=BITS,0,BITSService @@ -150,6 +151,7 @@ AddService=FontCache,0,FontCacheService AddService=Schedule,0,TaskSchedulerService AddService=WineBus,0,WineBusService AddService=Winmgmt,0,WinmgmtService +AddService=wuauserv,0,wuauService [DefaultInstall.ntamd64.Services] AddService=BITS,0,BITSService @@ -167,6 +169,7 @@ AddService=FontCache,0,FontCacheService AddService=Schedule,0,TaskSchedulerService AddService=WineBus,0,WineBusService AddService=Winmgmt,0,WinmgmtService +AddService=wuauserv,0,wuauService [Strings] MciExtStr="Software\Microsoft\Windows NT\CurrentVersion\MCI Extensions" @@ -3582,6 +3585,14 @@ ErrorControl=1 HKR,Parameters,"ServiceDll",,"%11%\schedsvc.dll" HKLM,%CurrentVersionNT%\SvcHost,"netsvcs",0x00010008,"Schedule" +[wuauService] +Description="wuauserv" +DisplayName="Automatic Updates" +ServiceBinary="%11%\wuauserv.exe" +ServiceType=32 +StartType=3 +ErrorControl=1 + [Services] HKLM,%CurrentVersion%\RunServices,"winemenubuilder",2,"%11%\winemenubuilder.exe -a -r" HKLM,"System\CurrentControlSet\Services\Eventlog\Application",,16 diff --git a/programs/wuauserv/Makefile.in b/programs/wuauserv/Makefile.in new file mode 100644 index 0000000..ff9939b --- /dev/null +++ b/programs/wuauserv/Makefile.in @@ -0,0 +1,6 @@ +MODULE = wuauserv.exe +APPMODE = -mconsole -mno-cygwin +IMPORTS = advapi32 + +C_SRCS = \ + main.c diff --git a/programs/wuauserv/main.c b/programs/wuauserv/main.c new file mode 100644 index 0000000..31df299 --- /dev/null +++ b/programs/wuauserv/main.c @@ -0,0 +1,104 @@ +/* + * Copyright 2007 Jacek Caban for CodeWeavers + * Copyright 2016 Michael Müller + * + * 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 + */ + +#define WIN32_LEAN_AND_MEAN + +#include <windows.h> +#include <winsvc.h> + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wuauserv); + +static WCHAR wuauservW[] = {'w','u','a','u','s','e','r','v',0}; + +static SERVICE_STATUS_HANDLE service_handle; +static HANDLE stop_event; + +static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_data, LPVOID context ) +{ + SERVICE_STATUS status; + + status.dwServiceType = SERVICE_WIN32; + status.dwControlsAccepted = SERVICE_ACCEPT_STOP; + status.dwWin32ExitCode = 0; + status.dwServiceSpecificExitCode = 0; + status.dwCheckPoint = 0; + status.dwWaitHint = 0; + + switch(ctrl) + { + case SERVICE_CONTROL_STOP: + case SERVICE_CONTROL_SHUTDOWN: + WINE_TRACE( "shutting down\n" ); + status.dwCurrentState = SERVICE_STOP_PENDING; + status.dwControlsAccepted = 0; + SetServiceStatus( service_handle, &status ); + SetEvent( stop_event ); + return NO_ERROR; + default: + WINE_FIXME( "got service ctrl %x\n", ctrl ); + status.dwCurrentState = SERVICE_RUNNING; + SetServiceStatus( service_handle, &status ); + return NO_ERROR; + } +} + +static void WINAPI serv_main(DWORD argc, LPWSTR *argv) +{ + SERVICE_STATUS status; + + WINE_TRACE( "starting service\n" ); + + stop_event = CreateEventW( NULL, TRUE, FALSE, NULL ); + + service_handle = RegisterServiceCtrlHandlerExW( wuauservW, service_handler, NULL ); + if (!service_handle) + return; + + status.dwServiceType = SERVICE_WIN32; + status.dwCurrentState = SERVICE_RUNNING; + status.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN; + status.dwWin32ExitCode = 0; + status.dwServiceSpecificExitCode = 0; + status.dwCheckPoint = 0; + status.dwWaitHint = 10000; + SetServiceStatus( service_handle, &status ); + + WaitForSingleObject( stop_event, INFINITE ); + + status.dwCurrentState = SERVICE_STOPPED; + status.dwControlsAccepted = 0; + SetServiceStatus( service_handle, &status ); + WINE_TRACE( "service stopped\n" ); +} + +int main(int argc, char **argv) +{ + static const SERVICE_TABLE_ENTRYW servtbl[] = + { + {wuauservW, serv_main}, + {NULL, NULL} + }; + + WINE_TRACE( "(%d %p)\n", argc, argv ); + + StartServiceCtrlDispatcherW( servtbl ); + return 0; +}

1 0

Alistair Leslie-Hughes : dsound: Add missing defines.
by Alexandre Julliard Aug. 26, 2019

Aug. 26, 2019

Module: wine Branch: master Commit: ed475adcc41e6ad750202e44deefb2b141c6aa9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed475adcc41e6ad750202e44… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Aug 26 04:49:15 2019 +0000 dsound: Add missing defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dsound.h | 100 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/include/dsound.h b/include/dsound.h index 23e2a59..43fffce 100644 --- a/include/dsound.h +++ b/include/dsound.h @@ -1326,6 +1326,11 @@ typedef struct _DSFXGargle typedef const DSFXGargle *LPCDSFXGargle; +#define DSFXGARGLE_RATEHZ_MIN 1 +#define DSFXGARGLE_RATEHZ_MAX 1000 +#define DSFXGARGLE_WAVE_SQUARE 1 +#define DSFXGARGLE_WAVE_TRIANGLE 0 + #define INTERFACE IDirectSoundFXGargle DECLARE_INTERFACE_(IDirectSoundFXGargle,IUnknown) { @@ -1367,6 +1372,26 @@ typedef struct _DSFXChorus typedef const DSFXChorus *LPCDSFXChorus; +#define DSFXCHORUS_DEPTH_MIN 0.0f +#define DSFXCHORUS_DEPTH_MAX 100.0f +#define DSFXCHORUS_DELAY_MIN 0.0f +#define DSFXCHORUS_DELAY_MAX 20.0f +#define DSFXCHORUS_FEEDBACK_MIN -99.0f +#define DSFXCHORUS_FEEDBACK_MAX 99.0f +#define DSFXCHORUS_FREQUENCY_MIN 0.0f +#define DSFXCHORUS_FREQUENCY_MAX 10.0f +#define DSFXCHORUS_PHASE_MIN 0 +#define DSFXCHORUS_PHASE_MAX 4 +#define DSFXCHORUS_PHASE_NEG_180 0 +#define DSFXCHORUS_PHASE_NEG_90 1 +#define DSFXCHORUS_PHASE_ZERO 2 +#define DSFXCHORUS_PHASE_90 3 +#define DSFXCHORUS_PHASE_180 4 +#define DSFXCHORUS_WAVE_TRIANGLE 0 +#define DSFXCHORUS_WAVE_SIN 1 +#define DSFXCHORUS_WETDRYMIX_MIN 0.0f +#define DSFXCHORUS_WETDRYMIX_MAX 100.0f + #define INTERFACE IDirectSoundFXChorus DECLARE_INTERFACE_(IDirectSoundFXChorus,IUnknown) { @@ -1408,6 +1433,26 @@ typedef struct _DSFXFlanger typedef const DSFXFlanger *LPCDSFXFlanger; +#define DSFXFLANGER_DELAY_MIN 0.0f +#define DSFXFLANGER_DELAY_MAX 4.0f +#define DSFXFLANGER_DEPTH_MIN 0.0f +#define DSFXFLANGER_DEPTH_MAX 100.0f +#define DSFXFLANGER_FREQUENCY_MIN 0.0f +#define DSFXFLANGER_FREQUENCY_MAX 10.0f +#define DSFXFLANGER_FEEDBACK_MIN -99.0f +#define DSFXFLANGER_FEEDBACK_MAX 99.0f +#define DSFXFLANGER_PHASE_MIN 0 +#define DSFXFLANGER_PHASE_MAX 4 +#define DSFXFLANGER_PHASE_NEG_180 0 +#define DSFXFLANGER_PHASE_NEG_90 1 +#define DSFXFLANGER_PHASE_ZERO 2 +#define DSFXFLANGER_PHASE_90 3 +#define DSFXFLANGER_PHASE_180 4 +#define DSFXFLANGER_WAVE_SIN 1 +#define DSFXFLANGER_WAVE_TRIANGLE 0 +#define DSFXFLANGER_WETDRYMIX_MIN 0.0f +#define DSFXFLANGER_WETDRYMIX_MAX 100.0f + #define INTERFACE IDirectSoundFXFlanger DECLARE_INTERFACE_(IDirectSoundFXFlanger,IUnknown) { @@ -1447,6 +1492,17 @@ typedef struct _DSFXEcho typedef const DSFXEcho *LPCDSFXEcho; +#define DSFXECHO_FEEDBACK_MIN 0.0f +#define DSFXECHO_FEEDBACK_MAX 100.0f +#define DSFXECHO_LEFTDELAY_MIN 1.0f +#define DSFXECHO_LEFTDELAY_MAX 2000.0f +#define DSFXECHO_PANDELAY_MIN 0 +#define DSFXECHO_PANDELAY_MAX 1 +#define DSFXECHO_RIGHTDELAY_MIN 1.0f +#define DSFXECHO_RIGHTDELAY_MAX 2000.0f +#define DSFXECHO_WETDRYMIX_MIN 0.0f +#define DSFXECHO_WETDRYMIX_MAX 100.0f + #define INTERFACE IDirectSoundFXEcho DECLARE_INTERFACE_(IDirectSoundFXEcho,IUnknown) { @@ -1486,6 +1542,17 @@ typedef struct _DSFXDistortion typedef const DSFXDistortion *LPCDSFXDistortion; +#define DSFXDISTORTION_EDGE_MIN 0.0f +#define DSFXDISTORTION_EDGE_MAX 100.0f +#define DSFXDISTORTION_GAIN_MIN -60.0f +#define DSFXDISTORTION_GAIN_MAX 0.0f +#define DSFXDISTORTION_POSTEQCENTERFREQUENCY_MIN 100.0f +#define DSFXDISTORTION_POSTEQCENTERFREQUENCY_MAX 8000.0f +#define DSFXDISTORTION_POSTEQBANDWIDTH_MIN 100.0f +#define DSFXDISTORTION_POSTEQBANDWIDTH_MAX 8000.0f +#define DSFXDISTORTION_PRELOWPASSCUTOFF_MIN 100.0f +#define DSFXDISTORTION_PRELOWPASSCUTOFF_MAX 8000.0f + #define INTERFACE IDirectSoundFXDistortion DECLARE_INTERFACE_(IDirectSoundFXDistortion,IUnknown) { @@ -1526,6 +1593,19 @@ typedef struct _DSFXCompressor typedef const DSFXCompressor *LPCDSFXCompressor; +#define DSFXCOMPRESSOR_ATTACK_MIN 0.01f +#define DSFXCOMPRESSOR_ATTACK_MAX 500.0f +#define DSFXCOMPRESSOR_GAIN_MIN -60.0f +#define DSFXCOMPRESSOR_GAIN_MAX 60.0f +#define DSFXCOMPRESSOR_PREDELAY_MIN 0.0f +#define DSFXCOMPRESSOR_PREDELAY_MAX 4.0f +#define DSFXCOMPRESSOR_RATIO_MIN 1.0f +#define DSFXCOMPRESSOR_RATIO_MAX 100.0f +#define DSFXCOMPRESSOR_RELEASE_MIN 50.0f +#define DSFXCOMPRESSOR_RELEASE_MAX 3000.0f +#define DSFXCOMPRESSOR_THRESHOLD_MIN -60.0f +#define DSFXCOMPRESSOR_THRESHOLD_MAX 0.0f + #define INTERFACE IDirectSoundFXCompressor DECLARE_INTERFACE_(IDirectSoundFXCompressor, IUnknown) { @@ -1563,6 +1643,13 @@ typedef struct _DSFXParamEq typedef const DSFXParamEq *LPCDSFXParamEq; +#define DSFXPARAMEQ_BANDWIDTH_MIN 1.0f +#define DSFXPARAMEQ_BANDWIDTH_MAX 36.0f +#define DSFXPARAMEQ_CENTER_MIN 80.0f +#define DSFXPARAMEQ_CENTER_MAX 16000.0f +#define DSFXPARAMEQ_GAIN_MIN -15.0f +#define DSFXPARAMEQ_GAIN_MAX 15.0f + #define INTERFACE IDirectSoundFXParamEq DECLARE_INTERFACE_(IDirectSoundFXParamEq, IUnknown) { @@ -1601,6 +1688,19 @@ typedef struct _DSFXWavesReverb typedef const DSFXWavesReverb *LPCDSFXWavesReverb; +#define DSFX_WAVESREVERB_HIGHFREQRTRATIO_MIN 0.001f +#define DSFX_WAVESREVERB_HIGHFREQRTRATIO_MAX 0.999f +#define DSFX_WAVESREVERB_HIGHFREQRTRATIO_DEFAULT 0.001f +#define DSFX_WAVESREVERB_INGAIN_MIN -96.0f +#define DSFX_WAVESREVERB_INGAIN_MAX 0.0f +#define DSFX_WAVESREVERB_INGAIN_DEFAULT 0.0f +#define DSFX_WAVESREVERB_REVERBMIX_MIN -96.0f +#define DSFX_WAVESREVERB_REVERBMIX_MAX 0.0f +#define DSFX_WAVESREVERB_REVERBMIX_DEFAULT 0.0f +#define DSFX_WAVESREVERB_REVERBTIME_MIN 0.001f +#define DSFX_WAVESREVERB_REVERBTIME_MAX 3000.0f +#define DSFX_WAVESREVERB_REVERBTIME_DEFAULT 1000.0f + #define INTERFACE IDirectSoundFXWavesReverb DECLARE_INTERFACE_(IDirectSoundFXWavesReverb,IUnknown) {

1 0

Austin English : regini: Add stub program.
by Alexandre Julliard Aug. 26, 2019

Aug. 26, 2019

Module: wine Branch: master Commit: 4d10575df950c2d78527605f38ebe34218011970 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d10575df950c2d78527605f… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Aug 25 03:52:23 2019 -0500 regini: Add stub program. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + programs/regini/Makefile.in | 6 ++++++ programs/regini/main.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 42 insertions(+) diff --git a/configure b/configure index 450cb4f..c06bc4f 100755 --- a/configure +++ b/configure @@ -1747,6 +1747,7 @@ enable_progman enable_reg enable_regasm enable_regedit +enable_regini enable_regsvcs enable_regsvr32 enable_rpcss @@ -20910,6 +20911,7 @@ wine_fn_config_makefile programs/reg/tests enable_tests wine_fn_config_makefile programs/regasm enable_regasm wine_fn_config_makefile programs/regedit enable_regedit wine_fn_config_makefile programs/regedit/tests enable_tests +wine_fn_config_makefile programs/regini enable_regini wine_fn_config_makefile programs/regsvcs enable_regsvcs wine_fn_config_makefile programs/regsvr32 enable_regsvr32 wine_fn_config_makefile programs/rpcss enable_rpcss diff --git a/configure.ac b/configure.ac index df652e8..e58a924 100644 --- a/configure.ac +++ b/configure.ac @@ -3891,6 +3891,7 @@ WINE_CONFIG_MAKEFILE(programs/reg/tests) WINE_CONFIG_MAKEFILE(programs/regasm) WINE_CONFIG_MAKEFILE(programs/regedit) WINE_CONFIG_MAKEFILE(programs/regedit/tests) +WINE_CONFIG_MAKEFILE(programs/regini) WINE_CONFIG_MAKEFILE(programs/regsvcs) WINE_CONFIG_MAKEFILE(programs/regsvr32) WINE_CONFIG_MAKEFILE(programs/rpcss) diff --git a/programs/regini/Makefile.in b/programs/regini/Makefile.in new file mode 100644 index 0000000..13c456f --- /dev/null +++ b/programs/regini/Makefile.in @@ -0,0 +1,6 @@ +MODULE = regini.exe + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + +C_SRCS = \ + main.c diff --git a/programs/regini/main.c b/programs/regini/main.c new file mode 100644 index 0000000..a8ad654 --- /dev/null +++ b/programs/regini/main.c @@ -0,0 +1,33 @@ +/* + * Copyright 2019 Austin English + * + * 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 + */ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(regini); + +int wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +}

1 0