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

Andrey Gusev : Ukrainian translation for release 1.7.11
by Jeremy Newman Jan. 20, 2014

Jan. 20, 2014

Module: website Branch: master Commit: 98373fc111568910486e38e5f505ec4ea45ff73f URL: http://source.winehq.org/git/website.git/?a=commit;h=98373fc111568910486e38… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat Jan 18 11:28:59 2014 +0200 Ukrainian translation for release 1.7.11 --- news/uk/2014011701.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/uk/2014011701.xml b/news/uk/2014011701.xml new file mode 100644 index 0000000..e5ed372 --- /dev/null +++ b/news/uk/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>Підтримка Uniscribe у налаштуванні RichEdit.</li> + <li>Підтримка змінних умов та Slim Reader/Writer замків.</li> + <li>Більший командний потік підготовчих робіт D3D.</li> + <li>Опціональне меню Пуск у режимі робочого столу.</li> + <li>Покращена підтримка метрика вертикальних шрифтів.</li> + <li>Виправлення різних помилок.</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 : Wine 1.7.11 freigegeben
by Jeremy Newman Jan. 20, 2014

Jan. 20, 2014

Module: website Branch: master Commit: a7abd1e159a07168dad996845a60e133e0d1ec56 URL: http://source.winehq.org/git/website.git/?a=commit;h=a7abd1e159a07168dad996… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 17 22:24:36 2014 +0100 Wine 1.7.11 freigegeben --- news/de/2014011701.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2014011701.xml b/news/de/2014011701.xml new file mode 100644 index 0000000..7fdb910 --- /dev/null +++ b/news/de/2014011701.xml @@ -0,0 +1,17 @@ +<news> +<date>17. Januar 2014</date> +<title>Wine 1.7.11 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.11 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.11">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung für Uniscribe im RichEdit Steuerelement.</li> + <li>Unterstützung für Bedingungsvariablen und Slim Reader/Writer locks.</li> + <li>Mehr Vorarbeit für den Direct3D Befehlsstrom.</li> + <li>Optionales Startmenü im Desktopmodus.</li> + <li>Verbesserte Unterstützung für vertikale Schriftarten.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.11.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Lucas Zawacki : Portuguese translation for release 1.7.10
by Jeremy Newman Jan. 20, 2014

Jan. 20, 2014

Module: website Branch: master Commit: b54baa130129ab04a326aef462fa2235c68f3571 URL: http://source.winehq.org/git/website.git/?a=commit;h=b54baa130129ab04a326ae… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Mon Jan 20 11:49:56 2014 -0200 Portuguese translation for release 1.7.10 --- news/pt/2014010301.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/pt/2014010301.xml b/news/pt/2014010301.xml new file mode 100644 index 0000000..a3ac466 --- /dev/null +++ b/news/pt/2014010301.xml @@ -0,0 +1,16 @@ +<news> +<date>3 de Janeiro de 2014</date> +<title>Wine 1.7.10 lançado</title> +<body> + A versão de desenvolvimento 1.7.10 já está disponível agora. + <a href="{$root}/announce/1.7.10">Novidades</a> desta versão: +<ul> + <li>Maximização de janelas no driver de Mac.</li> + <li>Implementação de um compressor AVI.</li> + <li>Armazenamento local a threads em bibliotecas carregadas dinamicamente.</li> + <li>Começo da implementação de um Gerenciador de Tarefas.</li> + <li>Suporte ao protocolo IPX estendido.</li> + <li>Várias correções de bugs.</li> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.10.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e irão aparecer em breve em suas respectivas <a href="{$root}/download">sessões da área de downloads</a>. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.7.11
by Jeremy Newman Jan. 20, 2014

Jan. 20, 2014

Module: website Branch: master Commit: 19455fe5005fe889c796ebc4908a48d492c668f6 URL: http://source.winehq.org/git/website.git/?a=commit;h=19455fe5005fe889c796eb… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jan 17 21:26:40 2014 +0100 French translation for release 1.7.11 --- news/fr/2014011701.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/fr/2014011701.xml b/news/fr/2014011701.xml new file mode 100644 index 0000000..6207ece --- /dev/null +++ b/news/fr/2014011701.xml @@ -0,0 +1,16 @@ +<news> +<date>17 janvier 2014</date> +<title>Sortie de Wine 1.7.11</title> +<body> + La version de développement 1.7.11 de Wine est disponible. + <a href="{$root}/announce/1.7.11">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge de Uniscribe dans le contrôle RichEdit.</li> + <li>Prise en charge des variables conditionnelles et des verrous SRW (Slim Reader/Writer).</li> + <li>Travail préparatoire additionnel pour le flux de commandes D3D.</li> + <li>Menu Démarrer optionnel dans le mode bureau.</li> + <li>Prise en charge améliorée des métriques de fontes verticales.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.11.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Alexandre Julliard : Wine release 1.7.11
by Alexandre Julliard Jan. 17, 2014

Jan. 17, 2014

Module: website Branch: master Commit: 350464e6c0462e4356ae57bbb1e3a91bd30ce2b2 URL: http://source.winehq.org/git/website.git/?a=commit;h=350464e6c0462e4356ae57… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 17 20:56:37 2014 +0100 Wine release 1.7.11 --- news/en/2014011701.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2014011701.xml b/news/en/2014011701.xml new file mode 100644 index 0000000..a903f9e --- /dev/null +++ b/news/en/2014011701.xml @@ -0,0 +1,17 @@ +<news> +<date>January 17, 2014</date> +<title>Wine 1.7.11 Released</title> +<body> + The Wine development release 1.7.11 is now available. + <a href="{$root}/announce/1.7.11">What's new</a> in this release: +<ul> + <li>Uniscribe support in the RichEdit control.</li> + <li>Support for condition variables and Slim Reader/Writer locks.</li> + <li>More D3D command stream preparation work.</li> + <li>Optional Start Menu in desktop mode.</li> + <li>Improved support for vertical fonts metrics.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.11.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.7.11 : Alexandre Julliard : Release 1.7.11
by Alexandre Julliard Jan. 17, 2014

Jan. 17, 2014

Module: wine Branch: refs/tags/wine-1.7.11 Tag: d74ede00a8e425644b75f4e71cf49dffd6c062a8 URL: http://source.winehq.org/git/wine.git/?a=tag;h=d74ede00a8e425644b75f4e71cf4… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 17 20:48:48 2014 +0100 Release 1.7.11

1 0

Alexandre Julliard : Release 1.7.11.
by Alexandre Julliard Jan. 17, 2014

Jan. 17, 2014

Module: wine Branch: master Commit: e12a1bdf7840f2f34cc3df470cc2a59844bc5b87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e12a1bdf7840f2f34cc3df470… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 17 20:48:48 2014 +0100 Release 1.7.11. --- ANNOUNCE | 766 ++++++++++++++++++++++++++++++++++++------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 462 insertions(+), 324 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e12a1bdf7840f2f34cc3d…

1 0

Dmitry Timoshkov : taskschd: Implement ITaskFolder::get_Path.
by Alexandre Julliard Jan. 17, 2014

Jan. 17, 2014

Module: wine Branch: master Commit: 663444ccb70899887537697f08d9f024a6ee885f URL: http://source.winehq.org/git/wine.git/?a=commit;h=663444ccb70899887537697f0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jan 17 18:00:08 2014 +0900 taskschd: Implement ITaskFolder::get_Path. --- dlls/taskschd/folder.c | 51 ++++++++++++++++++++++++++++++++++++--- dlls/taskschd/tests/scheduler.c | 5 ---- 2 files changed, 48 insertions(+), 8 deletions(-) diff --git a/dlls/taskschd/folder.c b/dlls/taskschd/folder.c index ef69cfe..c19aa4e 100644 --- a/dlls/taskschd/folder.c +++ b/dlls/taskschd/folder.c @@ -35,6 +35,7 @@ typedef struct { ITaskFolder ITaskFolder_iface; LONG ref; + WCHAR *path; } TaskFolder; static inline TaskFolder *impl_from_ITaskFolder(ITaskFolder *iface) @@ -56,6 +57,7 @@ static ULONG WINAPI TaskFolder_Release(ITaskFolder *iface) if (!ref) { TRACE("destroying %p\n", iface); + HeapFree(GetProcessHeap(), 0, folder->path); HeapFree(GetProcessHeap(), 0, folder); } @@ -116,8 +118,16 @@ static HRESULT WINAPI TaskFolder_get_Name(ITaskFolder *iface, BSTR *name) static HRESULT WINAPI TaskFolder_get_Path(ITaskFolder *iface, BSTR *path) { - FIXME("%p,%p: stub\n", iface, path); - return E_NOTIMPL; + TaskFolder *folder = impl_from_ITaskFolder(iface); + + TRACE("%p,%p\n", iface, path); + + if (!path) return E_POINTER; + + *path = SysAllocString(folder->path); + if (!*path) return E_OUTOFMEMORY; + + return S_OK; } static HRESULT WINAPI TaskFolder_GetFolder(ITaskFolder *iface, BSTR path, ITaskFolder **folder) @@ -218,13 +228,48 @@ static const ITaskFolderVtbl TaskFolder_vtbl = HRESULT TaskFolder_create(const WCHAR *parent, const WCHAR *path, ITaskFolder **obj) { + static const WCHAR bslash[] = { '\\', 0 }; TaskFolder *folder; + WCHAR *folder_path; + int len = 0; + + if (path) + { + len = strlenW(path); + if (len && path[len - 1] == '\\') return ERROR_INVALID_NAME; + } + + if (parent) len += strlenW(parent); + + /* +1 if parent is not '\' terminated */ + folder_path = HeapAlloc(GetProcessHeap(), 0, (len + 2) * sizeof(WCHAR)); + if (!folder_path) return E_OUTOFMEMORY; + + folder_path[0] = 0; + + if (parent) + strcpyW(folder_path, parent); + + len = strlenW(folder_path); + if (!len || folder_path[len - 1] != '\\') + strcatW(folder_path, bslash); + + if (path) + { + while (*path == '\\') path++; + strcatW(folder_path, path); + } folder = HeapAlloc(GetProcessHeap(), 0, sizeof(*folder)); - if (!folder) return E_OUTOFMEMORY; + if (!folder) + { + HeapFree(GetProcessHeap(), 0, folder_path); + return E_OUTOFMEMORY; + } folder->ITaskFolder_iface.lpVtbl = &TaskFolder_vtbl; folder->ref = 1; + folder->path = folder_path; *obj = &folder->ITaskFolder_iface; TRACE("created %p\n", *obj); diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 74ae95f..38d60a4 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -182,17 +182,12 @@ if (hr == S_OK) } hr = ITaskFolder_get_Path(folder, NULL); -todo_wine ok(hr == E_POINTER, "expected E_POINTER, got %#x\n", hr); hr = ITaskFolder_get_Path(folder, &bstr); -todo_wine ok(hr == S_OK, "get_Path error %#x\n", hr); -if (hr == S_OK) -{ ok(!lstrcmpW(bstr, bslash), "expected '\\', got %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); -} hr = ITaskFolder_CreateFolder(folder, NULL, v_null, &subfolder); todo_wine

1 0

Jacek Caban : include: Fixed eConnTypeRJ11Modem declaration.
by Alexandre Julliard Jan. 17, 2014

Jan. 17, 2014

Module: wine Branch: master Commit: 2190601ca20a5088a1cd6e50a0587e6fe1cf2c2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2190601ca20a5088a1cd6e50a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 17 14:40:50 2014 +0100 include: Fixed eConnTypeRJ11Modem declaration. --- include/devicetopology.idl | 2 +- include/ksmedia.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/devicetopology.idl b/include/devicetopology.idl index 0cacce2..74796a2 100644 --- a/include/devicetopology.idl +++ b/include/devicetopology.idl @@ -81,7 +81,7 @@ typedef enum eConnTypeOtherAnalog, eConnTypeMultichannelAnalogDIN, eConnTypeXlrProfessional, - eConnTypeRj11Modem, + eConnTypeRJ11Modem, eConnTypeCombination } EPcxConnectionType; diff --git a/include/ksmedia.h b/include/ksmedia.h index dec2866..88c9fad 100644 --- a/include/ksmedia.h +++ b/include/ksmedia.h @@ -57,7 +57,7 @@ typedef enum eConnTypeOtherAnalog, eConnTypeMultichannelAnalogDIN, eConnTypeXlrProfessional, - eConnTypeRj11Modem, + eConnTypeRJ11Modem, eConnTypeCombination } EPcxConnectionType;

1 0

Stefan Dösinger : wined3d: Migrate surfaces to the new location flags.
by Alexandre Julliard Jan. 17, 2014

Jan. 17, 2014

Module: wine Branch: master Commit: b81e5605310754363b2275329eb042a94c9e1993 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b81e5605310754363b2275329… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 17 13:27:16 2014 +0100 wined3d: Migrate surfaces to the new location flags. --- dlls/wined3d/arb_program_shader.c | 3 +- dlls/wined3d/context.c | 40 ++--- dlls/wined3d/cs.c | 2 +- dlls/wined3d/device.c | 10 +- dlls/wined3d/drawprim.c | 4 +- dlls/wined3d/surface.c | 307 +++++++++++++++++++------------------ dlls/wined3d/swapchain.c | 40 ++--- dlls/wined3d/utils.c | 23 +-- dlls/wined3d/wined3d_private.h | 22 +-- 9 files changed, 221 insertions(+), 230 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b81e5605310754363b227…

1 0

Jacek Caban : msctf.idl: Added some missing declarations.
by Alexandre Julliard Jan. 17, 2014

Jan. 17, 2014

Module: wine Branch: master Commit: c30581274ed896523c0e5f26edfc06b1e95e9e6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c30581274ed896523c0e5f26e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 17 14:14:12 2014 +0100 msctf.idl: Added some missing declarations. --- include/msctf.idl | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/include/msctf.idl b/include/msctf.idl index a3db32e..e4b54e4 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -84,6 +84,8 @@ cpp_quote("#define TF_MOD_IGNORE_ALL_MODIFIER 0x0400") cpp_quote("#define TF_PROFILETYPE_INPUTPROCESSOR 0x0001") cpp_quote("#define TF_PROFILETYPE_KEYBOARDLAYOUT 0x0002") +cpp_quote("#define TF_IPSINK_FLAG_ACTIVE 0x0001") + interface ITfDocumentMgr; interface ITfContext; interface IEnumTfDocumentMgrs; @@ -326,6 +328,8 @@ interface ITfContext : IUnknown }; +const DWORD TF_INVALID_COOKIE = 0xffffffff; + [ object, uuid(4ea48a35-60ae-446f-8fd6-e6a8d82459f7), @@ -1522,3 +1526,20 @@ interface ITfThreadFocusSink : IUnknown HRESULT OnKillThreadFocus(); }; + +[ + object, + uuid(71c6e74e-0f28-11d8-a82a-00065b84435c), + pointer_default(unique) +] +interface ITfInputProcessorProfileActivationSink : IUnknown +{ + HRESULT OnActivated( + [in] DWORD dwProfileType, + [in] LANGID langid, + [in] REFCLSID clsid, + [in] REFGUID catid, + [in] REFGUID guidProfile, + [in] HKL hkl, + [in] DWORD dwFlags); +}

1 0

Andrey Gusev : po: Update Ukrainian translation.
by Alexandre Julliard Jan. 17, 2014

Jan. 17, 2014

Module: wine Branch: master Commit: 57c5cd6cbc55f6780ecf4b8240cd7c7424931dcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=57c5cd6cbc55f6780ecf4b824… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Jan 17 13:01:06 2014 +0200 po: Update Ukrainian translation. --- po/uk.po | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/po/uk.po b/po/uk.po index 4cba99d..1b08d4b 100644 --- a/po/uk.po +++ b/po/uk.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2013-12-31 15:59+0300\n" +"PO-Revision-Date: 2014-01-17 12:58+0300\n" "Last-Translator: Andrey Gusev <andrey.goosev(a)gmail.com>\n" "Language-Team: none\n" "Language: Ukrainian\n" @@ -5189,7 +5189,7 @@ msgstr "" #: winerror.mc:1981 msgid "Invalid account name.\n" -msgstr "Невірне ім'я акаунта.\n" +msgstr "Невірне ім'я облікового запису.\n" #: winerror.mc:1986 msgid "User already exists.\n" @@ -10102,7 +10102,7 @@ msgstr "Командний рядок Wine" #: cmd.rc:351 msgid "Microsoft Windows %1!S!\n" -msgstr "" +msgstr "Microsoft Windows %1!S!\n" #: cmd.rc:352 msgid "More? " @@ -10175,10 +10175,8 @@ msgid "Wine Explorer" msgstr "Оглядач Wine" #: explorer.rc:33 -#, fuzzy -#| msgid "StartUp" msgid "Start" -msgstr "Автозавантаження" +msgstr "Пуск" #: explorer.rc:34 winefile.rc:36 msgid "&Run..." @@ -12633,7 +12631,7 @@ msgstr "Wine" #: wineboot.rc:46 msgid "The Wine configuration in %s is being updated, please wait..." -msgstr "Оновлення конфігурації Wine в %s, будь-ласка зачекайте..." +msgstr "Оновлення конфігурації Wine в %s, будь-ласка, зачекайте..." #: winecfg.rc:135 msgid ""

1 0

Dmitry Timoshkov : taskschd: Add ITaskFolder stub implementation.
by Alexandre Julliard Jan. 17, 2014

Jan. 17, 2014

Module: wine Branch: master Commit: fe55cb10312e984a58f927ac459f233c031e51e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe55cb10312e984a58f927ac4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jan 17 17:59:49 2014 +0900 taskschd: Add ITaskFolder stub implementation. --- dlls/taskschd/Makefile.in | 1 + dlls/taskschd/folder.c | 233 ++++++++++++++++++++++++++++++++++++++ dlls/taskschd/task.c | 7 +- dlls/taskschd/taskschd_private.h | 1 + dlls/taskschd/tests/scheduler.c | 39 ++++--- 5 files changed, 264 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fe55cb10312e984a58f92…

1 0

Sebastian Lackner : ntdll: Implement SRWLock functions using keyed events.
by Alexandre Julliard Jan. 17, 2014

Jan. 17, 2014

Module: wine Branch: master Commit: 31a283d4daf1cb1e5a29ef489abc6625155ac4d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31a283d4daf1cb1e5a29ef489… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Jan 11 02:18:10 2014 +0100 ntdll: Implement SRWLock functions using keyed events. --- dlls/kernel32/tests/sync.c | 6 -- dlls/ntdll/sync.c | 158 ++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 154 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=31a283d4daf1cb1e5a29e…

1 0

Alistair Leslie-Hughes : dpnet: Add stubbed interface IDirectPlay8Server.
by Alexandre Julliard Jan. 17, 2014

Jan. 17, 2014

Module: wine Branch: master Commit: 64b40aeb82d0ef63995a55c6c89d0e75b880c9e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64b40aeb82d0ef63995a55c6c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jan 8 13:19:47 2014 +1100 dpnet: Add stubbed interface IDirectPlay8Server. --- dlls/dpnet/server.c | 364 +++++++++++++++++++++++++++++++++++++++++- dlls/dpnet/tests/Makefile.in | 3 +- dlls/dpnet/tests/server.c | 66 ++++++++ 3 files changed, 429 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=64b40aeb82d0ef63995a5…

1 0

Frédéric Delanoy : mmdevapi/tests: Remove unused dbgstr_guid function.
by Alexandre Julliard Jan. 17, 2014

Jan. 17, 2014

Module: wine Branch: master Commit: b0071852e8821cf04bab5011e81f40fd3d6c66a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0071852e8821cf04bab5011e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jan 17 12:42:10 2014 +0100 mmdevapi/tests: Remove unused dbgstr_guid function. --- dlls/mmdevapi/tests/render.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 4117cb3..078eab7 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -60,16 +60,6 @@ static HRESULT hexcl = S_OK; /* or AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED */ static const LARGE_INTEGER ullZero; -static inline const char *dbgstr_guid( const GUID *id ) -{ - static char ret[256]; - sprintf(ret, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", - id->Data1, id->Data2, id->Data3, - id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3], - id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7] ); - return ret; -} - #define PI 3.14159265358979323846L static DWORD wave_generate_tone(PWAVEFORMATEX pwfx, BYTE* data, UINT32 frames) {

1 0

Stefan Dösinger : wined3d: Remove surface_ops->map.
by Alexandre Julliard Jan. 17, 2014

Jan. 17, 2014

Module: wine Branch: master Commit: 00923cb50ce39c5917d0bb15c545ff7fd12d7d46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00923cb50ce39c5917d0bb15c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 17 13:27:14 2014 +0100 wined3d: Remove surface_ops->map. --- dlls/wined3d/surface.c | 97 ++++++++++++++-------------------------- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 33 insertions(+), 65 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1b61cb5..2317ce6 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -810,45 +810,6 @@ static void surface_realize_palette(struct wined3d_surface *surface) surface_load_location(surface, surface->draw_binding); } -static BYTE *surface_map(struct wined3d_surface *surface, const RECT *rect, DWORD flags) -{ - struct wined3d_device *device = surface->resource.device; - BYTE *ret; - const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; - - TRACE("surface %p, rect %s, flags %#x.\n", - surface, wine_dbgstr_rect(rect), flags); - - switch (surface->map_binding) - { - case SFLAG_INUSERMEM: - return surface->user_memory; - - case SFLAG_INDIB: - return surface->dib.bitmap_data; - - case SFLAG_INBUFFER: - context = context_acquire(device, NULL); - gl_info = context->gl_info; - - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, surface->pbo)); - ret = GL_EXTCALL(glMapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, GL_READ_WRITE_ARB)); - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); - checkGLcall("map PBO"); - - context_release(context); - return ret; - - case SFLAG_INSYSMEM: - return surface->resource.heap_memory; - - default: - ERR("Unexpected map binding %s.\n", debug_surflocation(surface->map_binding)); - return NULL; - } -} - static void surface_unmap(struct wined3d_surface *surface) { struct wined3d_device *device = surface->resource.device; @@ -1381,7 +1342,6 @@ static const struct wined3d_surface_ops surface_ops = { surface_private_setup, surface_realize_palette, - surface_map, surface_unmap, }; @@ -1458,28 +1418,6 @@ static void gdi_surface_realize_palette(struct wined3d_surface *surface) x11_copy_to_screen(surface->swapchain, NULL); } -static BYTE *gdi_surface_map(struct wined3d_surface *surface, const RECT *rect, DWORD flags) -{ - TRACE("surface %p, rect %s, flags %#x.\n", - surface, wine_dbgstr_rect(rect), flags); - - switch (surface->map_binding) - { - case SFLAG_INUSERMEM: - return surface->user_memory; - - case SFLAG_INDIB: - return surface->dib.bitmap_data; - - case SFLAG_INSYSMEM: - return surface->resource.heap_memory; - - default: - ERR("Unexpected map binding %s.\n", debug_surflocation(surface->map_binding)); - return NULL; - } -} - static void gdi_surface_unmap(struct wined3d_surface *surface) { TRACE("surface %p.\n", surface); @@ -1495,7 +1433,6 @@ static const struct wined3d_surface_ops gdi_surface_ops = { gdi_surface_private_setup, gdi_surface_realize_palette, - gdi_surface_map, gdi_surface_unmap, }; @@ -3099,6 +3036,9 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_desc *map_desc, const RECT *rect, DWORD flags) { const struct wined3d_format *format = surface->resource.format; + struct wined3d_device *device = surface->resource.device; + struct wined3d_context *context; + const struct wined3d_gl_info *gl_info; BYTE *base_memory; TRACE("surface %p, map_desc %p, rect %s, flags %#x.\n", @@ -3156,7 +3096,36 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, if (!(flags & (WINED3D_MAP_NO_DIRTY_UPDATE | WINED3D_MAP_READONLY))) surface_invalidate_location(surface, ~surface->map_binding); - base_memory = surface->surface_ops->surface_map(surface, rect, flags); + switch (surface->map_binding) + { + case SFLAG_INUSERMEM: + base_memory = surface->user_memory; + break; + + case SFLAG_INDIB: + base_memory = surface->dib.bitmap_data; + break; + + case SFLAG_INBUFFER: + context = context_acquire(device, NULL); + gl_info = context->gl_info; + + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, surface->pbo)); + base_memory = GL_EXTCALL(glMapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, GL_READ_WRITE_ARB)); + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); + checkGLcall("map PBO"); + + context_release(context); + break; + + case SFLAG_INSYSMEM: + base_memory = surface->resource.heap_memory; + break; + + default: + ERR("Unexpected map binding %s.\n", debug_surflocation(surface->map_binding)); + base_memory = NULL; + } if (format->flags & WINED3DFMT_FLAG_BROKEN_PITCH) map_desc->row_pitch = surface->resource.width * format->byte_count; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e23d284..dc7ba65 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2180,7 +2180,6 @@ struct wined3d_surface_ops { HRESULT (*surface_private_setup)(struct wined3d_surface *surface); void (*surface_realize_palette)(struct wined3d_surface *surface); - BYTE *(*surface_map)(struct wined3d_surface *surface, const RECT *rect, DWORD flags); void (*surface_unmap)(struct wined3d_surface *surface); };

1 0

Stefan Dösinger : wined3d: Separate surface locations and flags.
by Alexandre Julliard Jan. 17, 2014

Jan. 17, 2014

Module: wine Branch: master Commit: beb64c9998261976e799b969dcfc78abf1da3a97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=beb64c9998261976e799b969d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 17 13:27:15 2014 +0100 wined3d: Separate surface locations and flags. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/device.c | 4 +- dlls/wined3d/drawprim.c | 5 +- dlls/wined3d/surface.c | 116 ++++++++++++++++++------------------- dlls/wined3d/swapchain.c | 4 +- dlls/wined3d/wined3d_private.h | 11 +--- 6 files changed, 67 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=beb64c9998261976e799b…

1 0

Alistair Leslie-Hughes : dpnet: Cleanup IDirectPlay8Peer COM interface.
by Alexandre Julliard Jan. 17, 2014

Jan. 17, 2014

Module: wine Branch: master Commit: 1fd704b3af6de6a3c2ac0a5576689290e3832a7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fd704b3af6de6a3c2ac0a557… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jan 10 10:27:59 2014 +1100 dpnet: Cleanup IDirectPlay8Peer COM interface. --- dlls/dpnet/dpnet_private.h | 10 ---------- dlls/dpnet/peer.c | 24 +++++++++++++++++++----- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/dpnet/dpnet_private.h b/dlls/dpnet/dpnet_private.h index 72012cd..4a42eae 100644 --- a/dlls/dpnet/dpnet_private.h +++ b/dlls/dpnet/dpnet_private.h @@ -35,7 +35,6 @@ typedef struct IDirectPlay8ClientImpl IDirectPlay8ClientImpl; typedef struct IDirectPlay8AddressImpl IDirectPlay8AddressImpl; typedef struct IDirectPlay8LobbiedApplicationImpl IDirectPlay8LobbiedApplicationImpl; -typedef struct IDirectPlay8PeerImpl IDirectPlay8PeerImpl; typedef struct IDirectPlay8ThreadPoolImpl IDirectPlay8ThreadPoolImpl; /* ------------------ */ @@ -78,15 +77,6 @@ struct IDirectPlay8LobbiedApplicationImpl }; /***************************************************************************** - * IDirectPlay8Peer implementation structure - */ -struct IDirectPlay8PeerImpl -{ - IDirectPlay8Peer IDirectPlay8Peer_iface; - LONG ref; -}; - -/***************************************************************************** * IDirectPlay8ThreadPool implementation structure */ struct IDirectPlay8ThreadPoolImpl diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index ef100a3..1b287dd 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -38,6 +38,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(dpnet); + +typedef struct IDirectPlay8PeerImpl +{ + IDirectPlay8Peer IDirectPlay8Peer_iface; + LONG ref; +} IDirectPlay8PeerImpl; + static inline IDirectPlay8PeerImpl *impl_from_IDirectPlay8Peer(IDirectPlay8Peer *iface) { return CONTAINING_RECORD(iface, IDirectPlay8PeerImpl, IDirectPlay8Peer_iface); @@ -66,6 +73,8 @@ static ULONG WINAPI IDirectPlay8PeerImpl_AddRef(IDirectPlay8Peer *iface) IDirectPlay8PeerImpl* This = impl_from_IDirectPlay8Peer(iface); ULONG RefCount = InterlockedIncrement(&This->ref); + TRACE("(%p) ref=%d\n", This, RefCount); + return RefCount; } @@ -74,6 +83,8 @@ static ULONG WINAPI IDirectPlay8PeerImpl_Release(IDirectPlay8Peer *iface) IDirectPlay8PeerImpl* This = impl_from_IDirectPlay8Peer(iface); ULONG RefCount = InterlockedDecrement(&This->ref); + TRACE("(%p) ref=%d\n", This, RefCount); + if(!RefCount) HeapFree(GetProcessHeap(), 0, This); @@ -474,23 +485,26 @@ static const IDirectPlay8PeerVtbl DirectPlay8Peer_Vtbl = IDirectPlay8PeerImpl_TerminateSession }; -HRESULT DPNET_CreateDirectPlay8Peer(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj) { +HRESULT DPNET_CreateDirectPlay8Peer(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, LPVOID *ppobj) +{ IDirectPlay8PeerImpl* Client; HRESULT ret; Client = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectPlay8PeerImpl)); + *ppobj = NULL; + if(Client == NULL) { - *ppobj = NULL; WARN("Not enough memory\n"); return E_OUTOFMEMORY; } Client->IDirectPlay8Peer_iface.lpVtbl = &DirectPlay8Peer_Vtbl; - ret = IDirectPlay8PeerImpl_QueryInterface(&Client->IDirectPlay8Peer_iface, riid, ppobj); - if(ret != DPN_OK) - HeapFree(GetProcessHeap(), 0, Client); + Client->ref = 1; + + ret = IDirectPlay8Peer_QueryInterface(&Client->IDirectPlay8Peer_iface, riid, ppobj); + IDirectPlay8Peer_Release(&Client->IDirectPlay8Peer_iface); return ret; }

1 0

Stefan Dösinger : wined3d: Don' t set SFLAG_DYNLOCK at surface creation.
by Alexandre Julliard Jan. 17, 2014

Jan. 17, 2014

Module: wine Branch: master Commit: 5630cb5dc8ef7e9a8195262726f73d6828f59a6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5630cb5dc8ef7e9a819526272… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 17 13:27:17 2014 +0100 wined3d: Don't set SFLAG_DYNLOCK at surface creation. We no longer depend on SFLAG_DYNLOCK to create buffers and PIN_SYSMEM makes sure the address remains constant. --- dlls/wined3d/surface.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index def47d3..87de9e1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6385,16 +6385,6 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text if (lockable || desc->format == WINED3DFMT_D16_LOCKABLE) surface->resource.access_flags |= WINED3D_RESOURCE_ACCESS_CPU; - /* I'm not sure if this qualifies as a hack or as an optimization. It - * seems reasonable to assume that lockable render targets will get - * locked, so we might as well set SFLAG_DYNLOCK right at surface - * creation. However, the other reason we want to do this is that several - * ddraw applications access surface memory while the surface isn't - * mapped. The SFLAG_DYNLOCK behaviour of keeping SYSMEM around for - * future locks prevents these from crashing. */ - if (lockable && (desc->usage & WINED3DUSAGE_RENDERTARGET)) - surface->flags |= SFLAG_DYNLOCK; - surface->map_binding = WINED3D_LOCATION_SYSMEM; /* Call the private setup routine */

1 0

Stefan Dösinger : wined3d: Only set SFLAG_DYNLOCK when map_binding = sysmem.
by Alexandre Julliard Jan. 17, 2014

Jan. 17, 2014

Module: wine Branch: master Commit: d640018a3c1d5b6bc109891cc4acf894a6c4413a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d640018a3c1d5b6bc109891cc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 17 13:27:18 2014 +0100 wined3d: Only set SFLAG_DYNLOCK when map_binding = sysmem. All other map bindings are never freed. Setting SFLAG_DYNLOCK if map_binding != sysmem might only keep a heap memory allocation around (e.g. after device_reset) that is never used. --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 87de9e1..628a4a5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3068,7 +3068,7 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, * mapped regularly do not throw away the system memory copy. This avoids * the need to download the surface from OpenGL all the time. The surface * is still downloaded if the OpenGL texture is changed. */ - if (!(surface->flags & SFLAG_DYNLOCK)) + if (!(surface->flags & SFLAG_DYNLOCK) && surface->map_binding == WINED3D_LOCATION_SYSMEM) { if (++surface->lockCount > MAXLOCKCOUNT) {

1 0

Stefan Dösinger : wined3d: Add a missing break.
by Alexandre Julliard Jan. 17, 2014

Jan. 17, 2014

Module: wine Branch: master Commit: f1ac04f2a6aea5056d9e5a3a3f429d63f1ec9c69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1ac04f2a6aea5056d9e5a3a3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 17 13:27:13 2014 +0100 wined3d: Add a missing break. --- dlls/wined3d/surface.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 015478f..1b61cb5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -598,6 +598,7 @@ void surface_prepare_map_memory(struct wined3d_surface *surface) case SFLAG_INDIB: if (!surface->dib.bitmap_data) ERR("Map binding is set to SFLAG_INDIB but surface->dib.bitmap_data is NULL.\n"); + break; case SFLAG_INSYSMEM: surface_prepare_system_memory(surface);

1 0

Ken Thomases : wineboot: Ignore 0 result from WM_QUERYENDSESSION if target window was destroyed.
by Alexandre Julliard Jan. 17, 2014

Jan. 17, 2014

Module: wine Branch: master Commit: a05b53894a55b8de1ecfde3815dd10628b8b05f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a05b53894a55b8de1ecfde381… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Jan 16 21:11:10 2014 -0600 wineboot: Ignore 0 result from WM_QUERYENDSESSION if target window was destroyed. --- programs/wineboot/shutdown.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/programs/wineboot/shutdown.c b/programs/wineboot/shutdown.c index a5f5f5a..52d37e7 100644 --- a/programs/wineboot/shutdown.c +++ b/programs/wineboot/shutdown.c @@ -100,6 +100,14 @@ static void CALLBACK end_session_message_callback( HWND hwnd, UINT msg, ULONG_PT msg == WM_QUERYENDSESSION ? "WM_QUERYENDSESSION" : (msg == WM_ENDSESSION ? "WM_ENDSESSION" : "Unknown"), hwnd, lresult ); + /* If the window was destroyed while the message was in its queue, SendMessageCallback() + calls us with a default 0 result. Ignore it. */ + if (!lresult && !IsWindow( hwnd )) + { + WINE_TRACE( "window was destroyed; ignoring FALSE lresult\n" ); + lresult = TRUE; + } + /* we only care if a WM_QUERYENDSESSION response is FALSE */ cb_data->result = cb_data->result && lresult;

1 0

Vincent Povirk : gdiplus: Implement SetPageTransform playback.
by Alexandre Julliard Jan. 17, 2014

Jan. 17, 2014

Module: wine Branch: master Commit: 7c12d889d4000fd2b90fc9504a3d71e20b1a845b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c12d889d4000fd2b90fc9504… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jan 16 16:15:50 2014 -0600 gdiplus: Implement SetPageTransform playback. --- dlls/gdiplus/metafile.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 1218800..af7ec27 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -528,9 +528,15 @@ static GpStatus METAFILE_PlaybackUpdateWorldTransform(GpMetafile *metafile) if (stat == Ok) { - /* FIXME: Prepend page transform. */ + REAL scale = units_to_pixels(1.0, metafile->page_unit, 96.0); - stat = GdipMultiplyMatrix(real_transform, metafile->world_transform, MatrixOrderPrepend); + if (metafile->page_unit != UnitDisplay) + scale *= metafile->page_scale; + + stat = GdipScaleMatrix(real_transform, scale, scale, MatrixOrderPrepend); + + if (stat == Ok) + stat = GdipMultiplyMatrix(real_transform, metafile->world_transform, MatrixOrderPrepend); if (stat == Ok) stat = GdipSetWorldTransform(metafile->playback_graphics, real_transform); @@ -545,6 +551,7 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, EmfPlusRecordType recordType, UINT flags, UINT dataSize, GDIPCONST BYTE *data) { GpStatus stat; + GpMetafile *real_metafile = (GpMetafile*)metafile; TRACE("(%p,%x,%x,%d,%p)\n", metafile, recordType, flags, dataSize, data); @@ -655,6 +662,19 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, return stat; } + case EmfPlusRecordTypeSetPageTransform: + { + EmfPlusSetPageTransform *record = (EmfPlusSetPageTransform*)header; + GpUnit unit = (GpUnit)flags; + + if (dataSize + sizeof(EmfPlusRecordHeader) < sizeof(EmfPlusSetPageTransform)) + return InvalidParameter; + + real_metafile->page_unit = unit; + real_metafile->page_scale = record->PageScale; + + return METAFILE_PlaybackUpdateWorldTransform(real_metafile); + } default: FIXME("Not implemented for record type %x\n", recordType); return NotImplemented; @@ -774,7 +794,7 @@ GpStatus WINGDIPAPI GdipEnumerateMetafileSrcRectDestPoints(GpGraphics *graphics, if (stat == Ok) { - real_metafile->page_unit = UnitPixel; /* FIXME: Use frame unit here? */ + real_metafile->page_unit = UnitDisplay; real_metafile->page_scale = 1.0; stat = METAFILE_PlaybackUpdateWorldTransform(real_metafile); }

1 0

Vincent Povirk : gdiplus: Implement writing SetPageTransform records.
by Alexandre Julliard Jan. 17, 2014

Jan. 17, 2014

Module: wine Branch: master Commit: 6518edfa5f67a0a7cdda5b31ee9ac52c3a6a2c29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6518edfa5f67a0a7cdda5b31e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jan 16 15:43:45 2014 -0600 gdiplus: Implement writing SetPageTransform records. --- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 18 ++++++++++++++++++ dlls/gdiplus/metafile.c | 29 +++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 5e8f78a..e4e6b92 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -59,6 +59,7 @@ extern GpStatus METAFILE_GetDC(GpMetafile* metafile, HDC *hdc) DECLSPEC_HIDDEN; extern GpStatus METAFILE_ReleaseDC(GpMetafile* metafile, HDC hdc) DECLSPEC_HIDDEN; extern GpStatus METAFILE_FillRectangles(GpMetafile* metafile, GpBrush* brush, GDIPCONST GpRectF* rects, INT count) DECLSPEC_HIDDEN; +extern GpStatus METAFILE_SetPageTransform(GpMetafile* metafile, GpUnit unit, REAL scale) DECLSPEC_HIDDEN; extern GpStatus METAFILE_GraphicsDeleted(GpMetafile* metafile) DECLSPEC_HIDDEN; extern MetafileType METAFILE_GetEmfType(HENHMETAFILE hemf) DECLSPEC_HIDDEN; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 7f892f6..21ee84d 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5274,6 +5274,8 @@ GpStatus WINGDIPAPI GdipSetInterpolationMode(GpGraphics *graphics, GpStatus WINGDIPAPI GdipSetPageScale(GpGraphics *graphics, REAL scale) { + GpStatus stat; + TRACE("(%p, %.2f)\n", graphics, scale); if(!graphics || (scale <= 0.0)) @@ -5282,6 +5284,13 @@ GpStatus WINGDIPAPI GdipSetPageScale(GpGraphics *graphics, REAL scale) if(graphics->busy) return ObjectBusy; + if (graphics->image && graphics->image->type == ImageTypeMetafile) + { + stat = METAFILE_SetPageTransform((GpMetafile*)graphics->image, graphics->unit, scale); + if (stat != Ok) + return stat; + } + graphics->scale = scale; return Ok; @@ -5289,6 +5298,8 @@ GpStatus WINGDIPAPI GdipSetPageScale(GpGraphics *graphics, REAL scale) GpStatus WINGDIPAPI GdipSetPageUnit(GpGraphics *graphics, GpUnit unit) { + GpStatus stat; + TRACE("(%p, %d)\n", graphics, unit); if(!graphics) @@ -5300,6 +5311,13 @@ GpStatus WINGDIPAPI GdipSetPageUnit(GpGraphics *graphics, GpUnit unit) if(unit == UnitWorld) return InvalidParameter; + if (graphics->image && graphics->image->type == ImageTypeMetafile) + { + stat = METAFILE_SetPageTransform((GpMetafile*)graphics->image, unit, graphics->scale); + if (stat != Ok) + return stat; + } + graphics->unit = unit; return Ok; diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 4df7f6f..1218800 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -64,6 +64,12 @@ typedef struct EmfPlusFillRects DWORD Count; } EmfPlusFillRects; +typedef struct EmfPlusSetPageTransform +{ + EmfPlusRecordHeader Header; + REAL PageScale; +} EmfPlusSetPageTransform; + typedef struct EmfPlusRect { SHORT X; @@ -416,6 +422,29 @@ GpStatus METAFILE_FillRectangles(GpMetafile* metafile, GpBrush* brush, return Ok; } +GpStatus METAFILE_SetPageTransform(GpMetafile* metafile, GpUnit unit, REAL scale) +{ + if (metafile->metafile_type == MetafileTypeEmfPlusOnly || metafile->metafile_type == MetafileTypeEmfPlusDual) + { + EmfPlusSetPageTransform *record; + GpStatus stat; + + stat = METAFILE_AllocateRecord(metafile, + sizeof(EmfPlusSetPageTransform), + (void**)&record); + if (stat != Ok) + return stat; + + record->Header.Type = EmfPlusRecordTypeSetPageTransform; + record->Header.Flags = unit; + record->PageScale = scale; + + METAFILE_WriteRecords(metafile); + } + + return Ok; +} + GpStatus METAFILE_ReleaseDC(GpMetafile* metafile, HDC hdc) { if (hdc != metafile->record_dc)

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard Jan. 17, 2014

Jan. 17, 2014

Module: wine Branch: master Commit: dd5459cff45b3cec73fd5c617b73b20d694684d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd5459cff45b3cec73fd5c617… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jan 16 23:01:42 2014 +0100 po: Update French translation. --- po/fr.po | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/po/fr.po b/po/fr.po index 7412a66..9dc5d8c 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2013-12-03 23:12+0100\n" +"PO-Revision-Date: 2014-01-16 23:01+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -10190,7 +10190,7 @@ msgstr "Invite de commande Wine" #: cmd.rc:351 msgid "Microsoft Windows %1!S!\n" -msgstr "" +msgstr "Microsoft Windows %1!S!\n" #: cmd.rc:352 msgid "More? " @@ -10260,10 +10260,8 @@ msgid "Wine Explorer" msgstr "Explorateur de Wine" #: explorer.rc:33 -#, fuzzy -#| msgid "StartUp" msgid "Start" -msgstr "Démarrage" +msgstr "Démarrer" #: explorer.rc:34 winefile.rc:36 msgid "&Run..."

1 0

Ken Thomases : winemac: Ignore failure to send or 0 result from WM_QUERYENDSESSION if target window was destroyed.
by Alexandre Julliard Jan. 17, 2014

Jan. 17, 2014

Module: wine Branch: master Commit: ed3ed035197347fd36f6c89fa94ab23aec22bf9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed3ed035197347fd36f6c89fa… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Jan 16 20:38:14 2014 -0600 winemac: Ignore failure to send or 0 result from WM_QUERYENDSESSION if target window was destroyed. --- dlls/winemac.drv/window.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 5a1d5a7..d63e83f 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -2260,6 +2260,12 @@ static void CALLBACK quit_callback(HWND hwnd, UINT msg, ULONG_PTR data, LRESULT TRACE("got WM_QUERYENDSESSION result %ld from win %p (%u of %u done)\n", result, hwnd, qi->done, qi->count); + if (!result && !IsWindow(hwnd)) + { + TRACE("win %p no longer exists; ignoring apparent refusal\n", hwnd); + result = TRUE; + } + if (!result && qi->result) { qi->result = FALSE; @@ -2360,9 +2366,15 @@ void macdrv_app_quit_requested(const macdrv_event *event) if (!SendMessageCallbackW(qi->wins[i], WM_QUERYENDSESSION, 0, qi->flags, quit_callback, (ULONG_PTR)qi)) { - WARN("failed to send WM_QUERYENDSESSION to win %p; error 0x%08x; assuming refusal\n", - qi->wins[i], GetLastError()); - quit_callback(qi->wins[i], WM_QUERYENDSESSION, (ULONG_PTR)qi, FALSE); + DWORD error = GetLastError(); + BOOL invalid = (error == ERROR_INVALID_WINDOW_HANDLE); + if (invalid) + TRACE("failed to send WM_QUERYENDSESSION to win %p because it's invalid; assuming success\n", + qi->wins[i]); + else + WARN("failed to send WM_QUERYENDSESSION to win %p; error 0x%08x; assuming refusal\n", + qi->wins[i], error); + quit_callback(qi->wins[i], WM_QUERYENDSESSION, (ULONG_PTR)qi, invalid); } }

1 0

Vincent Povirk : gdiplus: Fix recording metafile bounds/dpi reporting.
by Alexandre Julliard Jan. 17, 2014

Jan. 17, 2014

Module: wine Branch: master Commit: 55ad8315987d167dd657138c2d7dedd221916c0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=55ad8315987d167dd657138c2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jan 16 15:27:53 2014 -0600 gdiplus: Fix recording metafile bounds/dpi reporting. --- dlls/gdiplus/metafile.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index a79bfc3..4df7f6f 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -248,6 +248,8 @@ GpStatus WINGDIPAPI GdipRecordMetafile(HDC hdc, EmfType type, GDIPCONST GpRectF (*metafile)->image.picture = NULL; (*metafile)->image.flags = ImageFlagsNone; (*metafile)->image.palette = NULL; + (*metafile)->image.xres = 72.0; + (*metafile)->image.yres = 72.0; (*metafile)->bounds = *frameRect; (*metafile)->unit = frameUnit; (*metafile)->metafile_type = type; @@ -304,7 +306,11 @@ GpStatus METAFILE_GetGraphicsContext(GpMetafile* metafile, GpGraphics **result) stat = graphics_from_image((GpImage*)metafile, &metafile->record_graphics); if (stat == Ok) + { *result = metafile->record_graphics; + metafile->record_graphics->xres = 96.0; + metafile->record_graphics->yres = 96.0; + } return stat; }

1 0

Frédéric Delanoy : ntdll: Fix a typo in comment.
by Alexandre Julliard Jan. 17, 2014

Jan. 17, 2014

Module: wine Branch: master Commit: 841aabfd8271f6668a9b72eec248b98bf5f3563e URL: http://source.winehq.org/git/wine.git/?a=commit;h=841aabfd8271f6668a9b72eec… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jan 17 02:05:37 2014 +0100 ntdll: Fix a typo in comment. --- dlls/ntdll/debugtools.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/debugtools.c b/dlls/ntdll/debugtools.c index dfb44af..cbbf744 100644 --- a/dlls/ntdll/debugtools.c +++ b/dlls/ntdll/debugtools.c @@ -62,7 +62,7 @@ static char *get_temp_buffer( size_t n ) return res; } -/* release extra space that we requested in gimme1() */ +/* release extra space that we requested in get_temp_buffer() */ static void release_temp_buffer( char *ptr, size_t size ) { struct debug_info *info = get_info();

1 0

Michael Stefaniuc : dmcompos: COM cleanup for IDirectMusicComposer.
by Alexandre Julliard Jan. 17, 2014

Jan. 17, 2014

Module: wine Branch: master Commit: 604e395184c6584eb4d86ac11e49dd3672dfb2f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=604e395184c6584eb4d86ac11… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 17 01:14:48 2014 +0100 dmcompos: COM cleanup for IDirectMusicComposer. Also lock/unlock the module only on creation/destruction of the object. --- dlls/dmcompos/composer.c | 154 +++++++++++++++++++++++--------------- dlls/dmcompos/dmcompos_private.h | 12 --- 2 files changed, 95 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=604e395184c6584eb4d86…

1 0

Michael Stefaniuc : dmstyle/tests: Fix a crash on old dmusic versions.
by Alexandre Julliard Jan. 17, 2014

Jan. 17, 2014

Module: wine Branch: master Commit: 29fe708970653ffdc4f5da874cb8b96f49de8818 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29fe708970653ffdc4f5da874… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 17 01:13:58 2014 +0100 dmstyle/tests: Fix a crash on old dmusic versions. --- dlls/dmstyle/tests/dmstyle.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index a1565c0..58c15eb 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -64,6 +64,10 @@ static void test_COM(void) /* Same refcount for all DirectMusicStyle8 interfaces */ hr = CoCreateInstance(&CLSID_DirectMusicStyle, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicStyle8, (void**)&dms8); + if (hr == E_NOINTERFACE) { + win_skip("Old version without IDirectMusicStyle8\n"); + return; + } ok(hr == S_OK, "DirectMusicStyle8 create failed: %08x, expected S_OK\n", hr); refcount = IDirectMusicStyle8_AddRef(dms8); ok(refcount == 2, "refcount == %u, expected 2\n", refcount);

1 0

Henri Verbeet : ddraw/tests: Verify dwBackBufferCount on back buffer surfaces in test_flip().
by Alexandre Julliard Jan. 17, 2014

Jan. 17, 2014

Module: wine Branch: master Commit: 1318d5786f15cb491610eb4c08abf27d13852830 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1318d5786f15cb491610eb4c0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 16 23:44:49 2014 +0100 ddraw/tests: Verify dwBackBufferCount on back buffer surfaces in test_flip(). --- dlls/ddraw/tests/ddraw1.c | 3 +++ dlls/ddraw/tests/ddraw2.c | 3 +++ dlls/ddraw/tests/ddraw4.c | 3 +++ dlls/ddraw/tests/ddraw7.c | 3 +++ dlls/ddraw/tests/dsurface.c | 23 +---------------------- 5 files changed, 13 insertions(+), 22 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index c7c227b..7ab339f 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -3879,6 +3879,7 @@ static void test_flip(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_GetSurfaceDesc(backbuffer1, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(!surface_desc.dwBackBufferCount, "Got unexpected back buffer count %u.\n", surface_desc.dwBackBufferCount); ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX | DDSCAPS_BACKBUFFER), "Got unexpected caps %#x.\n", surface_desc.ddsCaps.dwCaps); @@ -3888,6 +3889,7 @@ static void test_flip(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_GetSurfaceDesc(backbuffer2, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(!surface_desc.dwBackBufferCount, "Got unexpected back buffer count %u.\n", surface_desc.dwBackBufferCount); ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX), "Got unexpected caps %#x.\n", surface_desc.ddsCaps.dwCaps); @@ -3897,6 +3899,7 @@ static void test_flip(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_GetSurfaceDesc(backbuffer3, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(!surface_desc.dwBackBufferCount, "Got unexpected back buffer count %u.\n", surface_desc.dwBackBufferCount); ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX), "Got unexpected caps %#x.\n", surface_desc.ddsCaps.dwCaps); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 2a7b64f..e4e8ff3 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -4560,6 +4560,7 @@ static void test_flip(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_GetSurfaceDesc(backbuffer1, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(!surface_desc.dwBackBufferCount, "Got unexpected back buffer count %u.\n", surface_desc.dwBackBufferCount); ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX | DDSCAPS_BACKBUFFER), "Got unexpected caps %#x.\n", surface_desc.ddsCaps.dwCaps); @@ -4569,6 +4570,7 @@ static void test_flip(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_GetSurfaceDesc(backbuffer2, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(!surface_desc.dwBackBufferCount, "Got unexpected back buffer count %u.\n", surface_desc.dwBackBufferCount); ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX), "Got unexpected caps %#x.\n", surface_desc.ddsCaps.dwCaps); @@ -4578,6 +4580,7 @@ static void test_flip(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_GetSurfaceDesc(backbuffer3, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(!surface_desc.dwBackBufferCount, "Got unexpected back buffer count %u.\n", surface_desc.dwBackBufferCount); ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX), "Got unexpected caps %#x.\n", surface_desc.ddsCaps.dwCaps); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 589ff55..a639834 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -5163,6 +5163,7 @@ static void test_flip(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface4_GetSurfaceDesc(backbuffer1, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(!surface_desc.dwBackBufferCount, "Got unexpected back buffer count %u.\n", surface_desc.dwBackBufferCount); ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX | DDSCAPS_BACKBUFFER), "Got unexpected caps %#x.\n", surface_desc.ddsCaps.dwCaps); @@ -5172,6 +5173,7 @@ static void test_flip(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface4_GetSurfaceDesc(backbuffer2, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(!surface_desc.dwBackBufferCount, "Got unexpected back buffer count %u.\n", surface_desc.dwBackBufferCount); ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX), "Got unexpected caps %#x.\n", surface_desc.ddsCaps.dwCaps); @@ -5181,6 +5183,7 @@ static void test_flip(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface4_GetSurfaceDesc(backbuffer3, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(!surface_desc.dwBackBufferCount, "Got unexpected back buffer count %u.\n", surface_desc.dwBackBufferCount); ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX), "Got unexpected caps %#x.\n", surface_desc.ddsCaps.dwCaps); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index bcec1fd..9520842 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -5041,6 +5041,7 @@ static void test_flip(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface7_GetSurfaceDesc(backbuffer1, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(!surface_desc.dwBackBufferCount, "Got unexpected back buffer count %u.\n", surface_desc.dwBackBufferCount); ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX | DDSCAPS_BACKBUFFER), "Got unexpected caps %#x.\n", surface_desc.ddsCaps.dwCaps); @@ -5050,6 +5051,7 @@ static void test_flip(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface7_GetSurfaceDesc(backbuffer2, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(!surface_desc.dwBackBufferCount, "Got unexpected back buffer count %u.\n", surface_desc.dwBackBufferCount); ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX), "Got unexpected caps %#x.\n", surface_desc.ddsCaps.dwCaps); @@ -5059,6 +5061,7 @@ static void test_flip(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface7_GetSurfaceDesc(backbuffer3, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(!surface_desc.dwBackBufferCount, "Got unexpected back buffer count %u.\n", surface_desc.dwBackBufferCount); ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX), "Got unexpected caps %#x.\n", surface_desc.ddsCaps.dwCaps); diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index ffc9358..b07eddb 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -1125,10 +1125,10 @@ static void AttachmentTest7(void) IDirectDraw7 *dd7; IDirectDrawSurface7 *surface1, *surface2, *surface3, *surface4; IDirectDrawSurface *surface1v1, *surface2v1; + DDSCAPS2 caps = {DDSCAPS_TEXTURE, 0, 0, 0}; DDSURFACEDESC2 ddsd, ddsd2; DWORD ref; UINT num; - DDSCAPS2 caps = {DDSCAPS_TEXTURE, 0, 0, 0}, caps2 = {DDSCAPS_BACKBUFFER,0,0,0}; HWND window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL); @@ -1218,27 +1218,6 @@ static void AttachmentTest7(void) hr = IDirectDraw7_SetCooperativeLevel(dd7, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "SetCooperativeLevel returned %08x\n", hr); - memset(&ddsd, 0, sizeof(ddsd)); - ddsd.dwSize = sizeof(ddsd); - ddsd.dwFlags = DDSD_BACKBUFFERCOUNT | DDSD_CAPS; - ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE | DDSCAPS_COMPLEX | DDSCAPS_FLIP; - ddsd.dwBackBufferCount = 2; - hr = IDirectDraw7_CreateSurface(dd7, &ddsd, &surface1, NULL); - ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); - - /* backbuffer surfaces must not have dwBackBufferCount set */ - ddsd2.dwSize = sizeof(ddsd2); - hr = IDirectDrawSurface7_GetAttachedSurface(surface1, &caps2, &surface2); - ok(hr==DD_OK,"GetAttachedSurface returned: %x\n", hr); - hr = IDirectDrawSurface7_GetSurfaceDesc(surface2, &ddsd2); - ok(hr==DD_OK,"GetSurfaceDesc returned: %x\n", hr); - ok(ddsd2.dwBackBufferCount==0,"backbuffer surface has dwBackBufferCount==%u\n", ddsd2.dwBackBufferCount); - - num = 0; - IDirectDrawSurface7_EnumAttachedSurfaces(surface1, &num, SurfaceCounter); - ok(num == 1, "Primary surface has %d surfaces attached, expected 1\n", num); - IDirectDrawSurface7_Release(surface1); - /* Those are some invalid descriptions, no need to test attachments with them */ memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd);

1 0

Vincent Povirk : include: Fix off-by-one error in EmfPlusRecordType enumeration.
by Alexandre Julliard Jan. 17, 2014

Jan. 17, 2014

Module: wine Branch: master Commit: ea41f29c3231c78b8cfa15833e0225c7b066978a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea41f29c3231c78b8cfa15833… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jan 16 14:58:09 2014 -0600 include: Fix off-by-one error in EmfPlusRecordType enumeration. Apparently MSDN made up EmfPlusRecordTypeSetGammaValue, it's not in the SDK headers or EMF+ spec. --- include/gdiplusenums.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/gdiplusenums.h b/include/gdiplusenums.h index c730a0c..3223d2b 100644 --- a/include/gdiplusenums.h +++ b/include/gdiplusenums.h @@ -672,7 +672,6 @@ enum EmfPlusRecordType { EmfPlusRecordTypeSetAntiAliasMode, EmfPlusRecordTypeSetTextRenderingHint, EmfPlusRecordTypeSetTextContrast, - EmfPlusRecordTypeSetGammaValue, EmfPlusRecordTypeSetInterpolationMode, EmfPlusRecordTypeSetPixelOffsetMode, EmfPlusRecordTypeSetCompositingMode,

1 0

Frédéric Delanoy : wine/test.h: Fix a typo in comment.
by Alexandre Julliard Jan. 17, 2014

Jan. 17, 2014

Module: wine Branch: master Commit: e46796e7a4e6d5edf359d8f8e3ffd63ec7d3c014 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e46796e7a4e6d5edf359d8f8e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jan 17 02:05:36 2014 +0100 wine/test.h: Fix a typo in comment. --- include/wine/test.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/test.h b/include/wine/test.h index 373fe76..ab10399 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -259,7 +259,7 @@ static char *get_temp_buffer( size_t n ) return res; } -/* release extra space that we requested in gimme1() */ +/* release extra space that we requested in get_temp_buffer() */ static void release_temp_buffer( char *ptr, size_t size ) { tls_data *data = get_tls_data();

1 0

刘涛 : website: Simplified Chinese translation for 1.6.2 release
by Jeremy Newman Jan. 17, 2014

Jan. 17, 2014

Module: website Branch: master Commit: d153292842c3264dfb3ab00ab7ca110460dc0c30 URL: http://source.winehq.org/git/website.git/?a=commit;h=d153292842c3264dfb3ab0… Author: 刘涛 <wendaotao(a)163.com> Date: Thu Jan 16 14:38:16 2014 +0800 website: Simplified Chinese translation for 1.6.2 release --- news/zh-cn/2014011001.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/zh-cn/2014011001.xml b/news/zh-cn/2014011001.xml new file mode 100644 index 0000000..edd1c8e --- /dev/null +++ b/news/zh-cn/2014011001.xml @@ -0,0 +1,13 @@ +<news> +<date>一月 10, 2014</date> +<title>Wine 1.6.2 发布</title> +<body> + Wine 维护版 1.6.2 现在可以使用了。 + 本次<a href="{$root}/announce/1.6.2">更新</a> : +<ul> + <li>升级 liblcms 到版本 2 来支持色彩管理。</li> + <li>各种 bug 的修复。</li> +</ul> +源代码可以从<a href="http://prdownloads.sourceforge.net/wine/wine-1.6.2.tar.bz2">这里</a>获取。 +二进制包正在构建中，稍后将出现在各自相应的<a href="{$root}/download">下载位置</a>。 +</body></news>

1 0

Stefan Dösinger : wined3d: Prevent blits to surfaces that will be converted.
by Alexandre Julliard Jan. 16, 2014

Jan. 16, 2014

Module: wine Branch: master Commit: 65bc678fcc9974b79921d6706a44ff10d0aa5f53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65bc678fcc9974b79921d6706… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 15 22:02:17 2014 +0100 wined3d: Prevent blits to surfaces that will be converted. --- dlls/wined3d/surface.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ec9f586..015478f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6032,6 +6032,8 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC DWORD src_ds_flags, dst_ds_flags; RECT src_rect, dst_rect; BOOL scale, convert; + enum wined3d_conversion_type dst_convert_type; + struct wined3d_format dst_conv_fmt; static const DWORD simple_blit = WINEDDBLT_ASYNC | WINEDDBLT_COLORFILL @@ -6146,7 +6148,8 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC /* We want to avoid invalidating the sysmem location for converted * surfaces, since otherwise we'd have to convert the data back when * locking them. */ - if (dst_surface->flags & SFLAG_CONVERTED) + d3dfmt_get_conv(dst_surface, TRUE, TRUE, &dst_conv_fmt, &dst_convert_type); + if (dst_convert_type != WINED3D_CT_NONE || dst_conv_fmt.convert || dst_surface->flags & SFLAG_CONVERTED) { WARN_(d3d_perf)("Converted surface, using CPU blit.\n"); goto cpu;

1 0

Stefan Dösinger : d3dx9_36/tests: Use a window with a non-zero size.
by Alexandre Julliard Jan. 16, 2014

Jan. 16, 2014

Module: wine Branch: master Commit: f85f733c7924503f5880e525d4a2698e81726da1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f85f733c7924503f5880e525d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 15 22:02:18 2014 +0100 d3dx9_36/tests: Use a window with a non-zero size. --- dlls/d3dx9_36/tests/core.c | 3 ++- dlls/d3dx9_36/tests/effect.c | 3 ++- dlls/d3dx9_36/tests/line.c | 3 ++- dlls/d3dx9_36/tests/mesh.c | 20 +++++++++++++------- dlls/d3dx9_36/tests/shader.c | 12 ++++++------ dlls/d3dx9_36/tests/surface.c | 3 ++- dlls/d3dx9_36/tests/texture.c | 3 ++- dlls/d3dx9_36/tests/volume.c | 3 ++- 8 files changed, 31 insertions(+), 19 deletions(-) diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index d2e2d5e..2990893 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -1225,7 +1225,8 @@ START_TEST(core) D3DPRESENT_PARAMETERS d3dpp; HRESULT hr; - if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return; diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 2306f1e..bc1ddbe 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -2691,7 +2691,8 @@ START_TEST(effect) HRESULT hr; ULONG count; - if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return; diff --git a/dlls/d3dx9_36/tests/line.c b/dlls/d3dx9_36/tests/line.c index 25d1f32..ae8d07e 100644 --- a/dlls/d3dx9_36/tests/line.c +++ b/dlls/d3dx9_36/tests/line.c @@ -123,7 +123,8 @@ START_TEST(line) D3DPRESENT_PARAMETERS d3dpp; HRESULT hr; - if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return; diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 47a1b1f..2eb2146 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -121,7 +121,8 @@ static struct test_context *new_test_context(void) D3DPRESENT_PARAMETERS d3dpp = {0}; struct test_context *test_context; - if (!(hwnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(hwnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); goto error; @@ -1175,7 +1176,8 @@ static void D3DXCreateMeshTest(void) hr = D3DXCreateMesh(1, 3, D3DXMESH_MANAGED, decl1, NULL, &d3dxmesh); ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); - if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return; @@ -1381,7 +1383,8 @@ static void D3DXCreateMeshFVFTest(void) hr = D3DXCreateMeshFVF(1, 3, D3DXMESH_MANAGED, D3DFVF_XYZ | D3DFVF_NORMAL, NULL, &d3dxmesh); ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); - if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return; @@ -2449,7 +2452,7 @@ static void D3DXCreateBoxTest(void) return; } - wnd = CreateWindowA("d3dx9_test_wc", "d3dx9_test", WS_SYSMENU | WS_POPUP, + wnd = CreateWindowA("d3dx9_test_wc", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); ok(wnd != NULL, "Expected to have a window, received NULL\n"); if (!wnd) @@ -2750,7 +2753,8 @@ static void D3DXCreateSphereTest(void) hr = D3DXCreateSphere(NULL, 0.0f, 0, 1, NULL, NULL); ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n",hr,D3DERR_INVALIDCALL); - if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return; @@ -2992,7 +2996,8 @@ static void D3DXCreateCylinderTest(void) hr = D3DXCreateCylinder(NULL, 1.0f, 1.0f, 1.0f, 2, 1, &cylinder, NULL); ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n",hr,D3DERR_INVALIDCALL); - if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return; @@ -4282,7 +4287,8 @@ static void D3DXGenerateAdjacencyTest(void) }, }; - if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return; diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 4fcf3d3..c0d5f00 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -1423,8 +1423,8 @@ static void test_setting_constants(void) HRESULT hr; ULONG refcnt; - /* Create the device to use for our tests */ - if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return; @@ -6067,8 +6067,8 @@ static void test_registerset(void) ULONG count; D3DCAPS9 caps; - /* Create the device to use for our tests */ - if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return; @@ -6371,8 +6371,8 @@ static void test_registerset_defaults(void) ULONG count; D3DCAPS9 caps; - /* Create the device to use for our tests */ - if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return; diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 3af34d4..283fc96 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -1281,7 +1281,8 @@ START_TEST(surface) D3DPRESENT_PARAMETERS d3dpp; HRESULT hr; - if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return; diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 18ac720..afc7144 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -1786,7 +1786,8 @@ START_TEST(texture) D3DPRESENT_PARAMETERS d3dpp; HRESULT hr; - if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return; diff --git a/dlls/d3dx9_36/tests/volume.c b/dlls/d3dx9_36/tests/volume.c index 8f1dc29..ee83bca 100644 --- a/dlls/d3dx9_36/tests/volume.c +++ b/dlls/d3dx9_36/tests/volume.c @@ -267,7 +267,8 @@ START_TEST(volume) D3DPRESENT_PARAMETERS d3dpp; HRESULT hr; - if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return;

1 0

André Hentschel : oleaut32/tests: Fix a test output.
by Alexandre Julliard Jan. 16, 2014

Jan. 16, 2014

Module: wine Branch: master Commit: dc27a38536e89e851e798282468198bf109c5463 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc27a38536e89e851e7982824… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jan 16 20:49:53 2014 +0100 oleaut32/tests: Fix a test output. --- dlls/oleaut32/tests/safearray.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index bb346f6..8a98782 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -1778,8 +1778,8 @@ static void test_SafeArrayCopy(void) /* copy from a vector */ sa = SafeArrayCreateVector(VT_UI1, 0, 2); ok(sa->fFeatures == (FADF_HAVEVARTYPE|FADF_CREATEVECTOR) || - broken(!sa->fFeatures /* W2k */), - "got 0x%08x\n", hres); + broken(sa->fFeatures == FADF_CREATEVECTOR /* W2k */), + "got 0x%08x\n", sa->fFeatures); hres = SafeArrayCopy(sa, &sa2); ok(hres == S_OK, "got 0x%08x\n", hres); ok(sa2->fFeatures == FADF_HAVEVARTYPE ||

1 0

Stefan Dösinger : wined3d: Remove surface_init_sysmem.
by Alexandre Julliard Jan. 16, 2014

Jan. 16, 2014

Module: wine Branch: master Commit: 09dbba00d0042dfda38143aee7630f0fe2c31c6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=09dbba00d0042dfda38143aee… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 15 22:02:16 2014 +0100 wined3d: Remove surface_init_sysmem. --- dlls/wined3d/surface.c | 40 +++++++++++++++------------------------- 1 file changed, 15 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 586358a..ec9f586 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1295,24 +1295,6 @@ static void surface_remove_pbo(struct wined3d_surface *surface, const struct win surface_invalidate_location(surface, SFLAG_INBUFFER); } -static BOOL surface_init_sysmem(struct wined3d_surface *surface) -{ - if (surface->user_memory) - return TRUE; - - if (surface->resource.heap_memory) - { - memset(surface->resource.heap_memory, 0, surface->resource.size); - } - else if (!wined3d_resource_allocate_sysmem(&surface->resource)) - { - ERR("Failed to allocate system memory.\n"); - return FALSE; - } - - return TRUE; -} - static void surface_unload(struct wined3d_resource *resource) { struct wined3d_surface *surface = surface_from_resource(resource); @@ -1334,7 +1316,8 @@ static void surface_unload(struct wined3d_resource *resource) * but we can't set the sysmem INDRAWABLE because when we're rendering the swapchain * or the depth stencil into an FBO the texture or render buffer will be removed * and all flags get lost */ - surface_init_sysmem(surface); + surface_prepare_system_memory(surface); + memset(surface->resource.heap_memory, 0, surface->resource.size); surface_validate_location(surface, SFLAG_INSYSMEM); surface_invalidate_location(surface, ~SFLAG_INSYSMEM); @@ -2682,6 +2665,7 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface, UINT resource_size = wined3d_format_calculate_size(format, device->surface_alignment, width, height, 1); BOOL create_dib = FALSE; HRESULT hr; + DWORD valid_location = 0; TRACE("surface %p, width %u, height %u, format %s, multisample_type %#x, multisample_quality %u.\n", surface, width, height, debug_d3dformat(format_id), multisample_type, multisample_type); @@ -2734,7 +2718,10 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface, surface->user_memory = mem; if (surface->user_memory) + { surface->map_binding = SFLAG_INUSERMEM; + valid_location = SFLAG_INUSERMEM; + } surface->pitch = pitch; surface->resource.format = format; surface->resource.multisample_type = multisample_type; @@ -2758,14 +2745,17 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface, ERR("Failed to create dib section, hr %#x.\n", hr); return hr; } + if (!valid_location) + valid_location = SFLAG_INDIB; } - if (!surface_init_sysmem(surface)) - return E_OUTOFMEMORY; - if (surface->map_binding == SFLAG_INBUFFER) - surface_validate_location(surface, SFLAG_INSYSMEM); - else - surface_validate_location(surface, surface->map_binding); + if (!valid_location) + { + surface_prepare_system_memory(surface); + valid_location = SFLAG_INSYSMEM; + } + + surface_validate_location(surface, valid_location); return WINED3D_OK; }

1 0

Michael Stefaniuc : dmcompos/tests: Add COM tests for DirectMusicTemplate.
by Alexandre Julliard Jan. 16, 2014

Jan. 16, 2014

Module: wine Branch: master Commit: d3a3deb6605164f29e5ddd4a568c3f5c707a4485 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3a3deb6605164f29e5ddd4a5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 16 00:54:08 2014 +0100 dmcompos/tests: Add COM tests for DirectMusicTemplate. --- dlls/dmcompos/tests/dmcompos.c | 41 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/dmcompos/tests/dmcompos.c b/dlls/dmcompos/tests/dmcompos.c index ba07305..ecb7745 100644 --- a/dlls/dmcompos/tests/dmcompos.c +++ b/dlls/dmcompos/tests/dmcompos.c @@ -126,6 +126,46 @@ static void test_COM_chordmap(void) while (IDirectMusicChordMap_Release(dmcm)); } +static void test_COM_template(void) +{ + IPersistStream *ps = (IPersistStream*)0xdeadbeef; + IUnknown *unk; + ULONG refcount; + HRESULT hr; + + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_DirectMusicTemplate, (IUnknown*)&ps, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&ps); + ok(hr == CLASS_E_NOAGGREGATION, + "DirectMusicTemplate create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + ok(!ps, "ps = %p\n", ps); + + /* Invalid RIID */ + hr = CoCreateInstance(&CLSID_DirectMusicTemplate, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicObject, (void**)&ps); + todo_wine ok(hr == E_NOINTERFACE, + "DirectMusicTemplate create failed: %08x, expected E_NOINTERFACE\n", hr); + + /* Same refcount for all DirectMusicTemplate interfaces */ + hr = CoCreateInstance(&CLSID_DirectMusicTemplate, NULL, CLSCTX_INPROC_SERVER, + &IID_IPersistStream, (void**)&ps); + todo_wine ok(hr == S_OK, "DirectMusicTemplate create failed: %08x, expected S_OK\n", hr); + if (hr != S_OK) { + skip("DirectMusicTemplate not implemented\n"); + return; + } + refcount = IPersistStream_AddRef(ps); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = IPersistStream_QueryInterface(ps, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IUnknown_Release(unk); + + while (IPersistStream_Release(ps)); +} + static void test_COM_track(void) { IDirectMusicTrack8 *dmt8; @@ -202,6 +242,7 @@ START_TEST(dmcompos) } test_COM(); test_COM_chordmap(); + test_COM_template(); test_COM_track(); CoUninitialize();

1 0