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

Alistair Leslie-Hughes : wininet: Support QueryOption INTERNET_OPTION_ERROR_MASK for http.
by Alexandre Julliard 24 Jun '19

24 Jun '19

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 24 Jun '19

24 Jun '19

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

Alistair Leslie-Hughes : wininet: Always set last error in InternetReadFile.
by Alexandre Julliard 24 Jun '19

24 Jun '19

Module: wine Branch: master Commit: 8f5b9f4d4bf13cc95e809d9d7e9e24a96ea86878 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f5b9f4d4bf13cc95e809d9d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jun 24 00:22:53 2019 +0000 wininet: Always set last error in InternetReadFile. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47352 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 3 +-- dlls/wininet/tests/http.c | 6 ++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 6671950..7294241 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2193,8 +2193,7 @@ BOOL WINAPI InternetReadFile(HINTERNET hFile, LPVOID lpBuffer, TRACE("-- %s (%u) (bytes read: %d)\n", res == ERROR_SUCCESS ? "TRUE": "FALSE", res, pdwNumOfBytesRead ? *pdwNumOfBytesRead : -1); - 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 70d5738..c8a2796 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -987,7 +987,10 @@ static void InternetReadFile_chunked_test(void) { char *buffer = HeapAlloc(GetProcessHeap(),0,length+1); + SetLastError(0xdeadbeef); res = InternetReadFile(hor,buffer,length,&got); + ok(GetLastError() == 0 || + broken(GetLastError() == 0xdeadbeef /* XP/W2K3 */), "Last Error not reset %u\n", GetLastError()); buffer[got]=0; trace("ReadFile -> %i %i\n",res,got); @@ -1000,8 +1003,11 @@ static void InternetReadFile_chunked_test(void) if (length == 0) { got = 0xdeadbeef; + SetLastError(0xdeadbeef); res = InternetReadFile( hor, buffer, 1, &got ); ok( res, "InternetReadFile failed: %u\n", GetLastError() ); + ok(GetLastError() == 0 || + broken(GetLastError() == 0xdeadbeef /* XP/W2K3 */), "Last Error not reset %u\n", GetLastError()); ok( !got, "got %u\n", got ); break; }

1 0

Zebediah Figura : quartz/tests: Add more tests for standard media samples.
by Alexandre Julliard 24 Jun '19

24 Jun '19

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

Zebediah Figura : quartz/memallocator: Clear some sample properties when freeing the sample.
by Alexandre Julliard 24 Jun '19

24 Jun '19

Module: wine Branch: master Commit: b9073b1e94d7be21cc2ee2ada888eb1f0a019c52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9073b1e94d7be21cc2ee2ad… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 21 22:35:41 2019 -0500 quartz/memallocator: Clear some sample properties when freeing the sample. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38421 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/memallocator.c | 7 +++++++ dlls/quartz/tests/memallocator.c | 24 ++++++++++++------------ 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index 4e366f3..be973b3 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -492,6 +492,13 @@ static ULONG WINAPI StdMediaSample2_Release(IMediaSample2 * iface) if (!ref) { + if (This->props.pMediaType) + DeleteMediaType(This->props.pMediaType); + This->props.pMediaType = NULL; + This->props.dwSampleFlags = 0; + This->tMediaStart = INVALID_MEDIA_TIME; + This->tMediaEnd = 0; + if (This->pParent) IMemAllocator_ReleaseBuffer(This->pParent, (IMediaSample *)iface); else diff --git a/dlls/quartz/tests/memallocator.c b/dlls/quartz/tests/memallocator.c index 6f094c0..effb51d 100644 --- a/dlls/quartz/tests/memallocator.c +++ b/dlls/quartz/tests/memallocator.c @@ -324,13 +324,13 @@ static void test_sample_time(void) start = 0xdeadbeef; end = 0xdeadf00d; hr = IMediaSample_GetTime(sample, &start, &end); - todo_wine ok(hr == VFW_E_SAMPLE_TIME_NOT_SET, "Got hr %#x.\n", hr); - todo_wine ok(start == 0xdeadbeef, "Got start %s.\n", wine_dbgstr_longlong(start)); - todo_wine ok(end == 0xdeadf00d, "Got end %s.\n", wine_dbgstr_longlong(end)); + ok(hr == VFW_E_SAMPLE_TIME_NOT_SET, "Got hr %#x.\n", hr); + ok(start == 0xdeadbeef, "Got start %s.\n", wine_dbgstr_longlong(start)); + ok(end == 0xdeadf00d, "Got end %s.\n", wine_dbgstr_longlong(end)); 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; @@ -338,7 +338,7 @@ static void test_sample_time(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaSample_GetTime(sample, &start, &end); - todo_wine ok(hr == VFW_E_SAMPLE_TIME_NOT_SET, "Got hr %#x.\n", hr); + ok(hr == VFW_E_SAMPLE_TIME_NOT_SET, "Got hr %#x.\n", hr); IMediaSample2_Release(sample2); IMediaSample_Release(sample); @@ -410,9 +410,9 @@ static void test_media_time(void) start = 0xdeadbeef; end = 0xdeadf00d; hr = IMediaSample_GetMediaTime(sample, &start, &end); - todo_wine ok(hr == VFW_E_MEDIA_TIME_NOT_SET, "Got hr %#x.\n", hr); - todo_wine ok(start == 0xdeadbeef, "Got start %s.\n", wine_dbgstr_longlong(start)); - todo_wine ok(end == 0xdeadf00d, "Got end %s.\n", wine_dbgstr_longlong(end)); + ok(hr == VFW_E_MEDIA_TIME_NOT_SET, "Got hr %#x.\n", hr); + ok(start == 0xdeadbeef, "Got start %s.\n", wine_dbgstr_longlong(start)); + ok(end == 0xdeadf00d, "Got end %s.\n", wine_dbgstr_longlong(end)); start = 0x123; end = 0x321; @@ -420,7 +420,7 @@ static void test_media_time(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaSample_GetMediaTime(sample, &start, &end); - todo_wine ok(hr == VFW_E_MEDIA_TIME_NOT_SET, "Got hr %#x.\n", hr); + ok(hr == VFW_E_MEDIA_TIME_NOT_SET, "Got hr %#x.\n", hr); start = 0x123; end = 0x321; @@ -433,7 +433,7 @@ static void test_media_time(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaSample_GetMediaTime(sample, &start, &end); - todo_wine ok(hr == VFW_E_MEDIA_TIME_NOT_SET, "Got hr %#x.\n", hr); + ok(hr == VFW_E_MEDIA_TIME_NOT_SET, "Got hr %#x.\n", hr); IMediaSample_Release(sample); IMemAllocator_Release(allocator); @@ -638,11 +638,11 @@ static void test_sample_properties(void) hr = IMediaSample2_GetProperties(sample2, sizeof(props), (BYTE *)&props); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(!props.dwTypeSpecificFlags, "Got type-specific flags %#x.\n", props.dwTypeSpecificFlags); - todo_wine ok(!props.dwSampleFlags, "Got flags %#x.\n", props.dwSampleFlags); + ok(!props.dwSampleFlags, "Got flags %#x.\n", props.dwSampleFlags); ok(props.lActual == 123, "Got actual length %d.\n", props.lActual); ok(!props.tStart, "Got sample start %s.\n", wine_dbgstr_longlong(props.tStart)); ok(!props.dwStreamId, "Got stream ID %#x.\n", props.dwStreamId); - todo_wine ok(!props.pMediaType, "Got media type %p.\n", props.pMediaType); + ok(!props.pMediaType, "Got media type %p.\n", props.pMediaType); ok(props.cbBuffer == 65536, "Got buffer length %d.\n", props.cbBuffer); IMediaSample2_Release(sample2);

1 0

Zebediah Figura : quartz/memallocator: Set the sample end time only if the start time is valid.
by Alexandre Julliard 24 Jun '19

24 Jun '19

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

Alexandre Julliard : t2embed: Build with msvcrt.
by Alexandre Julliard 24 Jun '19

24 Jun '19

Module: wine Branch: master Commit: c7f2da4fd0fba0fa2c2513f185ba3da99a5d08e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7f2da4fd0fba0fa2c2513f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 24 10:09:43 2019 +0200 t2embed: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/t2embed/Makefile.in | 2 ++ dlls/t2embed/main.c | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/t2embed/Makefile.in b/dlls/t2embed/Makefile.in index baa4757..f2b0583 100644 --- a/dlls/t2embed/Makefile.in +++ b/dlls/t2embed/Makefile.in @@ -2,5 +2,7 @@ MODULE = t2embed.dll IMPORTLIB = t2embed IMPORTS = gdi32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/t2embed/main.c b/dlls/t2embed/main.c index 288c19b..e478846 100644 --- a/dlls/t2embed/main.c +++ b/dlls/t2embed/main.c @@ -17,9 +17,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 : tapi32: Build with msvcrt.
by Alexandre Julliard 24 Jun '19

24 Jun '19

Module: wine Branch: master Commit: 4dd9f585acee66bad289a3822884156e095778ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=4dd9f585acee66bad289a382… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 24 10:10:05 2019 +0200 tapi32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tapi32/Makefile.in | 2 ++ dlls/tapi32/assisted.c | 8 ++------ dlls/tapi32/line.c | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/tapi32/Makefile.in b/dlls/tapi32/Makefile.in index e8c5e58..1184e79 100644 --- a/dlls/tapi32/Makefile.in +++ b/dlls/tapi32/Makefile.in @@ -2,6 +2,8 @@ MODULE = tapi32.dll IMPORTLIB = tapi32 IMPORTS = advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ assisted.c \ line.c \ diff --git a/dlls/tapi32/assisted.c b/dlls/tapi32/assisted.c index 0d707db..298087d 100644 --- a/dlls/tapi32/assisted.c +++ b/dlls/tapi32/assisted.c @@ -19,9 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include <stdarg.h> #include <stdio.h> #include "windef.h" @@ -30,7 +27,6 @@ #include "winreg.h" #include "objbase.h" #include "tapi.h" -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(tapi); @@ -65,7 +61,7 @@ DWORD WINAPI tapiGetLocationInfoW(LPWSTR countrycode, LPWSTR citycode) if(!RegQueryValueExW(hkey, currentidW, 0, &type, (LPBYTE) &currid, &valsize) && type == REG_DWORD) { /* find a subkey called Location1, Location2... */ - sprintfW( szlockey, locationW, currid); + swprintf( szlockey, ARRAY_SIZE(szlockey), locationW, currid); if( !RegOpenKeyW( hkey, szlockey, &hsubkey)) { if( citycode) { bufsize=sizeof(buf); @@ -79,7 +75,7 @@ DWORD WINAPI tapiGetLocationInfoW(LPWSTR countrycode, LPWSTR citycode) bufsize=sizeof(buf); if( !RegQueryValueExW( hsubkey, countryW, 0, &type, buf, &bufsize) && type == REG_DWORD) - snprintfW( countrycode, 8, fmtW, *(LPDWORD) buf ); + swprintf( countrycode, 8, fmtW, *(LPDWORD) buf ); else countrycode[0] = '\0'; } diff --git a/dlls/tapi32/line.c b/dlls/tapi32/line.c index d21fd91..a44ac1a 100644 --- a/dlls/tapi32/line.c +++ b/dlls/tapi32/line.c @@ -32,7 +32,6 @@ #include "objbase.h" #include "tapi.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(tapi); @@ -539,7 +538,7 @@ DWORD WINAPI lineGetCountryW(DWORD id, DWORD version, LPLINECOUNTRYLIST list) HKEY hsubkey; if (RegEnumKeyW(hkey, i, subkey_name, max_subkey_len) != ERROR_SUCCESS) continue; - if (id && (atoiW(subkey_name) != id)) continue; + if (id && (wcstol(subkey_name, NULL, 10) != id)) continue; if (RegOpenKeyW(hkey, subkey_name, &hsubkey) != ERROR_SUCCESS) continue; RegQueryValueExW(hsubkey, international_ruleW, NULL, NULL, NULL, &size_int); @@ -566,7 +565,7 @@ DWORD WINAPI lineGetCountryW(DWORD id, DWORD version, LPLINECOUNTRYLIST list) list->dwUsedSize += len + sizeof(LINECOUNTRYENTRY); if (id) i = 0; - entry[i].dwCountryID = atoiW(subkey_name); + entry[i].dwCountryID = wcstol(subkey_name, NULL, 10); size = sizeof(DWORD); RegQueryValueExW(hsubkey, country_codeW, NULL, NULL, (BYTE *)&entry[i].dwCountryCode, &size); entry[i].dwNextCountryID = 0;

1 0

Alexandre Julliard : taskschd: Build with msvcrt.
by Alexandre Julliard 24 Jun '19

24 Jun '19

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

Alexandre Julliard : tdh: Build with msvcrt.
by Alexandre Julliard 24 Jun '19

24 Jun '19

Module: wine Branch: master Commit: bae2395b14210cae32d1b30cd27e50dbe37ee86e URL: https://source.winehq.org/git/wine.git/?a=commit;h=bae2395b14210cae32d1b30c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 24 10:10:35 2019 +0200 tdh: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tdh/Makefile.in | 2 ++ dlls/tdh/tdh_main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/tdh/Makefile.in b/dlls/tdh/Makefile.in index 8979549..66bc18c 100644 --- a/dlls/tdh/Makefile.in +++ b/dlls/tdh/Makefile.in @@ -1,5 +1,7 @@ MODULE = tdh.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ tdh_main.c diff --git a/dlls/tdh/tdh_main.c b/dlls/tdh/tdh_main.c index c1885f8..29e7d50 100644 --- a/dlls/tdh/tdh_main.c +++ b/dlls/tdh/tdh_main.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "ntstatus.h"

1 0