March 2014 - Wine-Commits - list.winehq.org

Dmitry Timoshkov : taskschd: Implement ITaskService::get_HighestVersion.
by Alexandre Julliard March 13, 2014

March 13, 2014

Module: wine Branch: master Commit: 38dcd677c8c8bcd1d1e00710fb3bd747d0c21b84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38dcd677c8c8bcd1d1e00710f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 7 12:10:53 2014 +0900 taskschd: Implement ITaskService::get_HighestVersion. --- dlls/taskschd/Makefile.in | 6 ++- dlls/taskschd/schrpc.idl | 3 ++ dlls/taskschd/task.c | 101 ++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 106 insertions(+), 4 deletions(-) diff --git a/dlls/taskschd/Makefile.in b/dlls/taskschd/Makefile.in index afbb2ad..c6df2a3 100644 --- a/dlls/taskschd/Makefile.in +++ b/dlls/taskschd/Makefile.in @@ -1,5 +1,5 @@ MODULE = taskschd.dll -IMPORTS = oleaut32 ole32 advapi32 xmllite +IMPORTS = oleaut32 ole32 advapi32 xmllite rpcrt4 C_SRCS = \ folder.c \ @@ -8,4 +8,6 @@ C_SRCS = \ task.c \ taskschd.c -IDL_SRCS = taskschd_tlb.idl +IDL_SRCS = \ + schrpc.idl \ + taskschd_tlb.idl diff --git a/dlls/taskschd/schrpc.idl b/dlls/taskschd/schrpc.idl new file mode 100644 index 0000000..d8bca06 --- /dev/null +++ b/dlls/taskschd/schrpc.idl @@ -0,0 +1,3 @@ +#pragma makedep client + +#include "wine/schrpc.idl" diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 41ff843..e6e61c7 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -26,6 +26,8 @@ #include "objbase.h" #include "xmllite.h" #include "taskschd.h" +#include "winsvc.h" +#include "schrpc.h" #include "taskschd_private.h" #include "wine/unicode.h" @@ -2257,6 +2259,7 @@ typedef struct ITaskService ITaskService_iface; LONG ref; BOOL connected; + DWORD version; WCHAR comp_name[MAX_COMPUTERNAME_LENGTH + 1]; } TaskService; @@ -2370,11 +2373,70 @@ static inline BOOL is_variant_null(const VARIANT *var) (V_VT(var) == VT_BSTR && (V_BSTR(var) == NULL || !*V_BSTR(var))); } +static HRESULT start_schedsvc(void) +{ + static const WCHAR scheduleW[] = { 'S','c','h','e','d','u','l','e',0 }; + SC_HANDLE scm, service; + SERVICE_STATUS_PROCESS status; + ULONGLONG start_time; + HRESULT hr = SCHED_E_SERVICE_NOT_RUNNING; + + TRACE("Trying to start %s service\n", debugstr_w(scheduleW)); + + scm = OpenSCManagerW(NULL, NULL, 0); + if (!scm) return SCHED_E_SERVICE_NOT_INSTALLED; + + service = OpenServiceW(scm, scheduleW, SERVICE_START | SERVICE_QUERY_STATUS); + if (service) + { + if (StartServiceW(service, 0, NULL) || GetLastError() == ERROR_SERVICE_ALREADY_RUNNING) + { + start_time = GetTickCount64(); + do + { + DWORD dummy; + + if (!QueryServiceStatusEx(service, SC_STATUS_PROCESS_INFO, (BYTE *)&status, sizeof(status), &dummy)) + { + WARN("failed to query scheduler status (%u)\n", GetLastError()); + break; + } + + if (status.dwCurrentState == SERVICE_RUNNING) + { + hr = S_OK; + break; + } + + if (GetTickCount64() - start_time > 30000) break; + Sleep(1000); + + } while (status.dwCurrentState == SERVICE_START_PENDING); + + if (status.dwCurrentState != SERVICE_RUNNING) + WARN("scheduler failed to start %u\n", status.dwCurrentState); + } + else + WARN("failed to start scheduler service (%u)\n", GetLastError()); + + CloseServiceHandle(service); + } + else + WARN("failed to open scheduler service (%u)\n", GetLastError()); + + CloseServiceHandle(scm); + return hr; +} + static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, VARIANT user, VARIANT domain, VARIANT password) { + static WCHAR ncalrpc[] = { 'n','c','a','l','r','p','c',0 }; TaskService *task_svc = impl_from_ITaskService(iface); WCHAR comp_name[MAX_COMPUTERNAME_LENGTH + 1]; DWORD len; + HRESULT hr; + RPC_WSTR binding_str; + extern handle_t rpc_handle; TRACE("%p,%s,%s,%s,%s\n", iface, debugstr_variant(&server), debugstr_variant(&user), debugstr_variant(&domain), debugstr_variant(&password)); @@ -2408,6 +2470,21 @@ static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, V } } + hr = start_schedsvc(); + if (hr != S_OK) return hr; + + hr = RpcStringBindingComposeW(NULL, ncalrpc, NULL, NULL, NULL, &binding_str); + if (hr != RPC_S_OK) return hr; + hr = RpcBindingFromStringBindingW(binding_str, &rpc_handle); + if (hr != RPC_S_OK) return hr; + RpcStringFreeW(&binding_str); + + /* Make sure that the connection works */ + hr = SchRpcHighestVersion(&task_svc->version); + if (hr != S_OK) return hr; + + TRACE("server version %#x\n", task_svc->version); + strcpyW(task_svc->comp_name, comp_name); task_svc->connected = TRUE; @@ -2458,8 +2535,18 @@ static HRESULT WINAPI TaskService_get_ConnectedDomain(ITaskService *iface, BSTR static HRESULT WINAPI TaskService_get_HighestVersion(ITaskService *iface, DWORD *version) { - FIXME("%p,%p: stub\n", iface, version); - return E_NOTIMPL; + TaskService *task_svc = impl_from_ITaskService(iface); + + TRACE("%p,%p\n", iface, version); + + if (!version) return E_POINTER; + + if (!task_svc->connected) + return HRESULT_FROM_WIN32(ERROR_ONLY_IF_CONNECTED); + + *version = task_svc->version; + + return S_OK; } static const ITaskServiceVtbl TaskService_vtbl = @@ -2498,3 +2585,13 @@ HRESULT TaskService_create(void **obj) return S_OK; } + +void __RPC_FAR *__RPC_USER MIDL_user_allocate(SIZE_T n) +{ + return HeapAlloc(GetProcessHeap(), 0, n); +} + +void __RPC_USER MIDL_user_free(void __RPC_FAR *p) +{ + HeapFree(GetProcessHeap(), 0, p); +}

1 0

Nikolay Sivov : msxml3: Fix some test failures on Win8.1.
by Alexandre Julliard March 13, 2014

March 13, 2014

Module: wine Branch: master Commit: c7d45060e5a246ad79ab848e76387f1f1039b490 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7d45060e5a246ad79ab848e7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 13 21:15:47 2014 +0400 msxml3: Fix some test failures on Win8.1. --- dlls/msxml3/schema.c | 12 ++++++++++-- dlls/msxml3/tests/domdoc.c | 28 +++++++++++++++++----------- 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index 5bfabb3..2b2882c 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -1292,11 +1292,17 @@ static HRESULT WINAPI schema_cache_get(IXMLDOMSchemaCollection2* iface, BSTR uri TRACE("(%p)->(%s %p)\n", This, debugstr_w(uri), node); - if (This->version == MSXML6) return E_NOTIMPL; + if (This->version == MSXML6) + { + if (node) *node = NULL; + return E_NOTIMPL; + } if (!node) return E_POINTER; + *node = NULL; + name = uri ? xmlchar_from_wchar(uri) : xmlchar_from_wchar(emptyW); entry = (cache_entry*) xmlHashLookup(This->cache, name); heap_free(name); @@ -1305,7 +1311,6 @@ static HRESULT WINAPI schema_cache_get(IXMLDOMSchemaCollection2* iface, BSTR uri if (entry && entry->doc) return get_domdoc_from_xmldoc(entry->doc, (IXMLDOMDocument3**)node); - *node = NULL; return S_OK; } @@ -1344,6 +1349,9 @@ static HRESULT WINAPI schema_cache_get_namespaceURI(IXMLDOMSchemaCollection2* if if (!uri) return E_POINTER; + if (This->version == MSXML6) + *uri = NULL; + if (index >= This->count) return E_FAIL; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 79805cc..dd40133 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -10382,7 +10382,8 @@ static void test_dispex(void) hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08x\n", hr); ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); - ok(V_DISPATCH(&ret) == (void*)0x1, "got %p\n", V_DISPATCH(&ret)); +todo_wine + ok(broken(V_DISPATCH(&ret) == (void*)0x1) || (V_DISPATCH(&ret) == NULL), "got %p\n", V_DISPATCH(&ret)); V_VT(&arg) = VT_I4; V_I4(&arg) = 0; @@ -10396,7 +10397,8 @@ static void test_dispex(void) hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08x\n", hr); ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); - ok(V_DISPATCH(&ret) == (void*)0x1, "got %p\n", V_DISPATCH(&ret)); +todo_wine + ok(broken(V_DISPATCH(&ret) == (void*)0x1) || (V_DISPATCH(&ret) == NULL), "got %p\n", V_DISPATCH(&ret)); V_VT(&arg) = VT_I4; V_I4(&arg) = 0; @@ -10448,7 +10450,8 @@ static void test_dispex(void) hr = IDispatchEx_Invoke(dispex, DISPID_DOM_NODELIST_LENGTH, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); ok(hr == DISP_E_MEMBERNOTFOUND, "got 0x%08x\n", hr); ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); - ok(V_I4(&ret) == 1, "got %d\n", V_I4(&ret)); +todo_wine + ok(broken(V_I4(&ret) == 1) || (V_I4(&ret) == 0), "got %d\n", V_I4(&ret)); IXMLDOMNodeList_Release(node_list); @@ -10473,7 +10476,8 @@ static void test_dispex(void) hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); ok(hr == DISP_E_MEMBERNOTFOUND, "got 0x%08x\n", hr); ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); - ok(V_DISPATCH(&ret) == (void*)0x1, "got %p\n", V_DISPATCH(&ret)); +todo_wine + ok(broken(V_DISPATCH(&ret) == (void*)0x1) || (V_DISPATCH(&ret) == NULL), "got %p\n", V_DISPATCH(&ret)); IDispatchEx_Release(dispex); @@ -10547,8 +10551,9 @@ static void test_dispex(void) todo_wine { ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08x\n", hr); ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); - ok(V_DISPATCH(&ret) == (void*)0x1, "got %p\n", V_DISPATCH(&ret)); } + ok(broken(V_DISPATCH(&ret) == (void*)0x1) || (V_DISPATCH(&ret) == NULL), "got %p\n", V_DISPATCH(&ret)); + V_VT(&arg) = VT_I4; V_I4(&arg) = 0; dispparams.cArgs = 2; @@ -10562,8 +10567,9 @@ todo_wine { todo_wine { ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08x\n", hr); ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); - ok(V_DISPATCH(&ret) == (void*)0x1, "got %p\n", V_DISPATCH(&ret)); } + ok(broken(V_DISPATCH(&ret) == (void*)0x1) || (V_DISPATCH(&ret) == NULL), "got %p\n", V_DISPATCH(&ret)); + V_VT(&arg) = VT_I4; V_I4(&arg) = 0; dispparams.cArgs = 1; @@ -10614,10 +10620,10 @@ todo_wine V_I4(&ret) = 1; hr = IDispatchEx_Invoke(dispex, DISPID_DOM_NODELIST_LENGTH, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); ok(hr == DISP_E_MEMBERNOTFOUND, "got 0x%08x\n", hr); -todo_wine { +todo_wine ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); - ok(V_I4(&ret) == 1, "got %d\n", V_I4(&ret)); -} + ok(broken(V_I4(&ret) == 1) || (V_I4(&ret) == 0), "got %d\n", V_I4(&ret)); + IXMLDOMNamedNodeMap_Release(map); IXMLDOMElement_Release(elem); @@ -11265,7 +11271,7 @@ static void test_get_namespaces(void) node = (void*)0xdeadbeef; hr = IXMLDOMSchemaCollection_get(collection, _bstr_("http://blah.org"), &node); EXPECT_HR(hr, E_NOTIMPL); - ok(node == (void*)0xdeadbeef, "got %p\n", node); + ok(broken(node == (void*)0xdeadbeef) || (node == NULL), "got %p\n", node); /* load schema and try to add it */ doc2 = create_document(&IID_IXMLDOMDocument2); @@ -11291,7 +11297,7 @@ static void test_get_namespaces(void) s = (void*)0xdeadbeef; hr = IXMLDOMSchemaCollection_get_namespaceURI(collection, 2, &s); EXPECT_HR(hr, E_FAIL); - ok(s == (void*)0xdeadbeef, "got %p\n", s); + ok(broken(s == (void*)0xdeadbeef) || (s == NULL), "got %p\n", s); /* enumerate */ enumv = (void*)0xdeadbeef;

1 0

Dmitry Timoshkov : schedsvc: Add Task Scheduler service.
by Alexandre Julliard March 13, 2014

March 13, 2014

Module: wine Branch: master Commit: 88df368868be59eebee4a5c2b2be7574fb173aa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88df368868be59eebee4a5c2b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 7 12:10:28 2014 +0900 schedsvc: Add Task Scheduler service. --- configure | 2 + configure.ac | 1 + dlls/schedsvc/Makefile.in | 8 +++ dlls/schedsvc/schedsvc.c | 158 +++++++++++++++++++++++++++++++++++++++++++ dlls/schedsvc/schedsvc.spec | 1 + dlls/schedsvc/schrpc.idl | 3 + dlls/schedsvc/svc_main.c | 158 +++++++++++++++++++++++++++++++++++++++++++ include/wine/schrpc.idl | 100 +++++++++++++++++++++++++++ loader/wine.inf.in | 16 +++++ 9 files changed, 447 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=88df368868be59eebee4a…

1 0

Matteo Bruni : d3dx9/tests: Mark a test todo_wine when DXTn textures aren' t supported by the GL driver.
by Alexandre Julliard March 13, 2014

March 13, 2014

Module: wine Branch: master Commit: 9295ee0c0b47f4b67e7268041008e1d12eff72c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9295ee0c0b47f4b67e7268041… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 13 16:31:09 2014 +0100 d3dx9/tests: Mark a test todo_wine when DXTn textures aren't supported by the GL driver. --- dlls/d3dx9_36/tests/texture.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 1a85d15..16cb0e5 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -1637,7 +1637,10 @@ static void test_D3DXCreateVolumeTextureFromFileInMemory(IDirect3DDevice9 *devic ok(hr == D3DERR_INVALIDCALL, "D3DXCreateVolumeTextureFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); hr = D3DXCreateVolumeTextureFromFileInMemory(device, dds_volume_map, sizeof(dds_volume_map), &volume_texture); - ok(hr == D3D_OK, "D3DXCreateVolumeTextureFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); + if (has_2d_dxt3) + ok(hr == D3D_OK, "D3DXCreateVolumeTextureFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); + else + todo_wine ok(hr == D3D_OK, "D3DXCreateVolumeTextureFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); if (SUCCEEDED(hr)) { levelcount = IDirect3DVolumeTexture9_GetLevelCount(volume_texture);

1 0

Matteo Bruni : d3dx9/tests: Skip some volume tests if loading the texture fails.
by Alexandre Julliard March 13, 2014

March 13, 2014

Module: wine Branch: master Commit: d96d0af83d9be0cf27dcf45536fdcd5939ae04a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d96d0af83d9be0cf27dcf4553… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 13 16:31:07 2014 +0100 d3dx9/tests: Skip some volume tests if loading the texture fails. --- dlls/d3dx9_36/tests/volume.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/volume.c b/dlls/d3dx9_36/tests/volume.c index ee83bca..860a20b 100644 --- a/dlls/d3dx9_36/tests/volume.c +++ b/dlls/d3dx9_36/tests/volume.c @@ -73,7 +73,7 @@ static void test_D3DXLoadVolumeFromMemory(IDirect3DDevice9 *device) &volume_texture, NULL); if (FAILED(hr)) { - skip("Failed to create volume texture\n"); + skip("Failed to create volume texture.\n"); return; } @@ -84,6 +84,11 @@ static void test_D3DXLoadVolumeFromMemory(IDirect3DDevice9 *device) hr = D3DXLoadVolumeFromMemory(volume, NULL, &dst_box, pixels, D3DFMT_A8R8G8B8, 16, 16, NULL, &src_box, D3DX_DEFAULT, 0); ok(hr == D3D_OK, "D3DXLoadVolumeFromMemory returned %#x, expected %#x\n", hr, D3D_OK); + if (FAILED(hr)) + { + win_skip("D3DXLoadVolumeFromMemory failed with error %#x, skipping some tests.\n", hr); + return; + } IDirect3DVolume9_LockBox(volume, &locked_box, &dst_box, D3DLOCK_READONLY); for (i = 0; i < 16; i++) check_pixel_4bpp(&locked_box, i % 4, 0, i / 4, pixels[i]);

1 0

Dmitry Timoshkov : schedsvc: Implement SchRpcRetrieveTask.
by Alexandre Julliard March 13, 2014

March 13, 2014

Module: wine Branch: master Commit: c751ec6a65f6c1ba3a417b05c5df31945cf54143 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c751ec6a65f6c1ba3a417b05c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 7 12:10:49 2014 +0900 schedsvc: Implement SchRpcRetrieveTask. --- dlls/schedsvc/schedsvc.c | 74 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 72 insertions(+), 2 deletions(-) diff --git a/dlls/schedsvc/schedsvc.c b/dlls/schedsvc/schedsvc.c index a527ab4..538a423 100644 --- a/dlls/schedsvc/schedsvc.c +++ b/dlls/schedsvc/schedsvc.c @@ -214,10 +214,80 @@ HRESULT __cdecl SchRpcRegisterTask(const WCHAR *path, const WCHAR *xml, DWORD fl return hr; } +static int detect_encoding(const void *buffer, DWORD size) +{ + static const char bom_utf8[] = { 0xef,0xbb,0xbf }; + + if (size >= sizeof(bom_utf8) && !memcmp(buffer, bom_utf8, sizeof(bom_utf8))) + return CP_UTF8; + else + { + int flags = IS_TEXT_UNICODE_SIGNATURE | + IS_TEXT_UNICODE_REVERSE_SIGNATURE | + IS_TEXT_UNICODE_ODD_LENGTH; + IsTextUnicode(buffer, size, &flags); + if (flags & IS_TEXT_UNICODE_SIGNATURE) + return -1; + if (flags & IS_TEXT_UNICODE_REVERSE_SIGNATURE) + return -2; + return CP_ACP; + } +} + +static HRESULT read_xml(const WCHAR *name, WCHAR **xml) +{ + HANDLE hfile; + DWORD size; + char *src; + int cp; + + hfile = CreateFileW(name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); + if (hfile == INVALID_HANDLE_VALUE) + return HRESULT_FROM_WIN32(GetLastError()); + + size = GetFileSize(hfile, NULL); + src = heap_alloc(size + 2); + if (!src) + { + CloseHandle(hfile); + return E_OUTOFMEMORY; + } + + src[size] = 0; + src[size + 1] = 0; + + ReadFile(hfile, src, size, &size, NULL); + CloseHandle(hfile); + + cp = detect_encoding(src, size); + if (cp < 0) + { + *xml = (WCHAR *)src; + return S_OK; + } + + size = MultiByteToWideChar(cp, 0, src, -1, NULL, 0); + *xml = heap_alloc(size * sizeof(WCHAR)); + if (!*xml) return E_OUTOFMEMORY; + MultiByteToWideChar(cp, 0, src, -1, *xml, size); + return S_OK; +} + HRESULT __cdecl SchRpcRetrieveTask(const WCHAR *path, const WCHAR *languages, ULONG *n_languages, WCHAR **xml) { - WINE_FIXME("%s,%s,%p,%p: stub\n", wine_dbgstr_w(path), wine_dbgstr_w(languages), n_languages, xml); - return E_NOTIMPL; + WCHAR *full_name; + HRESULT hr; + + WINE_TRACE("%s,%s,%p,%p\n", wine_dbgstr_w(path), wine_dbgstr_w(languages), n_languages, xml); + + full_name = get_full_name(path, NULL); + if (!full_name) return E_OUTOFMEMORY; + + hr = read_xml(full_name, xml); + if (hr != S_OK) *xml = NULL; + + heap_free(full_name); + return hr; } HRESULT __cdecl SchRpcCreateFolder(const WCHAR *path, const WCHAR *sddl, DWORD flags)

1 0

Jacek Caban : vbscript: Allow empty brackets in argument declarations.
by Alexandre Julliard March 13, 2014

March 13, 2014

Module: wine Branch: master Commit: 69bee9f00452ea526afea75199ba540b391ddee3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69bee9f00452ea526afea7519… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 13 17:44:14 2014 +0100 vbscript: Allow empty brackets in argument declarations. --- dlls/vbscript/parser.y | 6 +++--- dlls/vbscript/tests/lang.vbs | 17 +++++++++++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index cd69f5d..6bd4907 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -434,9 +434,9 @@ ArgumentDeclList | ArgumentDecl ',' ArgumentDeclList { $1->next = $3; $$ = $1; } ArgumentDecl - : Identifier { $$ = new_argument_decl(ctx, $1, TRUE); } - | tBYREF Identifier { $$ = new_argument_decl(ctx, $2, TRUE); } - | tBYVAL Identifier { $$ = new_argument_decl(ctx, $2, FALSE); } + : Identifier EmptyBrackets_opt { $$ = new_argument_decl(ctx, $1, TRUE); } + | tBYREF Identifier EmptyBrackets_opt { $$ = new_argument_decl(ctx, $2, TRUE); } + | tBYVAL Identifier EmptyBrackets_opt { $$ = new_argument_decl(ctx, $2, FALSE); } /* 'property' may be both keyword and identifier, depending on context */ Identifier diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index c1af191..612c615 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1115,4 +1115,21 @@ End Sub Call arrarg(arr, arr, obj.classarr, obj.classarr) +Sub arrarg2(byref refarr(), byval valarr(), byref refarr2(), byval valarr2()) + Call ok(getVT(refarr) = "VT_ARRAY|VT_BYREF|VT_VARIANT*", "getVT(refarr) = " & getVT(refarr)) + Call ok(getVT(valarr) = "VT_ARRAY|VT_VARIANT*", "getVT(valarr) = " & getVT(valarr)) + Call ok(getVT(refarr2) = "VT_ARRAY|VT_VARIANT*", "getVT(refarr2) = " & getVT(refarr2)) + Call ok(getVT(valarr2) = "VT_ARRAY|VT_VARIANT*", "getVT(valarr2) = " & getVT(valarr2)) +End Sub + +Call arrarg2(arr, arr, obj.classarr, obj.classarr) + +Sub testarrarg(arg(), vt) + Call ok(getVT(arg) = vt, "getVT() = " & getVT(arg) & " expected " & vt) +End Sub + +Call testarrarg(1, "VT_I2*") +Call testarrarg(false, "VT_BOOL*") +Call testarrarg(Empty, "VT_EMPTY*") + reportSuccess()

1 0

Piotr Caban : msvcrt: Improve tolower_l implementation.
by Alexandre Julliard March 13, 2014

March 13, 2014

Module: wine Branch: master Commit: 6a63e0e6bc5bcb7ee07e2d92b4b501865b0d2077 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a63e0e6bc5bcb7ee07e2d92b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 13 14:12:41 2014 +0100 msvcrt: Improve tolower_l implementation. --- dlls/msvcrt/ctype.c | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c index ca8b5fd..c486f8e 100644 --- a/dlls/msvcrt/ctype.c +++ b/dlls/msvcrt/ctype.c @@ -394,37 +394,42 @@ int CDECL MSVCRT__toupper(int c) int CDECL MSVCRT__tolower_l(int c, MSVCRT__locale_t locale) { MSVCRT_pthreadlocinfo locinfo; + unsigned char str[2], *p = str; + WCHAR wide, lower; if(!locale) locinfo = get_locinfo(); else locinfo = locale->locinfo; - if(c < 256) - return locinfo->pclmap[(unsigned char)c]; + if((unsigned)c < 256) + return locinfo->pclmap[c]; if(locinfo->pctype[(c>>8)&255] & MSVCRT__LEADBYTE) - { - WCHAR wide, upper; - char str[2], *p = str; *p++ = (c>>8) & 255; - *p++ = c & 255; - - if(!MultiByteToWideChar(locinfo->lc_codepage, - MB_ERR_INVALID_CHARS, str, 2, &wide, 1)) - return c; + else { + *MSVCRT__errno() = MSVCRT_EILSEQ; + str[1] = 0; + } + *p++ = c & 255; - upper = tolowerW(wide); - if(upper == wide) - return c; + if(!MultiByteToWideChar(locinfo->lc_codepage, + MB_ERR_INVALID_CHARS, (char*)str, p-str, &wide, 1)) + return c; - WideCharToMultiByte(locinfo->lc_codepage, 0, - &upper, 1, str, 2, NULL, NULL); + lower = tolowerW(wide); + if(lower == wide) + return str[0] + (str[1]<<8); + switch(WideCharToMultiByte(locinfo->lc_codepage, 0, + &lower, 1, (char*)str, 2, NULL, NULL)) { + case 0: + return c; + case 1: + return str[0]; + default: return str[0] + (str[1]<<8); } - - return c; } /*********************************************************************

1 0

Piotr Caban : msvcrt: Improve tolower tests.
by Alexandre Julliard March 13, 2014

March 13, 2014

Module: wine Branch: master Commit: 13f6194bb15fe87c9c385b066b099f8416317fb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13f6194bb15fe87c9c385b066… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 13 14:12:53 2014 +0100 msvcrt: Improve tolower tests. --- dlls/msvcrt/tests/string.c | 54 ++++++++++++++++++++++++++++++++------------ 1 file changed, 40 insertions(+), 14 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 71b6815..7d820e1 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2419,29 +2419,59 @@ static void test_wctomb(void) static void test_tolower(void) { - int ret; + char ch, lch; + int ret, len; + /* test C locale when locale was never changed */ ret = p_tolower(0x41); ok(ret == 0x61, "ret = %x\n", ret); ret = p_tolower(0xF4); ok(ret == 0xF4, "ret = %x\n", ret); + errno = 0xdeadbeef; ret = p_tolower((char)0xF4); - ok(ret==0xF4/*Vista+*/ || ret==(char)0xF4, "ret = %x\n", ret); + todo_wine ok(ret == (char)0xF4, "ret = %x\n", ret); + todo_wine ok(errno == 0xdeadbeef, "errno = %d\n", errno); - /* is it using different locale (CP_ACP) for negative values?? */ - /* current implementation matches msvcr90 behaviour */ + errno = 0xdeadbeef; ret = p_tolower((char)0xD0); - todo_wine ok(ret==0xF0/*Vista+*/ || ret==(char)0xD0, "ret = %x\n", ret); - - ret = p_tolower(0xD0); - ok(ret == 0xD0, "ret = %x\n", ret); + todo_wine ok(ret == (char)0xD0, "ret = %x\n", ret); + todo_wine ok(errno == 0xdeadbeef, "errno = %d\n", errno); + /* test C locale after setting locale */ if(!setlocale(LC_ALL, "us")) { win_skip("skipping tolower tests that depends on locale\n"); return; } + setlocale(LC_ALL, "C"); + + ch = 0xF4; + errno = 0xdeadbeef; + ret = p_tolower(ch); + len = LCMapStringA(0, LCMAP_LOWERCASE, &ch, 1, &lch, 1); + if(len) + ok(ret==(unsigned char)lch || broken(ret==ch)/*WinXP-*/, "ret = %x\n", ret); + else + ok(ret == ch, "ret = %x\n", ret); + if(!len || ret==(unsigned char)lch) + ok(errno == EILSEQ, "errno = %d\n", errno); + + ch = 0xD0; + errno = 0xdeadbeef; + ret = p_tolower(ch); + len = LCMapStringA(0, LCMAP_LOWERCASE, &ch, 1, &lch, 1); + if(len) + ok(ret==(unsigned char)lch || broken(ret==ch)/*WinXP-*/, "ret = %x\n", ret); + else + ok(ret == ch, "ret = %x\n", ret); + if(!len || ret==(unsigned char)lch) + ok(errno == EILSEQ, "errno = %d\n", errno); + + ret = p_tolower(0xD0); + ok(ret == 0xD0, "ret = %x\n", ret); + + ok(setlocale(LC_ALL, "us") != NULL, "setlocale failed\n"); ret = p_tolower((char)0xD0); ok(ret == 0xF0, "ret = %x\n", ret); @@ -2696,15 +2726,12 @@ START_TEST(string) ok(pmemcmp(mem+5,xilstring, nLen) == 0, "Got result %s\n",mem+5); - /* Test _swab function */ + /* run tolower tests first */ + test_tolower(); test_swab(); - - /* Test ismbblead*/ test_mbcp(); - /* test _mbsspn */ test_mbsspn(); test_mbsspnp(); - /* test _strdup */ test_strdup(); test_strcpy_s(); test_memcpy_s(); @@ -2736,7 +2763,6 @@ START_TEST(string) test__mbslwr_s(); test_wctob(); test_wctomb(); - test_tolower(); test__atodbl(); test__stricmp(); test__wcstoi64();

1 0

Piotr Caban : msvcrt: Improve toupper_l implementation.
by Alexandre Julliard March 13, 2014

March 13, 2014

Module: wine Branch: master Commit: 28cc0b8bc15e78a66fe2ea6692cd08ba843aa8db URL: http://source.winehq.org/git/wine.git/?a=commit;h=28cc0b8bc15e78a66fe2ea669… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 13 14:13:02 2014 +0100 msvcrt: Improve toupper_l implementation. --- dlls/msvcrt/ctype.c | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c index c486f8e..8b9d14c 100644 --- a/dlls/msvcrt/ctype.c +++ b/dlls/msvcrt/ctype.c @@ -339,37 +339,42 @@ int CDECL MSVCRT___iscsymf(int c) int CDECL MSVCRT__toupper_l(int c, MSVCRT__locale_t locale) { MSVCRT_pthreadlocinfo locinfo; + unsigned char str[2], *p = str; + WCHAR wide, upper; if(!locale) locinfo = get_locinfo(); else locinfo = locale->locinfo; - if(c < 256) - return locinfo->pcumap[(unsigned char)c]; + if((unsigned)c < 256) + return locinfo->pcumap[c]; if(locinfo->pctype[(c>>8)&255] & MSVCRT__LEADBYTE) - { - WCHAR wide, upper; - char str[2], *p = str; *p++ = (c>>8) & 255; - *p++ = c & 255; - - if(!MultiByteToWideChar(locinfo->lc_codepage, - MB_ERR_INVALID_CHARS, str, 2, &wide, 1)) - return c; + else { + *MSVCRT__errno() = MSVCRT_EILSEQ; + str[1] = 0; + } + *p++ = c & 255; - upper = toupperW(wide); - if(upper == wide) - return c; + if(!MultiByteToWideChar(locinfo->lc_codepage, + MB_ERR_INVALID_CHARS, (char*)str, p-str, &wide, 1)) + return c; - WideCharToMultiByte(locinfo->lc_codepage, 0, - &upper, 1, str, 2, NULL, NULL); + upper = toupperW(wide); + if(upper == wide) + return str[0] + (str[1]<<8); + switch(WideCharToMultiByte(locinfo->lc_codepage, 0, + &upper, 1, (char*)str, 2, NULL, NULL)) { + case 0: + return c; + case 1: + return str[0]; + default: return str[0] + (str[1]<<8); } - - return c; } /*********************************************************************

1 0