January 2014 - Wine-Commits

Frédéric Delanoy : include: Make wine_dbgstr_guid available in test.h for all tests.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: 9134a24e87b4b024311e8749f147e400dbe25a46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9134a24e87b4b024311e8749f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:22 2014 +0100 include: Make wine_dbgstr_guid available in test.h for all tests. --- include/wine/test.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/wine/test.h b/include/wine/test.h index ab10399..f8b608f 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -65,6 +65,7 @@ extern void winetest_add_failures( LONG new_failures ); extern void winetest_wait_child_process( HANDLE process ); extern const char *wine_dbgstr_wn( const WCHAR *str, int n ); +extern const char *wine_dbgstr_guid( const GUID *guid ); static inline const char *wine_dbgstr_w( const WCHAR *s ) { return wine_dbgstr_wn( s, -1 ); } /* strcmpW is available for tests compiled under Wine, but not in standalone @@ -523,6 +524,19 @@ const char *wine_dbgstr_wn( const WCHAR *str, int n ) return res; } +const char *wine_dbgstr_guid( const GUID *guid ) +{ + char *res; + + if (!guid) return "(null)"; + res = get_temp_buffer( 39 ); /* CHARS_IN_GUID */ + sprintf( res, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", + guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], + guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4], + guid->Data4[5], guid->Data4[6], guid->Data4[7] ); + return res; +} + /* Find a test by name */ static const struct test *find_test( const char *name ) {

1 0

Dmitry Timoshkov : taskschd: Implement ITaskFolderCollection:: get__NewEnum.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: d33c0e14ae7088e608a6bfb30008774f1905eb1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d33c0e14ae7088e608a6bfb30… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 28 11:54:48 2014 +0900 taskschd: Implement ITaskFolderCollection::get__NewEnum. --- dlls/taskschd/folder_collection.c | 157 ++++++++++++++++++++++++++++++++++++- dlls/taskschd/tests/scheduler.c | 4 - 2 files changed, 155 insertions(+), 6 deletions(-) diff --git a/dlls/taskschd/folder_collection.c b/dlls/taskschd/folder_collection.c index e8e4933..c8cc89b 100644 --- a/dlls/taskschd/folder_collection.c +++ b/dlls/taskschd/folder_collection.c @@ -42,6 +42,8 @@ typedef struct LONG count; } TaskFolderCollection; +static HRESULT NewEnum_create(TaskFolderCollection *folders, IUnknown **obj); + static inline TaskFolderCollection *impl_from_ITaskFolderCollection(ITaskFolderCollection *iface) { return CONTAINING_RECORD(iface, TaskFolderCollection, ITaskFolderCollection_iface); @@ -190,8 +192,13 @@ static HRESULT WINAPI folders_get_Item(ITaskFolderCollection *iface, VARIANT ind static HRESULT WINAPI folders_get__NewEnum(ITaskFolderCollection *iface, IUnknown **penum) { - FIXME("%p,%p: stub\n", iface, penum); - return E_NOTIMPL; + TaskFolderCollection *folders = impl_from_ITaskFolderCollection(iface); + + TRACE("%p,%p\n", iface, penum); + + if (!penum) return E_POINTER; + + return NewEnum_create(folders, penum); } static const ITaskFolderCollectionVtbl TaskFolderCollection_vtbl = @@ -319,3 +326,149 @@ HRESULT TaskFolderCollection_create(const WCHAR *path, ITaskFolderCollection **o return S_OK; } + +typedef struct +{ + IEnumVARIANT IEnumVARIANT_iface; + LONG ref, pos; + TaskFolderCollection *folders; +} EnumVARIANT; + +static inline EnumVARIANT *impl_from_IEnumVARIANT(IEnumVARIANT *iface) +{ + return CONTAINING_RECORD(iface, EnumVARIANT, IEnumVARIANT_iface); +} + +static HRESULT WINAPI enumvar_QueryInterface(IEnumVARIANT *iface, REFIID riid, void **obj) +{ + if (!riid || !obj) return E_INVALIDARG; + + TRACE("%p,%s,%p\n", iface, debugstr_guid(riid), obj); + + if (IsEqualGUID(riid, &IID_IEnumVARIANT) || + IsEqualGUID(riid, &IID_IUnknown)) + { + IEnumVARIANT_AddRef(iface); + *obj = iface; + return S_OK; + } + + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI enumvar_AddRef(IEnumVARIANT *iface) +{ + EnumVARIANT *enumvar = impl_from_IEnumVARIANT(iface); + return InterlockedIncrement(&enumvar->ref); +} + +static ULONG WINAPI enumvar_Release(IEnumVARIANT *iface) +{ + EnumVARIANT *enumvar = impl_from_IEnumVARIANT(iface); + LONG ref = InterlockedDecrement(&enumvar->ref); + + if (!ref) + { + TRACE("destroying %p\n", iface); + ITaskFolderCollection_Release(&enumvar->folders->ITaskFolderCollection_iface); + heap_free(enumvar); + } + + return ref; +} + +static HRESULT WINAPI enumvar_Next(IEnumVARIANT *iface, ULONG celt, VARIANT *var, ULONG *fetched) +{ + EnumVARIANT *enumvar = impl_from_IEnumVARIANT(iface); + LONG i; + + TRACE("%p,%u,%p,%p\n", iface, celt, var, fetched); + + for (i = 0; i < celt && enumvar->pos < enumvar->folders->count; i++) + { + ITaskFolder *folder; + HRESULT hr; + + hr = TaskFolder_create(enumvar->folders->path, enumvar->folders->list[enumvar->pos++], &folder, FALSE); + if (hr) return hr; + + if (!var) + { + ITaskFolder_Release(folder); + return E_POINTER; + } + + V_VT(&var[i]) = VT_DISPATCH; + V_DISPATCH(&var[i]) = (IDispatch *)folder; + } + + if (fetched) *fetched = i; + + return i == celt ? S_OK : S_FALSE; +} + +static HRESULT WINAPI enumvar_Skip(IEnumVARIANT *iface, ULONG celt) +{ + EnumVARIANT *enumvar = impl_from_IEnumVARIANT(iface); + + TRACE("%p,%u\n", iface, celt); + + enumvar->pos += celt; + + if (enumvar->pos > enumvar->folders->count) + { + enumvar->pos = enumvar->folders->count; + return S_FALSE; + } + + return S_OK; +} + +static HRESULT WINAPI enumvar_Reset(IEnumVARIANT *iface) +{ + EnumVARIANT *enumvar = impl_from_IEnumVARIANT(iface); + + TRACE("%p\n", iface); + + enumvar->pos = 0; + + return S_OK; +} + +static HRESULT WINAPI enumvar_Clone(IEnumVARIANT *iface, IEnumVARIANT **penum) +{ + FIXME("%p,%p: stub\n", iface, penum); + return E_NOTIMPL; +} + +static const struct IEnumVARIANTVtbl EnumVARIANT_vtbl = +{ + enumvar_QueryInterface, + enumvar_AddRef, + enumvar_Release, + enumvar_Next, + enumvar_Skip, + enumvar_Reset, + enumvar_Clone +}; + +static HRESULT NewEnum_create(TaskFolderCollection *folders, IUnknown **obj) +{ + EnumVARIANT *enumvar; + + enumvar = heap_alloc(sizeof(*enumvar)); + if (!enumvar) return E_OUTOFMEMORY; + + enumvar->IEnumVARIANT_iface.lpVtbl = &EnumVARIANT_vtbl; + enumvar->ref = 1; + enumvar->pos = 0; + enumvar->folders = folders; + ITaskFolderCollection_AddRef(&folders->ITaskFolderCollection_iface); + + *obj = (IUnknown *)&enumvar->IEnumVARIANT_iface; + + TRACE("created %p\n", *obj); + + return S_OK; +} diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index d9f622e..f30a1be 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -544,10 +544,7 @@ static void test_FolderCollection(void) ok(hr == E_NOINTERFACE, "expected E_NOINTERFACE, got %#x\n", hr); hr = ITaskFolderCollection_get__NewEnum(folders, &unknown); -todo_wine ok(hr == S_OK, "get__NewEnum error %#x\n", hr); - /* FIXME: remove once implemented */ - if (hr != S_OK) goto failed; hr = IUnknown_QueryInterface(unknown, &IID_IEnumUnknown, (void **)&enumvar); ok(hr == E_NOINTERFACE, "expected E_NOINTERFACE, got %#x\n", hr); hr = IUnknown_QueryInterface(unknown, &IID_IEnumVARIANT, (void **)&enumvar); @@ -592,7 +589,6 @@ todo_wine IDispatch_Release(V_DISPATCH(&var[0])); IDispatch_Release(V_DISPATCH(&var[1])); -failed: ITaskFolderCollection_Release(folders); hr = ITaskFolder_DeleteFolder(root, Wine_Folder1, 0);

1 0

Dmitry Timoshkov : taskschd: Implement ITaskFolderCollection::get_Item.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: eeffc8f073522c2ceb5f34a6c8618c625d68ede5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eeffc8f073522c2ceb5f34a6c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 28 11:54:45 2014 +0900 taskschd: Implement ITaskFolderCollection::get_Item. --- dlls/taskschd/folder_collection.c | 59 ++++++++++++++++++++++++++++++++++--- dlls/taskschd/tests/scheduler.c | 12 ++++---- 2 files changed, 61 insertions(+), 10 deletions(-) diff --git a/dlls/taskschd/folder_collection.c b/dlls/taskschd/folder_collection.c index f1a3f3f..e8e4933 100644 --- a/dlls/taskschd/folder_collection.c +++ b/dlls/taskschd/folder_collection.c @@ -127,14 +127,65 @@ static HRESULT WINAPI folders_Invoke(ITaskFolderCollection *iface, DISPID dispid static HRESULT WINAPI folders_get_Count(ITaskFolderCollection *iface, LONG *count) { - FIXME("%p,%p: stub\n", iface, count); - return E_NOTIMPL; + TaskFolderCollection *folders = impl_from_ITaskFolderCollection(iface); + + TRACE("%p,%p\n", iface, count); + + if (!count) return E_POINTER; + + *count = folders->count; + + return S_OK; +} + +static LONG get_var_int(const VARIANT *var) +{ + switch(V_VT(var)) + { + case VT_I1: + case VT_UI1: + return V_UI1(var); + + case VT_I2: + case VT_UI2: + return V_UI2(var); + + case VT_I4: + case VT_UI4: + return V_UI4(var); + + case VT_I8: + case VT_UI8: + return V_UI8(var); + + case VT_INT: + case VT_UINT: + return V_UINT(var); + + default: + FIXME("unsupported variant type %d\n", V_VT(var)); + return 0; + } } static HRESULT WINAPI folders_get_Item(ITaskFolderCollection *iface, VARIANT index, ITaskFolder **folder) { - FIXME("%p,%s,%p: stub\n", iface, debugstr_variant(&index), folder); - return E_NOTIMPL; + TaskFolderCollection *folders = impl_from_ITaskFolderCollection(iface); + LONG idx; + + TRACE("%p,%s,%p\n", iface, debugstr_variant(&index), folder); + + if (!folder) return E_POINTER; + + if (V_VT(&index) == VT_BSTR) + return TaskFolder_create(folders->path, V_BSTR(&index), folder, FALSE); + + idx = get_var_int(&index); + /* collections are 1 based */ + if (idx < 1 || idx > folders->count) + return E_INVALIDARG; + + return TaskFolder_create(folders->path, folders->list[idx - 1], folder, FALSE); } static HRESULT WINAPI folders_get__NewEnum(ITaskFolderCollection *iface, IUnknown **penum) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 700fab2..d9f622e 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -455,11 +455,12 @@ static void test_FolderCollection(void) ITaskFolder_Release(folder); + hr = ITaskFolderCollection_get_Count(folders, NULL); + ok (hr == E_POINTER, "expected E_POINTER, got %#x\n", hr); + count = 0; hr = ITaskFolderCollection_get_Count(folders, &count); -todo_wine ok(hr == S_OK, "get_Count error %#x\n", hr); -todo_wine ok(count == 2, "expected 2, got %d\n", count); hr = ITaskFolder_CreateFolder(root, Wine_Folder3, v_null, &subfolder); @@ -468,12 +469,8 @@ todo_wine count = 0; hr = ITaskFolderCollection_get_Count(folders, &count); -todo_wine ok(hr == S_OK, "get_Count error %#x\n", hr); -todo_wine ok(count == 2, "expected 2, got %d\n", count); - /* FIXME: remove once implemented */ - if (!count) goto failed; for (i = 0; i < sizeof(vt)/sizeof(vt[0]); i++) { @@ -547,7 +544,10 @@ todo_wine ok(hr == E_NOINTERFACE, "expected E_NOINTERFACE, got %#x\n", hr); hr = ITaskFolderCollection_get__NewEnum(folders, &unknown); +todo_wine ok(hr == S_OK, "get__NewEnum error %#x\n", hr); + /* FIXME: remove once implemented */ + if (hr != S_OK) goto failed; hr = IUnknown_QueryInterface(unknown, &IID_IEnumUnknown, (void **)&enumvar); ok(hr == E_NOINTERFACE, "expected E_NOINTERFACE, got %#x\n", hr); hr = IUnknown_QueryInterface(unknown, &IID_IEnumVARIANT, (void **)&enumvar);

1 0

Piotr Caban : msvcm90: Share the source code with msvcm80.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: 0e658d111c41da4188f393fd2a1b06b25de6a7d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e658d111c41da4188f393fd2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 28 10:10:01 2014 +0100 msvcm90: Share the source code with msvcm80. --- dlls/msvcm80/Makefile.in | 2 +- dlls/msvcm80/{msvcm80_main.c => msvcm_main.c} | 0 dlls/msvcm90/Makefile.in | 3 +- dlls/msvcm90/msvcm90_main.c | 43 ------------------------- 4 files changed, 3 insertions(+), 45 deletions(-) diff --git a/dlls/msvcm80/Makefile.in b/dlls/msvcm80/Makefile.in index bbef214..c3bf20e 100644 --- a/dlls/msvcm80/Makefile.in +++ b/dlls/msvcm80/Makefile.in @@ -1,4 +1,4 @@ MODULE = msvcm80.dll C_SRCS = \ - msvcm80_main.c + msvcm_main.c diff --git a/dlls/msvcm80/msvcm80_main.c b/dlls/msvcm80/msvcm_main.c similarity index 100% rename from dlls/msvcm80/msvcm80_main.c rename to dlls/msvcm80/msvcm_main.c diff --git a/dlls/msvcm90/Makefile.in b/dlls/msvcm90/Makefile.in index a543df3..6b03a53 100644 --- a/dlls/msvcm90/Makefile.in +++ b/dlls/msvcm90/Makefile.in @@ -1,4 +1,5 @@ MODULE = msvcm90.dll +PARENTSRC = ../msvcm80 C_SRCS = \ - msvcm90_main.c + msvcm_main.c diff --git a/dlls/msvcm90/msvcm90_main.c b/dlls/msvcm90/msvcm90_main.c deleted file mode 100644 index 6019afd..0000000 --- a/dlls/msvcm90/msvcm90_main.c +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2012 Vincent Povirk for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msvcm90); - -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -}

1 0

Henri Verbeet : dxgi: Implement IDXGIAdapter1.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: ac84e9b726873687c1efb3a08ea6ed9395a8e920 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac84e9b726873687c1efb3a08… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 28 10:09:25 2014 +0100 dxgi: Implement IDXGIAdapter1. --- dlls/dxgi/adapter.c | 64 ++++++++++++++++++++++++++++++--------------- dlls/dxgi/tests/device.c | 29 ++++++++++++++++++++ include/wine/winedxgi.idl | 2 +- 3 files changed, 73 insertions(+), 22 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 87d886b..d18db85 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -38,6 +38,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_QueryInterface(IWineDXGIAdapter *i if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDXGIObject) || IsEqualGUID(riid, &IID_IDXGIAdapter) + || IsEqualGUID(riid, &IID_IDXGIAdapter1) || IsEqualGUID(riid, &IID_IWineDXGIAdapter)) { IUnknown_AddRef(iface); @@ -135,9 +136,9 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_EnumOutputs(IWineDXGIAdapter *ifac return S_OK; } -static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc(IWineDXGIAdapter *iface, DXGI_ADAPTER_DESC *desc) +static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc1(IWineDXGIAdapter *iface, DXGI_ADAPTER_DESC1 *desc) { - struct dxgi_adapter *This = impl_from_IWineDXGIAdapter(iface); + struct dxgi_adapter *adapter = impl_from_IWineDXGIAdapter(iface); struct wined3d_adapter_identifier adapter_id; char description[128]; struct wined3d *wined3d; @@ -145,38 +146,57 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc(IWineDXGIAdapter *iface, D TRACE("iface %p, desc %p.\n", iface, desc); - if (!desc) return E_INVALIDARG; + if (!desc) + return E_INVALIDARG; - wined3d = IWineDXGIFactory_get_wined3d(This->parent); + wined3d = IWineDXGIFactory_get_wined3d(adapter->parent); adapter_id.driver_size = 0; adapter_id.description = description; adapter_id.description_size = sizeof(description); adapter_id.device_name_size = 0; EnterCriticalSection(&dxgi_cs); - hr = wined3d_get_adapter_identifier(wined3d, This->ordinal, 0, &adapter_id); + hr = wined3d_get_adapter_identifier(wined3d, adapter->ordinal, 0, &adapter_id); wined3d_decref(wined3d); LeaveCriticalSection(&dxgi_cs); - if (SUCCEEDED(hr)) + if (FAILED(hr)) + return hr; + + if (!MultiByteToWideChar(CP_ACP, 0, description, -1, desc->Description, 128)) { - if (!MultiByteToWideChar(CP_ACP, 0, description, -1, desc->Description, 128)) - { - DWORD err = GetLastError(); - ERR("Failed to translate description %s (%#x).\n", debugstr_a(description), err); - hr = E_FAIL; - } - - desc->VendorId = adapter_id.vendor_id; - desc->DeviceId = adapter_id.device_id; - desc->SubSysId = adapter_id.subsystem_id; - desc->Revision = adapter_id.revision; - desc->DedicatedVideoMemory = adapter_id.video_memory; - desc->DedicatedSystemMemory = 0; /* FIXME */ - desc->SharedSystemMemory = 0; /* FIXME */ - memcpy(&desc->AdapterLuid, &adapter_id.adapter_luid, sizeof(desc->AdapterLuid)); + DWORD err = GetLastError(); + ERR("Failed to translate description %s (%#x).\n", debugstr_a(description), err); + hr = E_FAIL; } + desc->VendorId = adapter_id.vendor_id; + desc->DeviceId = adapter_id.device_id; + desc->SubSysId = adapter_id.subsystem_id; + desc->Revision = adapter_id.revision; + desc->DedicatedVideoMemory = adapter_id.video_memory; + desc->DedicatedSystemMemory = 0; /* FIXME */ + desc->SharedSystemMemory = 0; /* FIXME */ + memcpy(&desc->AdapterLuid, &adapter_id.adapter_luid, sizeof(desc->AdapterLuid)); + desc->Flags = 0; + + return hr; +} + +static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc(IWineDXGIAdapter *iface, DXGI_ADAPTER_DESC *desc) +{ + DXGI_ADAPTER_DESC1 desc1; + HRESULT hr; + + TRACE("iface %p, desc %p.\n", iface, desc); + + if (!desc) + return E_INVALIDARG; + + if (FAILED(hr = dxgi_adapter_GetDesc1(iface, &desc1))) + return hr; + memcpy(desc, &desc1, sizeof(*desc)); + return hr; } @@ -214,6 +234,8 @@ static const struct IWineDXGIAdapterVtbl dxgi_adapter_vtbl = dxgi_adapter_EnumOutputs, dxgi_adapter_GetDesc, dxgi_adapter_CheckInterfaceSupport, + /* IDXGIAdapter1 methods */ + dxgi_adapter_GetDesc1, /* IWineDXGIAdapter methods */ dxgi_adapter_get_ordinal, }; diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 9be59db..b8e7b33 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -101,6 +101,8 @@ static void test_device_interfaces(IDXGIDevice *device) static void test_adapter_desc(IDXGIDevice *device) { + DXGI_ADAPTER_DESC1 desc1; + IDXGIAdapter1 *adapter1; DXGI_ADAPTER_DESC desc; IDXGIAdapter *adapter; HRESULT hr; @@ -126,6 +128,33 @@ static void test_adapter_desc(IDXGIDevice *device) desc.SharedSystemMemory, desc.SharedSystemMemory / (1024 * 1024)); trace("LUID: %08x:%08x.\n", desc.AdapterLuid.HighPart, desc.AdapterLuid.LowPart); + hr = IDXGIAdapter_QueryInterface(adapter, &IID_IDXGIAdapter1, (void **)&adapter1); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE), "Got unexpected hr %#x.\n", hr); + if (hr == E_NOINTERFACE) + goto done; + + hr = IDXGIAdapter1_GetDesc1(adapter1, &desc1); + ok(SUCCEEDED(hr), "GetDesc1 failed, hr %#x.\n", hr); + + ok(!lstrcmpW(desc.Description, desc1.Description), + "Got unexpected description %s.\n", wine_dbgstr_w(desc1.Description)); + ok(desc1.VendorId == desc.VendorId, "Got unexpected vendor ID %04x.\n", desc1.VendorId); + ok(desc1.DeviceId == desc.DeviceId, "Got unexpected device ID %04x.\n", desc1.DeviceId); + ok(desc1.SubSysId == desc.SubSysId, "Got unexpected sub system ID %04x.\n", desc1.SubSysId); + ok(desc1.Revision == desc.Revision, "Got unexpected revision %02x.\n", desc1.Revision); + ok(desc1.DedicatedVideoMemory == desc.DedicatedVideoMemory, + "Got unexpected dedicated video memory %lu.\n", desc1.DedicatedVideoMemory); + ok(desc1.DedicatedSystemMemory == desc.DedicatedSystemMemory, + "Got unexpected dedicated system memory %lu.\n", desc1.DedicatedSystemMemory); + ok(desc1.SharedSystemMemory == desc.SharedSystemMemory, + "Got unexpected shared system memory %lu.\n", desc1.SharedSystemMemory); + ok(!memcmp(&desc.AdapterLuid, &desc1.AdapterLuid, sizeof(desc.AdapterLuid)), + "Got unexpected adapter LUID %08x:%08x.\n", desc1.AdapterLuid.HighPart, desc1.AdapterLuid.LowPart); + trace("Flags: %08x.\n", desc1.Flags); + + IDXGIAdapter1_Release(adapter1); + +done: IDXGIAdapter_Release(adapter); } diff --git a/include/wine/winedxgi.idl b/include/wine/winedxgi.idl index 363030a..a3baece 100644 --- a/include/wine/winedxgi.idl +++ b/include/wine/winedxgi.idl @@ -33,7 +33,7 @@ interface IWineDXGIFactory : IDXGIFactory local, uuid(ab1de34c-2963-4ffd-8493-40f580e510e5) ] -interface IWineDXGIAdapter : IDXGIAdapter +interface IWineDXGIAdapter : IDXGIAdapter1 { UINT get_ordinal(); }

1 0

Piotr Caban : msvcrt: Flush standard streams in flushall function.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: 6f4a1817099f861e06aa24a59215b361ebf6b79c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f4a1817099f861e06aa24a59… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 28 10:08:32 2014 +0100 msvcrt: Flush standard streams in flushall function. --- dlls/msvcrt/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 908ba26..a78076c 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -860,7 +860,7 @@ static int msvcrt_flush_all_buffers(int mask) MSVCRT_FILE *file; LOCK_FILES(); - for (i = 3; i < MSVCRT_stream_idx; i++) { + for (i = 0; i < MSVCRT_stream_idx; i++) { file = msvcrt_get_file(i); if (file->_flag)

1 0

Frédéric Delanoy : apphelp/tests: Use common wine_dbgstr_guid implementation from test.h.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: 1b27173579dbbd8c9a2677a3d779cdc2612eaba5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b27173579dbbd8c9a2677a3d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:23 2014 +0100 apphelp/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/apphelp/tests/apphelp.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/dlls/apphelp/tests/apphelp.c b/dlls/apphelp/tests/apphelp.c index fb2e3a3..8b264e9 100644 --- a/dlls/apphelp/tests/apphelp.c +++ b/dlls/apphelp/tests/apphelp.c @@ -47,18 +47,6 @@ static const CLSID * objects[] = { &test_UserAssist, NULL,}; -static const char *debugstr_guid(REFIID riid) -{ - static char buf[50]; - - sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", - riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], - riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], - riid->Data4[5], riid->Data4[6], riid->Data4[7]); - - return buf; -} - static void test_ApphelpCheckShellObject(void) { ULONGLONG flags; @@ -77,20 +65,20 @@ static void test_ApphelpCheckShellObject(void) SetLastError(0xdeadbeef); res = pApphelpCheckShellObject(objects[i], FALSE, &flags); ok(res && (flags == 0), "%s 0: got %d and 0x%x%08x with 0x%x (expected TRUE and 0)\n", - debugstr_guid(objects[i]), res, (ULONG)(flags >> 32), (ULONG)flags, GetLastError()); + wine_dbgstr_guid(objects[i]), res, (ULONG)(flags >> 32), (ULONG)flags, GetLastError()); flags = 0xdeadbeef; SetLastError(0xdeadbeef); res = pApphelpCheckShellObject(objects[i], TRUE, &flags); ok(res && (flags == 0), "%s 1: got %d and 0x%x%08x with 0x%x (expected TRUE and 0)\n", - debugstr_guid(objects[i]), res, (ULONG)(flags >> 32), (ULONG)flags, GetLastError()); + wine_dbgstr_guid(objects[i]), res, (ULONG)(flags >> 32), (ULONG)flags, GetLastError()); } /* NULL as pointer to flags is checked */ SetLastError(0xdeadbeef); res = pApphelpCheckShellObject(&GUID_NULL, FALSE, NULL); - ok(res, "%s 0: got %d with 0x%x (expected != FALSE)\n", debugstr_guid(&GUID_NULL), res, GetLastError()); + ok(res, "%s 0: got %d with 0x%x (expected != FALSE)\n", wine_dbgstr_guid(&GUID_NULL), res, GetLastError()); /* NULL as CLSID* crash on Windows */ if (0)

1 0

Dmitry Timoshkov : taskschd: Add some tests for ITaskFolderCollection:: get__NewEnum.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: 979e2d3a4e5648f25a23b3b49a808121d1bae863 URL: http://source.winehq.org/git/wine.git/?a=commit;h=979e2d3a4e5648f25a23b3b49… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 28 11:54:56 2014 +0900 taskschd: Add some tests for ITaskFolderCollection::get__NewEnum. --- dlls/taskschd/tests/scheduler.c | 59 +++++++++++++++++++++++++++++++++++---- 1 file changed, 54 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index f30a1be..3499d5e 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -414,7 +414,7 @@ static void test_FolderCollection(void) ITaskFolderCollection *folders; IUnknown *unknown; IEnumVARIANT *enumvar; - LONG count, i; + ULONG count, i; VARIANT idx; static const int vt[] = { VT_I1, VT_I2, VT_I4, VT_I8, VT_UI1, VT_UI2, VT_UI4, VT_UI8, VT_INT, VT_UINT }; @@ -459,7 +459,7 @@ static void test_FolderCollection(void) ok (hr == E_POINTER, "expected E_POINTER, got %#x\n", hr); count = 0; - hr = ITaskFolderCollection_get_Count(folders, &count); + hr = ITaskFolderCollection_get_Count(folders, (LONG *)&count); ok(hr == S_OK, "get_Count error %#x\n", hr); ok(count == 2, "expected 2, got %d\n", count); @@ -468,10 +468,14 @@ static void test_FolderCollection(void) ITaskFolder_Release(subfolder); count = 0; - hr = ITaskFolderCollection_get_Count(folders, &count); + hr = ITaskFolderCollection_get_Count(folders, (LONG *)&count); ok(hr == S_OK, "get_Count error %#x\n", hr); ok(count == 2, "expected 2, got %d\n", count); + set_var(VT_INT, &idx, 0); + hr = ITaskFolderCollection_get_Item(folders, idx, NULL); + ok (hr == E_POINTER, "expected E_POINTER, got %#x\n", hr); + for (i = 0; i < sizeof(vt)/sizeof(vt[0]); i++) { set_var(vt[i], &idx, 1); @@ -543,6 +547,9 @@ static void test_FolderCollection(void) hr = ITaskFolderCollection_QueryInterface(folders, &IID_IEnumUnknown, (void **)&enumvar); ok(hr == E_NOINTERFACE, "expected E_NOINTERFACE, got %#x\n", hr); + hr = ITaskFolderCollection_get__NewEnum(folders, NULL); + ok (hr == E_POINTER, "expected E_POINTER, got %#x\n", hr); + hr = ITaskFolderCollection_get__NewEnum(folders, &unknown); ok(hr == S_OK, "get__NewEnum error %#x\n", hr); hr = IUnknown_QueryInterface(unknown, &IID_IEnumUnknown, (void **)&enumvar); @@ -554,9 +561,51 @@ static void test_FolderCollection(void) hr = IUnknown_QueryInterface(unknown, &IID_IUnknown, (void **)&enumvar); ok(hr == S_OK, "QueryInterface error %#x\n", hr); + hr = IEnumVARIANT_Skip(enumvar, 0); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + hr = IEnumVARIANT_Skip(enumvar, 2); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + hr = IEnumVARIANT_Skip(enumvar, 1); + ok(hr == S_FALSE, "expected S_FALSE, got %#x\n", hr); + + hr = IEnumVARIANT_Reset(enumvar); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + count = -1; + hr = IEnumVARIANT_Next(enumvar, 1, NULL, &count); + ok(hr == E_POINTER, "expected E_POINTER, got %#x\n", hr); + memset(var, 0, sizeof(var)); - count = 0; - hr = IEnumVARIANT_Next(enumvar, 3, var, (ULONG *)&count); + count = -1; + hr = IEnumVARIANT_Next(enumvar, 1, var, &count); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + ok(count == 1, "expected 1, got %d\n", count); + hr = ITaskFolder_get_Path((ITaskFolder *)V_DISPATCH(&var[0]), &bstr); + ok(hr == S_OK, "get_Path error %#x\n", hr); + ok(!lstrcmpW(bstr, Wine_Folder2), "expected \\Wine\\Folder2, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hr = ITaskFolder_get_Name((ITaskFolder *)V_DISPATCH(&var[0]), &bstr); + ok(hr == S_OK, "get_Name error %#x\n", hr); + ok(!lstrcmpW(bstr, Folder2), "expected Folder2, got %s\n", wine_dbgstr_w(bstr)); + IDispatch_Release(V_DISPATCH(&var[0])); + + memset(var, 0, sizeof(var)); + count = -1; + hr = IEnumVARIANT_Next(enumvar, 1, var, &count); + ok(hr == S_FALSE, "expected S_FALSE, got %#x\n", hr); + ok(count == 0, "expected 0, got %d\n", count); + + count = -1; + hr = IEnumVARIANT_Next(enumvar, 1, NULL, &count); + ok(hr == S_FALSE, "expected S_FALSE, got %#x\n", hr); + ok(count == 0, "expected 0, got %d\n", count); + + hr = IEnumVARIANT_Reset(enumvar); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + memset(var, 0, sizeof(var)); + count = -1; + hr = IEnumVARIANT_Next(enumvar, 3, var, &count); ok(hr == S_FALSE, "expected S_FALSE, got %#x\n", hr); ok(count == 2, "expected 2, got %d\n", count); ok(V_VT(&var[0]) == VT_DISPATCH, "expected VT_DISPATCH, got %d\n", V_VT(&var[0]));

1 0

Henri Verbeet : dxgi: Implement IDXGIFactory1.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: 3d28b01916cf83461ee36325bb555b3f0771e792 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d28b01916cf83461ee36325b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 28 10:09:26 2014 +0100 dxgi: Implement IDXGIFactory1. --- dlls/dxgi/factory.c | 34 +++++++++++++++++++++++++++------- include/wine/winedxgi.idl | 2 +- 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index e0aa035..18a9a81 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -38,6 +38,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_QueryInterface(IWineDXGIFactory *i if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDXGIObject) || IsEqualGUID(riid, &IID_IDXGIFactory) + || IsEqualGUID(riid, &IID_IDXGIFactory1) || IsEqualGUID(riid, &IID_IWineDXGIFactory)) { IUnknown_AddRef(iface); @@ -124,29 +125,38 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_GetParent(IWineDXGIFactory *iface, /* IDXGIFactory methods */ -static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumAdapters(IWineDXGIFactory *iface, - UINT adapter_idx, IDXGIAdapter **adapter) +static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumAdapters1(IWineDXGIFactory *iface, + UINT adapter_idx, IDXGIAdapter1 **adapter) { - struct dxgi_factory *This = impl_from_IWineDXGIFactory(iface); + struct dxgi_factory *factory = impl_from_IWineDXGIFactory(iface); TRACE("iface %p, adapter_idx %u, adapter %p\n", iface, adapter_idx, adapter); - if (!adapter) return DXGI_ERROR_INVALID_CALL; + if (!adapter) + return DXGI_ERROR_INVALID_CALL; - if (adapter_idx >= This->adapter_count) + if (adapter_idx >= factory->adapter_count) { *adapter = NULL; return DXGI_ERROR_NOT_FOUND; } - *adapter = (IDXGIAdapter *)This->adapters[adapter_idx]; - IDXGIAdapter_AddRef(*adapter); + *adapter = (IDXGIAdapter1 *)factory->adapters[adapter_idx]; + IDXGIAdapter1_AddRef(*adapter); TRACE("Returning adapter %p\n", *adapter); return S_OK; } +static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumAdapters(IWineDXGIFactory *iface, + UINT adapter_idx, IDXGIAdapter **adapter) +{ + TRACE("iface %p, adapter_idx %u, adapter %p\n", iface, adapter_idx, adapter); + + return dxgi_factory_EnumAdapters1(iface, adapter_idx, (IDXGIAdapter1 **)adapter); +} + static HRESULT STDMETHODCALLTYPE dxgi_factory_MakeWindowAssociation(IWineDXGIFactory *iface, HWND window, UINT flags) { FIXME("iface %p, window %p, flags %#x stub!\n\n", iface, window, flags); @@ -263,6 +273,13 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSoftwareAdapter(IWineDXGIFac return E_NOTIMPL; } +static BOOL STDMETHODCALLTYPE dxgi_factory_IsCurrent(IWineDXGIFactory *iface) +{ + FIXME("iface %p stub!\n", iface); + + return TRUE; +} + /* IWineDXGIFactory methods */ static struct wined3d * STDMETHODCALLTYPE dxgi_factory_get_wined3d(IWineDXGIFactory *iface) @@ -294,6 +311,9 @@ static const struct IWineDXGIFactoryVtbl dxgi_factory_vtbl = dxgi_factory_GetWindowAssociation, dxgi_factory_CreateSwapChain, dxgi_factory_CreateSoftwareAdapter, + /* IDXGIFactory1 methods */ + dxgi_factory_EnumAdapters1, + dxgi_factory_IsCurrent, /* IWineDXGIFactory methods */ dxgi_factory_get_wined3d, }; diff --git a/include/wine/winedxgi.idl b/include/wine/winedxgi.idl index a3baece..26f29e3 100644 --- a/include/wine/winedxgi.idl +++ b/include/wine/winedxgi.idl @@ -23,7 +23,7 @@ import "dxgi.idl"; local, uuid(a07ad9ab-fb01-4574-8bfb-0a70a7373f04) ] -interface IWineDXGIFactory : IDXGIFactory +interface IWineDXGIFactory : IDXGIFactory1 { struct wined3d *get_wined3d(); }

1 0

Henri Verbeet : dxgi: Store IWineDXGIAdapter pointers in the factory.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: e9f9c15016c4650a00c74916fbcaa5d1c7141d23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9f9c15016c4650a00c74916f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 28 10:09:24 2014 +0100 dxgi: Store IWineDXGIAdapter pointers in the factory. --- dlls/dxgi/dxgi_private.h | 2 +- dlls/dxgi/factory.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 1ae997c..20401c7 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -82,7 +82,7 @@ struct dxgi_factory LONG refcount; struct wined3d *wined3d; UINT adapter_count; - IDXGIAdapter **adapters; + IWineDXGIAdapter **adapters; }; HRESULT dxgi_factory_init(struct dxgi_factory *factory) DECLSPEC_HIDDEN; diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 72927c5..e0aa035 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -74,7 +74,7 @@ static ULONG STDMETHODCALLTYPE dxgi_factory_Release(IWineDXGIFactory *iface) for (i = 0; i < This->adapter_count; ++i) { - IDXGIAdapter_Release(This->adapters[i]); + IWineDXGIAdapter_Release(This->adapters[i]); } HeapFree(GetProcessHeap(), 0, This->adapters); @@ -139,7 +139,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumAdapters(IWineDXGIFactory *ifa return DXGI_ERROR_NOT_FOUND; } - *adapter = This->adapters[adapter_idx]; + *adapter = (IDXGIAdapter *)This->adapters[adapter_idx]; IDXGIAdapter_AddRef(*adapter); TRACE("Returning adapter %p\n", *adapter); @@ -335,7 +335,7 @@ HRESULT dxgi_factory_init(struct dxgi_factory *factory) for (j = 0; j < i; ++j) { - IDXGIAdapter_Release(factory->adapters[j]); + IWineDXGIAdapter_Release(factory->adapters[j]); } hr = E_OUTOFMEMORY; goto fail; @@ -351,12 +351,12 @@ HRESULT dxgi_factory_init(struct dxgi_factory *factory) HeapFree(GetProcessHeap(), 0, adapter); for (j = 0; j < i; ++j) { - IDXGIAdapter_Release(factory->adapters[j]); + IWineDXGIAdapter_Release(factory->adapters[j]); } goto fail; } - factory->adapters[i] = (IDXGIAdapter *)adapter; + factory->adapters[i] = &adapter->IWineDXGIAdapter_iface; } return S_OK;

1 0

Dmitry Timoshkov : taskschd: Implement enumeration of task folders in registry.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: 18ccad835190731c0f9ed34d7358aba00e3c7d55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18ccad835190731c0f9ed34d7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 28 11:54:41 2014 +0900 taskschd: Implement enumeration of task folders in registry. --- dlls/taskschd/folder_collection.c | 115 ++++++++++++++++++++++++++++++++++++- 1 file changed, 114 insertions(+), 1 deletion(-) diff --git a/dlls/taskschd/folder_collection.c b/dlls/taskschd/folder_collection.c index 4448667..f1a3f3f 100644 --- a/dlls/taskschd/folder_collection.c +++ b/dlls/taskschd/folder_collection.c @@ -31,10 +31,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(taskschd); +static const char root[] = "Software\\Microsoft\\Windows NT\\CurrentVersion\\Schedule\\TaskCache\\Tree"; + typedef struct { ITaskFolderCollection ITaskFolderCollection_iface; LONG ref; + WCHAR *path; + LPWSTR *list; + LONG count; } TaskFolderCollection; static inline TaskFolderCollection *impl_from_ITaskFolderCollection(ITaskFolderCollection *iface) @@ -48,6 +53,16 @@ static ULONG WINAPI folders_AddRef(ITaskFolderCollection *iface) return InterlockedIncrement(&folders->ref); } +static void free_list(LPWSTR *list, LONG count) +{ + LONG i; + + for (i = 0; i < count; i++) + heap_free(list[i]); + + heap_free(list); +} + static ULONG WINAPI folders_Release(ITaskFolderCollection *iface) { TaskFolderCollection *folders = impl_from_ITaskFolderCollection(iface); @@ -56,6 +71,8 @@ static ULONG WINAPI folders_Release(ITaskFolderCollection *iface) if (!ref) { TRACE("destroying %p\n", iface); + free_list(folders->list, folders->count); + heap_free(folders->path); heap_free(folders); } @@ -140,15 +157,111 @@ static const ITaskFolderCollectionVtbl TaskFolderCollection_vtbl = folders_get__NewEnum }; +static HRESULT reg_open_folder(const WCHAR *path, HKEY *hfolder) +{ + HKEY hroot; + DWORD ret; + + ret = RegCreateKeyA(HKEY_LOCAL_MACHINE, root, &hroot); + if (ret) return HRESULT_FROM_WIN32(ret); + + while (*path == '\\') path++; + ret = RegOpenKeyExW(hroot, path, 0, KEY_ALL_ACCESS, hfolder); + if (ret == ERROR_FILE_NOT_FOUND) + ret = ERROR_PATH_NOT_FOUND; + + RegCloseKey(hroot); + + return HRESULT_FROM_WIN32(ret); +} + +static inline void reg_close_folder(HKEY hfolder) +{ + RegCloseKey(hfolder); +} + +static HRESULT create_folders_list(const WCHAR *path, LPWSTR **folders_list, LONG *folders_count) +{ + HRESULT hr; + HKEY hfolder; + WCHAR name[MAX_PATH]; + LONG ret, idx, allocated, count; + LPWSTR *list; + + *folders_list = NULL; + *folders_count = 0; + + hr = reg_open_folder(path, &hfolder); + if (hr) return hr; + + allocated = 64; + list = heap_alloc(allocated * sizeof(LPWSTR)); + if (!list) + { + reg_close_folder(hfolder); + return E_OUTOFMEMORY; + } + + idx = count = 0; + + while (!(ret = RegEnumKeyW(hfolder, idx++, name, MAX_PATH))) + { + /* FIXME: differentiate between folders and tasks */ + if (count >= allocated) + { + LPWSTR *new_list; + allocated *= 2; + new_list = heap_realloc(list, allocated * sizeof(LPWSTR)); + if (!new_list) + { + reg_close_folder(hfolder); + free_list(list, count); + return E_OUTOFMEMORY; + } + list = new_list; + } + + list[count] = heap_strdupW(name); + if (!list[count]) + { + reg_close_folder(hfolder); + free_list(list, count); + return E_OUTOFMEMORY; + } + + count++; + } + + reg_close_folder(hfolder); + + *folders_list = list; + *folders_count = count; + + return S_OK; +} + HRESULT TaskFolderCollection_create(const WCHAR *path, ITaskFolderCollection **obj) { TaskFolderCollection *folders; + HRESULT hr; + LPWSTR *list; + LONG count; + + hr = create_folders_list(path, &list, &count); + if (hr) return hr; folders = heap_alloc(sizeof(*folders)); - if (!folders) return E_OUTOFMEMORY; + if (!folders) + { + free_list(list, count); + return E_OUTOFMEMORY; + } folders->ITaskFolderCollection_iface.lpVtbl = &TaskFolderCollection_vtbl; folders->ref = 1; + folders->path = heap_strdupW(path); + folders->count = count; + folders->list = list; *obj = &folders->ITaskFolderCollection_iface; TRACE("created %p\n", *obj);

1 0

Dmitry Timoshkov : taskschd: Add some useful inline helpers for memory management.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: 89548cd0ad2b5fbca1297fa48e2005aacb28add6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89548cd0ad2b5fbca1297fa48… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 28 11:54:36 2014 +0900 taskschd: Add some useful inline helpers for memory management. --- dlls/taskschd/folder.c | 12 ++++++------ dlls/taskschd/folder_collection.c | 4 ++-- dlls/taskschd/task.c | 4 ++-- dlls/taskschd/taskschd_private.h | 29 +++++++++++++++++++++++++++++ 4 files changed, 39 insertions(+), 10 deletions(-) diff --git a/dlls/taskschd/folder.c b/dlls/taskschd/folder.c index ce0176a..1793a62 100644 --- a/dlls/taskschd/folder.c +++ b/dlls/taskschd/folder.c @@ -60,8 +60,8 @@ static ULONG WINAPI TaskFolder_Release(ITaskFolder *iface) if (!ref) { TRACE("destroying %p\n", iface); - HeapFree(GetProcessHeap(), 0, folder->path); - HeapFree(GetProcessHeap(), 0, folder); + heap_free(folder->path); + heap_free(folder); } return ref; @@ -374,7 +374,7 @@ HRESULT TaskFolder_create(const WCHAR *parent, const WCHAR *path, ITaskFolder ** if (parent) len += strlenW(parent); /* +1 if parent is not '\' terminated */ - folder_path = HeapAlloc(GetProcessHeap(), 0, (len + 2) * sizeof(WCHAR)); + folder_path = heap_alloc((len + 2) * sizeof(WCHAR)); if (!folder_path) return E_OUTOFMEMORY; folder_path[0] = 0; @@ -399,16 +399,16 @@ HRESULT TaskFolder_create(const WCHAR *parent, const WCHAR *path, ITaskFolder ** hr = create ? reg_create_folder(folder_path, &hfolder) : reg_open_folder(folder_path, &hfolder); if (hr) { - HeapFree(GetProcessHeap(), 0, folder_path); + heap_free(folder_path); return hr; } reg_close_folder(hfolder); - folder = HeapAlloc(GetProcessHeap(), 0, sizeof(*folder)); + folder = heap_alloc(sizeof(*folder)); if (!folder) { - HeapFree(GetProcessHeap(), 0, folder_path); + heap_free(folder_path); return E_OUTOFMEMORY; } diff --git a/dlls/taskschd/folder_collection.c b/dlls/taskschd/folder_collection.c index 3327511..4448667 100644 --- a/dlls/taskschd/folder_collection.c +++ b/dlls/taskschd/folder_collection.c @@ -56,7 +56,7 @@ static ULONG WINAPI folders_Release(ITaskFolderCollection *iface) if (!ref) { TRACE("destroying %p\n", iface); - HeapFree(GetProcessHeap(), 0, folders); + heap_free(folders); } return ref; @@ -144,7 +144,7 @@ HRESULT TaskFolderCollection_create(const WCHAR *path, ITaskFolderCollection **o { TaskFolderCollection *folders; - folders = HeapAlloc(GetProcessHeap(), 0, sizeof(*folders)); + folders = heap_alloc(sizeof(*folders)); if (!folders) return E_OUTOFMEMORY; folders->ITaskFolderCollection_iface.lpVtbl = &TaskFolderCollection_vtbl; diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index a13a968..c424700 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -59,7 +59,7 @@ static ULONG WINAPI TaskService_Release(ITaskService *iface) if (!ref) { TRACE("destroying %p\n", iface); - HeapFree(GetProcessHeap(), 0, task_svc); + heap_free(task_svc); } return ref; @@ -254,7 +254,7 @@ HRESULT TaskService_create(void **obj) { TaskService *task_svc; - task_svc = HeapAlloc(GetProcessHeap(), 0, sizeof(*task_svc)); + task_svc = heap_alloc(sizeof(*task_svc)); if (!task_svc) return E_OUTOFMEMORY; task_svc->ITaskService_iface.lpVtbl = &TaskService_vtbl; diff --git a/dlls/taskschd/taskschd_private.h b/dlls/taskschd/taskschd_private.h index 0d801a9..9837cd3 100644 --- a/dlls/taskschd/taskschd_private.h +++ b/dlls/taskschd/taskschd_private.h @@ -16,8 +16,37 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wine/unicode.h" + HRESULT TaskService_create(void **obj) DECLSPEC_HIDDEN; HRESULT TaskFolder_create(const WCHAR *parent, const WCHAR *path, ITaskFolder **obj, BOOL create) DECLSPEC_HIDDEN; HRESULT TaskFolderCollection_create(const WCHAR *path, ITaskFolderCollection **obj) DECLSPEC_HIDDEN; const char *debugstr_variant(const VARIANT *v) DECLSPEC_HIDDEN; + +static void *heap_alloc(SIZE_T size) __WINE_ALLOC_SIZE(1); +static inline void *heap_alloc(SIZE_T size) +{ + return HeapAlloc(GetProcessHeap(), 0, size); +} + +static void *heap_realloc(void *ptr, SIZE_T size) __WINE_ALLOC_SIZE(2); +static inline void *heap_realloc(void *ptr, SIZE_T size) +{ + return HeapReAlloc(GetProcessHeap(), 0, ptr, size); +} + +static inline BOOL heap_free(void *ptr) +{ + return HeapFree(GetProcessHeap(), 0, ptr); +} + +static inline WCHAR *heap_strdupW(const WCHAR *src) +{ + WCHAR *dst; + unsigned len; + if (!src) return NULL; + len = (strlenW(src) + 1) * sizeof(WCHAR); + if ((dst = heap_alloc(len))) memcpy(dst, src, len); + return dst; +}

1 0

Dmitry Timoshkov : taskschd/tests: Add some ITaskFolderCollection tests.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: 463b1b645097c198ba1f7714e20cc362c1cd065f URL: http://source.winehq.org/git/wine.git/?a=commit;h=463b1b645097c198ba1f7714e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 28 11:54:33 2014 +0900 taskschd/tests: Add some ITaskFolderCollection tests. --- dlls/taskschd/tests/scheduler.c | 249 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 249 insertions(+) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 2d9beea..700fab2 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -360,12 +361,260 @@ todo_wine ITaskService_Release(service); } +static void set_var(int vt, VARIANT *var, LONG val) +{ + V_VT(var) = vt; + + switch(vt) + { + case VT_I1: + case VT_UI1: + V_UI1(var) = (BYTE)val; + break; + + case VT_I2: + case VT_UI2: + V_UI2(var) = (USHORT)val; + break; + + case VT_I4: + case VT_UI4: + V_UI4(var) = val; + break; + + case VT_I8: + case VT_UI8: + V_UI8(var) = val; + break; + + case VT_INT: + case VT_UINT: + V_UINT(var) = val; + break; + + default: + assert(0); + break; + } +} + +static void test_FolderCollection(void) +{ + static WCHAR Wine[] = { '\\','W','i','n','e',0 }; + static WCHAR Wine_Folder1[] = { '\\','W','i','n','e','\\','F','o','l','d','e','r','1',0 }; + static WCHAR Wine_Folder2[] = { '\\','W','i','n','e','\\','F','o','l','d','e','r','2',0 }; + static WCHAR Wine_Folder3[] = { '\\','W','i','n','e','\\','F','o','l','d','e','r','3',0 }; + static const WCHAR Folder1[] = { 'F','o','l','d','e','r','1',0 }; + static const WCHAR Folder2[] = { 'F','o','l','d','e','r','2',0 }; + HRESULT hr; + BSTR bstr; + VARIANT v_null, var[3]; + ITaskService *service; + ITaskFolder *root, *folder, *subfolder; + ITaskFolderCollection *folders; + IUnknown *unknown; + IEnumVARIANT *enumvar; + LONG count, i; + VARIANT idx; + static const int vt[] = { VT_I1, VT_I2, VT_I4, VT_I8, VT_UI1, VT_UI2, VT_UI4, VT_UI8, VT_INT, VT_UINT }; + + hr = CoCreateInstance(&CLSID_TaskScheduler, NULL, CLSCTX_INPROC_SERVER, &IID_ITaskService, (void **)&service); + if (hr != S_OK) + { + win_skip("CoCreateInstance(CLSID_TaskScheduler) error %#x\n", hr); + return; + } + + V_VT(&v_null) = VT_NULL; + + hr = ITaskService_Connect(service, v_null, v_null, v_null, v_null); + ok(hr == S_OK, "Connect error %#x\n", hr); + + hr = ITaskService_GetFolder(service, NULL, &root); + ok(hr == S_OK, "GetFolder error %#x\n", hr); + + /* Just in case something was left from previous runs */ + ITaskFolder_DeleteFolder(root, Wine_Folder1, 0); + ITaskFolder_DeleteFolder(root, Wine_Folder2, 0); + ITaskFolder_DeleteFolder(root, Wine_Folder3, 0); + ITaskFolder_DeleteFolder(root, Wine, 0); + + hr = ITaskFolder_CreateFolder(root, Wine_Folder1, v_null, &subfolder); + ok(hr == S_OK, "CreateFolder error %#x\n", hr); + ITaskFolder_Release(subfolder); + + hr = ITaskFolder_CreateFolder(root, Wine_Folder2, v_null, &subfolder); + ok(hr == S_OK, "CreateFolder error %#x\n", hr); + ITaskFolder_Release(subfolder); + + hr = ITaskFolder_GetFolder(root, Wine, &folder); + ok(hr == S_OK, "GetFolder error %#x\n", hr); + + hr = ITaskFolder_GetFolders(folder, 0, &folders); + ok(hr == S_OK, "GetFolders error %#x\n", hr); + + ITaskFolder_Release(folder); + + count = 0; + hr = ITaskFolderCollection_get_Count(folders, &count); +todo_wine + ok(hr == S_OK, "get_Count error %#x\n", hr); +todo_wine + ok(count == 2, "expected 2, got %d\n", count); + + hr = ITaskFolder_CreateFolder(root, Wine_Folder3, v_null, &subfolder); + ok(hr == S_OK, "CreateFolder error %#x\n", hr); + ITaskFolder_Release(subfolder); + + count = 0; + hr = ITaskFolderCollection_get_Count(folders, &count); +todo_wine + ok(hr == S_OK, "get_Count error %#x\n", hr); +todo_wine + ok(count == 2, "expected 2, got %d\n", count); + /* FIXME: remove once implemented */ + if (!count) goto failed; + + for (i = 0; i < sizeof(vt)/sizeof(vt[0]); i++) + { + set_var(vt[i], &idx, 1); + hr = ITaskFolderCollection_get_Item(folders, idx, &subfolder); + ok(hr == S_OK, "get_Item(vt = %d) error %#x\n", vt[i], hr); + ITaskFolder_Release(subfolder); + } + + for (i = 0; i <= count; i++) + { + V_VT(&idx) = VT_I4; + V_UI4(&idx) = i; + hr = ITaskFolderCollection_get_Item(folders, idx, &subfolder); + if (i == 0) + { + ok (hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + continue; + } + ok(hr == S_OK, "get_Item error %#x\n", hr); + + hr = ITaskFolder_get_Path(subfolder, &bstr); + ok(hr == S_OK, "get_Path error %#x\n", hr); + if (i == 1) + ok(!lstrcmpW(bstr, Wine_Folder1), "expected \\Wine\\Folder1, got %s\n", wine_dbgstr_w(bstr)); + else + ok(!lstrcmpW(bstr, Wine_Folder2), "expected \\Wine\\Folder2, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + hr = ITaskFolder_get_Name(subfolder, &bstr); + ok(hr == S_OK, "get_Name error %#x\n", hr); + if (i == 1) + ok(!lstrcmpW(bstr, Folder1), "expected Folder1, got %s\n", wine_dbgstr_w(bstr)); + else + ok(!lstrcmpW(bstr, Folder2), "expected Folder2, got %s\n", wine_dbgstr_w(bstr)); + + ITaskFolder_Release(subfolder); + + V_VT(&idx) = VT_BSTR; + V_BSTR(&idx) = bstr; + hr = ITaskFolderCollection_get_Item(folders, idx, &subfolder); + ok(hr == S_OK, "get_Item error %#x\n", hr); + SysFreeString(bstr); + + hr = ITaskFolder_get_Path(subfolder, &bstr); + ok(hr == S_OK, "get_Path error %#x\n", hr); + if (i == 1) + ok(!lstrcmpW(bstr, Wine_Folder1), "expected \\Wine\\Folder1, got %s\n", wine_dbgstr_w(bstr)); + else + ok(!lstrcmpW(bstr, Wine_Folder2), "expected \\Wine\\Folder2, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + hr = ITaskFolder_get_Name(subfolder, &bstr); + ok(hr == S_OK, "get_Name error %#x\n", hr); + if (i == 1) + ok(!lstrcmpW(bstr, Folder1), "expected Folder1, got %s\n", wine_dbgstr_w(bstr)); + else + ok(!lstrcmpW(bstr, Folder2), "expected Folder2, got %s\n", wine_dbgstr_w(bstr)); + + ITaskFolder_Release(subfolder); + } + + V_VT(&idx) = VT_I4; + V_UI4(&idx) = 3; + hr = ITaskFolderCollection_get_Item(folders, idx, &subfolder); + ok (hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + + hr = ITaskFolderCollection_QueryInterface(folders, &IID_IEnumVARIANT, (void **)&enumvar); + ok(hr == E_NOINTERFACE, "expected E_NOINTERFACE, got %#x\n", hr); + hr = ITaskFolderCollection_QueryInterface(folders, &IID_IEnumUnknown, (void **)&enumvar); + ok(hr == E_NOINTERFACE, "expected E_NOINTERFACE, got %#x\n", hr); + + hr = ITaskFolderCollection_get__NewEnum(folders, &unknown); + ok(hr == S_OK, "get__NewEnum error %#x\n", hr); + hr = IUnknown_QueryInterface(unknown, &IID_IEnumUnknown, (void **)&enumvar); + ok(hr == E_NOINTERFACE, "expected E_NOINTERFACE, got %#x\n", hr); + hr = IUnknown_QueryInterface(unknown, &IID_IEnumVARIANT, (void **)&enumvar); + ok(hr == S_OK, "QueryInterface error %#x\n", hr); + IEnumVARIANT_Release(enumvar); + + hr = IUnknown_QueryInterface(unknown, &IID_IUnknown, (void **)&enumvar); + ok(hr == S_OK, "QueryInterface error %#x\n", hr); + + memset(var, 0, sizeof(var)); + count = 0; + hr = IEnumVARIANT_Next(enumvar, 3, var, (ULONG *)&count); + ok(hr == S_FALSE, "expected S_FALSE, got %#x\n", hr); + ok(count == 2, "expected 2, got %d\n", count); + ok(V_VT(&var[0]) == VT_DISPATCH, "expected VT_DISPATCH, got %d\n", V_VT(&var[0])); + ok(V_VT(&var[1]) == VT_DISPATCH, "expected VT_DISPATCH, got %d\n", V_VT(&var[1])); + IEnumVARIANT_Release(enumvar); + + for (i = 0; i < count; i++) + { + hr = IDispatch_QueryInterface(V_DISPATCH(&var[i]), &IID_ITaskFolder, (void **)&subfolder); + ok(hr == S_OK, "QueryInterface error %#x\n", hr); + + hr = ITaskFolder_get_Path(subfolder, &bstr); + ok(hr == S_OK, "get_Path error %#x\n", hr); + if (i == 0) + ok(!lstrcmpW(bstr, Wine_Folder1), "expected \\Wine\\Folder1, got %s\n", wine_dbgstr_w(bstr)); + else + ok(!lstrcmpW(bstr, Wine_Folder2), "expected \\Wine\\Folder2, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + hr = ITaskFolder_get_Name(subfolder, &bstr); + ok(hr == S_OK, "get_Name error %#x\n", hr); + if (i == 0) + ok(!lstrcmpW(bstr, Folder1), "expected Folder1, got %s\n", wine_dbgstr_w(bstr)); + else + ok(!lstrcmpW(bstr, Folder2), "expected Folder2, got %s\n", wine_dbgstr_w(bstr)); + + ITaskFolder_Release(subfolder); + } + + IDispatch_Release(V_DISPATCH(&var[0])); + IDispatch_Release(V_DISPATCH(&var[1])); + +failed: + ITaskFolderCollection_Release(folders); + + hr = ITaskFolder_DeleteFolder(root, Wine_Folder1, 0); + ok(hr == S_OK, "DeleteFolder error %#x\n", hr); + hr = ITaskFolder_DeleteFolder(root, Wine_Folder2, 0); + ok(hr == S_OK, "DeleteFolder error %#x\n", hr); + hr = ITaskFolder_DeleteFolder(root, Wine_Folder3, 0); + ok(hr == S_OK, "DeleteFolder error %#x\n", hr); + hr = ITaskFolder_DeleteFolder(root, Wine, 0); + ok(hr == S_OK, "DeleteFolder error %#x\n", hr); + + ITaskFolder_Release(root); + ITaskService_Release(service); +} + START_TEST(scheduler) { OleInitialize(NULL); test_Connect(); test_GetFolder(); + test_FolderCollection(); OleUninitialize(); }

1 0

Dmitry Timoshkov : taskschd: Add ITaskFolderCollection stub implementation.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: 553352f0afd3db0fd77c10aa98e322d0ee63e60e URL: http://source.winehq.org/git/wine.git/?a=commit;h=553352f0afd3db0fd77c10aa9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 28 11:54:29 2014 +0900 taskschd: Add ITaskFolderCollection stub implementation. --- dlls/taskschd/Makefile.in | 1 + dlls/taskschd/folder.c | 10 ++- dlls/taskschd/folder_collection.c | 157 +++++++++++++++++++++++++++++++++++++ dlls/taskschd/taskschd_private.h | 1 + 4 files changed, 167 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/Makefile.in b/dlls/taskschd/Makefile.in index fa4beba..70a50a0 100644 --- a/dlls/taskschd/Makefile.in +++ b/dlls/taskschd/Makefile.in @@ -3,6 +3,7 @@ IMPORTS = advapi32 oleaut32 C_SRCS = \ folder.c \ + folder_collection.c \ task.c \ taskschd.c diff --git a/dlls/taskschd/folder.c b/dlls/taskschd/folder.c index 412ec5b..ce0176a 100644 --- a/dlls/taskschd/folder.c +++ b/dlls/taskschd/folder.c @@ -232,8 +232,14 @@ static HRESULT WINAPI TaskFolder_GetFolder(ITaskFolder *iface, BSTR path, ITaskF static HRESULT WINAPI TaskFolder_GetFolders(ITaskFolder *iface, LONG flags, ITaskFolderCollection **folders) { - FIXME("%p,%x,%p: stub\n", iface, flags, folders); - return E_NOTIMPL; + TaskFolder *folder = impl_from_ITaskFolder(iface); + + TRACE("%p,%x,%p: stub\n", iface, flags, folders); + + if (flags) + FIXME("unsupported flags %x\n", flags); + + return TaskFolderCollection_create(folder->path, folders); } static inline BOOL is_variant_null(const VARIANT *var) diff --git a/dlls/taskschd/folder_collection.c b/dlls/taskschd/folder_collection.c new file mode 100644 index 0000000..3327511 --- /dev/null +++ b/dlls/taskschd/folder_collection.c @@ -0,0 +1,157 @@ +/* + * Copyright 2014 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "taskschd.h" +#include "taskschd_private.h" + +#include "wine/unicode.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(taskschd); + +typedef struct +{ + ITaskFolderCollection ITaskFolderCollection_iface; + LONG ref; +} TaskFolderCollection; + +static inline TaskFolderCollection *impl_from_ITaskFolderCollection(ITaskFolderCollection *iface) +{ + return CONTAINING_RECORD(iface, TaskFolderCollection, ITaskFolderCollection_iface); +} + +static ULONG WINAPI folders_AddRef(ITaskFolderCollection *iface) +{ + TaskFolderCollection *folders = impl_from_ITaskFolderCollection(iface); + return InterlockedIncrement(&folders->ref); +} + +static ULONG WINAPI folders_Release(ITaskFolderCollection *iface) +{ + TaskFolderCollection *folders = impl_from_ITaskFolderCollection(iface); + LONG ref = InterlockedDecrement(&folders->ref); + + if (!ref) + { + TRACE("destroying %p\n", iface); + HeapFree(GetProcessHeap(), 0, folders); + } + + return ref; +} + +static HRESULT WINAPI folders_QueryInterface(ITaskFolderCollection *iface, REFIID riid, void **obj) +{ + if (!riid || !obj) return E_INVALIDARG; + + TRACE("%p,%s,%p\n", iface, debugstr_guid(riid), obj); + + if (IsEqualGUID(riid, &IID_ITaskFolderCollection) || + IsEqualGUID(riid, &IID_IDispatch) || + IsEqualGUID(riid, &IID_IUnknown)) + { + ITaskFolderCollection_AddRef(iface); + *obj = iface; + return S_OK; + } + + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static HRESULT WINAPI folders_GetTypeInfoCount(ITaskFolderCollection *iface, UINT *count) +{ + FIXME("%p,%p: stub\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI folders_GetTypeInfo(ITaskFolderCollection *iface, UINT index, LCID lcid, ITypeInfo **info) +{ + FIXME("%p,%u,%u,%p: stub\n", iface, index, lcid, info); + return E_NOTIMPL; +} + +static HRESULT WINAPI folders_GetIDsOfNames(ITaskFolderCollection *iface, REFIID riid, LPOLESTR *names, + UINT count, LCID lcid, DISPID *dispid) +{ + FIXME("%p,%s,%p,%u,%u,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); + return E_NOTIMPL; +} + +static HRESULT WINAPI folders_Invoke(ITaskFolderCollection *iface, DISPID dispid, REFIID riid, LCID lcid, WORD flags, + DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *argerr) +{ + FIXME("%p,%d,%s,%04x,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, + params, result, excepinfo, argerr); + return E_NOTIMPL; +} + +static HRESULT WINAPI folders_get_Count(ITaskFolderCollection *iface, LONG *count) +{ + FIXME("%p,%p: stub\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI folders_get_Item(ITaskFolderCollection *iface, VARIANT index, ITaskFolder **folder) +{ + FIXME("%p,%s,%p: stub\n", iface, debugstr_variant(&index), folder); + return E_NOTIMPL; +} + +static HRESULT WINAPI folders_get__NewEnum(ITaskFolderCollection *iface, IUnknown **penum) +{ + FIXME("%p,%p: stub\n", iface, penum); + return E_NOTIMPL; +} + +static const ITaskFolderCollectionVtbl TaskFolderCollection_vtbl = +{ + folders_QueryInterface, + folders_AddRef, + folders_Release, + folders_GetTypeInfoCount, + folders_GetTypeInfo, + folders_GetIDsOfNames, + folders_Invoke, + folders_get_Count, + folders_get_Item, + folders_get__NewEnum +}; + +HRESULT TaskFolderCollection_create(const WCHAR *path, ITaskFolderCollection **obj) +{ + TaskFolderCollection *folders; + + folders = HeapAlloc(GetProcessHeap(), 0, sizeof(*folders)); + if (!folders) return E_OUTOFMEMORY; + + folders->ITaskFolderCollection_iface.lpVtbl = &TaskFolderCollection_vtbl; + folders->ref = 1; + *obj = &folders->ITaskFolderCollection_iface; + + TRACE("created %p\n", *obj); + + return S_OK; +} diff --git a/dlls/taskschd/taskschd_private.h b/dlls/taskschd/taskschd_private.h index 4ef348f..0d801a9 100644 --- a/dlls/taskschd/taskschd_private.h +++ b/dlls/taskschd/taskschd_private.h @@ -18,5 +18,6 @@ HRESULT TaskService_create(void **obj) DECLSPEC_HIDDEN; HRESULT TaskFolder_create(const WCHAR *parent, const WCHAR *path, ITaskFolder **obj, BOOL create) DECLSPEC_HIDDEN; +HRESULT TaskFolderCollection_create(const WCHAR *path, ITaskFolderCollection **obj) DECLSPEC_HIDDEN; const char *debugstr_variant(const VARIANT *v) DECLSPEC_HIDDEN;

1 0

Dmitry Timoshkov : taskschd: Add some invalid parameters checks to ITaskFolder::DeleteFolder.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: e654be2aeca93fb7c0da9079e7c58b718f2270ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=e654be2aeca93fb7c0da9079e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 28 11:54:24 2014 +0900 taskschd: Add some invalid parameters checks to ITaskFolder::DeleteFolder. --- dlls/taskschd/folder.c | 2 ++ dlls/taskschd/tests/scheduler.c | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/dlls/taskschd/folder.c b/dlls/taskschd/folder.c index 4eb7b8a..412ec5b 100644 --- a/dlls/taskschd/folder.c +++ b/dlls/taskschd/folder.c @@ -270,6 +270,8 @@ static HRESULT WINAPI TaskFolder_DeleteFolder(ITaskFolder *iface, BSTR name, LON TRACE("%p,%s,%x\n", iface, debugstr_w(name), flags); + if (!name || !*name) return E_ACCESSDENIED; + if (flags) FIXME("unsupported flags %x\n", flags); diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 61e4a04..2d9beea 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -346,6 +346,16 @@ todo_wine hr = ITaskFolder_DeleteFolder(folder, Wine, 0); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "expected ERROR_FILE_NOT_FOUND, got %#x\n", hr); + hr = ITaskFolder_DeleteFolder(folder, NULL, 0); + ok(hr == E_ACCESSDENIED || hr == E_INVALIDARG /* Vista */, "expected E_ACCESSDENIED, got %#x\n", hr); + + hr = ITaskFolder_DeleteFolder(folder, empty, 0); + ok(hr == E_ACCESSDENIED || hr == E_INVALIDARG /* Vista */, "expected E_ACCESSDENIED, got %#x\n", hr); + + hr = ITaskFolder_DeleteFolder(folder, slash, 0); +todo_wine + ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "expected ERROR_INVALID_NAME, got %#x\n", hr); + ITaskFolder_Release(folder); ITaskService_Release(service); }

1 0

Henri Verbeet : d3d10/tests: Don't reuse the device.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: 127e9bc46b502258f51f39e111d542c74c7f479b URL: http://source.winehq.org/git/wine.git/?a=commit;h=127e9bc46b502258f51f39e11… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 28 10:09:23 2014 +0100 d3d10/tests: Don't reuse the device. --- dlls/d3d10/tests/effect.c | 163 ++++++++++++++++++++++++++++++++++++--------- 1 file changed, 130 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=127e9bc46b502258f51f3…

1 0

Henri Verbeet : d3d10/tests: Also try a WARP device in create_device().
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: ce49a4ae63c6a3f6f9ec790ca19037e54695de49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce49a4ae63c6a3f6f9ec790ca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 28 10:09:22 2014 +0100 d3d10/tests: Also try a WARP device in create_device(). --- dlls/d3d10/tests/device.c | 5 ++--- dlls/d3d10/tests/effect.c | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/d3d10/tests/device.c b/dlls/d3d10/tests/device.c index 0d5e0b3..8df4150 100644 --- a/dlls/d3d10/tests/device.c +++ b/dlls/d3d10/tests/device.c @@ -27,12 +27,11 @@ static ID3D10Device *create_device(void) if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0, D3D10_SDK_VERSION, &device))) return device; - - trace("Failed to create a HW device, trying REF\n"); + if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_WARP, NULL, 0, D3D10_SDK_VERSION, &device))) + return device; if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_REFERENCE, NULL, 0, D3D10_SDK_VERSION, &device))) return device; - trace("Failed to create a device, returning NULL\n"); return NULL; } diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index a07bc6c..c75e59f 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -29,12 +29,11 @@ static ID3D10Device *create_device(void) if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0, D3D10_SDK_VERSION, &device))) return device; - - trace("Failed to create a HW device, trying REF\n"); + if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_WARP, NULL, 0, D3D10_SDK_VERSION, &device))) + return device; if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_REFERENCE, NULL, 0, D3D10_SDK_VERSION, &device))) return device; - trace("Failed to create a device, returning NULL\n"); return NULL; }

1 0

Piotr Caban : msvcrt: Don' t close handles returned by GetStdHandle function.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: 5e3cadf8342e2f008ca084188be94b4ab1f1f394 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e3cadf8342e2f008ca084188… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 28 10:08:47 2014 +0100 msvcrt: Don't close handles returned by GetStdHandle function. --- dlls/msvcrt/file.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index a78076c..80482e1 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1066,14 +1066,8 @@ void msvcrt_free_io(void) unsigned int i; int j; + MSVCRT__flushall(); MSVCRT__fcloseall(); - /* The Win32 _fcloseall() function explicitly doesn't close stdin, - * stdout, and stderr (unlike GNU), so we need to fclose() them here - * or they won't get flushed. - */ - MSVCRT_fclose(&MSVCRT__iob[0]); - MSVCRT_fclose(&MSVCRT__iob[1]); - MSVCRT_fclose(&MSVCRT__iob[2]); for(i=0; i<sizeof(MSVCRT___pioinfo)/sizeof(MSVCRT___pioinfo[0]); i++) MSVCRT_free(MSVCRT___pioinfo[i]);

1 0

Dmitry Timoshkov : taskschd: Implement IEnumVARIANT:: Clone for a folder collection.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: b5ed10c5ca1532c4bd4786e6973e9ddfc3330bc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5ed10c5ca1532c4bd4786e69… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 28 11:54:52 2014 +0900 taskschd: Implement IEnumVARIANT::Clone for a folder collection. --- dlls/taskschd/folder_collection.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/folder_collection.c b/dlls/taskschd/folder_collection.c index c8cc89b..1b8c39d 100644 --- a/dlls/taskschd/folder_collection.c +++ b/dlls/taskschd/folder_collection.c @@ -438,8 +438,11 @@ static HRESULT WINAPI enumvar_Reset(IEnumVARIANT *iface) static HRESULT WINAPI enumvar_Clone(IEnumVARIANT *iface, IEnumVARIANT **penum) { - FIXME("%p,%p: stub\n", iface, penum); - return E_NOTIMPL; + EnumVARIANT *enumvar = impl_from_IEnumVARIANT(iface); + + TRACE("%p,%p\n", iface, penum); + + return NewEnum_create(enumvar->folders, (IUnknown **)penum); } static const struct IEnumVARIANTVtbl EnumVARIANT_vtbl =

1 0

Nikolay Sivov : dlls: Print HRESULT as 32bit value.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: acea0eea5d96bdf9f119fdea65b1a1295f1ac71f URL: http://source.winehq.org/git/wine.git/?a=commit;h=acea0eea5d96bdf9f119fdea6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 28 09:46:35 2014 +0400 dlls: Print HRESULT as 32bit value. --- dlls/dispex/tests/marshal.c | 2 +- dlls/dplayx/dplayx_global.c | 2 +- dlls/oleaut32/tests/tmarshal.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dispex/tests/marshal.c b/dlls/dispex/tests/marshal.c index 1b2ef61..0211cd7 100644 --- a/dlls/dispex/tests/marshal.c +++ b/dlls/dispex/tests/marshal.c @@ -31,7 +31,7 @@ #include "wine/test.h" -#define ok_ole_success(hr, func) ok(hr == S_OK, #func " failed with error 0x%08lx\n", (unsigned long int)hr) +#define ok_ole_success(hr, func) ok(hr == S_OK, #func " failed with error 0x%08x\n", hr) #define RELEASEMARSHALDATA WM_USER diff --git a/dlls/dplayx/dplayx_global.c b/dlls/dplayx/dplayx_global.c index d7f3cca..64c4bc3 100644 --- a/dlls/dplayx/dplayx_global.c +++ b/dlls/dplayx/dplayx_global.c @@ -1200,7 +1200,7 @@ LPCSTR DPLAYX_HresultToString(HRESULT hr) /* For errors not in the list, return HRESULT as a string This part is not thread safe */ WARN( "Unknown error 0x%08x\n", hr ); - wsprintfA( szTempStr, "0x%08lx", hr ); + wsprintfA( szTempStr, "0x%08x", hr ); return szTempStr; } } diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 1a3effe..5753871 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -32,7 +32,7 @@ static HRESULT (WINAPI *pVarAdd)(LPVARIANT,LPVARIANT,LPVARIANT); -#define ok_ole_success(hr, func) ok(hr == S_OK, #func " failed with error 0x%08lx\n", (unsigned long int)hr) +#define ok_ole_success(hr, func) ok(hr == S_OK, #func " failed with error 0x%08x\n", hr) /* ULL suffix is not portable */ #define ULL_CONST(dw1, dw2) ((((ULONGLONG)dw1) << 32) | (ULONGLONG)dw2)

1 0

Nikolay Sivov : oleaut32/tests: Use local IDispatch test impl instead of global variable.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: dd89dd1932172e0f22c0470169f0122ab75798e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd89dd1932172e0f22c047016… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 28 09:49:52 2014 +0400 oleaut32/tests: Use local IDispatch test impl instead of global variable. --- dlls/oleaut32/tests/vartype.c | 64 ++++++++++++++++++++++++++++------------- 1 file changed, 44 insertions(+), 20 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index bc74e2e..035502a 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -537,8 +537,6 @@ typedef struct BOOL bFailInvoke; } DummyDispatch; -static DummyDispatch dispatch; - static inline DummyDispatch *impl_from_IDispatch(IDispatch *iface) { return CONTAINING_RECORD(iface, DummyDispatch, IDispatch_iface); @@ -599,6 +597,8 @@ static HRESULT WINAPI DummyDispatch_Invoke(IDispatch *iface, EXCEPINFO *ei, UINT *arg_err) { + DummyDispatch *This = impl_from_IDispatch(iface); + CHECK_EXPECT(dispatch_invoke); ok(dispid == DISPID_VALUE, "got dispid %d\n", dispid); @@ -614,11 +614,11 @@ static HRESULT WINAPI DummyDispatch_Invoke(IDispatch *iface, ok(ei == NULL, "got %p\n", ei); ok(arg_err == NULL, "got %p\n", arg_err); - if (dispatch.bFailInvoke) + if (This->bFailInvoke) return E_OUTOFMEMORY; - V_VT(res) = dispatch.vt; - if (dispatch.vt == VT_UI1) + V_VT(res) = This->vt; + if (This->vt == VT_UI1) V_UI1(res) = 1; else memset(res, 0, sizeof(*res)); @@ -637,7 +637,13 @@ static const IDispatchVtbl DummyDispatch_VTable = DummyDispatch_Invoke }; -static DummyDispatch dispatch = { { &DummyDispatch_VTable }, 1, 0, 0 }; +static void init_test_dispatch(LONG ref, VARTYPE vt, DummyDispatch *dispatch) +{ + dispatch->IDispatch_iface.lpVtbl = &DummyDispatch_VTable; + dispatch->ref = ref; + dispatch->vt = vt; + dispatch->bFailInvoke = FALSE; +} /* * VT_I1/VT_UI1 @@ -1111,6 +1117,7 @@ static void test_VarUI1FromStr(void) static void test_VarUI1FromDisp(void) { + DummyDispatch dispatch; CONVVARS(LCID); VARIANTARG vSrc, vDst; @@ -1133,10 +1140,9 @@ static void test_VarUI1FromDisp(void) VariantInit(&vSrc); VariantInit(&vDst); + init_test_dispatch(1, VT_UI1, &dispatch); V_VT(&vSrc) = VT_DISPATCH; V_DISPATCH(&vSrc) = &dispatch.IDispatch_iface; - dispatch.vt = VT_UI1; - dispatch.bFailInvoke = FALSE; SET_EXPECT(dispatch_invoke); out = 10; @@ -5693,8 +5699,11 @@ static void test_IUnknownClear(void) { HRESULT hres; VARIANTARG v; - DummyDispatch u = { { &DummyDispatch_VTable }, 1, VT_UI1, FALSE }; - IUnknown* pu = (IUnknown*)&u.IDispatch_iface; + DummyDispatch u; + IUnknown* pu; + + init_test_dispatch(1, VT_UI1, &u); + pu = (IUnknown*)&u.IDispatch_iface; /* Test that IUnknown_Release is called on by-value */ V_VT(&v) = VT_UNKNOWN; @@ -5718,8 +5727,11 @@ static void test_IUnknownCopy(void) { HRESULT hres; VARIANTARG vSrc, vDst; - DummyDispatch u = { { &DummyDispatch_VTable }, 1, VT_UI1, FALSE }; - IUnknown* pu = (IUnknown*)&u.IDispatch_iface; + DummyDispatch u; + IUnknown* pu; + + init_test_dispatch(1, VT_UI1, &u); + pu = (IUnknown*)&u.IDispatch_iface; /* AddRef is called on by-value copy */ VariantInit(&vDst); @@ -5766,8 +5778,11 @@ static void test_IUnknownChangeTypeEx(void) VARIANTARG vSrc, vDst; LCID lcid; VARTYPE vt; - DummyDispatch u = { { &DummyDispatch_VTable }, 1, VT_UI1, FALSE }; - IUnknown* pu = (IUnknown*)&u.IDispatch_iface; + DummyDispatch u; + IUnknown* pu; + + init_test_dispatch(1, VT_UI1, &u); + pu = (IUnknown*)&u.IDispatch_iface; lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); @@ -5831,8 +5846,11 @@ static void test_IDispatchClear(void) { HRESULT hres; VARIANTARG v; - DummyDispatch d = { { &DummyDispatch_VTable }, 1, VT_UI1, FALSE }; - IDispatch* pd = &d.IDispatch_iface; + DummyDispatch d; + IDispatch* pd; + + init_test_dispatch(1, VT_UI1, &d); + pd = &d.IDispatch_iface; /* As per IUnknown */ @@ -5856,8 +5874,11 @@ static void test_IDispatchCopy(void) { HRESULT hres; VARIANTARG vSrc, vDst; - DummyDispatch d = { { &DummyDispatch_VTable }, 1, VT_UI1, FALSE }; - IDispatch* pd = &d.IDispatch_iface; + DummyDispatch d; + IDispatch* pd; + + init_test_dispatch(1, VT_UI1, &d); + pd = &d.IDispatch_iface; /* As per IUnknown */ @@ -5901,8 +5922,11 @@ static void test_IDispatchChangeTypeEx(void) HRESULT hres; VARIANTARG vSrc, vDst; LCID lcid; - DummyDispatch d = { { &DummyDispatch_VTable }, 1, VT_UI1, FALSE }; - IDispatch* pd = &d.IDispatch_iface; + DummyDispatch d; + IDispatch* pd; + + init_test_dispatch(1, VT_UI1, &d); + pd = &d.IDispatch_iface; lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT);

1 0

Nikolay Sivov : widl: Uuid attribute is allowed for 'struct'.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: cbf55d82519e8e69c2cf4581e4029204c6425e78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbf55d82519e8e69c2cf4581e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 28 09:49:25 2014 +0400 widl: Uuid attribute is allowed for 'struct'. --- dlls/oleaut32/tests/test_tlb.idl | 6 +++ dlls/oleaut32/tests/typelib.c | 84 +++++++++++++++++++++++++------------- include/objbase.h | 3 +- tools/widl/parser.y | 2 +- 4 files changed, 65 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cbf55d82519e8e69c2cf4…

1 0

Piotr Caban : msvcrt: Support _IOSTRG flag in _filbuf function.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: e16059113cf717a0422c4ff6e0d0d64e5a60355b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e16059113cf717a0422c4ff6e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 28 10:08:17 2014 +0100 msvcrt: Support _IOSTRG flag in _filbuf function. --- dlls/msvcrt/file.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 04651fb..908ba26 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3280,6 +3280,11 @@ int CDECL MSVCRT__filbuf(MSVCRT_FILE* file) unsigned char c; MSVCRT__lock_file(file); + if(file->_flag & MSVCRT__IOSTRG) { + MSVCRT__unlock_file(file); + return MSVCRT_EOF; + } + /* Allocate buffer if needed */ if(file->_bufsiz == 0 && !(file->_flag & MSVCRT__IONBF)) msvcrt_alloc_buffer(file);

1 0

刘涛 : website: Simplified Chinese translation for wine 1.7.11 release
by Jeremy Newman Jan. 27, 2014

Jan. 27, 2014

Module: website Branch: master Commit: 190e3a9e4f8f0f237e15ec3e509f83626d07ae72 URL: http://source.winehq.org/git/website.git/?a=commit;h=190e3a9e4f8f0f237e15ec… Author: 刘涛 <wendaotao(a)163.com> Date: Mon Jan 27 15:49:09 2014 +0800 website: Simplified Chinese translation for wine 1.7.11 release --- news/zh-cn/2014011701.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/zh-cn/2014011701.xml b/news/zh-cn/2014011701.xml new file mode 100644 index 0000000..7cf5912 --- /dev/null +++ b/news/zh-cn/2014011701.xml @@ -0,0 +1,17 @@ +<news> +<date>一月 17, 2014</date> +<title>Wine 1.7.11 发布</title> +<body> + Wine 开发版 1.7.11 现在可以使用了。 + 本次<a href="{$root}/announce/1.7.11">更新</a> : +<ul> + <li>在 RichEdit 控件中加入对 Uniscribe 的支持。</li> + <li>支持条件变量和 Slim 读写锁。</li> + <li>更多 Direct3D 指令流的准备工作。</li> + <li>在桌面模式中增加可选的开始菜单。</li> + <li>改进对竖排字体规格的支持。</li> + <li>各种 bug 的修复。</li> +</ul> +源代码可以从<a href="http://prdownloads.sourceforge.net/wine/wine-1.7.11.tar.bz2">这里</a>获取。 +二进制包正在构建中，稍后将出现在各自相应的<a href="{$root}/download">下载位置</a>。 +</body></news>

1 0

André Hentschel : shell32/tests: Avoid preprocessor check to ensure it compiles.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 9d1fdf1165e81116d7401a8dc4a65d78a053efd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d1fdf1165e81116d7401a8dc… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 22 22:32:31 2014 +0100 shell32/tests: Avoid preprocessor check to ensure it compiles. --- dlls/shell32/tests/string.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/string.c b/dlls/shell32/tests/string.c index 1d55ecf..81f4754 100644 --- a/dlls/shell32/tests/string.c +++ b/dlls/shell32/tests/string.c @@ -87,13 +87,14 @@ static void test_StrRetToStringNW(void) "STRRET_OFFSET: dup failed, ret=%d\n", ret); /* The next test crashes on W2K, WinXP and W2K3, so we don't test. */ -#if 0 +if (0) +{ /* Invalid dest - should return FALSE, except NT4 does not, so we don't check. */ strret.uType = STRRET_WSTR; U(strret).pOleStr = CoDupStrW("Test"); pStrRetToStrNAW(NULL, sizeof(buff)/sizeof(WCHAR), &strret, NULL); trace("NULL dest: ret=%d\n", ret); -#endif +} } START_TEST(string)

1 0