January 2014 - Wine-Commits

Vincent Povirk : gdiplus: Add option to save metafile tests to files.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 6332297bf5ca260949cda900e98d6b7f4d29516f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6332297bf5ca260949cda900e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jan 24 16:22:58 2014 -0600 gdiplus: Add option to save metafile tests to files. --- dlls/gdiplus/tests/metafile.c | 42 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 16c440b..f9a5092 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -27,6 +27,8 @@ #define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) #define expectf(expected, got) ok(fabs((expected) - (got)) < 0.0001, "Expected %f, got %f\n", (expected), (got)) +static BOOL save_metafiles; + typedef struct emfplus_record { BOOL todo; @@ -248,6 +250,29 @@ static void play_metafile(GpMetafile *metafile, GpGraphics *graphics, const emfp expect(Ok, stat); } +static void save_metafile(GpMetafile *metafile, const char *filename) +{ + if (save_metafiles) + { + GpMetafile *clone; + HENHMETAFILE hemf; + GpStatus stat; + + stat = GdipCloneImage((GpImage*)metafile, (GpImage**)&clone); + expect(Ok, stat); + + stat = GdipGetHemfFromMetafile(clone, &hemf); + expect(Ok, stat); + + DeleteEnhMetaFile(CopyEnhMetaFileA(hemf, filename)); + + DeleteEnhMetaFile(hemf); + + stat = GdipDisposeImage((GpImage*)clone); + expect(Ok, stat); + } +} + static const emfplus_record empty_records[] = { {0, EMR_HEADER}, {0, EmfPlusRecordTypeHeader}, @@ -310,6 +335,8 @@ static void test_empty(void) check_metafile(metafile, empty_records, "empty metafile", dst_points, &frame, UnitPixel); + save_metafile(metafile, "empty.emf"); + stat = GdipGetHemfFromMetafile(metafile, &hemf); expect(Ok, stat); @@ -399,6 +426,8 @@ static void test_getdc(void) check_metafile(metafile, getdc_records, "getdc metafile", dst_points, &frame, UnitPixel); + save_metafile(metafile, "getdc.emf"); + stat = GdipCreateBitmapFromScan0(100, 100, 0, PixelFormat32bppARGB, NULL, &bitmap); expect(Ok, stat); @@ -532,6 +561,8 @@ static void test_emfonly(void) check_metafile(metafile, emfonly_records, "emfonly metafile", dst_points, &frame, UnitPixel); + save_metafile(metafile, "emfonly.emf"); + stat = GdipCreateBitmapFromScan0(100, 100, 0, PixelFormat32bppARGB, NULL, &bitmap); expect(Ok, stat); @@ -658,6 +689,8 @@ static void test_fillrect(void) check_metafile(metafile, fillrect_records, "fillrect metafile", dst_points, &frame, UnitPixel); + save_metafile(metafile, "fillrect.emf"); + stat = GdipCreateBitmapFromScan0(100, 100, 0, PixelFormat32bppARGB, NULL, &bitmap); expect(Ok, stat); @@ -869,6 +902,8 @@ static void test_pagetransform(void) check_metafile(metafile, pagetransform_records, "pagetransform metafile", dst_points, &frame, UnitPixel); + save_metafile(metafile, "pagetransform.emf"); + stat = GdipCreateBitmapFromScan0(100, 100, 0, PixelFormat32bppARGB, NULL, &bitmap); expect(Ok, stat); @@ -915,6 +950,8 @@ START_TEST(metafile) { struct GdiplusStartupInput gdiplusStartupInput; ULONG_PTR gdiplusToken; + int myARGC; + char **myARGV; gdiplusStartupInput.GdiplusVersion = 1; gdiplusStartupInput.DebugEventCallback = NULL; @@ -923,6 +960,11 @@ START_TEST(metafile) GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); + myARGC = winetest_get_mainargs( &myARGV ); + + if (myARGC >= 3 && !strcmp(myARGV[2], "save")) + save_metafiles = TRUE; + test_empty(); test_getdc(); test_emfonly();

1 0

Jacek Caban : include: Added wmp.idl.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: d57ccd77ec74d98a223e0c725b354661e98f36a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d57ccd77ec74d98a223e0c725… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jan 25 18:21:18 2014 +0100 include: Added wmp.idl. --- include/Makefile.in | 1 + include/wmp.idl | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 0d0dab6..7153467 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -124,6 +124,7 @@ PUBLIC_IDL_H_SRCS = \ wine/svcctl.idl \ winsxs.idl \ wmiutils.idl \ + wmp.idl \ wmsbuffer.idl \ wmsdkidl.idl \ wpcapi.idl \ diff --git a/include/wmp.idl b/include/wmp.idl new file mode 100644 index 0000000..86e507d --- /dev/null +++ b/include/wmp.idl @@ -0,0 +1,42 @@ +/* + * Copyright 2014 Jacek Caban 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 + */ + +import "oaidl.idl"; +import "ocidl.idl"; + +#ifndef __WIDL__ +#define threading(model) +#define progid(str) +#define vi_progid(str) +#endif + +[ + helpstring("Windows Media Player"), + version(1.0), + uuid(6bf52a50-394a-11d3-b153-00c04f79Faa6) +] +library WMPLib { + [ + helpstring("Windows Media Player"), + threading(apartment), + progid("WMPlayer.OCX"), + uuid(6bf52a52-394a-11d3-b153-00c04f79faa6) + ] + coclass WindowsMediaPlayer + {} +}

1 0

Piotr Caban : msvcp90: Read last character of bool string in num_get_do_get_bool.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 12cfebb683fa71d6a0cab967620533a7e25821a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12cfebb683fa71d6a0cab9676… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 20 15:08:27 2014 +0100 msvcp90: Read last character of bool string in num_get_do_get_bool. --- dlls/msvcp60/locale.c | 12 ++++++++---- dlls/msvcp90/locale.c | 12 ++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp60/locale.c b/dlls/msvcp60/locale.c index a2ce279..6b95521 100644 --- a/dlls/msvcp60/locale.c +++ b/dlls/msvcp60/locale.c @@ -4828,8 +4828,7 @@ static istreambuf_iterator_wchar* num_get_do_get_bool(const num_get *this, pfalse = basic_string_wchar_c_str(&false_bstr); ptrue = basic_string_wchar_c_str(&true_bstr); - for(istreambuf_iterator_wchar_val(&first); first.strbuf; - istreambuf_iterator_wchar_inc(&first)) { + for(istreambuf_iterator_wchar_val(&first); first.strbuf;) { if(pfalse && *pfalse && first.val!=*pfalse) pfalse = NULL; if(ptrue && *ptrue && first.val!=*ptrue) @@ -4845,6 +4844,9 @@ static istreambuf_iterator_wchar* num_get_do_get_bool(const num_get *this, if(ptrue) ptrue++; + if(pfalse || ptrue) + istreambuf_iterator_wchar_inc(&first); + if((!pfalse || !*pfalse) && (!ptrue || !*ptrue)) break; } @@ -5608,8 +5610,7 @@ istreambuf_iterator_char *__thiscall num_get_char_do_get_bool(const num_get *thi pfalse = basic_string_char_c_str(&false_bstr); ptrue = basic_string_char_c_str(&true_bstr); - for(istreambuf_iterator_char_val(&first); first.strbuf; - istreambuf_iterator_char_inc(&first)) { + for(istreambuf_iterator_char_val(&first); first.strbuf;) { if(pfalse && *pfalse && first.val!=*pfalse) pfalse = NULL; if(ptrue && *ptrue && first.val!=*ptrue) @@ -5625,6 +5626,9 @@ istreambuf_iterator_char *__thiscall num_get_char_do_get_bool(const num_get *thi if(ptrue) ptrue++; + if(pfalse || ptrue) + istreambuf_iterator_char_inc(&first); + if((!pfalse || !*pfalse) && (!ptrue || !*ptrue)) break; } diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 02ccb0e..2cdd002 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -5850,8 +5850,7 @@ static istreambuf_iterator_wchar* num_get_do_get_bool(const num_get *this, pfalse = MSVCP_basic_string_wchar_c_str(&false_bstr); ptrue = MSVCP_basic_string_wchar_c_str(&true_bstr); - for(istreambuf_iterator_wchar_val(&first); first.strbuf; - istreambuf_iterator_wchar_inc(&first)) { + for(istreambuf_iterator_wchar_val(&first); first.strbuf;) { if(pfalse && *pfalse && first.val!=*pfalse) pfalse = NULL; if(ptrue && *ptrue && first.val!=*ptrue) @@ -5867,6 +5866,9 @@ static istreambuf_iterator_wchar* num_get_do_get_bool(const num_get *this, if(ptrue) ptrue++; + if(pfalse || ptrue) + istreambuf_iterator_wchar_inc(&first); + if((!pfalse || !*pfalse) && (!ptrue || !*ptrue)) break; } @@ -6823,8 +6825,7 @@ istreambuf_iterator_char *__thiscall num_get_char_do_get_bool(const num_get *thi pfalse = MSVCP_basic_string_char_c_str(&false_bstr); ptrue = MSVCP_basic_string_char_c_str(&true_bstr); - for(istreambuf_iterator_char_val(&first); first.strbuf; - istreambuf_iterator_char_inc(&first)) { + for(istreambuf_iterator_char_val(&first); first.strbuf;) { if(pfalse && *pfalse && first.val!=*pfalse) pfalse = NULL; if(ptrue && *ptrue && first.val!=*ptrue) @@ -6840,6 +6841,9 @@ istreambuf_iterator_char *__thiscall num_get_char_do_get_bool(const num_get *thi if(ptrue) ptrue++; + if(pfalse || ptrue) + istreambuf_iterator_char_inc(&first); + if((!pfalse || !*pfalse) && (!ptrue || !*ptrue)) break; }

1 0

Jacek Caban : wmp: Added new DLL.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: e7053c1100b6758c9dcd5bde285bec959d136e9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7053c1100b6758c9dcd5bde2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jan 25 18:42:34 2014 +0100 wmp: Added new DLL. --- configure | 2 ++ configure.ac | 1 + dlls/wmp/Makefile.in | 4 +++ dlls/wmp/wmp.spec | 4 +++ dlls/wmp/wmp_main.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 93 insertions(+) diff --git a/configure b/configure index c2d0dd0..e3b45e2 100755 --- a/configure +++ b/configure @@ -1239,6 +1239,7 @@ enable_wlanapi enable_wldap32 enable_wmi enable_wmiutils +enable_wmp enable_wmvcore enable_wnaspi32 enable_ws2_32 @@ -17102,6 +17103,7 @@ wine_fn_config_test dlls/wldap32/tests wldap32_test wine_fn_config_dll wmi enable_wmi wine_fn_config_dll wmiutils enable_wmiutils clean wine_fn_config_test dlls/wmiutils/tests wmiutils_test +wine_fn_config_dll wmp enable_wmp wine_fn_config_dll wmvcore enable_wmvcore wine_fn_config_dll wnaspi32 enable_wnaspi32 implib wine_fn_config_dll wow32 enable_win16 implib diff --git a/configure.ac b/configure.ac index 4f51909..7744044 100644 --- a/configure.ac +++ b/configure.ac @@ -3226,6 +3226,7 @@ WINE_CONFIG_TEST(dlls/wldap32/tests) WINE_CONFIG_DLL(wmi) WINE_CONFIG_DLL(wmiutils,,[clean]) WINE_CONFIG_TEST(dlls/wmiutils/tests) +WINE_CONFIG_DLL(wmp) WINE_CONFIG_DLL(wmvcore) WINE_CONFIG_DLL(wnaspi32,,[implib]) WINE_CONFIG_DLL(wow32,enable_win16,[implib]) diff --git a/dlls/wmp/Makefile.in b/dlls/wmp/Makefile.in new file mode 100644 index 0000000..7d34324 --- /dev/null +++ b/dlls/wmp/Makefile.in @@ -0,0 +1,4 @@ +MODULE = wmp.dll + +C_SRCS = \ + wmp_main.c diff --git a/dlls/wmp/wmp.spec b/dlls/wmp/wmp.spec new file mode 100644 index 0000000..b16365d --- /dev/null +++ b/dlls/wmp/wmp.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/wmp/wmp_main.c b/dlls/wmp/wmp_main.c new file mode 100644 index 0000000..c0933f2 --- /dev/null +++ b/dlls/wmp/wmp_main.c @@ -0,0 +1,82 @@ +/* + * Copyright 2014 Jacek Caban 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 "windows.h" +#include "ole2.h" +#include "rpcproxy.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wmp); + +static HINSTANCE wmp_instance; + +/****************************************************************** + * DllMain (wmp.@) + */ +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +{ + TRACE("(%p %d %p)\n", hInstDLL, fdwReason, lpv); + + switch(fdwReason) { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hInstDLL); + wmp_instance = hInstDLL; + break; + } + + return TRUE; +} + +/*********************************************************************** + * DllGetClassObject (wmp.@) + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + return CLASS_E_CLASSNOTAVAILABLE; +} + +/*********************************************************************** + * DllCanUnloadNow (wmp.@) + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + TRACE("\n"); + return S_FALSE; +} + +/*********************************************************************** + * DllRegisterServer (wmp.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + TRACE("()\n"); + return __wine_register_resources(wmp_instance); +} + +/*********************************************************************** + * DllUnregisterServer (wmp.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + TRACE("()\n"); + return __wine_unregister_resources(wmp_instance); +}

1 0

Jacek Caban : mshtml: Release ActiveX object interfaces in detach_plugin_host.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: e2d04d3dec8d560a5a9d26f453fa63a304aadba2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2d04d3dec8d560a5a9d26f45… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 21 15:54:42 2014 +0100 mshtml: Release ActiveX object interfaces in detach_plugin_host. --- dlls/mshtml/pluginhost.c | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 38a8fd5..7c1b760 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -893,6 +893,29 @@ static ULONG WINAPI PHClientSite_AddRef(IOleClientSite *iface) return ref; } +static void release_plugin_ifaces(PluginHost *This) +{ + if(This->disp) { + IDispatch_Release(This->disp); + This->disp = NULL; + } + + if(This->ip_object) { + IOleInPlaceObject_Release(This->ip_object); + This->ip_object = NULL; + } + + if(This->plugin_unk) { + IUnknown *unk = This->plugin_unk; + LONG ref; + + This->plugin_unk = NULL; + ref = IUnknown_Release(unk); + + TRACE("plugin ref = %d\n", ref); + } +} + static ULONG WINAPI PHClientSite_Release(IOleClientSite *iface) { PluginHost *This = impl_from_IOleClientSite(iface); @@ -901,10 +924,7 @@ static ULONG WINAPI PHClientSite_Release(IOleClientSite *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) { - if(This->disp) - IDispatch_Release(This->disp); - if(This->ip_object) - IOleInPlaceObject_Release(This->ip_object); + release_plugin_ifaces(This); if(This->sink) { This->sink->host = NULL; IDispatch_Release(&This->sink->IDispatch_iface); @@ -913,8 +933,6 @@ static ULONG WINAPI PHClientSite_Release(IOleClientSite *iface) list_remove(&This->entry); if(This->element) This->element->plugin_host = NULL; - if(This->plugin_unk) - IUnknown_Release(This->plugin_unk); heap_free(This); } @@ -1687,6 +1705,8 @@ void detach_plugin_host(PluginHost *host) host->sink = NULL; } + release_plugin_ifaces(host); + if(host->element) { host->element->plugin_host = NULL; host->element = NULL;

1 0

Dmitry Timoshkov : taskschd: Implement ITaskFolder::get_Name.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: a4c4574bd403624c4b8d5c159a9d299deeff309c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4c4574bd403624c4b8d5c159… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jan 20 16:05:50 2014 +0900 taskschd: Implement ITaskFolder::get_Name. --- dlls/taskschd/folder.c | 19 +++++++++++++++++-- dlls/taskschd/tests/scheduler.c | 5 ----- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/taskschd/folder.c b/dlls/taskschd/folder.c index 9114417..6d69002 100644 --- a/dlls/taskschd/folder.c +++ b/dlls/taskschd/folder.c @@ -115,8 +115,23 @@ static HRESULT WINAPI TaskFolder_Invoke(ITaskFolder *iface, DISPID dispid, REFII static HRESULT WINAPI TaskFolder_get_Name(ITaskFolder *iface, BSTR *name) { - FIXME("%p,%p: stub\n", iface, name); - return E_NOTIMPL; + TaskFolder *folder = impl_from_ITaskFolder(iface); + const WCHAR *p_name; + + TRACE("%p,%p\n", iface, name); + + if (!name) return E_POINTER; + + p_name = strrchrW(folder->path, '\\'); + if (!p_name) + p_name = folder->path; + else + if (p_name[1] != 0) p_name++; + + *name = SysAllocString(p_name); + if (!*name) return E_OUTOFMEMORY; + + return S_OK; } static HRESULT reg_open_folder(const WCHAR *path, HKEY *hfolder) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 32c8f71..a976de2 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -169,17 +169,12 @@ todo_wine ok(hr == S_OK, "GetFolder error %#x\n", hr); hr = ITaskFolder_get_Name(folder, NULL); -todo_wine ok(hr == E_POINTER, "expected E_POINTER, got %#x\n", hr); hr = ITaskFolder_get_Name(folder, &bstr); -todo_wine ok (hr == S_OK, "get_Name error %#x\n", hr); -if (hr == S_OK) -{ ok(!lstrcmpW(bstr, bslash), "expected '\\', got %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); -} hr = ITaskFolder_get_Path(folder, NULL); ok(hr == E_POINTER, "expected E_POINTER, got %#x\n", hr);

1 0

Dmitry Timoshkov : taskschd: Make GetFolder check whether task folder tree exists in the registry.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 630354f6df619f3833db083242370fd6358f5607 URL: http://source.winehq.org/git/wine.git/?a=commit;h=630354f6df619f3833db08324… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jan 20 16:04:16 2014 +0900 taskschd: Make GetFolder check whether task folder tree exists in the registry. --- dlls/taskschd/Makefile.in | 2 +- dlls/taskschd/folder.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/taskschd/tests/scheduler.c | 1 - 3 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/Makefile.in b/dlls/taskschd/Makefile.in index 80775c7..fa4beba 100644 --- a/dlls/taskschd/Makefile.in +++ b/dlls/taskschd/Makefile.in @@ -1,5 +1,5 @@ MODULE = taskschd.dll -IMPORTS = oleaut32 +IMPORTS = advapi32 oleaut32 C_SRCS = \ folder.c \ diff --git a/dlls/taskschd/folder.c b/dlls/taskschd/folder.c index c19aa4e..cb285fd 100644 --- a/dlls/taskschd/folder.c +++ b/dlls/taskschd/folder.c @@ -22,6 +22,7 @@ #include "windef.h" #include "winbase.h" +#include "winreg.h" #include "objbase.h" #include "taskschd.h" #include "taskschd_private.h" @@ -31,6 +32,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(taskschd); +static const char root[] = "Software\\Microsoft\\Windows NT\\CurrentVersion\\Schedule\\TaskCache\\Tree"; + typedef struct { ITaskFolder ITaskFolder_iface; @@ -116,6 +119,29 @@ static HRESULT WINAPI TaskFolder_get_Name(ITaskFolder *iface, BSTR *name) return E_NOTIMPL; } +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 WINAPI TaskFolder_get_Path(ITaskFolder *iface, BSTR *path) { TaskFolder *folder = impl_from_ITaskFolder(iface); @@ -232,6 +258,8 @@ HRESULT TaskFolder_create(const WCHAR *parent, const WCHAR *path, ITaskFolder ** TaskFolder *folder; WCHAR *folder_path; int len = 0; + HRESULT hr; + HKEY hfolder; if (path) { @@ -260,6 +288,15 @@ HRESULT TaskFolder_create(const WCHAR *parent, const WCHAR *path, ITaskFolder ** strcatW(folder_path, path); } + hr = reg_open_folder(folder_path, &hfolder); + if (hr) + { + HeapFree(GetProcessHeap(), 0, folder_path); + return hr; + } + + reg_close_folder(hfolder); + folder = HeapAlloc(GetProcessHeap(), 0, sizeof(*folder)); if (!folder) { diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 38d60a4..32c8f71 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -203,7 +203,6 @@ todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "expected ERROR_INVALID_NAME, got %#x\n", hr); hr = ITaskService_GetFolder(service, Wine_Folder1_Folder2, &subfolder); -todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "expected ERROR_PATH_NOT_FOUND, got %#x\n", hr); hr = ITaskFolder_CreateFolder(folder, bslash, v_null, &subfolder);

1 0

Dmitry Timoshkov : taskschd: Implement ITaskFolder::DeleteFolder.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 3003ee9ba1a395a3da20d54efb6641759d942635 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3003ee9ba1a395a3da20d54ef… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jan 20 16:04:58 2014 +0900 taskschd: Implement ITaskFolder::DeleteFolder. --- dlls/taskschd/folder.c | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/folder.c b/dlls/taskschd/folder.c index cb285fd..9114417 100644 --- a/dlls/taskschd/folder.c +++ b/dlls/taskschd/folder.c @@ -137,6 +137,29 @@ static HRESULT reg_open_folder(const WCHAR *path, HKEY *hfolder) return HRESULT_FROM_WIN32(ret); } +static HRESULT reg_delete_folder(const WCHAR *path, const WCHAR *name) +{ + HKEY hroot, hfolder; + DWORD ret; + + ret = RegCreateKeyA(HKEY_LOCAL_MACHINE, root, &hroot); + if (ret) return HRESULT_FROM_WIN32(ret); + + while (*path == '\\') path++; + ret = RegOpenKeyExW(hroot, path, 0, DELETE, &hfolder); + + RegCloseKey(hroot); + + while (*name == '\\') name++; + if (ret == ERROR_SUCCESS) + { + ret = RegDeleteKeyW(hfolder, name); + RegCloseKey(hfolder); + } + + return HRESULT_FROM_WIN32(ret); +} + static inline void reg_close_folder(HKEY hfolder) { RegCloseKey(hfolder); @@ -176,8 +199,14 @@ static HRESULT WINAPI TaskFolder_CreateFolder(ITaskFolder *iface, BSTR name, VAR static HRESULT WINAPI TaskFolder_DeleteFolder(ITaskFolder *iface, BSTR name, LONG flags) { - FIXME("%p,%s,%x: stub\n", iface, debugstr_w(name), flags); - return E_NOTIMPL; + TaskFolder *folder = impl_from_ITaskFolder(iface); + + TRACE("%p,%s,%x\n", iface, debugstr_w(name), flags); + + if (flags) + FIXME("unsupported flags %x\n", flags); + + return reg_delete_folder(folder->path, name); } static HRESULT WINAPI TaskFolder_GetTask(ITaskFolder *iface, BSTR path, IRegisteredTask **task)

1 0

Volkan Gezer : Update Turkish news to version 1.7.11
by Jeremy Newman Jan. 20, 2014

Jan. 20, 2014

Module: website Branch: master Commit: b575bec82160fc3b7f417575cf28b0b0fe30e262 URL: http://source.winehq.org/git/website.git/?a=commit;h=b575bec82160fc3b7f4175… Author: Volkan Gezer <vlkngzr(a)gmail.com> Date: Mon Jan 20 18:21:29 2014 +0100 Update Turkish news to version 1.7.11 --- news/tr/2013122001.xml | 15 +++++++++++++++ news/tr/2014010301.xml | 17 +++++++++++++++++ news/tr/2014011001.xml | 13 +++++++++++++ news/tr/2014011701.xml | 17 +++++++++++++++++ 4 files changed, 62 insertions(+) diff --git a/news/tr/2013122001.xml b/news/tr/2013122001.xml new file mode 100644 index 0000000..1922feb --- /dev/null +++ b/news/tr/2013122001.xml @@ -0,0 +1,15 @@ +<news> + <date>20 Aralık 2013</date> + <title>Wine 1.7.9 Yayınlandı</title> + <body> + Wine geliştirme sürümü 1.7.9 artık kullanılabilir. + Bu sürümdeki <a href="{$root}/announce/1.7.9">yenilikler</a>: +<ul> + <li>Mac sürücüsündeki pencere taşıma/boyutlandırma iyileştirmesi.</li> + <li>Bazı DirectDraw palet onarımları.</li> + <li>C++ çalışma zamanı sürümleri arasındaki kod yinelenmesi azaltıldı.</li> + <li>Çeşitli hata onarımları.</li> +</ul> +Kaynak dosyaları <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.9.tar.bz2">artık indirilebilir</a>. + İnşa sürecindeki ikili paketler kısa zaman içinde <a href="{$root}/download">indirme</a> konumunda yerini alacaktır. + </body></news> diff --git a/news/tr/2014010301.xml b/news/tr/2014010301.xml new file mode 100644 index 0000000..4f53eb6 --- /dev/null +++ b/news/tr/2014010301.xml @@ -0,0 +1,17 @@ +<news> + <date>3 Ocak 2014</date> + <title>Wine 1.7.10 Yayınlandı</title> + <body> + Wine geliştirme sürümü 1.7.10 artık kullanılabilir. + Bu sürümdeki <a href="{$root}/announce/1.7.10">yenilikler</a>: +<ul> + <li>Mac sürüsücünde pencere ekranı kaplaması.</li> + <li>AVI sıkıştırma desteği.</li> + <li>Dinamik olarak yüklü kütüphanelerde yerel iş parçacığı depolama desteği.</li> + <li>Görev Zamanlayıcı geliştirmesi başlangıcı.</li> + <li>İyileştirilmiş IPX protokol desteği.</li> + <li>Çeşitli hata onarımları.</li> +</ul> +Kaynak dosyaları <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.10.tar.bz2">artık indirilebilir</a>. + İnşa sürecindeki ikili paketler kısa zaman içinde <a href="{$root}/download">indirme</a> konumunda yerini alacaktır. + </body></news> diff --git a/news/tr/2014011001.xml b/news/tr/2014011001.xml new file mode 100644 index 0000000..65b62cb --- /dev/null +++ b/news/tr/2014011001.xml @@ -0,0 +1,13 @@ +<news> + <date>10 Ocak 2014</date> + <title>Wine 1.6.2 Yayınlandı</title> + <body> + Wine bakım sürümü 1.6.2 artık kullanılabilir. + Bu sürümdeki <a href="{$root}/announce/1.6.2">yenilikler</a>: +<ul> + <li>Renk yönetim desteği liblcms sürüm 2'ye yükseltildi.</li> + <li>Çeşitli hata onarımları.</li> +</ul> +Kaynak dosyaları <a href="http://prdownloads.sourceforge.net/wine/wine-1.6.2.tar.bz2">artık indirilebilir</a>. + İnşa sürecindeki ikili paketler kısa zaman içinde <a href="{$root}/download">indirme</a> konumunda yerini alacaktır. + </body></news> diff --git a/news/tr/2014011701.xml b/news/tr/2014011701.xml new file mode 100644 index 0000000..06eeaaf --- /dev/null +++ b/news/tr/2014011701.xml @@ -0,0 +1,17 @@ +<news> + <date>17 Ocak 2014</date> + <title>Wine 1.7.11 Yayınlandı</title> + <body> + Wine geliştirme sürümü 1.7.11 artık kullanılabilir. + Bu sürümdeki <a href="{$root}/announce/1.7.11">yenilikler</a>: +<ul> + <li>RichEdit denetiminde unikod desteği.</li> + <li>Koşul değişkenleri ve Slim Okuyucu/Yazıcı kilitleri için destek.</li> + <li>Daha fazla D3D komut akış hazırlık çalışması.</li> + <li>Masaüstü kipinde isteğe bağlı Başlat Menüsü.</li> + <li>Dikey yazı tipi ölçütleri için iyileştirilmiş destek.</li> + <li>Çeşitli hata onarımları.</li> +</ul> +Kaynak dosyaları <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.11.tar.bz2">artık indirilebilir</a>. + İnşa sürecindeki ikili paketler kısa zaman içinde <a href="{$root}/download">indirme</a> konumunda yerini alacaktır. + </body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.11
by Jeremy Newman Jan. 20, 2014

Jan. 20, 2014

Module: website Branch: master Commit: dae07c0b5b0d187dbdc83a3983b4fa41f40f609f URL: http://source.winehq.org/git/website.git/?a=commit;h=dae07c0b5b0d187dbdc83a… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Jan 18 05:59:02 2014 +0100 Polish translation for release 1.7.11 --- news/pl/2014011701.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/pl/2014011701.xml b/news/pl/2014011701.xml new file mode 100644 index 0000000..fd7a6ad --- /dev/null +++ b/news/pl/2014011701.xml @@ -0,0 +1,17 @@ +<news> +<date>Styczeń 17, 2014</date> +<title>Wydano Wine 1.7.11</title> +<body> + Wydanie rozwojowe Wine 1.7.11 jest już dostępne. + <a href="{$root}/announce/1.7.11">Co nowego</a> w tym wydaniu: +<ul> + <li>Wsparcie dla Uniscribe w elementach sterowania RichEdit.</li> + <li>Wsparcie dla zmiennych warunkowych i blokad Slim Reader/Writer.</li> + <li>Włożono więcej pracy w powstawanie strumienia poleceń D3D.</li> + <li>Opcjonalne menu start w trybie pulpitu.</li> + <li>Ulepszono wsparcie dla metryk pionowych czcionek.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.11.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0