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

Zebediah Figura : http.sys: Find a request queue to assign new HTTP requests to.
by Alexandre Julliard 26 Aug '19

26 Aug '19

Module: wine Branch: master Commit: 85f5338eff0705125f41ef8558d34910e7108ebd URL: https://source.winehq.org/git/wine.git/?a=commit;h=85f5338eff0705125f41ef85… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Aug 23 17:36:17 2019 -0500 http.sys: Find a request queue to assign new HTTP requests to. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/http.sys/http.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index 81f5d34..4b83cc6 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -54,6 +54,7 @@ struct connection unsigned int len, size; BOOL available; + struct request_queue *queue; /* Things we already parsed out of the request header in parse_request(). * These are valid only if "available" is TRUE. */ @@ -180,12 +181,20 @@ static int parse_number(const char *str, const char **endptr, const char *end) return n; } +static BOOL host_matches(const struct connection *conn, const struct request_queue *queue) +{ + const char *conn_host = (conn->url[0] == '/') ? conn->host : conn->url + 7; + + return !memicmp(queue->url + 7, conn_host, strlen(queue->url) - 8 /* strip final slash */); +} + /* Upon receiving a request, parse it to ensure that it is a valid HTTP request, * and mark down some information that we will use later. Returns 1 if we parsed * a complete request, 0 if incomplete, -1 if invalid. */ static int parse_request(struct connection *conn) { const char *const req = conn->buffer, *const end = conn->buffer + conn->len; + struct request_queue *queue; const char *p = req, *q; int len, ret; @@ -275,6 +284,18 @@ static int parse_request(struct connection *conn) TRACE("Received a full request, length %u bytes.\n", conn->req_len); + conn->queue = NULL; + /* Find a queue which can receive this request. */ + LIST_FOR_EACH_ENTRY(queue, &request_queues, struct request_queue, entry) + { + if (host_matches(conn, queue)) + { + TRACE("Assigning request to queue %p.\n", queue); + conn->queue = queue; + break; + } + } + /* Stop selecting on incoming data until a response is queued. */ WSAEventSelect(conn->socket, request_event, FD_CLOSE); @@ -376,6 +397,7 @@ static NTSTATUS http_add_url(struct request_queue *queue, IRP *irp) { const struct http_add_url_params *params = irp->AssociatedIrp.SystemBuffer; struct sockaddr_in addr; + struct connection *conn; char *url, *endptr; int s, count = 0; ULONG true = 1; @@ -453,6 +475,13 @@ static NTSTATUS http_add_url(struct request_queue *queue, IRP *irp) queue->url = url; queue->context = params->context; + /* See if any pending requests now match this queue. */ + LIST_FOR_EACH_ENTRY(conn, &connections, struct connection, entry) + { + if (conn->available && !conn->queue && host_matches(conn, queue)) + conn->queue = queue; + } + LeaveCriticalSection(&http_cs); return STATUS_SUCCESS;

1 0

Zebediah Figura : http.sys: Allow receiving parsed HTTP requests.
by Alexandre Julliard 26 Aug '19

26 Aug '19

Module: wine Branch: master Commit: 7a73d01f88366d1d479053cd11577eb6109c5f4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a73d01f88366d1d479053cd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Aug 23 17:36:18 2019 -0500 http.sys: Allow receiving parsed HTTP requests. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/http.sys/http.c | 199 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/wine/http.h | 9 +++ 2 files changed, 208 insertions(+) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index 4b83cc6..a41b464 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> #include "ntstatus.h" #define WIN32_NO_STATUS #include "wine/http.h" @@ -32,6 +33,108 @@ static DEVICE_OBJECT *device_obj; WINE_DEFAULT_DEBUG_CHANNEL(http); +/* We have to return the HTTP_REQUEST structure to userspace exactly as it will + * be consumed; httpapi has no opportunity to massage it. Since it contains + * pointers, this is somewhat nontrivial. */ + +struct http_request_32 +{ + ULONG Flags; + HTTP_CONNECTION_ID ConnectionId; + HTTP_REQUEST_ID RequestId; + HTTP_URL_CONTEXT UrlContext; + HTTP_VERSION Version; + HTTP_VERB Verb; + USHORT UnknownVerbLength; + USHORT RawUrlLength; + ULONG pUnknownVerb; /* char string */ + ULONG pRawUrl; /* char string */ + struct + { + USHORT FullUrlLength; + USHORT HostLength; + USHORT AbsPathLength; + USHORT QueryStringLength; + ULONG pFullUrl; /* WCHAR string */ + ULONG pHost; /* pointer to above */ + ULONG pAbsPath; /* pointer to above */ + ULONG pQueryString; /* pointer to above */ + } CookedUrl; + struct + { + ULONG pRemoteAddress; /* SOCKADDR */ + ULONG pLocalAddress; /* SOCKADDR */ + } Address; + struct + { + USHORT UnknownHeaderCount; + ULONG pUnknownHeaders; /* struct http_unknown_header_32 */ + USHORT TrailerCount; + ULONG pTrailers; /* NULL */ + struct + { + USHORT RawValueLength; + ULONG pRawValue; /* char string */ + } KnownHeaders[HttpHeaderRequestMaximum]; + } Headers; + ULONGLONG BytesReceived; + USHORT EntityChunkCount; + ULONG pEntityChunks; /* struct http_data_chunk_32 */ + HTTP_RAW_CONNECTION_ID RawConnectionId; + ULONG pSslInfo; /* NULL (FIXME) */ + USHORT RequestInfoCount; + ULONG pRequestInfo; /* NULL (FIXME) */ +}; + +struct http_request_64 +{ + ULONG Flags; + HTTP_CONNECTION_ID ConnectionId; + HTTP_REQUEST_ID RequestId; + HTTP_URL_CONTEXT UrlContext; + HTTP_VERSION Version; + HTTP_VERB Verb; + USHORT UnknownVerbLength; + USHORT RawUrlLength; + ULONGLONG pUnknownVerb; /* char string */ + ULONGLONG pRawUrl; /* char string */ + struct + { + USHORT FullUrlLength; + USHORT HostLength; + USHORT AbsPathLength; + USHORT QueryStringLength; + ULONGLONG pFullUrl; /* WCHAR string */ + ULONGLONG pHost; /* pointer to above */ + ULONGLONG pAbsPath; /* pointer to above */ + ULONGLONG pQueryString; /* pointer to above */ + } CookedUrl; + struct + { + ULONGLONG pRemoteAddress; /* SOCKADDR */ + ULONGLONG pLocalAddress; /* SOCKADDR */ + } Address; + struct + { + USHORT UnknownHeaderCount; + ULONGLONG pUnknownHeaders; /* struct http_unknown_header_32 */ + USHORT TrailerCount; + ULONGLONG pTrailers; /* NULL */ + struct + { + USHORT RawValueLength; + ULONGLONG pRawValue; /* char string */ + } KnownHeaders[HttpHeaderRequestMaximum]; + } Headers; + ULONGLONG BytesReceived; + USHORT EntityChunkCount; + ULONGLONG pEntityChunks; /* struct http_data_chunk_32 */ + HTTP_RAW_CONNECTION_ID RawConnectionId; + ULONGLONG pSslInfo; /* NULL (FIXME) */ + USHORT RequestInfoCount; + ULONGLONG pRequestInfo; /* NULL (FIXME) */ +}; + #define DECLARE_CRITICAL_SECTION(cs) \ static CRITICAL_SECTION cs; \ static CRITICAL_SECTION_DEBUG cs##_debug = \ @@ -161,6 +264,73 @@ static int parse_token(const char *str, const char *end) return p - str; } +static NTSTATUS complete_irp(struct connection *conn, IRP *irp) +{ + const struct http_receive_request_params params + = *(struct http_receive_request_params *)irp->AssociatedIrp.SystemBuffer; + DWORD irp_size = (params.bits == 32) ? sizeof(struct http_request_32) : sizeof(struct http_request_64); + IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); + const DWORD output_len = stack->Parameters.DeviceIoControl.OutputBufferLength; + ULONG offset; + + TRACE("Completing IRP %p.\n", irp); + + /* First calculate the total buffer size needed for this IRP. */ + + TRACE("Need %u bytes, have %u.\n", irp_size, output_len); + irp->IoStatus.Information = irp_size; + + memset(irp->AssociatedIrp.SystemBuffer, 0, output_len); + + if (output_len < irp_size) + { + if (params.bits == 32) + { + struct http_request_32 *req = irp->AssociatedIrp.SystemBuffer; + req->ConnectionId = (ULONG_PTR)conn; + } + else + { + struct http_request_64 *req = irp->AssociatedIrp.SystemBuffer; + req->ConnectionId = (ULONG_PTR)conn; + } + return STATUS_BUFFER_OVERFLOW; + } + + if (params.bits == 32) + { + struct http_request_32 *req = irp->AssociatedIrp.SystemBuffer; + + offset = sizeof(*req); + + req->ConnectionId = (ULONG_PTR)conn; + req->UrlContext = conn->queue->context; + req->Version = conn->version; + req->Verb = conn->verb; + req->BytesReceived = conn->req_len; + } + else + { + struct http_request_64 *req = irp->AssociatedIrp.SystemBuffer; + + offset = sizeof(*req); + + req->ConnectionId = (ULONG_PTR)conn; + req->UrlContext = conn->queue->context; + req->Version = conn->version; + req->Verb = conn->verb; + req->BytesReceived = conn->req_len; + } + + assert(offset == irp->IoStatus.Information); + + conn->available = FALSE; + memmove(conn->buffer, conn->buffer + conn->req_len, conn->len - conn->req_len); + conn->len -= conn->req_len; + + return STATUS_SUCCESS; +} + /* Return 1 if str matches expect, 0 if str is incomplete, -1 if they don't match. */ static int compare_exact(const char *str, const char *expect, const char *end) { @@ -507,6 +677,32 @@ static NTSTATUS http_remove_url(struct request_queue *queue, IRP *irp) return STATUS_SUCCESS; } +static NTSTATUS http_receive_request(struct request_queue *queue, IRP *irp) +{ + const struct http_receive_request_params *params = irp->AssociatedIrp.SystemBuffer; + struct connection *conn; + NTSTATUS ret; + + TRACE("addr %s, id %s, flags %#x, bits %u.\n", wine_dbgstr_longlong(params->addr), + wine_dbgstr_longlong(params->id), params->flags, params->bits); + + EnterCriticalSection(&http_cs); + + LIST_FOR_EACH_ENTRY(conn, &connections, struct connection, entry) + { + if (conn->available && conn->queue == queue) + { + ret = complete_irp(conn, irp); + LeaveCriticalSection(&http_cs); + return ret; + } + } + + LeaveCriticalSection(&http_cs); + + return STATUS_PENDING; +} + static NTSTATUS WINAPI dispatch_ioctl(DEVICE_OBJECT *device, IRP *irp) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); @@ -521,6 +717,9 @@ static NTSTATUS WINAPI dispatch_ioctl(DEVICE_OBJECT *device, IRP *irp) case IOCTL_HTTP_REMOVE_URL: ret = http_remove_url(queue, irp); break; + case IOCTL_HTTP_RECEIVE_REQUEST: + ret = http_receive_request(queue, irp); + break; default: FIXME("Unhandled ioctl %#x.\n", stack->Parameters.DeviceIoControl.IoControlCode); ret = STATUS_NOT_IMPLEMENTED; diff --git a/include/wine/http.h b/include/wine/http.h index 354c289..1145cab 100644 --- a/include/wine/http.h +++ b/include/wine/http.h @@ -25,6 +25,7 @@ #define IOCTL_HTTP_ADD_URL CTL_CODE(FILE_DEVICE_UNKNOWN, 0x800, METHOD_BUFFERED, 0) #define IOCTL_HTTP_REMOVE_URL CTL_CODE(FILE_DEVICE_UNKNOWN, 0x801, METHOD_BUFFERED, 0) +#define IOCTL_HTTP_RECEIVE_REQUEST CTL_CODE(FILE_DEVICE_UNKNOWN, 0x802, METHOD_BUFFERED, 0) struct http_add_url_params { @@ -32,4 +33,12 @@ struct http_add_url_params char url[1]; }; +struct http_receive_request_params +{ + ULONGLONG addr; /* user-mode buffer address */ + HTTP_REQUEST_ID id; + ULONG flags; + ULONG bits; +}; + #endif

1 0

Zebediah Figura : http.sys: Fill out unknown verbs.
by Alexandre Julliard 26 Aug '19

26 Aug '19

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

Michael Müller : wuauserv: Add dummy service.
by Alexandre Julliard 26 Aug '19

26 Aug '19

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

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

26 Aug '19

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

Austin English : regini: Add stub program.
by Alexandre Julliard 26 Aug '19

26 Aug '19

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

Jacek Caban : winebuild: Don't include aliases in importlib .def files.
by Alexandre Julliard 26 Aug '19

26 Aug '19

Module: wine Branch: master Commit: dd1a83c20a84f581bc36768669ccb4a7417fb418 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd1a83c20a84f581bc367686… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Aug 25 18:49:23 2019 +0200 winebuild: Don't include aliases in importlib .def files. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 2 +- tools/winebuild/import.c | 2 +- tools/winebuild/main.c | 2 +- tools/winebuild/spec32.c | 7 ++++--- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 43a0dd2..bde322c 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -310,7 +310,7 @@ extern void output_resources( DLLSPEC *spec ); extern void output_bin_resources( DLLSPEC *spec, unsigned int start_rva ); extern void output_spec32_file( DLLSPEC *spec ); extern void output_fake_module( DLLSPEC *spec ); -extern void output_def_file( DLLSPEC *spec, int include_stubs ); +extern void output_def_file( DLLSPEC *spec, int import_only ); extern void load_res16_file( const char *name, DLLSPEC *spec ); extern void output_res16_data( DLLSPEC *spec ); extern void output_bin_res16_data( DLLSPEC *spec ); diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 7d3c725..e2688a0 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1452,7 +1452,7 @@ static void build_windows_import_lib( DLLSPEC *spec ) const char *as_flags, *m_flag; def_file = open_temp_output_file( ".def" ); - output_def_file( spec, 0 ); + output_def_file( spec, 1 ); fclose( output_file ); args = find_tool( "dlltool", NULL ); diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 0a5becd..7d54395 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -664,7 +664,7 @@ int main(int argc, char **argv) if (!spec_file_name) fatal_error( "missing .spec file\n" ); if (!parse_input_file( spec )) break; open_output_file(); - output_def_file( spec, 1 ); + output_def_file( spec, 0 ); close_output_file(); break; case MODE_IMPLIB: diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 855e6d8..f2567e8 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -983,7 +983,7 @@ void output_fake_module( DLLSPEC *spec ) * * Build a Win32 def file from a spec file. */ -void output_def_file( DLLSPEC *spec, int include_stubs ) +void output_def_file( DLLSPEC *spec, int import_only ) { DLLSPEC *spec32 = NULL; const char *name; @@ -1017,7 +1017,7 @@ void output_def_file( DLLSPEC *spec, int include_stubs ) else continue; if (!is_private) total++; - if (!include_stubs && odp->type == TYPE_STUB) continue; + if (import_only && odp->type == TYPE_STUB) continue; if ((odp->flags & FLAG_FASTCALL) && target_platform == PLATFORM_WINDOWS) name = strmake( "@%s", name ); @@ -1032,13 +1032,14 @@ void output_def_file( DLLSPEC *spec, int include_stubs ) case TYPE_VARARGS: case TYPE_CDECL: /* try to reduce output */ - if(strcmp(name, odp->link_name) || (odp->flags & FLAG_FORWARD)) + if(!import_only && (strcmp(name, odp->link_name) || (odp->flags & FLAG_FORWARD))) output( "=%s", odp->link_name ); break; case TYPE_STDCALL: { int at_param = get_args_size( odp ); if (!kill_at && target_cpu == CPU_x86) output( "@%d", at_param ); + if (import_only) break; if (odp->flags & FLAG_FORWARD) output( "=%s", odp->link_name ); else if (strcmp(name, odp->link_name)) /* try to reduce output */

1 0

Jacek Caban : winebuild: Don' t underscore local symbols in func_declaration.
by Alexandre Julliard 26 Aug '19

26 Aug '19

Module: wine Branch: master Commit: e574d4f8f989b7c149c0f720084cef275fe8862c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e574d4f8f989b7c149c0f720… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Aug 25 18:49:39 2019 +0200 winebuild: Don't underscore local symbols in func_declaration. This is the case in output_call16_function. GNU ld happens to handle it, but LLD does not. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 31a6b28..fe82ad7 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -1093,7 +1093,7 @@ const char *func_declaration( const char *func ) return ""; case PLATFORM_WINDOWS: free( buffer ); - buffer = strmake( ".def %s%s; .scl 2; .type 32; .endef", target_cpu == CPU_x86 ? "_" : "", func ); + buffer = strmake( ".def %s; .scl 2; .type 32; .endef", asm_name(func) ); break; default: free( buffer );

1 0

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

26 Aug '19

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

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

26 Aug '19

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