October 2015 - Wine-Commits

Iván Matellanes : msvcirt: Implement strstreambuf:: seekoff.
by Alexandre Julliard Oct. 1, 2015

Oct. 1, 2015

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

YongHao Hu : msvcp110: Add tr2_sys__Last_write_time implementation and test.
by Alexandre Julliard Oct. 1, 2015

Oct. 1, 2015

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

Dmitry Timoshkov : winhttp: Add custom implementation of IWinHttpRequest:: Invoke(DISPID_HTTPREQUEST_OPTION).
by Alexandre Julliard Oct. 1, 2015

Oct. 1, 2015

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

Sebastian Lackner : server: Always switch back to server dir when open_fd returns.
by Alexandre Julliard Oct. 1, 2015

Oct. 1, 2015

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

Józef Kucia : d3d11: Rename d3d10_rb_{alloc, realloc, free} to d3d_rb_{alloc, realloc, free}.
by Alexandre Julliard Oct. 1, 2015

Oct. 1, 2015

Module: wine Branch: master Commit: 3068f0470d978d353b1c6e73ccb7434f14948d5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3068f0470d978d353b1c6e73c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Sep 27 18:49:55 2015 +0200 d3d11: Rename d3d10_rb_{alloc, realloc, free} to d3d_rb_{alloc, realloc, free}. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/device.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index ee492ca..73ff58e 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3038,17 +3038,17 @@ static const struct wined3d_device_parent_ops d3d10_wined3d_device_parent_ops = device_parent_create_swapchain, }; -static void *d3d10_rb_alloc(size_t size) +static void *d3d_rb_alloc(size_t size) { return HeapAlloc(GetProcessHeap(), 0, size); } -static void *d3d10_rb_realloc(void *ptr, size_t size) +static void *d3d_rb_realloc(void *ptr, size_t size) { return HeapReAlloc(GetProcessHeap(), 0, ptr, size); } -static void d3d10_rb_free(void *ptr) +static void d3d_rb_free(void *ptr) { HeapFree(GetProcessHeap(), 0, ptr); } @@ -3063,9 +3063,9 @@ static int d3d10_sampler_state_compare(const void *key, const struct wine_rb_ent static const struct wine_rb_functions d3d10_sampler_state_rb_ops = { - d3d10_rb_alloc, - d3d10_rb_realloc, - d3d10_rb_free, + d3d_rb_alloc, + d3d_rb_realloc, + d3d_rb_free, d3d10_sampler_state_compare, }; @@ -3079,9 +3079,9 @@ static int d3d10_blend_state_compare(const void *key, const struct wine_rb_entry static const struct wine_rb_functions d3d10_blend_state_rb_ops = { - d3d10_rb_alloc, - d3d10_rb_realloc, - d3d10_rb_free, + d3d_rb_alloc, + d3d_rb_realloc, + d3d_rb_free, d3d10_blend_state_compare, }; @@ -3096,9 +3096,9 @@ static int d3d10_depthstencil_state_compare(const void *key, const struct wine_r static const struct wine_rb_functions d3d10_depthstencil_state_rb_ops = { - d3d10_rb_alloc, - d3d10_rb_realloc, - d3d10_rb_free, + d3d_rb_alloc, + d3d_rb_realloc, + d3d_rb_free, d3d10_depthstencil_state_compare, }; @@ -3112,9 +3112,9 @@ static int d3d_rasterizer_state_compare(const void *key, const struct wine_rb_en static const struct wine_rb_functions d3d_rasterizer_state_rb_ops = { - d3d10_rb_alloc, - d3d10_rb_realloc, - d3d10_rb_free, + d3d_rb_alloc, + d3d_rb_realloc, + d3d_rb_free, d3d_rasterizer_state_compare, };

1 0

YongHao Hu : msvcp120/tests: Add tr2_sys__Last_write_time test.
by Alexandre Julliard Oct. 1, 2015

Oct. 1, 2015

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(a)sys@tr2(a)std@@YA?AW4file_type(a)123@PEBDAEAH(a)Z"); SET(p_tr2_sys__Lstat, "?_Lstat(a)sys@tr2(a)std@@YA?AW4file_type(a)123@PEBDAEAH(a)Z"); + SET(p_tr2_sys__Last_write_time, + "?_Last_write_time(a)sys@tr2(a)std@@YA_JPEBD(a)Z"); + SET(p_tr2_sys__Last_write_time_set, + "?_Last_write_time(a)sys@tr2(a)std@@YAXPEBD_J(a)Z"); } else { SET(p_tr2_sys__File_size, "?_File_size(a)sys@tr2(a)std@@YA_KPBD(a)Z"); @@ -219,6 +225,10 @@ static BOOL init(void) "?_Stat(a)sys@tr2(a)std@@YA?AW4file_type(a)123@PBDAAH(a)Z"); SET(p_tr2_sys__Lstat, "?_Lstat(a)sys@tr2(a)std@@YA?AW4file_type(a)123@PBDAAH(a)Z"); + SET(p_tr2_sys__Last_write_time, + "?_Last_write_time(a)sys@tr2(a)std@@YA_JPBD(a)Z"); + SET(p_tr2_sys__Last_write_time_set, + "?_Last_write_time(a)sys@tr2(a)std@@YAXPBD_J(a)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

Józef Kucia : d3d11: Rename d3d10_device_init() to d3d_device_init().
by Alexandre Julliard Oct. 1, 2015

Oct. 1, 2015

Module: wine Branch: master Commit: 5fb028139973c94b67cc22b2c9d2cc3095240037 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fb028139973c94b67cc22b2c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Sep 27 18:49:59 2015 +0200 d3d11: Rename d3d10_device_init() to d3d_device_init(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/d3d11_main.c | 2 +- dlls/d3d11/d3d11_private.h | 2 +- dlls/d3d11/device.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c index 5d35f10..5be4cd0 100644 --- a/dlls/d3d11/d3d11_main.c +++ b/dlls/d3d11/d3d11_main.c @@ -88,7 +88,7 @@ static HRESULT WINAPI layer_create(enum dxgi_device_layer_id id, void **layer_ba } object = *layer_base; - if (FAILED(hr = d3d10_device_init(object, device_object))) + if (FAILED(hr = d3d_device_init(object, device_object))) { WARN("Failed to initialize device, hr %#x.\n", hr); *device_layer = NULL; diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 671a5b5..6d9489a 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -392,7 +392,7 @@ static inline struct d3d_device *impl_from_ID3D10Device(ID3D10Device1 *iface) return CONTAINING_RECORD(iface, struct d3d_device, ID3D10Device1_iface); } -HRESULT d3d10_device_init(struct d3d_device *device, void *outer_unknown) DECLSPEC_HIDDEN; +HRESULT d3d_device_init(struct d3d_device *device, void *outer_unknown) DECLSPEC_HIDDEN; /* Layered device */ enum dxgi_device_layer_id diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index ed45ebe..efa52ee 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3123,7 +3123,7 @@ static const struct wine_rb_functions d3d_rasterizer_state_rb_ops = d3d_rasterizer_state_compare, }; -HRESULT d3d10_device_init(struct d3d_device *device, void *outer_unknown) +HRESULT d3d_device_init(struct d3d_device *device, void *outer_unknown) { device->IUnknown_inner.lpVtbl = &d3d10_device_inner_unknown_vtbl; device->ID3D11Device_iface.lpVtbl = &d3d11_device_vtbl;

1 0

Hans Leidekker : wininet/tests: Never use a proxy for connections to localhost.
by Alexandre Julliard Oct. 1, 2015

Oct. 1, 2015

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

Jacek Caban : winetest: Reject test runs from win2k.
by Alexandre Julliard Oct. 1, 2015

Oct. 1, 2015

Module: tools Branch: master Commit: 4d3af77617527501651acf4825a56efcc524c3ac URL: http://source.winehq.org/git/tools.git/?a=commit;h=4d3af77617527501651acf48… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 30 13:20:37 2015 +0200 winetest: Reject test runs from win2k. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- winetest/dissect | 1 + 1 file changed, 1 insertion(+) diff --git a/winetest/dissect b/winetest/dissect index 067fa7b..62cd997 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -181,6 +181,7 @@ if ($plid==1 && $major==4) { } elsif ($major==5) { if ($minor==0) { $version = "2000"; + $prediluvian = 1; } elsif ($minor==1) { $version = "xp"; } elsif ($minor==2) {

1 0