October 2013 - Wine-Commits

Kevin Eaves : winemac: Restore the window title when the window style is changed.
by Alexandre Julliard Oct. 17, 2013

Oct. 17, 2013

Module: wine Branch: master Commit: 771fcd894a62f53cb3862a9d97f28d2ce7c46a30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=771fcd894a62f53cb3862a9d9… Author: Kevin Eaves <sevae(a)roadrunner.com> Date: Thu Oct 17 01:54:00 2013 -0700 winemac: Restore the window title when the window style is changed. --- dlls/winemac.drv/cocoa_window.m | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 240812d..ef4e711 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -641,6 +641,7 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif if (newStyle != currentStyle) { + NSString* title = [[[self title] copy] autorelease]; BOOL showingButtons = (currentStyle & (NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask)) != 0; BOOL shouldShowButtons = (newStyle & (NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask)) != 0; if (shouldShowButtons != showingButtons && !((newStyle ^ currentStyle) & NSClosableWindowMask)) @@ -654,6 +655,9 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif } [self setStyleMask:newStyle]; [self adjustFullScreenBehavior:[self collectionBehavior]]; + + if ([[self title] length] == 0 && [title length] > 0) + [self setTitle:title]; } [self adjustFeaturesForState];

1 0

Nikolay Sivov : msxml3: Set referrer header to container url.
by Alexandre Julliard Oct. 17, 2013

Oct. 17, 2013

Module: wine Branch: master Commit: 13aac41b062642732ee912b9078e2b1060c54bed URL: http://source.winehq.org/git/wine.git/?a=commit;h=13aac41b062642732ee912b90… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 17 12:12:31 2013 +0400 msxml3: Set referrer header to container url. --- dlls/msxml3/httprequest.c | 25 ++++++++++++++++++- dlls/msxml3/tests/httpreq.c | 56 ++++++++++++++++++++++++++++++++++++++---- 2 files changed, 74 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index e2ede0e..c90cc51 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -458,9 +458,11 @@ static HRESULT WINAPI BSCHttpNegotiate_BeginningTransaction(IHttpNegotiate *ifac { static const WCHAR content_type_utf8W[] = {'C','o','n','t','e','n','t','-','T','y','p','e',':',' ', 't','e','x','t','/','p','l','a','i','n',';','c','h','a','r','s','e','t','=','u','t','f','-','8','\r','\n',0}; + static const WCHAR refererW[] = {'R','e','f','e','r','e','r',':',' ',0}; BindStatusCallback *This = impl_from_IHttpNegotiate(iface); const struct httpheader *entry; + BSTR base_uri = NULL; WCHAR *buff, *ptr; int size = 0; @@ -476,8 +478,18 @@ static HRESULT WINAPI BSCHttpNegotiate_BeginningTransaction(IHttpNegotiate *ifac if (!size) return S_OK; + if (This->request->base_uri) + { + IUri_GetRawUri(This->request->base_uri, &base_uri); + size += SysStringLen(base_uri)*sizeof(WCHAR) + sizeof(refererW) + sizeof(crlfW); + } + buff = CoTaskMemAlloc(size); - if (!buff) return E_OUTOFMEMORY; + if (!buff) + { + SysFreeString(base_uri); + return E_OUTOFMEMORY; + } ptr = buff; if (This->request->use_utf8_content) @@ -486,6 +498,15 @@ static HRESULT WINAPI BSCHttpNegotiate_BeginningTransaction(IHttpNegotiate *ifac ptr += sizeof(content_type_utf8W)/sizeof(WCHAR)-1; } + if (base_uri) + { + strcpyW(ptr, refererW); + strcatW(ptr, base_uri); + strcatW(ptr, crlfW); + ptr += strlenW(refererW) + SysStringLen(base_uri) + strlenW(crlfW); + SysFreeString(base_uri); + } + /* user headers */ LIST_FOR_EACH_ENTRY(entry, &This->request->reqheaders, struct httpheader, entry) { @@ -1571,6 +1592,8 @@ static void get_base_uri(httprequest *This) return; hr = IServiceProvider_QueryService(provider, &SID_SContainerDispatch, &IID_IHTMLDocument2, (void**)&doc); + if(FAILED(hr)) + hr = IServiceProvider_QueryService(provider, &SID_SInternetHostSecurityManager, &IID_IHTMLDocument2, (void**)&doc); IServiceProvider_Release(provider); if(FAILED(hr)) return; diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index 0aaf7d4..58abec9 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -51,6 +51,8 @@ static void _expect_ref(IUnknown* obj, ULONG ref, int line) DEFINE_GUID(SID_SContainerDispatch, 0xb722be00, 0x4e68, 0x101b, 0xa2, 0xbc, 0x00, 0xaa, 0x00, 0x40, 0x47, 0x70); DEFINE_GUID(SID_UnknownSID, 0x75dd09cb, 0x6c40, 0x11d5, 0x85, 0x43, 0x00, 0xc0, 0x4f, 0xa0, 0xfb, 0xa3); +static BOOL g_enablecallchecks; + #define DEFINE_EXPECT(func) \ static BOOL expect_ ## func = FALSE, called_ ## func = FALSE @@ -59,7 +61,8 @@ DEFINE_GUID(SID_UnknownSID, 0x75dd09cb, 0x6c40, 0x11d5, 0x85, 0x43, 0x00, 0xc0, #define CHECK_EXPECT2(func) \ do { \ - ok(expect_ ##func, "unexpected call " #func "\n"); \ + if (g_enablecallchecks) \ + ok(expect_ ##func, "unexpected call " #func "\n"); \ called_ ## func = TRUE; \ }while(0) @@ -1147,6 +1150,18 @@ static HRESULT WINAPI sp_QueryService(IServiceProvider *iface, REFGUID service, { /* FIXME: unidentified service id */ } + else if (IsEqualGUID(service, &IID_IInternetProtocol) && + IsEqualGUID(riid, &IID_IInternetProtocol)) + { + } + else if (IsEqualGUID(service, &IID_IHttpNegotiate2) && + IsEqualGUID(riid, &IID_IHttpNegotiate2)) + { + } + else if (IsEqualGUID(service, &IID_IGetBindHandle) && + IsEqualGUID(riid, &IID_IGetBindHandle)) + { + } else ok(0, "unexpected request: sid %s, riid %s\n", debugstr_guid(service), debugstr_guid(riid)); @@ -1365,6 +1380,8 @@ static void set_xhr_site(IXMLHttpRequest *xhr) hr = IXMLHttpRequest_QueryInterface(xhr, &IID_IObjectWithSite, (void**)&obj_site); ok(hr == S_OK, "Could not get IObjectWithSite iface: %08x\n", hr); + g_enablecallchecks = TRUE; + SET_EXPECT(site_qi_IServiceProvider); SET_EXPECT(sp_queryservice_SID_SBindHost); SET_EXPECT(sp_queryservice_SID_SContainerDispatch_htmldoc2); @@ -1387,20 +1404,24 @@ static void set_xhr_site(IXMLHttpRequest *xhr) todo_wine CHECK_CALLED(sp_queryservice_SID_SBindHost); CHECK_CALLED(sp_queryservice_SID_SContainerDispatch_htmldoc2); -todo_wine { CHECK_CALLED(sp_queryservice_SID_secmgr_htmldoc2); +todo_wine CHECK_CALLED(sp_queryservice_SID_secmgr_xmldomdoc); /* this one isn't very reliable CHECK_CALLED(sp_queryservice_SID_secmgr_secmgr); */ - +todo_wine { CHECK_CALLED(htmldoc2_get_all); CHECK_CALLED(collection_get_length); +} CHECK_CALLED(htmldoc2_get_url); +todo_wine { CHECK_CALLED(site_qi_IXMLDOMDocument); CHECK_CALLED(site_qi_IOleClientSite); } + g_enablecallchecks = FALSE; + IObjectWithSite_Release(obj_site); } @@ -1423,8 +1444,10 @@ static void test_XMLHTTP(void) static const char bodyA[] = "mode=Test"; static const char urlA[] = "http://crossover.codeweavers.com/posttest.php"; static const char xmltestA[] = "http://crossover.codeweavers.com/xmltest.xml"; + static const char referertesturl[] = "http://test.winehq.org/tests/referer.php"; static const WCHAR wszExpectedResponse[] = {'F','A','I','L','E','D',0}; static const CHAR xmltestbodyA[] = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<a>TEST</a>\n"; + static const WCHAR norefererW[] = {'n','o',' ','r','e','f','e','r','e','r',' ','s','e','t',0}; IXMLHttpRequest *xhr; IObjectWithSite *obj_site, *obj_site2; @@ -1686,6 +1709,17 @@ static void test_XMLHTTP(void) IDispatch_Release(event); + /* test if referrer header is sent */ + test_open(xhr, "GET", referertesturl, S_OK); + + V_VT(&varbody) = VT_EMPTY; + hr = IXMLHttpRequest_send(xhr, varbody); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLHttpRequest_get_responseText(xhr, &str); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(str, norefererW), "got response text %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + /* interaction with object site */ hr = IXMLHttpRequest_QueryInterface(xhr, &IID_IObjectWithSite, (void**)&obj_site); EXPECT_HR(hr, S_OK); @@ -1700,10 +1734,20 @@ static void test_XMLHTTP(void) set_xhr_site(xhr); - /* try to set site another time */ - SET_EXPECT(site_qi_IServiceProvider); - SET_EXPECT(sp_queryservice_SID_SContainerDispatch_htmldoc2); + test_open(xhr, "GET", "tests/referer.php", S_OK); + str1 = a2bstr("http://test.winehq.org/"); + V_VT(&varbody) = VT_EMPTY; + hr = IXMLHttpRequest_send(xhr, varbody); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLHttpRequest_get_responseText(xhr, &str); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(str, str1), "got response text %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(str1)); + SysFreeString(str); + SysFreeString(str1); + + /* try to set site another time */ hr = IObjectWithSite_SetSite(obj_site, &testsite); EXPECT_HR(hr, S_OK);

1 0

Dmitry Timoshkov : crypt32: Add another root store path to the certificate location list.
by Alexandre Julliard Oct. 17, 2013

Oct. 17, 2013

Module: wine Branch: master Commit: 84029a836f3dadd147b7e9149d725073ee00ec67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84029a836f3dadd147b7e9149… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 16 16:10:26 2013 +0900 crypt32: Add another root store path to the certificate location list. --- dlls/crypt32/rootstore.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c index efe8340..2c8af68 100644 --- a/dlls/crypt32/rootstore.c +++ b/dlls/crypt32/rootstore.c @@ -486,6 +486,7 @@ static const char * const CRYPT_knownLocations[] = { "/etc/ssl/certs/ca-certificates.crt", "/etc/ssl/certs", "/etc/pki/tls/certs/ca-bundle.crt", + "/usr/share/ca-certificates/ca-bundle.crt", "/usr/local/share/certs/", "/etc/sfw/openssl/certs", };

1 0

Dmitry Timoshkov : kernel32/tests: Fix environment tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 17, 2013

Oct. 17, 2013

Module: wine Branch: master Commit: 373178cdf18198a586a5d969c7e9f8c405b0b8ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=373178cdf18198a586a5d969c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Oct 17 11:45:40 2013 +0900 kernel32/tests: Fix environment tests compilation with __WINESRC__ defined. --- dlls/kernel32/tests/environ.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c index 3ac86cd..f8452be 100644 --- a/dlls/kernel32/tests/environ.c +++ b/dlls/kernel32/tests/environ.c @@ -357,7 +357,7 @@ static void test_ExpandEnvironmentStringsA(void) ret_size = ExpandEnvironmentStringsA(buf, buf1, sizeof(buf1)); ok(ret_size == strlen(buf2)+1 || ret_size == (strlen(buf2)+1)*2 /* NT4 */, - "ExpandEnvironmentStrings returned %d instead of %d\n", ret_size, lstrlen(buf2)+1); + "ExpandEnvironmentStrings returned %d instead of %d\n", ret_size, lstrlenA(buf2)+1); ok(!strcmp(buf1, buf2), "ExpandEnvironmentStrings returned [%s]\n", buf1); SetEnvironmentVariableA("IndirectVar", NULL);

1 0

Dmitry Timoshkov : kernel32/tests: Fix process tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 17, 2013

Oct. 17, 2013

Module: wine Branch: master Commit: 6774accd026c3221b50da02e3579b1914b2d3a28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6774accd026c3221b50da02e3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Oct 17 11:45:27 2013 +0900 kernel32/tests: Fix process tests compilation with __WINESRC__ defined. --- dlls/kernel32/tests/process.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index b35481e..f5c5ecf 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1665,7 +1665,7 @@ static void test_GetProcessImageFileNameA(void) length = sizeof(image); expect_eq_d(TRUE, pQueryFullProcessImageNameA(GetCurrentProcess(), PROCESS_NAME_NATIVE, image, &length)); expect_eq_d(length, lstrlenA(image)); - ok(lstrcmpi(process, image) == 0, "expected '%s' to be equal to '%s'\n", process, image); + ok(lstrcmpiA(process, image) == 0, "expected '%s' to be equal to '%s'\n", process, image); } } @@ -1691,7 +1691,7 @@ static void test_QueryFullProcessImageNameA(void) expect_eq_d(TRUE, pQueryFullProcessImageNameA(GetCurrentProcess(), 0, buf, &length)); expect_eq_d(length, lstrlenA(buf)); ok((buf[0] == '\\' && buf[1] == '\\') || - lstrcmpi(buf, module) == 0, "expected %s to match %s\n", buf, module); + lstrcmpiA(buf, module) == 0, "expected %s to match %s\n", buf, module); /* when the buffer is too small * - function fail with error ERROR_INSUFFICIENT_BUFFER @@ -1930,14 +1930,14 @@ static void test_TerminateProcess(void) { static char cmdline[] = "winver.exe"; PROCESS_INFORMATION pi; - STARTUPINFO si; + STARTUPINFOA si; DWORD ret; HANDLE dummy, thread; memset(&si, 0, sizeof(si)); si.cb = sizeof(si); SetLastError(0xdeadbeef); - ret = CreateProcess(NULL, cmdline, NULL, NULL, FALSE, CREATE_SUSPENDED, NULL, NULL, &si, &pi); + ret = CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, CREATE_SUSPENDED, NULL, NULL, &si, &pi); ok(ret, "CreateProcess error %u\n", GetLastError()); SetLastError(0xdeadbeef); @@ -1990,9 +1990,9 @@ static void test_DuplicateHandle(void) ok(out != GetCurrentProcess(), "out = GetCurrentProcess()\n"); CloseHandle(out); - GetTempPath(MAX_PATH, path); - GetTempFileName(path, "wt", 0, file_name); - f = CreateFile(file_name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + GetTempPathA(MAX_PATH, path); + GetTempFileNameA(path, "wt", 0, file_name); + f = CreateFileA(file_name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); if (f == INVALID_HANDLE_VALUE) { ok(0, "could not create %s\n", file_name); @@ -2043,9 +2043,9 @@ static void test_DuplicateHandle(void) ok(r, "DuplicateHandle error %u\n", GetLastError()); ok(f == out, "f != out\n"); CloseHandle(out); - DeleteFile(file_name); + DeleteFileA(file_name); - f = CreateFile("CONIN$", GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); + f = CreateFileA("CONIN$", GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); if (!is_console(f)) { skip("DuplicateHandle on console handle\n");

1 0

Alistair Leslie-Hughes : mscoree: Add support for ICLRMetaHostPolicy interface.
by Alexandre Julliard Oct. 17, 2013

Oct. 17, 2013

Module: wine Branch: master Commit: 3988ee946509478f39f8aa0af123f3709133a5ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=3988ee946509478f39f8aa0af… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Oct 2 15:48:32 2013 +1000 mscoree: Add support for ICLRMetaHostPolicy interface. --- dlls/mscoree/metahost.c | 64 ++++++++++++++++++++++++++++++++++++++++ dlls/mscoree/mscoree_main.c | 2 + dlls/mscoree/mscoree_private.h | 1 + 3 files changed, 67 insertions(+), 0 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index f84e455..fc00522 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -1220,6 +1220,70 @@ HRESULT CLRMetaHost_CreateInstance(REFIID riid, void **ppobj) return ICLRMetaHost_QueryInterface(&GlobalCLRMetaHost.ICLRMetaHost_iface, riid, ppobj); } +struct CLRMetaHostPolicy +{ + ICLRMetaHostPolicy ICLRMetaHostPolicy_iface; +}; + +static struct CLRMetaHostPolicy GlobalCLRMetaHostPolicy; + +static HRESULT WINAPI metahostpolicy_QueryInterface(ICLRMetaHostPolicy *iface, REFIID riid, void **obj) +{ + TRACE("%s %p\n", debugstr_guid(riid), obj); + + if ( IsEqualGUID( riid, &IID_ICLRMetaHostPolicy ) || + IsEqualGUID( riid, &IID_IUnknown ) ) + { + ICLRMetaHostPolicy_AddRef( iface ); + *obj = iface; + return S_OK; + } + + FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI metahostpolicy_AddRef(ICLRMetaHostPolicy *iface) +{ + return 2; +} + +static ULONG WINAPI metahostpolicy_Release(ICLRMetaHostPolicy *iface) +{ + return 1; +} + +static HRESULT WINAPI metahostpolicy_GetRequestedRuntime(ICLRMetaHostPolicy *iface, METAHOST_POLICY_FLAGS dwPolicyFlags, + LPCWSTR pwzBinary, IStream *pCfgStream, LPWSTR pwzVersion, DWORD *pcchVersion, + LPWSTR pwzImageVersion, DWORD *pcchImageVersion, DWORD *pdwConfigFlags, REFIID riid, + LPVOID *ppRuntime) +{ + FIXME("%d %p %p %p %p %p %p %p %s %p\n", dwPolicyFlags, pwzBinary, pCfgStream, + pwzVersion, pcchVersion, pwzImageVersion, pcchImageVersion, pdwConfigFlags, + debugstr_guid(riid), ppRuntime); + + return E_NOTIMPL; +} + +static const struct ICLRMetaHostPolicyVtbl CLRMetaHostPolicy_vtbl = +{ + metahostpolicy_QueryInterface, + metahostpolicy_AddRef, + metahostpolicy_Release, + metahostpolicy_GetRequestedRuntime +}; + +static struct CLRMetaHostPolicy GlobalCLRMetaHostPolicy = { + { &CLRMetaHostPolicy_vtbl } +}; + +HRESULT CLRMetaHostPolicy_CreateInstance(REFIID riid, void **ppobj) +{ + return ICLRMetaHostPolicy_QueryInterface(&GlobalCLRMetaHostPolicy.ICLRMetaHostPolicy_iface, riid, ppobj); +} + HRESULT get_file_from_strongname(WCHAR* stringnameW, WCHAR* assemblies_path, int path_length) { HRESULT hr=S_OK; diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 772ba01..2ca0ce7 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -588,6 +588,8 @@ HRESULT WINAPI CLRCreateInstance(REFCLSID clsid, REFIID riid, LPVOID *ppInterfac if (IsEqualGUID(clsid, &CLSID_CLRMetaHost)) return CLRMetaHost_CreateInstance(riid, ppInterface); + if (IsEqualGUID(clsid, &CLSID_CLRMetaHostPolicy)) + return CLRMetaHostPolicy_CreateInstance(riid, ppInterface); FIXME("not implemented for class %s\n", debugstr_guid(clsid)); diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index b66669c..dd5b1af 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -23,6 +23,7 @@ extern char *WtoA(LPCWSTR wstr) DECLSPEC_HIDDEN; extern HRESULT CLRMetaHost_CreateInstance(REFIID riid, void **ppobj) DECLSPEC_HIDDEN; +extern HRESULT CLRMetaHostPolicy_CreateInstance(REFIID riid, void **ppobj) DECLSPEC_HIDDEN; extern HRESULT WINAPI CLRMetaHost_GetVersionFromFile(ICLRMetaHost* iface, LPCWSTR pwzFilePath, LPWSTR pwzBuffer, DWORD *pcchBuffer) DECLSPEC_HIDDEN;

1 0

Andrew Eikum : winhttp: Attempt to refill empty buffer before answering QueryDataAvailable.
by Alexandre Julliard Oct. 17, 2013

Oct. 17, 2013

Module: wine Branch: master Commit: 04f0426fe6b0e4e8a3cb7da30ec317d5a1ecf65d URL: http://source.winehq.org/git/wine.git/?a=commit;h=04f0426fe6b0e4e8a3cb7da30… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Oct 14 14:36:05 2013 -0500 winhttp: Attempt to refill empty buffer before answering QueryDataAvailable. --- dlls/winhttp/request.c | 6 ++++ dlls/winhttp/tests/winhttp.c | 59 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 8c5a39a..930eb28 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2391,6 +2391,12 @@ static BOOL query_data_available( request_t *request, DWORD *available, BOOL asy { DWORD count = get_available_data( request ); + if (!count) + { + refill_buffer( request, async ); + count = get_available_data( request ); + } + if (async) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE, &count, sizeof(count) ); TRACE("%u bytes available\n", count); if (available) *available = count; diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index ab8b94c..e073e6a 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1800,6 +1800,8 @@ struct server_info int port; }; +#define BIG_BUFFER_LEN 0x2250 + static DWORD CALLBACK server_thread(LPVOID param) { struct server_info *si = param; @@ -1857,6 +1859,13 @@ static DWORD CALLBACK server_thread(LPVOID param) else send(c, noauthmsg, sizeof noauthmsg - 1, 0); } + if (strstr(buffer, "/big")) + { + char msg[BIG_BUFFER_LEN]; + memset(msg, 'm', sizeof(msg)); + send(c, okmsg, sizeof(okmsg) - 1, 0); + send(c, msg, sizeof(msg), 0); + } if (strstr(buffer, "/no_headers")) { send(c, page1, sizeof page1 - 1, 0); @@ -2129,6 +2138,55 @@ static void test_bad_header( int port ) WinHttpCloseHandle( ses ); } +static void test_multiple_reads(int port) +{ + static const WCHAR bigW[] = {'b','i','g',0}; + HINTERNET ses, con, req; + DWORD total_len = 0; + BOOL ret; + + ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); + ok(ses != NULL, "failed to open session %u\n", GetLastError()); + + con = WinHttpConnect(ses, localhostW, port, 0); + ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + + req = WinHttpOpenRequest(con, NULL, bigW, NULL, NULL, NULL, 0); + ok(req != NULL, "failed to open a request %u\n", GetLastError()); + + ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); + ok(ret, "failed to send request %u\n", GetLastError()); + + ret = WinHttpReceiveResponse(req, NULL); + ok(ret == TRUE, "expected success\n"); + + for (;;) + { + DWORD len = 0xdeadbeef; + ret = WinHttpQueryDataAvailable( req, &len ); + ok( ret, "WinHttpQueryDataAvailable failed with error %u\n", GetLastError() ); + if (ret) ok( len != 0xdeadbeef, "WinHttpQueryDataAvailable return wrong length\n" ); + if (len) + { + DWORD bytes_read; + char *buf = HeapAlloc( GetProcessHeap(), 0, len + 1 ); + + ret = WinHttpReadData( req, buf, len, &bytes_read ); + ok( len == bytes_read, "only got %u of %u available\n", bytes_read, len ); + + HeapFree( GetProcessHeap(), 0, buf ); + if (!bytes_read) break; + total_len += bytes_read; + } + if (!len) break; + } + ok(total_len == BIG_BUFFER_LEN, "got wrong length: 0x%x\n", total_len); + + WinHttpCloseHandle(req); + WinHttpCloseHandle(con); + WinHttpCloseHandle(ses); +} + static void test_connection_info( int port ) { static const WCHAR basicW[] = {'/','b','a','s','i','c',0}; @@ -3038,6 +3096,7 @@ START_TEST (winhttp) test_no_headers(si.port); test_basic_authentication(si.port); test_bad_header(si.port); + test_multiple_reads(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, NULL, quitW);

1 0

Dmitry Timoshkov : kernel32/tests: Fix time tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 17, 2013

Oct. 17, 2013

Module: wine Branch: master Commit: 193c837989d6988d7b3f6a8096ac7f80978764c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=193c837989d6988d7b3f6a809… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Oct 17 11:45:46 2013 +0900 kernel32/tests: Fix time tests compilation with __WINESRC__ defined. --- dlls/kernel32/tests/time.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c index 2f71184..0cc4485 100644 --- a/dlls/kernel32/tests/time.c +++ b/dlls/kernel32/tests/time.c @@ -720,7 +720,7 @@ static void test_GetCalendarInfo(void) START_TEST(time) { - HMODULE hKernel = GetModuleHandle("kernel32"); + HMODULE hKernel = GetModuleHandleA("kernel32"); pTzSpecificLocalTimeToSystemTime = (void *)GetProcAddress(hKernel, "TzSpecificLocalTimeToSystemTime"); pSystemTimeToTzSpecificLocalTime = (void *)GetProcAddress( hKernel, "SystemTimeToTzSpecificLocalTime"); pGetCalendarInfoA = (void *)GetProcAddress(hKernel, "GetCalendarInfoA");

1 0

Dmitry Timoshkov : kernel32/tests: Fix communication port tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 17, 2013

Oct. 17, 2013

Module: wine Branch: master Commit: 6e07317939a785b6edbaba5bf9ea6fdccca1bd90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e07317939a785b6edbaba5bf… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Oct 17 11:45:36 2013 +0900 kernel32/tests: Fix communication port tests compilation with __WINESRC__ defined. --- dlls/kernel32/tests/comm.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index c444e90..cf1c0c2 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -646,7 +646,7 @@ static void test_BuildCommDCB(void) COMMCONFIG commconfig; DWORD size = sizeof(COMMCONFIG); - if(GetDefaultCommConfig(port_name, &commconfig, &size)) + if(GetDefaultCommConfigA(port_name, &commconfig, &size)) { port = port_name[3]; break; @@ -697,7 +697,7 @@ static HANDLE test_OpenComm(BOOL doOverlap) /* Try to find a port */ for(port_name[3] = '1'; port_name[3] <= '9'; port_name[3]++) { - hcom = CreateFile( port_name, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, + hcom = CreateFileA( port_name, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, (doOverlap)?FILE_FLAG_OVERLAPPED:0, NULL ); if (hcom != INVALID_HANDLE_VALUE) break; @@ -835,7 +835,7 @@ static void test_waittxempty(void) S(U(ovl_write)).Offset = 0; S(U(ovl_write)).OffsetHigh = 0; - ovl_write.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + ovl_write.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); before = GetTickCount(); SetLastError(0xdeadbeef); res = WriteFile(hcom, tbuf, sizeof(tbuf), &bytes, &ovl_write); @@ -850,7 +850,7 @@ todo_wine S(U(ovl_wait)).Offset = 0; S(U(ovl_wait)).OffsetHigh = 0; - ovl_wait.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + ovl_wait.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); evtmask = 0; before = GetTickCount(); SetLastError(0xdeadbeef); @@ -911,7 +911,7 @@ todo_wine { S(U(ovl_write)).Offset = 0; S(U(ovl_write)).OffsetHigh = 0; - ovl_write.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + ovl_write.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); before = GetTickCount(); SetLastError(0xdeadbeef); res = WriteFile(hcom, tbuf, sizeof(tbuf), &bytes, &ovl_write); @@ -941,7 +941,7 @@ todo_wine S(U(ovl_wait)).Offset = 0; S(U(ovl_wait)).OffsetHigh = 0; - ovl_wait.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + ovl_wait.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); evtmask = 0; SetLastError(0xdeadbeef); res = WaitCommEvent(hcom, &evtmask, &ovl_wait); @@ -967,7 +967,7 @@ todo_wine S(U(ovl_wait2)).Offset = 0; S(U(ovl_wait2)).OffsetHigh = 0; - ovl_wait2.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + ovl_wait2.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); SetLastError(0xdeadbeef); res = WaitCommEvent(hcom, &evtmask, &ovl_wait2); ok(!res, "WaitCommEvent should fail if there is a pending wait\n"); @@ -1344,12 +1344,12 @@ static void test_WaitRx(void) if (hcom == INVALID_HANDLE_VALUE) return; ok(SetCommMask(hcom, EV_RXCHAR), "SetCommMask failed\n"); - hComPortEvent = CreateEvent( NULL, TRUE, FALSE, NULL ); + hComPortEvent = CreateEventW( NULL, TRUE, FALSE, NULL ); ok(hComPortEvent != 0, "CreateEvent failed\n"); ZeroMemory( &overlapped, sizeof(overlapped)); overlapped.hEvent = hComPortEvent; - hComWriteEvent = CreateEvent( NULL, TRUE, FALSE, NULL ); + hComWriteEvent = CreateEventW( NULL, TRUE, FALSE, NULL ); ok(hComWriteEvent != NULL, "CreateEvent res %d\n", GetLastError()); ZeroMemory( &overlapped_w, sizeof(overlapped_w)); overlapped_w.hEvent = hComWriteEvent; @@ -1464,7 +1464,7 @@ static void test_WaitCts(void) trace("test_WaitCts timeout %ld clt 0x%08lx handle %p\n",args[0], args[1], hcom); ok(SetCommMask(hcom, EV_CTS), "SetCommMask failed\n"); - hComPortEvent = CreateEvent( NULL, TRUE, FALSE, NULL ); + hComPortEvent = CreateEventW( NULL, TRUE, FALSE, NULL ); ok(hComPortEvent != 0, "CreateEvent failed\n"); args[3] = (DWORD_PTR)hComPortEvent; alarmThread = CreateThread(NULL, 0, toggle_ctlLine, args, 0, &alarmThreadId); @@ -1558,7 +1558,7 @@ static void test_AbortWaitCts(void) trace("test_AbortWaitCts timeout %ld handle %p\n",args[0], hcom); ok(SetCommMask(hcom, EV_CTS), "SetCommMask failed\n"); - hComPortEvent = CreateEvent( NULL, TRUE, FALSE, NULL ); + hComPortEvent = CreateEventW( NULL, TRUE, FALSE, NULL ); ok(hComPortEvent != 0, "CreateEvent failed\n"); alarmThread = CreateThread(NULL, 0, reset_CommMask, args, 0, &alarmThreadId); /* Wait a minimum to let the thread start up */ @@ -1630,7 +1630,7 @@ static void test_WaitDsr(void) trace("test_WaitDsr timeout %ld clt 0x%08lx handle %p\n",args[0], args[1], hcom); ok(SetCommMask(hcom, EV_DSR), "SetCommMask failed\n"); - hComPortEvent = CreateEvent( NULL, TRUE, FALSE, NULL ); + hComPortEvent = CreateEventW( NULL, TRUE, FALSE, NULL ); ok(hComPortEvent != 0, "CreateEvent failed\n"); alarmThread = CreateThread(NULL, 0, toggle_ctlLine, args, 0, &alarmThreadId); ok(alarmThread !=0 , "CreateThread Failed\n"); @@ -1716,7 +1716,7 @@ static void test_WaitRing(void) trace("test_WaitRing timeout %ld clt 0x%08lx handle %p\n",args[0], args[1], hcom); ok(SetCommMask(hcom, EV_RING), "SetCommMask failed\n"); - hComPortEvent = CreateEvent( NULL, TRUE, FALSE, NULL ); + hComPortEvent = CreateEventW( NULL, TRUE, FALSE, NULL ); ok(hComPortEvent != 0, "CreateEvent failed\n"); alarmThread = CreateThread(NULL, 0, toggle_ctlLine, args, 0, &alarmThreadId); ok(alarmThread !=0 , "CreateThread Failed\n"); @@ -1795,7 +1795,7 @@ static void test_WaitDcd(void) trace("test_WaitDcd timeout %ld clt 0x%08lx handle %p\n",args[0], args[1], hcom); ok(SetCommMask(hcom, EV_RLSD), "SetCommMask failed\n"); - hComPortEvent = CreateEvent( NULL, TRUE, FALSE, NULL ); + hComPortEvent = CreateEventW( NULL, TRUE, FALSE, NULL ); ok(hComPortEvent != 0, "CreateEvent failed\n"); alarmThread = CreateThread(NULL, 0, toggle_ctlLine, args, 0, &alarmThreadId); ok(alarmThread !=0 , "CreateThread Failed\n"); @@ -1874,7 +1874,7 @@ static void test_WaitBreak(void) if (hcom == INVALID_HANDLE_VALUE) return; ok(SetCommMask(hcom, EV_BREAK), "SetCommMask failed\n"); - hComPortEvent = CreateEvent( NULL, TRUE, FALSE, NULL ); + hComPortEvent = CreateEventW( NULL, TRUE, FALSE, NULL ); ok(hComPortEvent != 0, "CreateEvent failed\n"); trace("test_WaitBreak\n"); @@ -1947,7 +1947,7 @@ static void test_WaitCommEvent(void) S(U(ovl_wait)).Offset = 0; S(U(ovl_wait)).OffsetHigh = 0; - ovl_wait.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + ovl_wait.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); trace("waiting 10 secs for com port events (turn on/off the device)...\n"); last_event_time = 0; @@ -2111,7 +2111,7 @@ todo_wine S(U(ovl_wait)).Offset = 0; S(U(ovl_wait)).OffsetHigh = 0; - ovl_wait.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + ovl_wait.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); trace("waiting 3 secs for modem response...\n"); last_event_time = 0; @@ -2198,7 +2198,7 @@ done: START_TEST(comm) { - HMODULE ntdll = GetModuleHandle("ntdll.dll"); + HMODULE ntdll = GetModuleHandleA("ntdll.dll"); if (ntdll) { pNtReadFile = (void *)GetProcAddress(ntdll, "NtReadFile");

1 0

Dmitry Timoshkov : kernel32/tests: Fix virtual memory tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 17, 2013

Oct. 17, 2013

Module: wine Branch: master Commit: 035295bb31018455cbbd1e39a5f5903eb3f6e811 URL: http://source.winehq.org/git/wine.git/?a=commit;h=035295bb31018455cbbd1e39a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Oct 17 11:45:32 2013 +0900 kernel32/tests: Fix virtual memory tests compilation with __WINESRC__ defined. --- dlls/kernel32/tests/virtual.c | 54 ++++++++++++++++++++-------------------- 1 files changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 99d3286..a77fdb9 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -49,12 +49,12 @@ static HANDLE create_target_process(const char *arg) char cmdline[MAX_PATH]; PROCESS_INFORMATION pi; BOOL ret; - STARTUPINFO si = { 0 }; + STARTUPINFOA si = { 0 }; si.cb = sizeof(si); winetest_get_mainargs( &argv ); sprintf(cmdline, "%s %s %s", argv[0], argv[1], arg); - ret = CreateProcess(NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ret = CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ok(ret, "error: %u\n", GetLastError()); ret = CloseHandle(pi.hThread); ok(ret, "error %u\n", GetLastError()); @@ -586,17 +586,17 @@ static void test_MapViewOfFile(void) SetLastError(0xdeadbeef); name = "Local\\Foo"; - file = CreateFileMapping( INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, 4096, name ); + file = CreateFileMappingA( INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, 4096, name ); /* nt4 doesn't have Local\\ */ if (!file && GetLastError() == ERROR_PATH_NOT_FOUND) { name = "Foo"; - file = CreateFileMapping( INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, 4096, name ); + file = CreateFileMappingA( INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, 4096, name ); } ok( file != 0, "CreateFileMapping PAGE_READWRITE error %u\n", GetLastError() ); SetLastError(0xdeadbeef); - mapping = OpenFileMapping( FILE_MAP_READ, FALSE, name ); + mapping = OpenFileMappingA( FILE_MAP_READ, FALSE, name ); ok( mapping != 0, "OpenFileMapping FILE_MAP_READ error %u\n", GetLastError() ); SetLastError(0xdeadbeef); ptr = MapViewOfFile( mapping, FILE_MAP_WRITE, 0, 0, 0 ); @@ -623,7 +623,7 @@ static void test_MapViewOfFile(void) CloseHandle( mapping ); SetLastError(0xdeadbeef); - mapping = OpenFileMapping( FILE_MAP_WRITE, FALSE, name ); + mapping = OpenFileMappingA( FILE_MAP_WRITE, FALSE, name ); ok( mapping != 0, "OpenFileMapping FILE_MAP_WRITE error %u\n", GetLastError() ); SetLastError(0xdeadbeef); ptr = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 0 ); @@ -1283,7 +1283,7 @@ static void test_write_watch(void) "wrong error %u\n", GetLastError() ); SetLastError( 0xdeadbeef ); - ret = pGetWriteWatch( 0, GetModuleHandle(0), size, results, &count, &pagesize ); + ret = pGetWriteWatch( 0, GetModuleHandleW(NULL), size, results, &count, &pagesize ); if (ret) { ok( ret == ~0u, "GetWriteWatch succeeded %u\n", ret ); @@ -1459,7 +1459,7 @@ static void test_write_watch(void) ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); SetLastError( 0xdeadbeef ); - ret = pResetWriteWatch( GetModuleHandle(0), size ); + ret = pResetWriteWatch( GetModuleHandleW(NULL), size ); ok( ret == ~0u, "ResetWriteWatch succeeded %u\n", ret ); ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); } @@ -1486,7 +1486,7 @@ static void test_write_watch(void) ret = pResetWriteWatch( base, 0 ); ok( !ret, "ResetWriteWatch failed %u\n", ret ); - ret = pResetWriteWatch( GetModuleHandle(0), size ); + ret = pResetWriteWatch( GetModuleHandleW(NULL), size ); ok( !ret, "ResetWriteWatch failed %u\n", ret ); } @@ -1861,11 +1861,11 @@ static void test_CreateFileMapping_protection(void) GetSystemInfo(&si); trace("system page size %#x\n", si.dwPageSize); - GetTempPath(MAX_PATH, temp_path); - GetTempFileName(temp_path, "map", 0, file_name); + GetTempPathA(MAX_PATH, temp_path); + GetTempFileNameA(temp_path, "map", 0, file_name); SetLastError(0xdeadbeef); - hfile = CreateFile(file_name, GENERIC_READ|GENERIC_WRITE|GENERIC_EXECUTE, 0, NULL, CREATE_ALWAYS, 0, 0); + hfile = CreateFileA(file_name, GENERIC_READ|GENERIC_WRITE|GENERIC_EXECUTE, 0, NULL, CREATE_ALWAYS, 0, 0); ok(hfile != INVALID_HANDLE_VALUE, "CreateFile(%s) error %d\n", file_name, GetLastError()); SetFilePointer(hfile, si.dwPageSize, NULL, FILE_BEGIN); SetEndOfFile(hfile); @@ -1873,7 +1873,7 @@ static void test_CreateFileMapping_protection(void) for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) { SetLastError(0xdeadbeef); - hmap = CreateFileMapping(hfile, NULL, td[i].prot | SEC_COMMIT, 0, si.dwPageSize, NULL); + hmap = CreateFileMappingW(hfile, NULL, td[i].prot | SEC_COMMIT, 0, si.dwPageSize, NULL); if (td[i].success) { @@ -1954,7 +1954,7 @@ todo_wine if (page_exec_supported) alloc_prot = PAGE_EXECUTE_READWRITE; else alloc_prot = PAGE_READWRITE; SetLastError(0xdeadbeef); - hmap = CreateFileMapping(hfile, NULL, alloc_prot, 0, si.dwPageSize, NULL); + hmap = CreateFileMappingW(hfile, NULL, alloc_prot, 0, si.dwPageSize, NULL); ok(hmap != 0, "%d: CreateFileMapping error %d\n", i, GetLastError()); SetLastError(0xdeadbeef); @@ -2065,7 +2065,7 @@ todo_wine CloseHandle(hmap); CloseHandle(hfile); - DeleteFile(file_name); + DeleteFileA(file_name); } #define ACCESS_READ 0x01 @@ -2252,11 +2252,11 @@ static void test_mapping(void) GetSystemInfo(&si); trace("system page size %#x\n", si.dwPageSize); - GetTempPath(MAX_PATH, temp_path); - GetTempFileName(temp_path, "map", 0, file_name); + GetTempPathA(MAX_PATH, temp_path); + GetTempFileNameA(temp_path, "map", 0, file_name); SetLastError(0xdeadbeef); - hfile = CreateFile(file_name, GENERIC_READ|GENERIC_WRITE|GENERIC_EXECUTE, 0, NULL, CREATE_ALWAYS, 0, 0); + hfile = CreateFileA(file_name, GENERIC_READ|GENERIC_WRITE|GENERIC_EXECUTE, 0, NULL, CREATE_ALWAYS, 0, 0); ok(hfile != INVALID_HANDLE_VALUE, "CreateFile(%s) error %d\n", file_name, GetLastError()); SetFilePointer(hfile, si.dwPageSize, NULL, FILE_BEGIN); SetEndOfFile(hfile); @@ -2264,7 +2264,7 @@ static void test_mapping(void) for (i = 0; i < sizeof(page_prot)/sizeof(page_prot[0]); i++) { SetLastError(0xdeadbeef); - hmap = CreateFileMapping(hfile, NULL, page_prot[i] | SEC_COMMIT, 0, si.dwPageSize, NULL); + hmap = CreateFileMappingW(hfile, NULL, page_prot[i] | SEC_COMMIT, 0, si.dwPageSize, NULL); if (page_prot[i] == PAGE_NOACCESS) { @@ -2275,7 +2275,7 @@ static void test_mapping(void) /* A trick to create a not accessible mapping */ SetLastError(0xdeadbeef); - hmap = CreateFileMapping(hfile, NULL, PAGE_READWRITE | SEC_COMMIT, 0, si.dwPageSize, NULL); + hmap = CreateFileMappingW(hfile, NULL, PAGE_READWRITE | SEC_COMMIT, 0, si.dwPageSize, NULL); ok(hmap != 0, "CreateFileMapping(PAGE_READWRITE) error %d\n", GetLastError()); SetLastError(0xdeadbeef); ret = DuplicateHandle(GetCurrentProcess(), hmap, GetCurrentProcess(), &hmap2, 0, FALSE, 0); @@ -2442,7 +2442,7 @@ todo_wine } CloseHandle(hfile); - DeleteFile(file_name); + DeleteFileA(file_name); } static void test_shared_memory(int is_child) @@ -2451,7 +2451,7 @@ static void test_shared_memory(int is_child) LONG *p; SetLastError(0xdeadbef); - mapping = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, 4096, "winetest_virtual.c"); + mapping = CreateFileMappingA(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, 4096, "winetest_virtual.c"); ok(mapping != 0, "CreateFileMapping error %d\n", GetLastError()); if (is_child) ok(GetLastError() == ERROR_ALREADY_EXISTS, "expected ERROR_ALREADY_EXISTS, got %d\n", GetLastError()); @@ -2469,14 +2469,14 @@ static void test_shared_memory(int is_child) char **argv; char cmdline[MAX_PATH]; PROCESS_INFORMATION pi; - STARTUPINFO si = { sizeof(si) }; + STARTUPINFOA si = { sizeof(si) }; DWORD ret; *p = 0x1a2b3c4d; winetest_get_mainargs(&argv); sprintf(cmdline, "\"%s\" virtual sharedmem", argv[0]); - ret = CreateProcess(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ret = CreateProcessA(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ok(ret, "CreateProcess(%s) error %d\n", cmdline, GetLastError()); winetest_wait_child_process(pi.hProcess); CloseHandle(pi.hThread); @@ -2525,10 +2525,10 @@ START_TEST(virtual) pVirtualFreeEx = (void *) GetProcAddress(hkernel32, "VirtualFreeEx"); pGetWriteWatch = (void *) GetProcAddress(hkernel32, "GetWriteWatch"); pResetWriteWatch = (void *) GetProcAddress(hkernel32, "ResetWriteWatch"); - pNtAreMappedFilesTheSame = (void *)GetProcAddress( GetModuleHandle("ntdll.dll"), + pNtAreMappedFilesTheSame = (void *)GetProcAddress( GetModuleHandleA("ntdll.dll"), "NtAreMappedFilesTheSame" ); - pNtMapViewOfSection = (void *)GetProcAddress(GetModuleHandle("ntdll.dll"), "NtMapViewOfSection"); - pNtUnmapViewOfSection = (void *)GetProcAddress(GetModuleHandle("ntdll.dll"), "NtUnmapViewOfSection"); + pNtMapViewOfSection = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "NtMapViewOfSection"); + pNtUnmapViewOfSection = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "NtUnmapViewOfSection"); test_shared_memory(0); test_mapping();

1 0