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

Damjan Jovanovic : start.exe: Unquote the title.
by Alexandre Julliard 19 Aug '19

19 Aug '19

Module: wine Branch: master Commit: 6ae919de8112483c3e4c1b0cd69e0de6f084d038 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ae919de8112483c3e4c1b0c… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun Aug 11 16:28:26 2019 +0200 start.exe: Unquote the title. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/start/start.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/programs/start/start.c b/programs/start/start.c index 18fd5f5..1bdcba9 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -172,6 +172,25 @@ static BOOL is_option(const WCHAR* arg, const WCHAR* opt) arg, -1, opt, -1) == CSTR_EQUAL; } +static void parse_title(const WCHAR *arg, WCHAR *title, int size) +{ + /* See: + * WCMD_start() in programs/cmd/builtins.c + * WCMD_parameter_with_delims() in programs/cmd/batch.c + * The shell has already tokenized the command line for us. + * All we need to do is filter out all the quotes. + */ + + int next; + const WCHAR *p = arg; + + for (next = 0; next < (size-1) && *p; p++) { + if (*p != '"') + title[next++] = *p; + } + title[next] = '\0'; +} + int wmain (int argc, WCHAR *argv[]) { SHELLEXECUTEINFOW sei; @@ -223,7 +242,15 @@ int wmain (int argc, WCHAR *argv[]) for (i=1; i<argc; i++) { /* parse first quoted argument as console title */ if (!title && argv[i][0] == '"') { - title = argv[i]; + /* it will remove at least 1 quote */ + int maxChars = lstrlenW(argv[1]); + title = HeapAlloc(GetProcessHeap(), 0, maxChars*sizeof(WCHAR)); + if (title) + parse_title(argv[i], title, maxChars); + else { + WINE_ERR("out of memory\n"); + ExitProcess(1); + } continue; } if (argv[i][0] != '/') @@ -457,6 +484,7 @@ done: HeapFree( GetProcessHeap(), 0, args ); HeapFree( GetProcessHeap(), 0, dos_filename ); HeapFree( GetProcessHeap(), 0, parent_directory ); + HeapFree( GetProcessHeap(), 0, title ); if (sei.fMask & SEE_MASK_NOCLOSEPROCESS) { DWORD exitcode;

1 0

Damjan Jovanovic : cmd.exe: If there is a title given through STARTUPINFO, use it.
by Alexandre Julliard 19 Aug '19

19 Aug '19

Module: wine Branch: master Commit: ada8b1ab9387f0ee2a6b96ce7c468934ef3d86c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ada8b1ab9387f0ee2a6b96ce… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun Aug 11 16:28:33 2019 +0200 cmd.exe: If there is a title given through STARTUPINFO, use it. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/wcmdmain.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 29e498a..d7c0ce1 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2417,6 +2417,7 @@ int wmain (int argc, WCHAR *argvW[]) CMD_LIST *toExecute = NULL; /* Commands left to be executed */ OSVERSIONINFOW osv; char osver[50]; + STARTUPINFOW startupInfo; if (!GetEnvironmentVariableW(comspecW, comspec, ARRAY_SIZE(comspec))) { @@ -2676,7 +2677,11 @@ int wmain (int argc, WCHAR *argvW[]) return errorlevel; } - SetConsoleTitleW(WCMD_LoadMessage(WCMD_CONSTITLE)); + GetStartupInfoW(&startupInfo); + if (startupInfo.lpTitle != NULL) + SetConsoleTitleW(startupInfo.lpTitle); + else + SetConsoleTitleW(WCMD_LoadMessage(WCMD_CONSTITLE)); /* Note: cmd.exe /c dir does not get a new color, /k dir does */ if (opt_t) {

1 0

Damjan Jovanovic : start.exe: Pass the "show window" flags to CreateProcess() too.
by Alexandre Julliard 19 Aug '19

19 Aug '19

Module: wine Branch: master Commit: f2fa7ec3c57dc79fab755f6a0ec0c43447fce915 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2fa7ec3c57dc79fab755f6a… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun Aug 11 16:28:37 2019 +0200 start.exe: Pass the "show window" flags to CreateProcess() too. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/start/start.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/start/start.c b/programs/start/start.c index 1bdcba9..bc5b203 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -408,6 +408,7 @@ int wmain (int argc, WCHAR *argv[]) ZeroMemory(&startup_info, sizeof(startup_info)); startup_info.cb = sizeof(startup_info); + startup_info.wShowWindow = sei.nShow; startup_info.lpTitle = title; if (!CreateProcessW(

1 0

Damjan Jovanovic : start.exe: Launch all binaries through CreateProcess().
by Alexandre Julliard 19 Aug '19

19 Aug '19

Module: wine Branch: master Commit: 3c7501e8f0f941db012bed16cf7b5943202fe83d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c7501e8f0f941db012bed16… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun Aug 11 16:28:45 2019 +0200 start.exe: Launch all binaries through CreateProcess(). This lets us pass them the title, priority classes, and other options unsupported by ShellExecuteEx(). Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/start/start.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/start/start.c b/programs/start/start.c index bc5b203..b21a0c5 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -393,8 +393,9 @@ int wmain (int argc, WCHAR *argv[]) if (!sei.lpDirectory) sei.lpDirectory = parent_directory = get_parent_dir(dos_filename); sei.fMask &= ~SEE_MASK_FLAG_NO_UI; + } - if (GetBinaryTypeW(sei.lpFile, &binary_type)) { + if (GetBinaryTypeW(sei.lpFile, &binary_type)) { WCHAR *commandline; STARTUPINFOW startup_info; PROCESS_INFORMATION process_information; @@ -427,8 +428,7 @@ int wmain (int argc, WCHAR *argv[]) } sei.hProcess = process_information.hProcess; goto done; - } - } + } if (!ShellExecuteExW(&sei)) {

1 0

Damjan Jovanovic : start.exe: Search PATH for the executable to launch.
by Alexandre Julliard 19 Aug '19

19 Aug '19

Module: wine Branch: master Commit: 42fa293d48be89ce06b1aab264c5c0d8cc1b4f53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42fa293d48be89ce06b1aab2… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun Aug 11 16:28:50 2019 +0200 start.exe: Search PATH for the executable to launch. We want to launch all executables through CreateProcess(), but need to provide the full path, as the searching CreateProcess() does internally when the application name is NULL is more limited: it only searches for .EXE files. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/start/start.c | 182 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 177 insertions(+), 5 deletions(-) diff --git a/programs/start/start.c b/programs/start/start.c index b21a0c5..7668330 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -191,6 +191,165 @@ static void parse_title(const WCHAR *arg, WCHAR *title, int size) title[next] = '\0'; } +static BOOL search_path(const WCHAR *firstParam, WCHAR **full_path) +{ + /* Copied from WCMD_run_program() in programs/cmd/wcmdmain.c */ + +#define MAXSTRING 8192 + static const WCHAR slashW[] = {'\\','\0',}; + static const WCHAR envPath[] = {'P','A','T','H','\0'}; + static const WCHAR envPathExt[] = {'P','A','T','H','E','X','T','\0'}; + static const WCHAR dfltPathExt[] = {'.','b','a','t',';', + '.','c','o','m',';', + '.','c','m','d',';', + '.','e','x','e','\0'}; + static const WCHAR delims[] = {'/','\\',':','\0'}; + + WCHAR temp[MAX_PATH]; + WCHAR pathtosearch[MAXSTRING]; + WCHAR *pathposn; + WCHAR stemofsearch[MAX_PATH]; /* maximum allowed executable name is + MAX_PATH, including null character */ + WCHAR *lastSlash; + WCHAR pathext[MAXSTRING]; + BOOL extensionsupplied = FALSE; + DWORD len; + + /* Calculate the search path and stem to search for */ + if (wcspbrk (firstParam, delims) == NULL) { /* No explicit path given, search path */ + static const WCHAR curDir[] = {'.',';','\0'}; + lstrcpyW(pathtosearch, curDir); + len = GetEnvironmentVariableW(envPath, &pathtosearch[2], ARRAY_SIZE(pathtosearch)-2); + if ((len == 0) || (len >= ARRAY_SIZE(pathtosearch) - 2)) { + static const WCHAR curDir[] = {'.','\0'}; + lstrcpyW (pathtosearch, curDir); + } + if (wcschr(firstParam, '.') != NULL) extensionsupplied = TRUE; + if (lstrlenW(firstParam) >= MAX_PATH) { + return FALSE; + } + + lstrcpyW(stemofsearch, firstParam); + + } else { + + /* Convert eg. ..\fred to include a directory by removing file part */ + GetFullPathNameW(firstParam, ARRAY_SIZE(pathtosearch), pathtosearch, NULL); + lastSlash = wcsrchr(pathtosearch, '\\'); + if (lastSlash && wcschr(lastSlash, '.') != NULL) extensionsupplied = TRUE; + lstrcpyW(stemofsearch, lastSlash+1); + + /* Reduce pathtosearch to a path with trailing '\' to support c:\a.bat and + c:\windows\a.bat syntax */ + if (lastSlash) *(lastSlash + 1) = 0x00; + } + + /* Now extract PATHEXT */ + len = GetEnvironmentVariableW(envPathExt, pathext, ARRAY_SIZE(pathext)); + if ((len == 0) || (len >= ARRAY_SIZE(pathext))) { + lstrcpyW (pathext, dfltPathExt); + } + + /* Loop through the search path, dir by dir */ + pathposn = pathtosearch; + WINE_TRACE("Searching in '%s' for '%s'\n", wine_dbgstr_w(pathtosearch), + wine_dbgstr_w(stemofsearch)); + while (pathposn) { + WCHAR thisDir[MAX_PATH] = {'\0'}; + int length = 0; + WCHAR *pos = NULL; + BOOL found = FALSE; + BOOL inside_quotes = FALSE; + + /* Work on the first directory on the search path */ + pos = pathposn; + while ((inside_quotes || *pos != ';') && *pos != 0) + { + if (*pos == '"') + inside_quotes = !inside_quotes; + pos++; + } + + if (*pos) { /* Reached semicolon */ + memcpy(thisDir, pathposn, (pos-pathposn) * sizeof(WCHAR)); + thisDir[(pos-pathposn)] = 0x00; + pathposn = pos+1; + } else { /* Reached string end */ + lstrcpyW(thisDir, pathposn); + pathposn = NULL; + } + + /* Remove quotes */ + length = lstrlenW(thisDir); + if (thisDir[length - 1] == '"') + thisDir[length - 1] = 0; + + if (*thisDir != '"') + lstrcpyW(temp, thisDir); + else + lstrcpyW(temp, thisDir + 1); + + /* Since you can have eg. ..\.. on the path, need to expand + to full information */ + GetFullPathNameW(temp, MAX_PATH, thisDir, NULL); + + /* 1. If extension supplied, see if that file exists */ + lstrcatW(thisDir, slashW); + lstrcatW(thisDir, stemofsearch); + pos = &thisDir[lstrlenW(thisDir)]; /* Pos = end of name */ + + /* 1. If extension supplied, see if that file exists */ + if (extensionsupplied) { + if (GetFileAttributesW(thisDir) != INVALID_FILE_ATTRIBUTES) { + found = TRUE; + } + } + + /* 2. Any .* matches? */ + if (!found) { + HANDLE h; + WIN32_FIND_DATAW finddata; + static const WCHAR allFiles[] = {'.','*','\0'}; + + lstrcatW(thisDir,allFiles); + h = FindFirstFileW(thisDir, &finddata); + FindClose(h); + if (h != INVALID_HANDLE_VALUE) { + + WCHAR *thisExt = pathext; + + /* 3. Yes - Try each path ext */ + while (thisExt) { + WCHAR *nextExt = wcschr(thisExt, ';'); + + if (nextExt) { + memcpy(pos, thisExt, (nextExt-thisExt) * sizeof(WCHAR)); + pos[(nextExt-thisExt)] = 0x00; + thisExt = nextExt+1; + } else { + lstrcpyW(pos, thisExt); + thisExt = NULL; + } + + if (GetFileAttributesW(thisDir) != INVALID_FILE_ATTRIBUTES) { + found = TRUE; + thisExt = NULL; + } + } + } + } + + if (found) { + int needed_size = lstrlenW(thisDir) + 1; + *full_path = HeapAlloc(GetProcessHeap(), 0, needed_size * sizeof(WCHAR)); + if (*full_path) + lstrcpyW(*full_path, thisDir); + return TRUE; + } + } + return FALSE; +} + int wmain (int argc, WCHAR *argv[]) { SHELLEXECUTEINFOW sei; @@ -200,7 +359,9 @@ int wmain (int argc, WCHAR *argv[]) BOOL unix_mode = FALSE; BOOL progid_open = FALSE; WCHAR *title = NULL; + const WCHAR *file; WCHAR *dos_filename = NULL; + WCHAR *fullpath = NULL; WCHAR *parent_directory = NULL; DWORD binary_type; @@ -359,10 +520,10 @@ int wmain (int argc, WCHAR *argv[]) if (i == argc) { if (progid_open || unix_mode) usage(); - sei.lpFile = cmdW; + file = cmdW; } else - sei.lpFile = argv[i++]; + file = argv[i++]; args = build_args( argc - i, &argv[i] ); sei.lpParameters = args; @@ -377,10 +538,10 @@ int wmain (int argc, WCHAR *argv[]) if (!wine_get_dos_file_name_ptr) fatal_string(STRING_UNIXFAIL); - multibyte_unixpath_len = WideCharToMultiByte(CP_UNIXCP, 0, sei.lpFile, -1, NULL, 0, NULL, NULL); + multibyte_unixpath_len = WideCharToMultiByte(CP_UNIXCP, 0, file, -1, NULL, 0, NULL, NULL); multibyte_unixpath = HeapAlloc(GetProcessHeap(), 0, multibyte_unixpath_len); - WideCharToMultiByte(CP_UNIXCP, 0, sei.lpFile, -1, multibyte_unixpath, multibyte_unixpath_len, NULL, NULL); + WideCharToMultiByte(CP_UNIXCP, 0, file, -1, multibyte_unixpath, multibyte_unixpath_len, NULL, NULL); dos_filename = wine_get_dos_file_name_ptr(multibyte_unixpath); @@ -393,6 +554,16 @@ int wmain (int argc, WCHAR *argv[]) if (!sei.lpDirectory) sei.lpDirectory = parent_directory = get_parent_dir(dos_filename); sei.fMask &= ~SEE_MASK_FLAG_NO_UI; + } else { + if (search_path(file, &fullpath)) { + if (fullpath != NULL) { + sei.lpFile = fullpath; + } else { + fatal_string_error(STRING_EXECFAIL, ERROR_OUTOFMEMORY, file); + } + } else { + sei.lpFile = file; + } } if (GetBinaryTypeW(sei.lpFile, &binary_type)) { @@ -413,7 +584,7 @@ int wmain (int argc, WCHAR *argv[]) startup_info.lpTitle = title; if (!CreateProcessW( - NULL, /* lpApplicationName */ + sei.lpFile, /* lpApplicationName */ commandline, /* lpCommandLine */ NULL, /* lpProcessAttributes */ NULL, /* lpThreadAttributes */ @@ -484,6 +655,7 @@ int wmain (int argc, WCHAR *argv[]) done: HeapFree( GetProcessHeap(), 0, args ); HeapFree( GetProcessHeap(), 0, dos_filename ); + HeapFree( GetProcessHeap(), 0, fullpath ); HeapFree( GetProcessHeap(), 0, parent_directory ); HeapFree( GetProcessHeap(), 0, title );

1 0

Zebediah Figura : httpapi: Stub HttpReceiveHttpRequest().
by Alexandre Julliard 19 Aug '19

19 Aug '19

Module: wine Branch: master Commit: 965cdad7c126751ef808da98b78aeee4dc23aa6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=965cdad7c126751ef808da98… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Aug 7 21:10:13 2019 -0500 httpapi: Stub HttpReceiveHttpRequest(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/httpapi.spec | 2 +- dlls/httpapi/httpapi_main.c | 11 ++ include/http.h | 263 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 272 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=965cdad7c126751ef808…

1 0

Zebediah Figura : httpapi: Stub HttpSendHttpResponse().
by Alexandre Julliard 19 Aug '19

19 Aug '19

Module: wine Branch: master Commit: 43a3185eabd04835d2c338e751b0df75be88d978 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43a3185eabd04835d2c338e7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Aug 7 21:10:14 2019 -0500 httpapi: Stub HttpSendHttpResponse(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/httpapi.spec | 2 +- dlls/httpapi/httpapi_main.c | 13 +++++++ include/http.h | 85 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 99 insertions(+), 1 deletion(-) diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec index fd5dec9..98ed291 100644 --- a/dlls/httpapi/httpapi.spec +++ b/dlls/httpapi/httpapi.spec @@ -39,7 +39,7 @@ @ stub HttpRemoveUrl @ stub HttpRemoveUrlFromConfigGroup @ stub HttpSendHttpRequest -@ stub HttpSendHttpResponse +@ stdcall HttpSendHttpResponse(ptr int64 long ptr ptr ptr ptr long ptr ptr) @ stub HttpSendRequestEntityBody @ stub HttpSendResponseEntityBody @ stub HttpSetAppPoolInformation diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index 3739bbd..e5c5808 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -194,6 +194,19 @@ ULONG WINAPI HttpReceiveHttpRequest(HANDLE queue, HTTP_REQUEST_ID id, ULONG flag } /*********************************************************************** + * HttpSendHttpResponse (HTTPAPI.@) + */ +ULONG WINAPI HttpSendHttpResponse(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, + HTTP_RESPONSE *response, HTTP_CACHE_POLICY *cache_policy, ULONG *ret_size, + void *reserved1, ULONG reserved2, OVERLAPPED *ovl, HTTP_LOG_DATA *log_data) +{ + FIXME("queue %p, id %s, flags %#x, response %p, cache_policy %p, " + "ret_size %p, reserved1 %p, reserved2 %#x, ovl %p, log_data %p, stub!\n", + queue, wine_dbgstr_longlong(id), flags, response, cache_policy, ret_size, reserved1, reserved2, ovl, log_data); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/*********************************************************************** * HttpCreateServerSession (HTTPAPI.@) */ ULONG WINAPI HttpCreateServerSession( HTTPAPI_VERSION version, HTTP_SERVER_SESSION_ID *id, ULONG reserved ) diff --git a/include/http.h b/include/http.h index 85c82c5..a57013f 100644 --- a/include/http.h +++ b/include/http.h @@ -47,6 +47,13 @@ typedef struct _HTTPAPI_VERSION #define HTTP_REQUEST_FLAG_IP_ROUTED 0x00000002 #define HTTP_REQUEST_FLAG_HTTP2 0x00000004 +#define HTTP_SEND_RESPONSE_FLAG_DISCONNECT 0x00000001 +#define HTTP_SEND_RESPONSE_FLAG_MORE_DATA 0x00000002 +#define HTTP_SEND_RESPONSE_FLAG_BUFFER_DATA 0x00000004 +#define HTTP_SEND_RESPONSE_FLAG_ENABLE_NAGLING 0x00000008 +#define HTTP_SEND_RESPONSE_FLAG_PROCESS_RANGES 0x00000020 +#define HTTP_SEND_RESPONSE_FLAG_OPAQUE 0x00000040 + typedef enum _HTTP_SERVICE_CONFIG_ID { HttpServiceConfigIPListenList, @@ -311,6 +318,83 @@ typedef struct _HTTP_REQUEST_V2 typedef HTTP_REQUEST_V2 HTTP_REQUEST, *PHTTP_REQUEST; +typedef struct _HTTP_RESPONSE_HEADERS +{ + USHORT UnknownHeaderCount; + HTTP_UNKNOWN_HEADER *pUnknownHeaders; + USHORT TrailerCount; + HTTP_UNKNOWN_HEADER *pTrailers; + HTTP_KNOWN_HEADER KnownHeaders[HttpHeaderResponseMaximum]; +} HTTP_RESPONSE_HEADERS,*PHTTP_RESPONSE_HEADERS; + +typedef struct _HTTP_RESPONSE_V1 +{ + ULONG Flags; + HTTP_VERSION Version; + USHORT StatusCode; + USHORT ReasonLength; + const char *pReason; + HTTP_RESPONSE_HEADERS Headers; + USHORT EntityChunkCount; + HTTP_DATA_CHUNK *pEntityChunks; +} HTTP_RESPONSE_V1, *PHTTP_RESPONSE_V1; + +typedef enum _HTTP_RESPONSE_INFO_TYPE +{ + HttpResponseInfoTypeMultipleKnownHeaders = 0, + HttpResponseInfoTypeAuthenticationProperty, + HttpResponseInfoTypeQosProperty, + HttpResponseInfoTypeChannelBind, +} HTTP_RESPONSE_INFO_TYPE, *PHTTP_RESPONSE_INFO_TYPE; + +typedef struct _HTTP_RESPONSE_INFO +{ + HTTP_RESPONSE_INFO_TYPE Type; + ULONG Length; + void *pInfo; +} HTTP_RESPONSE_INFO, *PHTTP_RESPONSE_INFO; + +#ifdef __cplusplus +typedef struct _HTTP_RESPONSE_V2 : HTTP_RESPONSE_V1 +{ + USHORT ResponseInfoCount; + HTTP_RESPONSE_INFO *pResponseInfo; +} HTTP_RESPONSE_V2, *PHTTP_RESPONSE_V2; +#else +typedef struct _HTTP_RESPONSE_V2 +{ + HTTP_RESPONSE_V1 s; + USHORT ResponseInfoCount; + HTTP_RESPONSE_INFO *pResponseInfo; +} HTTP_RESPONSE_V2, *PHTTP_RESPONSE_V2; +#endif + +typedef HTTP_RESPONSE_V2 HTTP_RESPONSE, *PHTTP_RESPONSE; + +typedef enum _HTTP_CACHE_POLICY_TYPE +{ + HttpCachePolicyNocache, + HttpCachePolicyUserInvalidates, + HttpCachePolicyTimeToLive, + HttpCachePolicyMaximum, +} HTTP_CACHE_POLICY_TYPE, *PHTTP_CACHE_POLICY_TYPE; + +typedef struct _HTTP_CACHE_POLICY +{ + HTTP_CACHE_POLICY_TYPE Policy; + ULONG SecondsToLive; +} HTTP_CACHE_POLICY, *PHTTP_CACHE_POLICY; + +typedef enum _HTTP_LOG_DATA_TYPE +{ + HttpLogDataTypeFields = 0, +} HTTP_LOG_DATA_TYPE, *PHTTP_LOG_DATA_TYPE; + +typedef struct _HTTP_LOG_DATA +{ + HTTP_LOG_DATA_TYPE Type; +} HTTP_LOG_DATA, *PHTTP_LOG_DATA; + ULONG WINAPI HttpAddUrl(HANDLE,PCWSTR,PVOID); ULONG WINAPI HttpCreateHttpHandle(PHANDLE,ULONG); ULONG WINAPI HttpCreateServerSession(HTTPAPI_VERSION,PHTTP_SERVER_SESSION_ID,ULONG); @@ -320,6 +404,7 @@ ULONG WINAPI HttpInitialize(HTTPAPI_VERSION version, ULONG flags, void *reserved ULONG WINAPI HttpTerminate(ULONG flags, void *reserved); ULONG WINAPI HttpQueryServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,PVOID,ULONG,PULONG,LPOVERLAPPED); ULONG WINAPI HttpReceiveHttpRequest(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, HTTP_REQUEST *request, ULONG size, ULONG *ret_size, OVERLAPPED *ovl); +ULONG WINAPI HttpSendHttpResponse(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, HTTP_RESPONSE *response, HTTP_CACHE_POLICY *cache_policy, ULONG *ret_size, void *reserved1, ULONG reserved2, OVERLAPPED *ovl, HTTP_LOG_DATA *log_data); ULONG WINAPI HttpSetServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED); #ifdef __cplusplus

1 0

Zebediah Figura : httpapi: Stub HttpRemoveUrl().
by Alexandre Julliard 19 Aug '19

19 Aug '19

Module: wine Branch: master Commit: 904c0dc050c89ae2729ad68b1fe74f19db302c89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=904c0dc050c89ae2729ad68b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Aug 7 21:10:15 2019 -0500 httpapi: Stub HttpRemoveUrl(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/httpapi.spec | 2 +- dlls/httpapi/httpapi_main.c | 9 +++++++++ include/http.h | 3 +++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec index 98ed291..88bc324 100644 --- a/dlls/httpapi/httpapi.spec +++ b/dlls/httpapi/httpapi.spec @@ -36,7 +36,7 @@ @ stub HttpReceiveHttpResponse @ stub HttpReceiveRequestEntityBody @ stub HttpRemoveAllUrlsFromConfigGroup -@ stub HttpRemoveUrl +@ stdcall HttpRemoveUrl(ptr wstr) @ stub HttpRemoveUrlFromConfigGroup @ stub HttpSendHttpRequest @ stdcall HttpSendHttpResponse(ptr int64 long ptr ptr ptr ptr long ptr ptr) diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index e5c5808..429ae1a 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -183,6 +183,15 @@ ULONG WINAPI HttpAddUrl( HANDLE handle, PCWSTR url, PVOID reserved ) } /*********************************************************************** + * HttpRemoveUrl (HTTPAPI.@) + */ +ULONG WINAPI HttpRemoveUrl(HANDLE queue, const WCHAR *url) +{ + FIXME("queue %p, url %s, stub!\n", queue, debugstr_w(url)); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/*********************************************************************** * HttpReceiveHttpRequest (HTTPAPI.@) */ ULONG WINAPI HttpReceiveHttpRequest(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, diff --git a/include/http.h b/include/http.h index a57013f..84d3445 100644 --- a/include/http.h +++ b/include/http.h @@ -54,6 +54,8 @@ typedef struct _HTTPAPI_VERSION #define HTTP_SEND_RESPONSE_FLAG_PROCESS_RANGES 0x00000020 #define HTTP_SEND_RESPONSE_FLAG_OPAQUE 0x00000040 +#define HTTP_URL_FLAG_REMOVE_ALL 0x0000001 + typedef enum _HTTP_SERVICE_CONFIG_ID { HttpServiceConfigIPListenList, @@ -404,6 +406,7 @@ ULONG WINAPI HttpInitialize(HTTPAPI_VERSION version, ULONG flags, void *reserved ULONG WINAPI HttpTerminate(ULONG flags, void *reserved); ULONG WINAPI HttpQueryServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,PVOID,ULONG,PULONG,LPOVERLAPPED); ULONG WINAPI HttpReceiveHttpRequest(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, HTTP_REQUEST *request, ULONG size, ULONG *ret_size, OVERLAPPED *ovl); +ULONG WINAPI HttpRemoveUrl(HANDLE queue, const WCHAR *url); ULONG WINAPI HttpSendHttpResponse(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, HTTP_RESPONSE *response, HTTP_CACHE_POLICY *cache_policy, ULONG *ret_size, void *reserved1, ULONG reserved2, OVERLAPPED *ovl, HTTP_LOG_DATA *log_data); ULONG WINAPI HttpSetServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED);

1 0

Andrey Gusev : twain_32: Add missing debugstr_a.
by Alexandre Julliard 19 Aug '19

19 Aug '19

Module: wine Branch: master Commit: 5ea3a044b83c4cd55a3c647f5e80511a85b9f536 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ea3a044b83c4cd55a3c647f… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Aug 19 20:36:18 2019 +0300 twain_32: Add missing debugstr_a. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/twain_32/dsm_ctrl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/twain_32/dsm_ctrl.c b/dlls/twain_32/dsm_ctrl.c index 3f7ead4..45f227e 100644 --- a/dlls/twain_32/dsm_ctrl.c +++ b/dlls/twain_32/dsm_ctrl.c @@ -57,12 +57,12 @@ twain_add_onedriver(const char *dsname) { hmod = LoadLibraryA(dsname); if (!hmod) { - ERR("Failed to load TWAIN Source %s\n", dsname); + ERR("Failed to load TWAIN Source %s\n", debugstr_a(dsname)); return; } dsEntry = (DSENTRYPROC)GetProcAddress(hmod, "DS_Entry"); if (!dsEntry) { - ERR("Failed to find DS_Entry() in TWAIN DS %s\n", dsname); + ERR("Failed to find DS_Entry() in TWAIN DS %s\n", debugstr_a(dsname)); return; } /* Loop to do multiple detects, mostly for sane.ds and gphoto2.ds */ @@ -317,7 +317,7 @@ TW_UINT16 TWAIN_OpenDS (pTW_IDENTITY pOrigin, TW_MEMREF pData) } hmod = LoadLibraryA(devices[i].modname); if (!hmod) { - ERR("Failed to load TWAIN Source %s\n", modname); + ERR("Failed to load TWAIN Source %s\n", debugstr_a(modname)); DSM_twCC = TWCC_OPERATIONERROR; HeapFree(GetProcessHeap(), 0, newSource); return TWRC_FAILURE;

1 0

Sven Baars : wmp: Fix a crash in put_volume when basic_audio is NULL.
by Alexandre Julliard 19 Aug '19

19 Aug '19

Module: wine Branch: master Commit: 9e8cf8082c3523957f6b19f49e820d910c16faa7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e8cf8082c3523957f6b19f4… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat Aug 17 18:50:16 2019 +0200 wmp: Fix a crash in put_volume when basic_audio is NULL. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/player.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index 729cc81..c547dad 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -985,18 +985,18 @@ static HRESULT WINAPI WMPSettings_get_volume(IWMPSettings *iface, LONG *p) static HRESULT WINAPI WMPSettings_put_volume(IWMPSettings *iface, LONG v) { - HRESULT hres; WindowsMediaPlayer *This = impl_from_IWMPSettings(iface); TRACE("(%p)->(%d)\n", This, v); This->volume = v; - if (!This->filter_graph) { - hres = S_OK; - } else { - /* IBasicAudio - [-10000, 0], wmp - [0, 100] */ - v = 10000 * v / 100 - 10000; - hres = IBasicAudio_put_Volume(This->basic_audio, v); - } - return hres; + if (!This->filter_graph) + return S_OK; + + /* IBasicAudio - [-10000, 0], wmp - [0, 100] */ + v = 10000 * v / 100 - 10000; + if (!This->basic_audio) + return S_FALSE; + + return IBasicAudio_put_Volume(This->basic_audio, v); } static HRESULT WINAPI WMPSettings_getMode(IWMPSettings *iface, BSTR mode, VARIANT_BOOL *p)

1 0