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

Alexandre Julliard : urlmon: Build with msvcrt.
by Alexandre Julliard June 24, 2019

June 24, 2019

Module: wine Branch: master Commit: 42d2477edf29afada764e2eecc3666d6ccff7795 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42d2477edf29afada764e2ee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 24 10:15:45 2019 +0200 urlmon: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/Makefile.in | 2 ++ dlls/urlmon/axinstall.c | 34 +++++++++--------- dlls/urlmon/binding.c | 4 +-- dlls/urlmon/file.c | 4 +-- dlls/urlmon/http.c | 8 ++--- dlls/urlmon/internet.c | 4 +-- dlls/urlmon/mimefilter.c | 16 ++++----- dlls/urlmon/mk.c | 4 +-- dlls/urlmon/protocol.c | 2 +- dlls/urlmon/sec_mgr.c | 42 ++++++++++------------ dlls/urlmon/session.c | 12 +++---- dlls/urlmon/umon.c | 4 +-- dlls/urlmon/uri.c | 90 ++++++++++++++++++++++------------------------- dlls/urlmon/urlmon_main.c | 6 ++-- dlls/urlmon/urlmon_main.h | 3 +- 15 files changed, 113 insertions(+), 122 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=42d2477edf29afada764…

1 0

Alistair Leslie-Hughes : wininet: Support QueryOption INTERNET_OPTION_ERROR_MASK for http.
by Alexandre Julliard June 24, 2019

June 24, 2019

Module: wine Branch: master Commit: 223c3b4538f05489cbf36028918c304c60ced452 URL: https://source.winehq.org/git/wine.git/?a=commit;h=223c3b4538f05489cbf36028… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jun 21 03:58:45 2019 +0000 wininet: Support QueryOption INTERNET_OPTION_ERROR_MASK for http. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index cbc95fb..782b258 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2266,6 +2266,15 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe *(DWORD*)buffer = flags; return ERROR_SUCCESS; } + case INTERNET_OPTION_ERROR_MASK: + TRACE("INTERNET_OPTION_ERROR_MASK\n"); + + if (*size < sizeof(ULONG)) + return ERROR_INSUFFICIENT_BUFFER; + + *(ULONG*)buffer = hdr->ErrorMask; + *size = sizeof(ULONG); + return ERROR_SUCCESS; } return INET_QueryOption(hdr, option, buffer, size, unicode);

1 0

Alistair Leslie-Hughes : wininet: Always set last error in HttpQueryInfoW.
by Alexandre Julliard June 24, 2019

June 24, 2019

Module: wine Branch: master Commit: 3522b127a3a16949df16d023cc91d7dbbea1a8c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3522b127a3a16949df16d023… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jun 24 00:22:51 2019 +0000 wininet: Always set last error in HttpQueryInfoW. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 4 ++-- dlls/wininet/tests/http.c | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 782b258..9244393 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3920,8 +3920,8 @@ lend: WININET_Release( &request->hdr ); TRACE("%u <--\n", res); - if(res != ERROR_SUCCESS) - SetLastError(res); + + SetLastError(res); return res == ERROR_SUCCESS; } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 5a0cc11..70d5738 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -722,8 +722,11 @@ static void InternetReadFile_test(int flags, const test_data_t *test) length = sizeof(buffer)-2; memset(buffer, 0x77, sizeof(buffer)); + SetLastError(0xdeadbeef); res = HttpQueryInfoA(hor,HTTP_QUERY_RAW_HEADERS,buffer,&length,0x0); ok(res, "HttpQueryInfoA(HTTP_QUERY_RAW_HEADERS) failed with error %d\n", GetLastError()); + ok(GetLastError() == 0 || + broken(GetLastError() == 0xdeadbeef /* XP/W2K3 */), "Last Error not reset %u\n", GetLastError()); /* show that the function writes data past the length returned */ ok(buffer[length-2], "Expected any header character, got 0x00\n"); ok(!buffer[length-1], "Expected 0x00, got %02X\n", buffer[length-1]);

1 0

Alexandre Julliard : twain: Build with msvcrt.
by Alexandre Julliard June 24, 2019

June 24, 2019

Module: wine Branch: master Commit: 6b30142f828dc58e8338dee94479125d56293ec0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b30142f828dc58e8338dee9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 24 10:11:31 2019 +0200 twain: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/twain.dll16/Makefile.in | 2 +- dlls/twain.dll16/twain.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/twain.dll16/Makefile.in b/dlls/twain.dll16/Makefile.in index e9b5434..b92d0a9 100644 --- a/dlls/twain.dll16/Makefile.in +++ b/dlls/twain.dll16/Makefile.in @@ -1,4 +1,4 @@ MODULE = twain.dll16 -EXTRADLLFLAGS = -m16 -Wb,--main-module,twain_32.dll +EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,twain_32.dll C_SRCS = twain.c diff --git a/dlls/twain.dll16/twain.c b/dlls/twain.dll16/twain.c index 92ebf57..56a1d5e 100644 --- a/dlls/twain.dll16/twain.c +++ b/dlls/twain.dll16/twain.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : tdi.sys: Build with msvcrt.
by Alexandre Julliard June 24, 2019

June 24, 2019

Module: wine Branch: master Commit: 2eec1676ac94101685e06b8c7368f66264f48cab URL: https://source.winehq.org/git/wine.git/?a=commit;h=2eec1676ac94101685e06b8c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 24 10:10:42 2019 +0200 tdi.sys: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tdi.sys/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/tdi.sys/Makefile.in b/dlls/tdi.sys/Makefile.in index d414ff7..9d5e05f 100644 --- a/dlls/tdi.sys/Makefile.in +++ b/dlls/tdi.sys/Makefile.in @@ -1,5 +1,7 @@ MODULE = tdi.sys EXTRADLLFLAGS = -Wl,--subsystem,native +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c

1 0

Zebediah Figura : quartz/memallocator: Set the sample end time only if the start time is valid.
by Alexandre Julliard June 24, 2019

June 24, 2019

Module: wine Branch: master Commit: 646d3a103ec2460cfd5050fa1d9f2ded452836db URL: https://source.winehq.org/git/wine.git/?a=commit;h=646d3a103ec2460cfd5050fa… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 21 22:35:42 2019 -0500 quartz/memallocator: Set the sample end time only if the start time is valid. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/memallocator.c | 28 ++++++++++++++-------------- dlls/quartz/tests/memallocator.c | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index be973b3..ac12abd 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -560,27 +560,27 @@ static HRESULT WINAPI StdMediaSample2_GetTime(IMediaSample2 * iface, REFERENCE_T return hr; } -static HRESULT WINAPI StdMediaSample2_SetTime(IMediaSample2 * iface, REFERENCE_TIME * pStart, REFERENCE_TIME * pEnd) +static HRESULT WINAPI StdMediaSample2_SetTime(IMediaSample2 *iface, REFERENCE_TIME *start, REFERENCE_TIME *end) { - StdMediaSample2 *This = impl_from_IMediaSample2(iface); + StdMediaSample2 *sample = impl_from_IMediaSample2(iface); - TRACE("(%p)->(%p, %p)\n", iface, pStart, pEnd); + TRACE("iface %p, start %p, end %p.\n", iface, start, end); - if (pStart) + if (start) { - This->props.tStart = *pStart; - This->props.dwSampleFlags |= AM_SAMPLE_TIMEVALID; - } - else - This->props.dwSampleFlags &= ~AM_SAMPLE_TIMEVALID; + sample->props.tStart = *start; + sample->props.dwSampleFlags |= AM_SAMPLE_TIMEVALID; - if (pEnd) - { - This->props.tStop = *pEnd; - This->props.dwSampleFlags |= AM_SAMPLE_STOPVALID; + if (end) + { + sample->props.tStop = *end; + sample->props.dwSampleFlags |= AM_SAMPLE_STOPVALID; + } + else + sample->props.dwSampleFlags &= ~AM_SAMPLE_STOPVALID; } else - This->props.dwSampleFlags &= ~AM_SAMPLE_STOPVALID; + sample->props.dwSampleFlags &= ~(AM_SAMPLE_TIMEVALID | AM_SAMPLE_STOPVALID); return S_OK; } diff --git a/dlls/quartz/tests/memallocator.c b/dlls/quartz/tests/memallocator.c index effb51d..b4f3b23 100644 --- a/dlls/quartz/tests/memallocator.c +++ b/dlls/quartz/tests/memallocator.c @@ -245,7 +245,7 @@ static void test_sample_time(void) hr = IMediaSample2_GetProperties(sample2, sizeof(props), (BYTE *)&props); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(!props.dwSampleFlags, "Got flags %#x.\n", props.dwSampleFlags); + ok(!props.dwSampleFlags, "Got flags %#x.\n", props.dwSampleFlags); start = 0x123; end = 0x321;

1 0

Zebediah Figura : quartz/tests: Add more tests for standard media samples.
by Alexandre Julliard June 24, 2019

June 24, 2019

Module: wine Branch: master Commit: 1964051f771c72ae43ca3b56b6ca22fa16d4e661 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1964051f771c72ae43ca3b56… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 21 22:35:40 2019 -0500 quartz/tests: Add more tests for standard media samples. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/memallocator.c | 482 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 482 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1964051f771c72ae43ca…

1 0

Alexandre Julliard : twain_32: Build with msvcrt.
by Alexandre Julliard June 24, 2019

June 24, 2019

Module: wine Branch: master Commit: 04eb97f9caaef57466fc7842ece01d6a3a9e5564 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04eb97f9caaef57466fc7842… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 24 10:12:08 2019 +0200 twain_32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/twain_32/Makefile.in | 2 ++ dlls/twain_32/dsm_ctrl.c | 2 -- dlls/twain_32/twain32_main.c | 2 -- dlls/twain_32/twain_i.h | 4 ---- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/twain_32/Makefile.in b/dlls/twain_32/Makefile.in index c82b5a7..6fb2126 100644 --- a/dlls/twain_32/Makefile.in +++ b/dlls/twain_32/Makefile.in @@ -1,6 +1,8 @@ MODULE = twain_32.dll IMPORTS = user32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ dsm_ctrl.c \ twain32_main.c diff --git a/dlls/twain_32/dsm_ctrl.c b/dlls/twain_32/dsm_ctrl.c index 0b20986..3f7ead4 100644 --- a/dlls/twain_32/dsm_ctrl.c +++ b/dlls/twain_32/dsm_ctrl.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdlib.h> #include <stdarg.h> #include <stdio.h> diff --git a/dlls/twain_32/twain32_main.c b/dlls/twain_32/twain32_main.c index 016680b..b1beb96 100644 --- a/dlls/twain_32/twain32_main.c +++ b/dlls/twain_32/twain32_main.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h" diff --git a/dlls/twain_32/twain_i.h b/dlls/twain_32/twain_i.h index 4d33135..7939d23 100644 --- a/dlls/twain_32/twain_i.h +++ b/dlls/twain_32/twain_i.h @@ -20,10 +20,6 @@ #ifndef _TWAIN32_H #define _TWAIN32_H -#ifndef __WINE_CONFIG_H -# error You must include config.h first -#endif - #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : traffic: Build with msvcrt.
by Alexandre Julliard June 24, 2019

June 24, 2019

Module: wine Branch: master Commit: de293035d19ce9718a555aea5cb9ee3af5a29ea8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de293035d19ce9718a555aea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 24 10:11:18 2019 +0200 traffic: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/traffic/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/traffic/Makefile.in b/dlls/traffic/Makefile.in index cbed340..e823eb3 100644 --- a/dlls/traffic/Makefile.in +++ b/dlls/traffic/Makefile.in @@ -1,4 +1,6 @@ MODULE = traffic.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ traffic_main.c

1 0

Alexandre Julliard : taskschd: Build with msvcrt.
by Alexandre Julliard June 24, 2019

June 24, 2019

Module: wine Branch: master Commit: 86faa3d2765f8159d38b7fac069a188e5f104990 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86faa3d2765f8159d38b7fac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 24 10:10:24 2019 +0200 taskschd: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/Makefile.in | 2 ++ dlls/taskschd/folder.c | 21 ++++++++++----------- dlls/taskschd/folder_collection.c | 1 - dlls/taskschd/regtask.c | 3 +-- dlls/taskschd/task.c | 7 +++---- dlls/taskschd/taskschd_private.h | 3 +-- 6 files changed, 17 insertions(+), 20 deletions(-) diff --git a/dlls/taskschd/Makefile.in b/dlls/taskschd/Makefile.in index c6df2a3..8d12fed 100644 --- a/dlls/taskschd/Makefile.in +++ b/dlls/taskschd/Makefile.in @@ -1,6 +1,8 @@ MODULE = taskschd.dll IMPORTS = oleaut32 ole32 advapi32 xmllite rpcrt4 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ folder.c \ folder_collection.c \ diff --git a/dlls/taskschd/folder.c b/dlls/taskschd/folder.c index 26993ca..eea404a 100644 --- a/dlls/taskschd/folder.c +++ b/dlls/taskschd/folder.c @@ -28,7 +28,6 @@ #include "schrpc.h" #include "taskschd_private.h" -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(taskschd); @@ -122,7 +121,7 @@ static HRESULT WINAPI TaskFolder_get_Name(ITaskFolder *iface, BSTR *name) if (!name) return E_POINTER; - p_name = strrchrW(folder->path, '\\'); + p_name = wcsrchr(folder->path, '\\'); if (!p_name) p_name = folder->path; else @@ -208,9 +207,9 @@ WCHAR *get_full_path(const WCHAR *parent, const WCHAR *path) WCHAR *folder_path; int len = 0; - if (path) len = strlenW(path); + if (path) len = lstrlenW(path); - if (parent) len += strlenW(parent); + if (parent) len += lstrlenW(parent); /* +1 if parent is not '\' terminated */ folder_path = heap_alloc((len + 2) * sizeof(WCHAR)); @@ -219,21 +218,21 @@ WCHAR *get_full_path(const WCHAR *parent, const WCHAR *path) folder_path[0] = 0; if (parent) - strcpyW(folder_path, parent); + lstrcpyW(folder_path, parent); if (path && *path) { - len = strlenW(folder_path); + len = lstrlenW(folder_path); if (!len || folder_path[len - 1] != '\\') - strcatW(folder_path, bslash); + lstrcatW(folder_path, bslash); while (*path == '\\') path++; - strcatW(folder_path, path); + lstrcatW(folder_path, path); } - len = strlenW(folder_path); + len = lstrlenW(folder_path); if (!len) - strcatW(folder_path, bslash); + lstrcatW(folder_path, bslash); return folder_path; } @@ -416,7 +415,7 @@ HRESULT TaskFolder_create(const WCHAR *parent, const WCHAR *path, ITaskFolder ** if (path) { - int len = strlenW(path); + int len = lstrlenW(path); if (len && path[len - 1] == '\\') return HRESULT_FROM_WIN32(ERROR_INVALID_NAME); } diff --git a/dlls/taskschd/folder_collection.c b/dlls/taskschd/folder_collection.c index 0b2b513..394210d 100644 --- a/dlls/taskschd/folder_collection.c +++ b/dlls/taskschd/folder_collection.c @@ -27,7 +27,6 @@ #include "schrpc.h" #include "taskschd_private.h" -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(taskschd); diff --git a/dlls/taskschd/regtask.c b/dlls/taskschd/regtask.c index 74f95d9..b5d7269 100644 --- a/dlls/taskschd/regtask.c +++ b/dlls/taskschd/regtask.c @@ -28,7 +28,6 @@ #include "schrpc.h" #include "taskschd_private.h" -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(taskschd); @@ -124,7 +123,7 @@ static HRESULT WINAPI regtask_get_Name(IRegisteredTask *iface, BSTR *name) if (!name) return E_POINTER; - p_name = strrchrW(regtask->path, '\\'); + p_name = wcsrchr(regtask->path, '\\'); if (!p_name) p_name = regtask->path; else diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 54b6782..b75cfff 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -30,7 +30,6 @@ #include "schrpc.h" #include "taskschd_private.h" -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(taskschd); @@ -2919,7 +2918,7 @@ static HRESULT read_int_value(IXmlReader *reader, int *int_val) hr = read_text_value(reader, &value); if (hr != S_OK) return hr; - *int_val = strtolW(value, NULL, 10); + *int_val = wcstol(value, NULL, 10); return S_OK; } @@ -3871,7 +3870,7 @@ static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, V if (server_name[0] == '\\' && server_name[1] == '\\') server_name += 2; - if (strcmpiW(server_name, comp_name)) + if (wcsicmp(server_name, comp_name)) { FIXME("connection to remote server %s is not supported\n", debugstr_w(V_BSTR(&server))); return HRESULT_FROM_WIN32(ERROR_BAD_NETPATH); @@ -3893,7 +3892,7 @@ static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, V TRACE("server version %#x\n", task_svc->version); - strcpyW(task_svc->comp_name, comp_name); + lstrcpyW(task_svc->comp_name, comp_name); task_svc->connected = TRUE; return S_OK; diff --git a/dlls/taskschd/taskschd_private.h b/dlls/taskschd/taskschd_private.h index 6c7f916..accbc76 100644 --- a/dlls/taskschd/taskschd_private.h +++ b/dlls/taskschd/taskschd_private.h @@ -19,7 +19,6 @@ #ifndef __WINE_TASKSCHD_PRIVATE_H__ #define __WINE_TASKSCHD_PRIVATE_H__ -#include "wine/unicode.h" #include "wine/heap.h" HRESULT TaskService_create(void **obj) DECLSPEC_HIDDEN; @@ -37,7 +36,7 @@ static inline WCHAR *heap_strdupW(const WCHAR *src) WCHAR *dst; unsigned len; if (!src) return NULL; - len = (strlenW(src) + 1) * sizeof(WCHAR); + len = (lstrlenW(src) + 1) * sizeof(WCHAR); if ((dst = heap_alloc(len))) memcpy(dst, src, len); return dst; }

1 0