wine-commits October 2015

wine-commits@winehq.org

2 participants
749 discussions

Sebastian Lackner : server: Always switch back to server dir when open_fd returns.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: 0425c0eb9542a7097ca628cc39123c7fabd74f72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0425c0eb9542a7097ca628cc3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Sep 24 04:20:18 2015 +0200 server: Always switch back to server dir when open_fd returns. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> --- server/fd.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/server/fd.c b/server/fd.c index fef4827..6c78a0a 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1835,34 +1835,31 @@ struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t *mode, fd->closed = closed_fd; fd->cacheable = !inode->device->removable; list_add_head( &inode->open, &fd->inode_entry ); + closed_fd = NULL; /* check directory options */ if ((options & FILE_DIRECTORY_FILE) && !S_ISDIR(st.st_mode)) { - release_object( fd ); set_error( STATUS_NOT_A_DIRECTORY ); - return NULL; + goto error; } if ((options & FILE_NON_DIRECTORY_FILE) && S_ISDIR(st.st_mode)) { - release_object( fd ); set_error( STATUS_FILE_IS_A_DIRECTORY ); - return NULL; + goto error; } if ((err = check_sharing( fd, access, sharing, flags, options ))) { - release_object( fd ); set_error( err ); - return NULL; + goto error; } - closed_fd->unlink = (options & FILE_DELETE_ON_CLOSE) != 0; + fd->closed->unlink = (options & FILE_DELETE_ON_CLOSE) != 0; if (flags & O_TRUNC) { if (S_ISDIR(st.st_mode)) { - release_object( fd ); set_error( STATUS_OBJECT_NAME_COLLISION ); - return NULL; + goto error; } ftruncate( fd->unix_fd, 0 ); } @@ -1877,6 +1874,7 @@ struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t *mode, free( closed_fd ); fd->cacheable = 1; } + if (root_fd != -1) fchdir( server_dir_fd ); /* go back to the server dir */ return fd; error:

1 0

Jacek Caban : esen: Added stub DLL.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: 205799d131920128cf277c36385454011cb45dfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=205799d131920128cf277c363… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 23 18:20:09 2015 +0200 esen: Added stub DLL. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- configure | 2 + configure.ac | 1 + dlls/esent/Makefile.in | 4 + dlls/esent/esent.spec | 336 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/esent/esent_main.c | 37 ++++++ 5 files changed, 380 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=205799d131920128cf277…

1 0

Hans Leidekker : msi: Set the PrimaryVolumeSpaceRequired and PrimaryVolumeSpaceRemaining properties.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: 9a5788afc1464e8b8008dd561876f12fb6ad2979 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a5788afc1464e8b8008dd561… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 22 15:59:57 2015 +0200 msi: Set the PrimaryVolumeSpaceRequired and PrimaryVolumeSpaceRemaining properties. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/action.c | 34 ++++++++++++++++++++++++++++++---- dlls/msi/tests/install.c | 14 +++++++++++++- 2 files changed, 43 insertions(+), 5 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 93e85c3..16c633b 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2378,6 +2378,18 @@ void msi_resolve_target_folder( MSIPACKAGE *package, const WCHAR *name, BOOL loa TRACE("%s resolves to %s\n", debugstr_w(name), debugstr_w(folder->ResolvedTarget)); } +static ULONGLONG get_volume_space_required( MSIPACKAGE *package ) +{ + MSICOMPONENT *comp; + ULONGLONG ret = 0; + + LIST_FOR_EACH_ENTRY( comp, &package->components, MSICOMPONENT, entry ) + { + if (comp->Action == INSTALLSTATE_LOCAL) ret += comp->Cost; + } + return ret; +} + static UINT ACTION_CostFinalize(MSIPACKAGE *package) { static const WCHAR query[] = @@ -2392,6 +2404,12 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package) static const WCHAR szPrimaryVolumeSpaceAvailable[] = {'P','r','i','m','a','r','y','V','o','l','u','m','e','S','p','a','c','e', 'A','v','a','i','l','a','b','l','e',0}; + static const WCHAR szPrimaryVolumeSpaceRequired[] = + {'P','r','i','m','a','r','y','V','o','l','u','m','e','S','p','a','c','e', + 'R','e','q','u','i','r','e','d',0}; + static const WCHAR szPrimaryVolumeSpaceRemaining[] = + {'P','r','i','m','a','r','y','V','o','l','u','m','e','S','p','a','c','e', + 'R','e','m','a','i','n','i','n','g',0}; static const WCHAR szOutOfNoRbDiskSpace[] = {'O','u','t','O','f','N','o','R','b','D','i','s','k','S','p','a','c','e',0}; MSICOMPONENT *comp; @@ -2442,6 +2460,8 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package) if (!level) msi_set_property( package->db, szInstallLevel, szOne, -1 ); msi_free(level); + if ((rc = MSI_SetFeatureStates( package ))) return rc; + if ((primary_key = msi_dup_property( package->db, szPrimaryFolder ))) { if ((primary_folder = msi_dup_property( package->db, primary_key ))) @@ -2449,17 +2469,23 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package) if (((primary_folder[0] >= 'A' && primary_folder[0] <= 'Z') || (primary_folder[0] >= 'a' && primary_folder[0] <= 'z')) && primary_folder[1] == ':') { + static const WCHAR fmtW[] = {'%','l','u',0}; ULARGE_INTEGER free; + ULONGLONG required; + WCHAR buf[21]; primary_folder[2] = 0; if (GetDiskFreeSpaceExW( primary_folder, &free, NULL, NULL )) { - static const WCHAR fmtW[] = {'%','l','u',0}; - WCHAR buf[21]; - sprintfW( buf, fmtW, free.QuadPart / 512 ); msi_set_property( package->db, szPrimaryVolumeSpaceAvailable, buf, -1 ); } + required = get_volume_space_required( package ); + sprintfW( buf, fmtW, required / 512 ); + msi_set_property( package->db, szPrimaryVolumeSpaceRequired, buf, -1 ); + + sprintfW( buf, fmtW, (free.QuadPart - required) / 512 ); + msi_set_property( package->db, szPrimaryVolumeSpaceRemaining, buf, -1 ); msi_set_property( package->db, szPrimaryVolumePath, primary_folder, 2 ); } msi_free( primary_folder ); @@ -2471,7 +2497,7 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package) msi_set_property( package->db, szOutOfDiskSpace, szZero, -1 ); msi_set_property( package->db, szOutOfNoRbDiskSpace, szZero, -1 ); - return MSI_SetFeatureStates(package); + return ERROR_SUCCESS; } static BYTE *parse_value( MSIPACKAGE *package, const WCHAR *value, DWORD len, DWORD *type, DWORD *size ) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 86ad561..5eff29f 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1112,10 +1112,16 @@ static const char vp_custom_action_dat[] = "CustomAction\tAction\n" "TestPrimaryVolumePath0\t19\t\tPrimaryVolumePath set before CostFinalize\t\n" "TestPrimaryVolumeSpaceAvailable0\t19\t\tPrimaryVolumeSpaceAvailable set before CostFinalize\t\n" + "TestPrimaryVolumeSpaceRequired0\t19\t\tPrimaryVolumeSpaceRequired set before CostFinalize\t\n" + "TestPrimaryVolumeSpaceRemaining0\t19\t\tPrimaryVolumeSpaceRemaining set before CostFinalize\t\n" "TestPrimaryVolumePath1\t19\t\tPrimaryVolumePath set before InstallValidate\t\n" "TestPrimaryVolumeSpaceAvailable1\t19\t\tPrimaryVolumeSpaceAvailable not set before InstallValidate\t\n" + "TestPrimaryVolumeSpaceRequired1\t19\t\tPrimaryVolumeSpaceRequired not set before InstallValidate\t\n" + "TestPrimaryVolumeSpaceRemaining1\t19\t\tPrimaryVolumeSpaceRemaining not set before InstallValidate\t\n" "TestPrimaryVolumePath2\t19\t\tPrimaryVolumePath not set after InstallValidate\t\n" - "TestPrimaryVolumeSpaceAvailable2\t19\t\tPrimaryVolumeSpaceAvailable not set after InstallValidate\t\n"; + "TestPrimaryVolumeSpaceAvailable2\t19\t\tPrimaryVolumeSpaceAvailable not set after InstallValidate\t\n" + "TestPrimaryVolumeSpaceRequired2\t19\t\tPrimaryVolumeSpaceRequired not set after InstallValidate\t\n" + "TestPrimaryVolumeSpaceRemaining2\t19\t\tPrimaryVolumeSpaceRemaining not set after InstallValidate\t\n"; static const char vp_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" @@ -1126,12 +1132,18 @@ static const char vp_install_exec_seq_dat[] = "FileCost\t\t300\n" "TestPrimaryVolumePath0\tPrimaryVolumePath AND NOT REMOVE\t400\n" "TestPrimaryVolumeSpaceAvailable0\tPrimaryVolumeSpaceAvailable AND NOT REMOVE\t500\n" + "TestPrimaryVolumeSpaceRequired0\tPrimaryVolumeSpaceRequired AND NOT REMOVE\t510\n" + "TestPrimaryVolumeSpaceRemaining0\tPrimaryVolumeSpaceRemaining AND NOT REMOVE\t520\n" "CostFinalize\t\t600\n" "TestPrimaryVolumePath1\tPrimaryVolumePath AND NOT REMOVE\t600\n" "TestPrimaryVolumeSpaceAvailable1\tNOT PrimaryVolumeSpaceAvailable AND NOT REMOVE\t800\n" + "TestPrimaryVolumeSpaceRequired1\tNOT PrimaryVolumeSpaceRequired AND NOT REMOVE\t810\n" + "TestPrimaryVolumeSpaceRemaining1\tNOT PrimaryVolumeSpaceRemaining AND NOT REMOVE\t820\n" "InstallValidate\t\t900\n" "TestPrimaryVolumePath2\tNOT PrimaryVolumePath AND NOT REMOVE\t1000\n" "TestPrimaryVolumeSpaceAvailable2\tNOT PrimaryVolumeSpaceAvailable AND NOT REMOVE\t1100\n" + "TestPrimaryVolumeSpaceRequired2\tNOT PrimaryVolumeSpaceRequired AND NOT REMOVE\t1110\n" + "TestPrimaryVolumeSpaceRemaining2\tNOT PrimaryVolumeSpaceRemaining AND NOT REMOVE\t1120\n" "InstallInitialize\t\t1200\n" "ProcessComponents\t\t1300\n" "RemoveFiles\t\t1400\n"

1 0

Hans Leidekker : wininet/tests: Fix a couple of test failures.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: 1a74ccc8c585ed3c0d5da70b389a8a589162d9f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a74ccc8c585ed3c0d5da70b3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 22 15:59:22 2015 +0200 wininet/tests: Fix a couple of test failures. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wininet/tests/http.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 5f277d8..973413a 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2153,6 +2153,8 @@ static DWORD CALLBACK server_thread(LPVOID param) { if (strstr(buffer, "Content-Length: 100")) { + if (strstr(buffer, "POST /test7b")) + recvfrom(c, buffer, sizeof buffer, 0, NULL, NULL); send(c, okmsg, sizeof okmsg-1, 0); send(c, page1, sizeof page1-1, 0); } @@ -2879,7 +2881,7 @@ static void test_header_handling_order(int port) connect = InternetConnectA(session, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); ok(connect != NULL, "InternetConnect failed\n"); - request = HttpOpenRequestA(connect, "POST", "/test7b", NULL, NULL, types, 0, 0); + request = HttpOpenRequestA(connect, "POST", "/test7b", NULL, NULL, types, INTERNET_FLAG_KEEP_CONNECTION, 0); ok(request != NULL, "HttpOpenRequest failed\n"); ret = HttpAddRequestHeadersA(request, "Content-Length: 100\r\n", ~0u, HTTP_ADDREQ_FLAG_ADD_IF_NEW); @@ -2887,7 +2889,7 @@ static void test_header_handling_order(int port) data_len = sizeof(data); memset(data, 'a', sizeof(data)); - ret = HttpSendRequestA(request, connection, ~0u, data, data_len); + ret = HttpSendRequestA(request, NULL, 0, data, data_len); ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); status = 0;

1 0

Hans Leidekker : wininet/tests: Never use a proxy for connections to localhost.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: d8ddf1b0e1156a8f5a20426f9e526c25bf6c6cf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8ddf1b0e1156a8f5a20426f9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 22 15:59:01 2015 +0200 wininet/tests: Never use a proxy for connections to localhost. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wininet/tests/http.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 10cba19..5f277d8 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2410,7 +2410,7 @@ static void test_proxy_indirect(int port) DWORD r, sz; char buffer[0x40]; - hi = InternetOpenA(NULL, 0, NULL, NULL, 0); + hi = InternetOpenA(NULL, INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); ok(hi != NULL, "open failed\n"); hc = InternetConnectA(hi, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); @@ -3300,7 +3300,7 @@ static void test_no_content(int port) hCompleteEvent = CreateEventW(NULL, FALSE, FALSE, NULL); - session = InternetOpenA("", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, INTERNET_FLAG_ASYNC); + session = InternetOpenA("", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, INTERNET_FLAG_ASYNC); ok(session != NULL,"InternetOpen failed with error %u\n", GetLastError()); pInternetSetStatusCallbackA(session, callback); @@ -3365,7 +3365,7 @@ static void test_conn_close(int port) hCompleteEvent = CreateEventW(NULL, FALSE, FALSE, NULL); conn_close_event = CreateEventW(NULL, FALSE, FALSE, NULL); - session = InternetOpenA("", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, INTERNET_FLAG_ASYNC); + session = InternetOpenA("", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, INTERNET_FLAG_ASYNC); ok(session != NULL,"InternetOpen failed with error %u\n", GetLastError()); pInternetSetStatusCallbackA(session, callback); @@ -4318,7 +4318,7 @@ static void test_accept_encoding(int port) HINTERNET ses, con, req; BOOL ret; - ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); + ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); ok(ses != NULL, "InternetOpen failed\n"); con = InternetConnectA(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); @@ -4356,7 +4356,7 @@ static void test_basic_auth_credentials_reuse(int port) DWORD status, size; BOOL ret; - ses = InternetOpenA( "winetest", 0, NULL, NULL, 0 ); + ses = InternetOpenA( "winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0 ); ok( ses != NULL, "InternetOpenA failed\n" ); con = InternetConnectA( ses, "localhost", port, "user", "pwd", @@ -4379,7 +4379,7 @@ static void test_basic_auth_credentials_reuse(int port) InternetCloseHandle( con ); InternetCloseHandle( ses ); - ses = InternetOpenA( "winetest", 0, NULL, NULL, 0 ); + ses = InternetOpenA( "winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0 ); ok( ses != NULL, "InternetOpenA failed\n" ); con = InternetConnectA( ses, "localhost", port, NULL, NULL, @@ -5692,7 +5692,7 @@ static void test_connection_failure(void) DWORD error; BOOL ret; - session = InternetOpenA("winetest", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); + session = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); ok(session != NULL, "failed to get session handle\n"); connect = InternetConnectA(session, "localhost", 1, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0);

1 0

Dmitry Timoshkov : winhttp: Add custom implementation of IWinHttpRequest:: Invoke(DISPID_HTTPREQUEST_OPTION).
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: 01bfb3d6a6df9311e05315b9a776c25857f9deda URL: http://source.winehq.org/git/wine.git/?a=commit;h=01bfb3d6a6df9311e05315b9a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 3 17:42:14 2015 +0800 winhttp: Add custom implementation of IWinHttpRequest::Invoke(DISPID_HTTPREQUEST_OPTION). --- dlls/winhttp/request.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/winhttp/tests/winhttp.c | 37 ------------------------------------- 2 files changed, 44 insertions(+), 37 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 380edb8..79a319a 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -34,6 +34,7 @@ #include "ole2.h" #include "initguid.h" #include "httprequest.h" +#include "httprequestid.h" #include "winhttp.h" #include "winhttp_private.h" @@ -2946,6 +2947,48 @@ static HRESULT WINAPI winhttp_request_Invoke( TRACE("%p, %d, %s, %d, %d, %p, %p, %p, %p\n", request, member, debugstr_guid(riid), lcid, flags, params, result, excep_info, arg_err); + if (!IsEqualIID( riid, &IID_NULL )) return DISP_E_UNKNOWNINTERFACE; + + if (member == DISPID_HTTPREQUEST_OPTION) + { + VARIANT ret_value, option; + UINT err_pos; + + if (!result) result = &ret_value; + if (!arg_err) arg_err = &err_pos; + + VariantInit( &option ); + VariantInit( result ); + + if (!flags) return S_OK; + + if (flags == DISPATCH_PROPERTYPUT) + { + hr = DispGetParam( params, 0, VT_I4, &option, arg_err ); + if (FAILED(hr)) return hr; + + hr = IWinHttpRequest_put_Option( &request->IWinHttpRequest_iface, V_I4( &option ), params->rgvarg[0] ); + if (FAILED(hr)) + WARN("put_Option(%d) failed: %x\n", V_I4( &option ), hr); + return hr; + } + else if (flags & (DISPATCH_PROPERTYGET | DISPATCH_METHOD)) + { + hr = DispGetParam( params, 0, VT_I4, &option, arg_err ); + if (FAILED(hr)) return hr; + + hr = IWinHttpRequest_get_Option( &request->IWinHttpRequest_iface, V_I4( &option ), result ); + if (FAILED(hr)) + WARN("get_Option(%d) failed: %x\n", V_I4( &option ), hr); + return hr; + } + + FIXME("unsupported flags %x\n", flags); + return E_NOTIMPL; + } + + /* fallback to standard implementation */ + hr = get_typeinfo( IWinHttpRequest_tid, &typeinfo ); if (SUCCEEDED(hr)) { @@ -4216,6 +4259,7 @@ HRESULT WinHttpRequest_create( void **obj ) request->state = REQUEST_STATE_UNINITIALIZED; request->proxy.lpszProxy = NULL; request->proxy.lpszProxyBypass = NULL; + request->url_codepage = CP_UTF8; InitializeCriticalSection( &request->cs ); request->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": winhttp_request.cs"); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 0ecd5ab..381a9c4 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -3569,7 +3569,6 @@ static void request_get_property(IWinHttpRequest *request, int property, VARIANT VariantInit(ret); hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_PROPERTYGET, &params, ret, NULL, NULL); -todo_wine ok(hr == S_OK, "error %#x\n", hr); } @@ -3614,9 +3613,7 @@ static void test_IWinHttpRequest_Invoke(void) ok(id == DISPID_HTTPREQUEST_OPTION, "expected DISPID_HTTPREQUEST_OPTION, got %u\n", id); request_get_property(request, WinHttpRequestOption_URLCodePage, &ret); -todo_wine ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %d\n", V_VT(&ret)); -todo_wine ok(V_I4(&ret) == CP_UTF8, "expected CP_UTF8, got %d\n", V_I4(&ret)); memset(&params, 0, sizeof(params)); @@ -3630,13 +3627,10 @@ todo_wine VariantInit(&ret); hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_METHOD, &params, NULL, NULL, &err); -todo_wine ok(hr == S_OK, "error %#x\n", hr); request_get_property(request, WinHttpRequestOption_URLCodePage, &ret); -todo_wine ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %d\n", V_VT(&ret)); -todo_wine ok(V_I4(&ret) == CP_UTF8, "expected CP_UTF8, got %d\n", V_I4(&ret)); memset(&params, 0, sizeof(params)); @@ -3650,13 +3644,10 @@ todo_wine VariantInit(&ret); hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_METHOD | DISPATCH_PROPERTYPUT, &params, NULL, NULL, &err); -todo_wine ok(hr == S_OK, "error %#x\n", hr); request_get_property(request, WinHttpRequestOption_URLCodePage, &ret); -todo_wine ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %d\n", V_VT(&ret)); -todo_wine ok(V_I4(&ret) == CP_UTF8, "expected CP_UTF8, got %d\n", V_I4(&ret)); memset(&params, 0, sizeof(params)); @@ -3670,13 +3661,10 @@ todo_wine VariantInit(&ret); hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_PROPERTYPUT, &params, NULL, NULL, &err); -todo_wine ok(hr == S_OK, "error %#x\n", hr); request_get_property(request, WinHttpRequestOption_URLCodePage, &ret); -todo_wine ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %d\n", V_VT(&ret)); -todo_wine ok(V_I4(&ret) == 1252, "expected 1252, got %d\n", V_I4(&ret)); memset(&params, 0, sizeof(params)); @@ -3689,39 +3677,29 @@ todo_wine V_VT(&arg[1]) = VT_R8; V_R8(&arg[1]) = 2.0; /* WinHttpRequestOption_URLCodePage */ hr = IWinHttpRequest_Invoke(request, id, &IID_NULL, 0, DISPATCH_METHOD, &params, NULL, NULL, &err); -todo_wine ok(hr == S_OK, "error %#x\n", hr); request_get_property(request, WinHttpRequestOption_URLCodePage, &ret); -todo_wine ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %d\n", V_VT(&ret)); -todo_wine ok(V_I4(&ret) == 1252, "expected 1252, got %d\n", V_I4(&ret)); VariantInit(&ret); hr = IWinHttpRequest_Invoke(request, id, &IID_NULL, 0, DISPATCH_METHOD, &params, &ret, NULL, &err); -todo_wine ok(hr == S_OK, "error %#x\n", hr); request_get_property(request, WinHttpRequestOption_URLCodePage, &ret); -todo_wine ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %d\n", V_VT(&ret)); -todo_wine ok(V_I4(&ret) == 1252, "expected 1252, got %d\n", V_I4(&ret)); VariantInit(&ret); hr = IWinHttpRequest_Invoke(request, id, &IID_NULL, 0, DISPATCH_PROPERTYPUT, &params, &ret, NULL, &err); -todo_wine ok(hr == S_OK, "error %#x\n", hr); request_get_property(request, WinHttpRequestOption_URLCodePage, &ret); -todo_wine ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %d\n", V_VT(&ret)); -todo_wine ok(V_I4(&ret) == CP_UTF8, "expected CP_UTF8, got %d\n", V_I4(&ret)); hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_PROPERTYPUT, &params, NULL, NULL, NULL); -todo_wine ok(hr == S_OK, "error %#x\n", hr); hr = IWinHttpRequest_Invoke(request, 255, &IID_NULL, 0, DISPATCH_PROPERTYPUT, &params, NULL, NULL, NULL); @@ -3729,7 +3707,6 @@ todo_wine VariantInit(&ret); hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_IUnknown, 0, DISPATCH_PROPERTYPUT, &params, &ret, NULL, &err); -todo_wine ok(hr == DISP_E_UNKNOWNINTERFACE, "error %#x\n", hr); VariantInit(&ret); @@ -3738,7 +3715,6 @@ if (0) /* crashes */ params.cArgs = 1; hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_PROPERTYPUT, &params, &ret, NULL, &err); -todo_wine ok(hr == DISP_E_TYPEMISMATCH, "error %#x\n", hr); VariantInit(&arg[2]); @@ -3755,48 +3731,36 @@ todo_wine V_VT(&arg[0]) = VT_I4; V_I4(&arg[0]) = WinHttpRequestOption_URLCodePage; hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_PROPERTYGET, &params, NULL, NULL, NULL); -todo_wine ok(hr == S_OK, "error %#x\n", hr); V_VT(&ret) = 0xdead; V_I4(&ret) = 0xbeef; hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_METHOD|DISPATCH_PROPERTYGET, &params, &ret, NULL, NULL); -todo_wine ok(hr == S_OK, "error %#x\n", hr); -todo_wine ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %d\n", V_VT(&ret)); -todo_wine ok(V_I4(&ret) == CP_UTF8, "expected CP_UTF8, got %d\n", V_I4(&ret)); V_VT(&ret) = 0xdead; V_I4(&ret) = 0xbeef; hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_METHOD, &params, &ret, NULL, NULL); -todo_wine ok(hr == S_OK, "error %#x\n", hr); -todo_wine ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %d\n", V_VT(&ret)); -todo_wine ok(V_I4(&ret) == CP_UTF8, "expected CP_UTF8, got %d\n", V_I4(&ret)); hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_METHOD|DISPATCH_PROPERTYGET, &params, NULL, NULL, NULL); -todo_wine ok(hr == S_OK, "error %#x\n", hr); V_VT(&ret) = 0xdead; V_I4(&ret) = 0xbeef; hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, 0, &params, &ret, NULL, NULL); -todo_wine ok(hr == S_OK, "error %#x\n", hr); -todo_wine ok(V_VT(&ret) == VT_EMPTY, "expected VT_EMPTY, got %d\n", V_VT(&ret)); ok(V_I4(&ret) == 0xbeef || V_I4(&ret) == 0 /* Win8 */, "expected 0xdead, got %d\n", V_I4(&ret)); hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, 0, &params, NULL, NULL, NULL); -todo_wine ok(hr == S_OK, "error %#x\n", hr); hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_IUnknown, 0, DISPATCH_PROPERTYGET, &params, NULL, NULL, NULL); -todo_wine ok(hr == DISP_E_UNKNOWNINTERFACE, "error %#x\n", hr); params.cArgs = 2; @@ -3806,7 +3770,6 @@ todo_wine params.cArgs = 0; hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_PROPERTYGET, &params, NULL, NULL, NULL); -todo_wine ok(hr == DISP_E_PARAMNOTFOUND, "error %#x\n", hr); SysFreeString(utf8);

1 0

YongHao Hu : msvcp120/tests: Add tr2_sys__Last_write_time test.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: c1737515d5aae6b7a9b57ce112aac565204faaa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1737515d5aae6b7a9b57ce11… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Sat Sep 19 08:44:06 2015 +0800 msvcp120/tests: Add tr2_sys__Last_write_time test. --- dlls/msvcp120/tests/msvcp120.c | 47 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 9255ff1..bf7ed8f 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -108,6 +108,8 @@ static struct space_info (__cdecl *p_tr2_sys__Statvfs)(char const*); static struct space_info (__cdecl *p_tr2_sys__Statvfs_wchar)(WCHAR const*); static enum file_type (__cdecl *p_tr2_sys__Stat)(char const*, int *); static enum file_type (__cdecl *p_tr2_sys__Lstat)(char const*, int *); +static __int64 (__cdecl *p_tr2_sys__Last_write_time)(char const*); +static void (__cdecl *p_tr2_sys__Last_write_time_set)(char const*, __int64); static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) @@ -178,6 +180,10 @@ static BOOL init(void) "?_Stat@sys@tr2@std@@YA?AW4file_type@123@PEBDAEAH@Z"); SET(p_tr2_sys__Lstat, "?_Lstat@sys@tr2@std@@YA?AW4file_type@123@PEBDAEAH@Z"); + SET(p_tr2_sys__Last_write_time, + "?_Last_write_time@sys@tr2@std@@YA_JPEBD@Z"); + SET(p_tr2_sys__Last_write_time_set, + "?_Last_write_time@sys@tr2@std@@YAXPEBD_J@Z"); } else { SET(p_tr2_sys__File_size, "?_File_size@sys@tr2@std@@YA_KPBD@Z"); @@ -219,6 +225,10 @@ static BOOL init(void) "?_Stat@sys@tr2@std@@YA?AW4file_type@123@PBDAAH@Z"); SET(p_tr2_sys__Lstat, "?_Lstat@sys@tr2@std@@YA?AW4file_type@123@PBDAAH@Z"); + SET(p_tr2_sys__Last_write_time, + "?_Last_write_time@sys@tr2@std@@YA_JPBD@Z"); + SET(p_tr2_sys__Last_write_time_set, + "?_Last_write_time@sys@tr2@std@@YAXPBD_J@Z"); } msvcr = GetModuleHandleA("msvcr120.dll"); @@ -946,6 +956,42 @@ static void test_tr2_sys__Stat(void) ok(RemoveDirectoryA("tr2_test_dir"), "expect tr2_test_dir to exist\n"); } +static void test_tr2_sys__Last_write_time(void) +{ + HANDLE file; + int ret; + __int64 last_write_time, newtime; + ret = p_tr2_sys__Make_dir("tr2_test_dir"); + ok(ret == 1, "tr2_sys__Make_dir() expect 1 got %d\n", ret); + + file = CreateFileA("tr2_test_dir/f1", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); + CloseHandle(file); + + last_write_time = p_tr2_sys__Last_write_time("tr2_test_dir/f1"); + newtime = last_write_time + 123456789; + p_tr2_sys__Last_write_time_set("tr2_test_dir/f1", newtime); + todo_wine ok(last_write_time == p_tr2_sys__Last_write_time("tr2_test_dir/f1"), + "last_write_time before modfied should not equal to last_write_time %s\n", + debugstr_longlong(last_write_time)); + + errno = 0xdeadbeef; + last_write_time = p_tr2_sys__Last_write_time("not_exist"); + ok(errno == 0xdeadbeef, "tr2_sys__Last_write_time(): errno expect 0xdeadbeef, got %d\n", errno); + ok(last_write_time == 0, "expect 0 got %s\n", debugstr_longlong(last_write_time)); + last_write_time = p_tr2_sys__Last_write_time(NULL); + ok(last_write_time == 0, "expect 0 got %s\n", debugstr_longlong(last_write_time)); + + p_tr2_sys__Last_write_time_set("not_exist", newtime); + errno = 0xdeadbeef; + p_tr2_sys__Last_write_time_set(NULL, newtime); + ok(errno == 0xdeadbeef, "tr2_sys__Last_write_time(): errno expect 0xdeadbeef, got %d\n", errno); + + ok(DeleteFileA("tr2_test_dir/f1"), "expect tr2_test_dir/f1 to exist\n"); + ret = p_tr2_sys__Remove_dir("tr2_test_dir"); + ok(ret == 1, "test_tr2_sys__Remove_dir(): expect 1 got %d\n", ret); +} + START_TEST(msvcp120) { if(!init()) return; @@ -966,5 +1012,6 @@ START_TEST(msvcp120) test_tr2_sys__Rename(); test_tr2_sys__Statvfs(); test_tr2_sys__Stat(); + test_tr2_sys__Last_write_time(); FreeLibrary(msvcp); }

1 0

YongHao Hu : msvcp110: Add tr2_sys__Last_write_time implementation and test.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: a6dc6ac4ff73d52f9634bf80e8dc6e0b495ca32e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6dc6ac4ff73d52f9634bf80e… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Sat Sep 19 08:43:31 2015 +0800 msvcp110: Add tr2_sys__Last_write_time implementation and test. --- configure | 1 + configure.ac | 1 + dlls/msvcp110/msvcp110.spec | 8 +- dlls/msvcp110/tests/Makefile.in | 5 ++ dlls/msvcp110/tests/msvcp110.c | 163 ++++++++++++++++++++++++++++++++++++ dlls/msvcp120/msvcp120.spec | 8 +- dlls/msvcp120_app/msvcp120_app.spec | 8 +- dlls/msvcp90/ios.c | 59 +++++++++++++ 8 files changed, 241 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a6dc6ac4ff73d52f9634b…

1 0

Iván Matellanes : msvcirt: Implement strstreambuf:: seekoff.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: 24d57405acca3fb3352ef0d20c93d5b74dd045a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24d57405acca3fb3352ef0d20… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Sep 23 15:49:04 2015 +0200 msvcirt: Implement strstreambuf::seekoff. --- dlls/msvcirt/msvcirt.c | 39 ++++++++++++++- dlls/msvcirt/tests/msvcirt.c | 112 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 148 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=24d57405acca3fb3352ef…

1 0

Józef Kucia : d3d11: Rename d3d10_device_inner to d3d_device_inner.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: 9754cda53bdeb2354a75711fba27df15cfaf259c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9754cda53bdeb2354a75711fb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Sep 27 18:50:00 2015 +0200 d3d11: Rename d3d10_device_inner to d3d_device_inner. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/device.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index efa52ee..f56d3a9 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -563,7 +563,7 @@ static inline struct d3d_device *impl_from_IUnknown(IUnknown *iface) return CONTAINING_RECORD(iface, struct d3d_device, IUnknown_inner); } -static HRESULT STDMETHODCALLTYPE d3d10_device_inner_QueryInterface(IUnknown *iface, REFIID riid, void **out) +static HRESULT STDMETHODCALLTYPE d3d_device_inner_QueryInterface(IUnknown *iface, REFIID riid, void **out) { struct d3d_device *device = impl_from_IUnknown(iface); @@ -598,17 +598,17 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_inner_QueryInterface(IUnknown *ifa return S_OK; } -static ULONG STDMETHODCALLTYPE d3d10_device_inner_AddRef(IUnknown *iface) +static ULONG STDMETHODCALLTYPE d3d_device_inner_AddRef(IUnknown *iface) { - struct d3d_device *This = impl_from_IUnknown(iface); - ULONG refcount = InterlockedIncrement(&This->refcount); + struct d3d_device *device = impl_from_IUnknown(iface); + ULONG refcount = InterlockedIncrement(&device->refcount); - TRACE("%p increasing refcount to %u\n", This, refcount); + TRACE("%p increasing refcount to %u.\n", device, refcount); return refcount; } -static ULONG STDMETHODCALLTYPE d3d10_device_inner_Release(IUnknown *iface) +static ULONG STDMETHODCALLTYPE d3d_device_inner_Release(IUnknown *iface) { struct d3d_device *device = impl_from_IUnknown(iface); ULONG refcount = InterlockedDecrement(&device->refcount); @@ -2786,12 +2786,12 @@ static const struct ID3D10Device1Vtbl d3d10_device1_vtbl = d3d10_device_GetFeatureLevel, }; -static const struct IUnknownVtbl d3d10_device_inner_unknown_vtbl = +static const struct IUnknownVtbl d3d_device_inner_unknown_vtbl = { /* IUnknown methods */ - d3d10_device_inner_QueryInterface, - d3d10_device_inner_AddRef, - d3d10_device_inner_Release, + d3d_device_inner_QueryInterface, + d3d_device_inner_AddRef, + d3d_device_inner_Release, }; /* ID3D10Multithread methods */ @@ -3125,7 +3125,7 @@ static const struct wine_rb_functions d3d_rasterizer_state_rb_ops = HRESULT d3d_device_init(struct d3d_device *device, void *outer_unknown) { - device->IUnknown_inner.lpVtbl = &d3d10_device_inner_unknown_vtbl; + device->IUnknown_inner.lpVtbl = &d3d_device_inner_unknown_vtbl; device->ID3D11Device_iface.lpVtbl = &d3d11_device_vtbl; device->ID3D10Device1_iface.lpVtbl = &d3d10_device1_vtbl; device->ID3D10Multithread_iface.lpVtbl = &d3d10_multithread_vtbl;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2015