April 2015 - Wine-Commits - list.winehq.org

Piotr Caban : msvcp110: Fix _Getcvt implementation.
by Alexandre Julliard April 22, 2015

April 22, 2015

Module: wine Branch: master Commit: d7f6eac058a365c7b2f5593502b0b4fe7330834c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7f6eac058a365c7b2f559350… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 22 15:57:40 2015 +0200 msvcp110: Fix _Getcvt implementation. --- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120_app/msvcp120_app.spec | 2 +- dlls/msvcp90/locale.c | 26 ++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 7 +++++++ include/msvcrt/stdlib.h | 4 ++-- 6 files changed, 38 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 2f3ace4..3be4944 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3780,7 +3780,7 @@ # extern _FZero @ cdecl -ret64 _Getcoll() @ cdecl _Getctype(ptr) -@ cdecl -ret64 _Getcvt() +@ cdecl _Getcvt(ptr) @ cdecl _Getdateorder() @ cdecl _Getwctype(long ptr) @ cdecl _Getwctypes(ptr ptr ptr ptr) diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index bc539b2..d8187d5 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3723,7 +3723,7 @@ # extern _FZero @ cdecl -ret64 _Getcoll() @ cdecl _Getctype(ptr) -@ cdecl -ret64 _Getcvt() +@ cdecl _Getcvt(ptr) @ cdecl _Getdateorder() @ cdecl _Getwctype(long ptr) @ cdecl _Getwctypes(ptr ptr ptr ptr) diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 6ce2eb0..bd949be 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3723,7 +3723,7 @@ # extern _FZero @ cdecl -ret64 _Getcoll() msvcp120._Getcoll @ cdecl _Getctype(ptr) msvcp120._Getctype -@ cdecl -ret64 _Getcvt() msvcp120._Getcvt +@ cdecl _Getcvt(ptr) msvcp120._Getcvt @ cdecl _Getdateorder() msvcp120._Getdateorder @ cdecl _Getwctype(long ptr) msvcp120._Getwctype @ cdecl _Getwctypes(ptr ptr ptr ptr) msvcp120._Getwctypes diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index e7d816b..f77d844 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -24,6 +24,7 @@ #include "errno.h" #include "limits.h" #include "math.h" +#include "mbctype.h" #include "stdio.h" #include "wchar.h" #include "wctype.h" @@ -684,6 +685,7 @@ _Ctypevec* __thiscall _Locinfo__Getctype(const _Locinfo *this, _Ctypevec *ret) } /* _Getcvt */ +#if _MSVCP_VER < 110 ULONGLONG __cdecl _Getcvt(void) { union { @@ -697,14 +699,38 @@ ULONGLONG __cdecl _Getcvt(void) ret.cvtvec.handle = ___lc_handle_func()[LC_CTYPE]; return ret.ull; } +#else +_Cvtvec* __cdecl _Getcvt(_Cvtvec *ret) +{ + int i; + + TRACE("\n"); + + memset(ret, 0, sizeof(*ret)); + ret->page = ___lc_codepage_func(); + ret->mb_max = ___mb_cur_max_func(); + + if(ret->mb_max > 1) { + for(i=0; i<256; i++) + if(_ismbblead(i)) ret->isleadbyte[i/8] |= 1 << (i&7); + } + return ret; +} +#endif /* ?_Getcvt(a)_Locinfo@std@@QBE?AU_Cvtvec@@XZ */ /* ?_Getcvt(a)_Locinfo@std@@QEBA?AU_Cvtvec@@XZ */ DEFINE_THISCALL_WRAPPER(_Locinfo__Getcvt, 8) _Cvtvec* __thiscall _Locinfo__Getcvt(const _Locinfo *this, _Cvtvec *ret) { +#if _MSVCP_VER < 110 ULONGLONG ull = _Getcvt(); memcpy(ret, &ull, sizeof(ull)); +#else + _Cvtvec cvtvec; + _Getcvt(&cvtvec); + memcpy(ret, &cvtvec, sizeof(cvtvec)); +#endif return ret; } diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 62dddc9..17d582c 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -192,8 +192,15 @@ int __thiscall codecvt_char_in(const codecvt_char*, int*, const char*, int __thiscall codecvt_base_max_length(const codecvt_base*); typedef struct { +#if _MSVCP_VER < 110 LCID handle; +#endif unsigned page; +#if _MSVCP_VER >= 110 + int mb_max; + int unk; + BYTE isleadbyte[32]; +#endif } _Cvtvec; /* class codecvt<wchar> */ diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index e88ffa3..174df43 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -119,8 +119,8 @@ extern unsigned int _fmode; #endif /* __i386__ */ -extern int* __cdecl ___mb_cur_max_func(void); -#define __mb_cur_max (*___mb_cur_max_func()) +extern int __cdecl ___mb_cur_max_func(void); +#define __mb_cur_max ___mb_cur_max_func() extern __msvcrt_ulong* __cdecl __doserrno(void); #define _doserrno (*__doserrno()) extern int* __cdecl _errno(void);

1 0

Jacek Caban : inseng.idl: Added new IDL.
by Alexandre Julliard April 22, 2015

April 22, 2015

Module: wine Branch: master Commit: 4d7b7b71e106f9913fed90c8e28612c240708f93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d7b7b71e106f9913fed90c8e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 22 15:47:59 2015 +0200 inseng.idl: Added new IDL. --- dlls/inseng/Makefile.in | 2 +- dlls/inseng/inseng_classes.idl | 23 +++++++++++++++++++++++ dlls/inseng/inseng_main.c | 4 ++-- include/Makefile.in | 1 + {dlls/inseng => include}/inseng.idl | 12 ++++++------ 5 files changed, 33 insertions(+), 9 deletions(-) diff --git a/dlls/inseng/Makefile.in b/dlls/inseng/Makefile.in index a4b09de..652e06b 100644 --- a/dlls/inseng/Makefile.in +++ b/dlls/inseng/Makefile.in @@ -3,4 +3,4 @@ IMPORTS = uuid ole32 advapi32 C_SRCS = inseng_main.c -IDL_SRCS = inseng.idl +IDL_SRCS = inseng_classes.idl diff --git a/dlls/inseng/inseng_classes.idl b/dlls/inseng/inseng_classes.idl new file mode 100644 index 0000000..edb7c4d --- /dev/null +++ b/dlls/inseng/inseng_classes.idl @@ -0,0 +1,23 @@ +/* + * COM Classes for inseng + * + * Copyright 2010 Alexandre Julliard + * + * 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 + */ + +#pragma makedep register + +#include "inseng.idl" diff --git a/dlls/inseng/inseng_main.c b/dlls/inseng/inseng_main.c index d264b99..e76c6e1 100644 --- a/dlls/inseng/inseng_main.c +++ b/dlls/inseng/inseng_main.c @@ -110,8 +110,8 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) { - if(IsEqualGUID(rclsid, &CLSID_ActiveSetupEng)) { - TRACE("(CLSID_ActiveSetupEng %s %p)\n", debugstr_guid(iid), ppv); + if(IsEqualGUID(rclsid, &CLSID_InstallEngine)) { + TRACE("(CLSID_InstallEngine %s %p)\n", debugstr_guid(iid), ppv); return IClassFactory_QueryInterface(&ActiveSetupEngCF, iid, ppv); } diff --git a/include/Makefile.in b/include/Makefile.in index e114f9f..ad87f47 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -59,6 +59,7 @@ PUBLIC_IDL_H_SRCS = \ imnxport.idl \ indexsrv.idl \ inputscope.idl \ + inseng.idl \ mediaobj.idl \ metahost.idl \ mimeinfo.idl \ diff --git a/dlls/inseng/inseng.idl b/include/inseng.idl similarity index 86% rename from dlls/inseng/inseng.idl rename to include/inseng.idl index ba7a0f9..7b9d0e7 100644 --- a/dlls/inseng/inseng.idl +++ b/include/inseng.idl @@ -1,7 +1,5 @@ /* - * COM Classes for inseng - * - * Copyright 2010 Alexandre Julliard + * Copyright 2015 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 @@ -18,18 +16,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma makedep register +#ifndef __WIDL__ +#define threading(model) +#endif [ helpstring("Microsoft Active Setup Engine"), threading(apartment), uuid(6e449686-c509-11cf-aafa-00aa00b6015c) ] -coclass ActiveSetupEng { } +coclass InstallEngine { } [ helpstring("Download Site Manager"), threading(apartment), uuid(bfc880f1-7484-11d0-8309-00aa00b6015c) ] -coclass DLManager { } +coclass DownloadSiteMgr { }

1 0

Jacek Caban : inseng.idl: Added more declarations.
by Alexandre Julliard April 22, 2015

April 22, 2015

Module: wine Branch: master Commit: c61d9981e8a6139d68dfd2093cf6b9aaaa4bd1cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c61d9981e8a6139d68dfd2093… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 22 15:48:13 2015 +0200 inseng.idl: Added more declarations. --- include/inseng.idl | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) diff --git a/include/inseng.idl b/include/inseng.idl index 7b9d0e7..8a3f4c4 100644 --- a/include/inseng.idl +++ b/include/inseng.idl @@ -20,6 +20,107 @@ #define threading(model) #endif +cpp_quote("#if 0") +import "unknwn.idl"; +cpp_quote("#endif") + +interface IStream; + +/* FIXME: Add full declarations. */ +interface ICifComponent; +interface IEnumCifComponents; +interface ICifGroup; +interface IEnumCifGroups; +interface ICifMode; +interface IEnumCifModes; + +typedef struct { + DWORD cbSize; + DWORD dwInstallSize; + DWORD dwWinDriveSize; + DWORD dwDownloadSize; + DWORD dwDependancySize; + DWORD dwInstallDriveReq; + DWORD dwWinDriveReq; + DWORD dwDownloadDriveReq; + char chWinDrive; + char chInstallDrive; + char chDownloadDrive; + DWORD dwTotalDownloadSize; +} COMPONENT_SIZES; + +[ + uuid(6e449688-c509-11cf-aafa-00aa00b6015c), + local +] +interface ICifFile : IUnknown +{ + HRESULT EnumComponents(IEnumCifComponents **enum_components, DWORD filter, void *pv); + HRESULT FindComponent(const char *id, ICifComponent **p); + HRESULT EnumGroups(IEnumCifGroups **enum_groups, DWORD filter, void *pv); + HRESULT FindGroup(const char *id, ICifGroup **p); + HRESULT EnumModes(IEnumCifModes **cuf_modes, DWORD filter, void *pv); + HRESULT FindMode(const char *id, ICifMode **p); + HRESULT GetDescription(char *desc, DWORD size); + HRESULT GetDetDlls(char **dlls, DWORD size); +} + +[ + uuid(6e449685-c509-11cf-aafa-00aa00b6015c), + local +] +interface IInstallEngineCallback : IUnknown +{ + HRESULT OnEngineStatusChange(DWORD status, DWORD substatus); + HRESULT OnStartInstall(DWORD dl_size, DWORD install_size); + HRESULT OnStartComponent(const char *id, DWORD dl_size, DWORD install_size, const char *string); + HRESULT OnComponentProgress(const char *id, DWORD phrase, const char *string, + const char *msg_string, ULONG progress, ULONG max); + HRESULT OnStopComponent(const char *id, HRESULT error, DWORD phrase, const char *string, DWORD status); + HRESULT OnStopInstall(HRESULT error, const char *error_string, DWORD status); + HRESULT OnEngineProblem(DWORD problem, LPDWORD action); +} + +[ + uuid(6e449684-c509-11cf-aafa-00aa00b6015c), + local +] +interface IInstallEngine : IUnknown +{ + HRESULT GetEngineStatus(DWORD *status); + HRESULT SetCifFile(const char *cab_name, const char *cif_name); + HRESULT DownloadComponents(DWORD flags); + HRESULT InstallComponents(DWORD flags); + HRESULT EnumInstallIDs(UINT index, char **id); + HRESULT EnumDownloadIDs(UINT index, char **id); + HRESULT IsComponentInstalled(const char *id, DWORD *status); + HRESULT RegisterInstallEngineCallback(IInstallEngineCallback *callback); + HRESULT UnregisterInstallEngineCallback(); + HRESULT SetAction(const char *id, DWORD action, DWORD priority); + HRESULT GetSizes(const char *id, COMPONENT_SIZES *sizes); + HRESULT LaunchExtraCommand(const char *inf_name, const char *section); + HRESULT GetDisplayName(const char *id, const char *name); + HRESULT SetBaseUrl(const char *base_name); + HRESULT SetDownloadDir(const char *download_dir); + HRESULT SetInstallDrive(char drive); + HRESULT SetInstallOptions(DWORD flags); + HRESULT SetHWND(HWND hwnd); + HRESULT SetIStream(IStream *stream); + HRESULT Abort(DWORD flags); + HRESULT Suspend(); + HRESULT Resume(); +} + +[ + uuid(6e449689-c509-11cf-aafa-00aa00b6015c), + local +] +interface IInstallEngine2 : IInstallEngine +{ + HRESULT SetLocalCif(const char *cif); + HRESULT GetICifFile(ICifFile **cif_file); +} + [ helpstring("Microsoft Active Setup Engine"), threading(apartment),

1 0

Piotr Caban : msvcp120: Add _Getcvt tests.
by Alexandre Julliard April 22, 2015

April 22, 2015

Module: wine Branch: master Commit: a406abbec848c9706001e189a6ba77c27317629f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a406abbec848c9706001e189a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 22 15:57:54 2015 +0200 msvcp120: Add _Getcvt tests. --- dlls/msvcp120/tests/msvcp120.c | 60 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 1b1dbf0..e468a7e 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <locale.h> + #include "wine/test.h" #include "winbase.h" @@ -27,13 +29,27 @@ typedef struct { MSVCRT_long nsec; } xtime; +typedef struct { + unsigned page; + int mb_max; + int unk; + BYTE isleadbyte[32]; +} _Cvtvec; + +static char* (__cdecl *p_setlocale)(int, const char*); +static int (__cdecl *p__setmbcp)(int); +static int (__cdecl *p_isleadbyte)(int); + static MSVCRT_long (__cdecl *p__Xtime_diff_to_millis2)(const xtime*, const xtime*); static int (__cdecl *p_xtime_get)(xtime*, int); +static _Cvtvec* (__cdecl *p__Getcvt)(_Cvtvec*); static HMODULE msvcp; static BOOL init(void) { + HANDLE msvcr; + msvcp = LoadLibraryA("msvcp120.dll"); if(!msvcp) { @@ -43,7 +59,12 @@ static BOOL init(void) p__Xtime_diff_to_millis2 = (void*)GetProcAddress(msvcp, "_Xtime_diff_to_millis2"); p_xtime_get = (void*)GetProcAddress(msvcp, "xtime_get"); + p__Getcvt = (void*)GetProcAddress(msvcp, "_Getcvt"); + msvcr = GetModuleHandleA("msvcr120.dll"); + p_setlocale = (void*)GetProcAddress(msvcr, "setlocale"); + p__setmbcp = (void*)GetProcAddress(msvcr, "_setmbcp"); + p_isleadbyte = (void*)GetProcAddress(msvcr, "isleadbyte"); return TRUE; } @@ -131,9 +152,48 @@ static void test_xtime_get(void) "xtime_get() should have modified the xtime struct with the given option\n"); } +static void test__Getcvt(void) +{ + _Cvtvec cvtvec; + int i; + + p__Getcvt(&cvtvec); + ok(cvtvec.page == 0, "cvtvec.page = %d\n", cvtvec.page); + ok(cvtvec.mb_max == 1, "cvtvec.mb_max = %d\n", cvtvec.mb_max); + todo_wine ok(cvtvec.unk == 1, "cvtvec.unk = %d\n", cvtvec.unk); + for(i=0; i<32; i++) + ok(cvtvec.isleadbyte[i] == 0, "cvtvec.isleadbyte[%d] = %x\n", i, cvtvec.isleadbyte[i]); + + if(!p_setlocale(LC_ALL, ".936")) { + win_skip("_Getcvt tests\n"); + return; + } + p__Getcvt(&cvtvec); + ok(cvtvec.page == 936, "cvtvec.page = %d\n", cvtvec.page); + ok(cvtvec.mb_max == 2, "cvtvec.mb_max = %d\n", cvtvec.mb_max); + ok(cvtvec.unk == 0, "cvtvec.unk = %d\n", cvtvec.unk); + for(i=0; i<32; i++) + ok(cvtvec.isleadbyte[i] == 0, "cvtvec.isleadbyte[%d] = %x\n", i, cvtvec.isleadbyte[i]); + + p__setmbcp(936); + p__Getcvt(&cvtvec); + ok(cvtvec.page == 936, "cvtvec.page = %d\n", cvtvec.page); + ok(cvtvec.mb_max == 2, "cvtvec.mb_max = %d\n", cvtvec.mb_max); + ok(cvtvec.unk == 0, "cvtvec.unk = %d\n", cvtvec.unk); + for(i=0; i<32; i++) { + BYTE b = 0; + int j; + + for(j=0; j<8; j++) + b |= (p_isleadbyte(i*8+j) ? 1 : 0) << j; + ok(cvtvec.isleadbyte[i] ==b, "cvtvec.isleadbyte[%d] = %x (%x)\n", i, cvtvec.isleadbyte[i], b); + } +} + START_TEST(msvcp120) { if(!init()) return; test__Xtime_diff_to_millis2(); test_xtime_get(); + test__Getcvt(); }

1 0

Nikolay Sivov : msdmo: Fix DMOGetName() error handling and error values.
by Alexandre Julliard April 22, 2015

April 22, 2015

Module: wine Branch: master Commit: 6238adc81782b8db8ea0de48d73a3bb3ddcc33f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6238adc81782b8db8ea0de48d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 22 14:31:42 2015 +0300 msdmo: Fix DMOGetName() error handling and error values. --- dlls/msdmo/dmoreg.c | 41 ++++++++++++++++++++--------------------- dlls/msdmo/tests/msdmo.c | 17 +++++++++++++++++ 2 files changed, 37 insertions(+), 21 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index 25480e5..4bd7ab4 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -325,38 +325,37 @@ lend: /*************************************************************** * DMOGetName (MSDMO.@) * - * Get DMP Name from the registry + * Get DMO Name from the registry */ -HRESULT WINAPI DMOGetName(REFCLSID clsidDMO, WCHAR szName[]) +HRESULT WINAPI DMOGetName(REFCLSID clsidDMO, WCHAR name[]) { + static const INT max_name_len = 80*sizeof(WCHAR); + DWORD count = max_name_len; WCHAR szguid[64]; - HKEY hrkey = 0; - HKEY hkey = 0; - static const INT max_name_len = 80; - DWORD count; + HKEY hrkey, hkey; LONG ret; - TRACE("%s\n", debugstr_guid(clsidDMO)); + TRACE("%s %p\n", debugstr_guid(clsidDMO), name); - ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, szDMORootKey, 0, KEY_READ, &hrkey); - if (ERROR_SUCCESS != ret) - goto lend; + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, szDMORootKey, 0, KEY_READ, &hrkey)) + return E_FAIL; ret = RegOpenKeyExW(hrkey, GUIDToString(szguid, clsidDMO), 0, KEY_READ, &hkey); - if (ERROR_SUCCESS != ret) - goto lend; + RegCloseKey(hrkey); + if (ret) + return E_FAIL; - count = max_name_len * sizeof(WCHAR); - ret = RegQueryValueExW(hkey, NULL, NULL, NULL, (LPBYTE) szName, &count); + ret = RegQueryValueExW(hkey, NULL, NULL, NULL, (LPBYTE)name, &count); + RegCloseKey(hkey); - TRACE(" szName=%s\n", debugstr_w(szName)); -lend: - if (hkey) - RegCloseKey(hrkey); - if (hkey) - RegCloseKey(hkey); + if (!ret && count > 1) + { + TRACE("name=%s\n", debugstr_w(name)); + return S_OK; + } - return HRESULT_FROM_WIN32(ret); + name[0] = 0; + return S_FALSE; } /************************************************************************** diff --git a/dlls/msdmo/tests/msdmo.c b/dlls/msdmo/tests/msdmo.c index 4fc0c35..00ab656 100644 --- a/dlls/msdmo/tests/msdmo.c +++ b/dlls/msdmo/tests/msdmo.c @@ -25,6 +25,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); static const GUID GUID_unknowndmo = {0x14d99047,0x441f,0x4cd3,{0xbc,0xa8,0x3e,0x67,0x99,0xaf,0x34,0x75}}; static const GUID GUID_unknowncategory = {0x14d99048,0x441f,0x4cd3,{0xbc,0xa8,0x3e,0x67,0x99,0xaf,0x34,0x75}}; +static const GUID GUID_wmp1 = {0x13a7995e,0x7d8f,0x45b4,{0x9c,0x77,0x81,0x92,0x65,0x22,0x57,0x63}}; static void test_DMOUnregister(void) { @@ -54,7 +55,23 @@ static void test_DMOUnregister(void) ok(hr == S_FALSE, "got 0x%08x\n", hr); } +static void test_DMOGetName(void) +{ + WCHAR name[80]; + HRESULT hr; + + hr = DMOGetName(&GUID_unknowndmo, NULL); + ok(hr == E_FAIL, "got 0x%08x\n", hr); + + /* no such DMO */ + name[0] = 'a'; + hr = DMOGetName(&GUID_wmp1, name); + ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(name[0] == 'a', "got %x\n", name[0]); +} + START_TEST(msdmo) { test_DMOUnregister(); + test_DMOGetName(); }

1 0

Michael Stefaniuc : d3dxof: Don' t ERR on alloc failures for small compile time known sizes.
by Alexandre Julliard April 22, 2015

April 22, 2015

Module: wine Branch: master Commit: c954d50b1650ac6b08d74a49926fd4cb217a9b59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c954d50b1650ac6b08d74a499… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 22 13:07:07 2015 +0200 d3dxof: Don't ERR on alloc failures for small compile time known sizes. --- dlls/d3dxof/d3dxof.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 8888d8b..8aa6c21 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -56,10 +56,7 @@ HRESULT IDirectXFileImpl_Create(IUnknown* pUnkOuter, LPVOID* ppObj) object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectXFileImpl)); if (!object) - { - ERR("Out of memory\n"); return DXFILEERR_BADALLOC; - } object->IDirectXFile_iface.lpVtbl = &IDirectXFile_Vtbl; object->ref = 1; @@ -373,10 +370,7 @@ static HRESULT IDirectXFileBinaryImpl_Create(IDirectXFileBinaryImpl** ppObj) object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectXFileBinaryImpl)); if (!object) - { - ERR("Out of memory\n"); return DXFILEERR_BADALLOC; - } object->IDirectXFileBinary_iface.lpVtbl = &IDirectXFileBinary_Vtbl; object->ref = 1; @@ -506,10 +500,7 @@ static HRESULT IDirectXFileDataImpl_Create(IDirectXFileDataImpl** ppObj) object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectXFileDataImpl)); if (!object) - { - ERR("Out of memory\n"); return DXFILEERR_BADALLOC; - } object->IDirectXFileData_iface.lpVtbl = &IDirectXFileData_Vtbl; object->ref = 1; @@ -784,10 +775,7 @@ static HRESULT IDirectXFileDataReferenceImpl_Create(IDirectXFileDataReferenceImp object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectXFileDataReferenceImpl)); if (!object) - { - ERR("Out of memory\n"); return DXFILEERR_BADALLOC; - } object->IDirectXFileDataReference_iface.lpVtbl = &IDirectXFileDataReference_Vtbl; object->ref = 1; @@ -935,10 +923,7 @@ static HRESULT IDirectXFileEnumObjectImpl_Create(IDirectXFileEnumObjectImpl** pp object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectXFileEnumObjectImpl)); if (!object) - { - ERR("Out of memory\n"); return DXFILEERR_BADALLOC; - } object->IDirectXFileEnumObject_iface.lpVtbl = &IDirectXFileEnumObject_Vtbl; object->ref = 1; @@ -1037,7 +1022,6 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE object->pobj = HeapAlloc(GetProcessHeap(), 0, sizeof(xobject)*MAX_SUBOBJECTS); if (!object->pobj) { - ERR("Out of memory\n"); hr = DXFILEERR_BADALLOC; goto error; } @@ -1045,7 +1029,6 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE object->pstrings = HeapAlloc(GetProcessHeap(), 0, MAX_STRINGS_BUFFER); if (!object->pstrings) { - ERR("Out of memory\n"); hr = DXFILEERR_BADALLOC; goto error; } @@ -1125,10 +1108,7 @@ static HRESULT IDirectXFileSaveObjectImpl_Create(IDirectXFileSaveObjectImpl** pp object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectXFileSaveObjectImpl)); if (!object) - { - ERR("Out of memory\n"); return DXFILEERR_BADALLOC; - } object->IDirectXFileSaveObject_iface.lpVtbl = &IDirectXFileSaveObject_Vtbl; object->ref = 1;

1 0

Nikolay Sivov : wbemprox/tests: Fix interface instance leak (Valgrind).
by Alexandre Julliard April 22, 2015

April 22, 2015

Module: wine Branch: master Commit: f068eb9acd5b9bec6c7157bf763095d82c4cd343 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f068eb9acd5b9bec6c7157bf7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 22 12:28:20 2015 +0300 wbemprox/tests: Fix interface instance leak (Valgrind). --- dlls/wbemprox/tests/query.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 7e031d2..eb3bd58 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -267,6 +267,7 @@ static void test_Win32_Process( IWbemServices *services ) } hr = IWbemClassObject_GetMethod( process, getownerW, 0, NULL, NULL ); ok( hr == S_OK, "failed to get GetOwner method %08x\n", hr ); + IWbemClassObject_Release( process ); out = NULL; method = SysAllocString( getownerW );

1 0

Matteo Bruni : ddraw/tests: Port the lighting test to the previous d3d versions.
by Alexandre Julliard April 22, 2015

April 22, 2015

Module: wine Branch: master Commit: b6717dc2e3d0ca5df5ff9ac5fbb485a1a1d83aac URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6717dc2e3d0ca5df5ff9ac5f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Apr 21 15:11:21 2015 +0200 ddraw/tests: Port the lighting test to the previous d3d versions. --- dlls/ddraw/tests/ddraw1.c | 368 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 268 +++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 278 ++++++++++++++++++++++++++++++++++ 3 files changed, 914 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b6717dc2e3d0ca5df5ff9…

1 0

Stefan Leichter : ntdll: Add stub for WinSqmIsOptedIn.
by Alexandre Julliard April 22, 2015

April 22, 2015

Module: wine Branch: master Commit: a9ae8dbf149ce063c2110d9e29bf8da5911ae468 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9ae8dbf149ce063c2110d9e2… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Tue Apr 21 22:06:33 2015 +0200 ntdll: Add stub for WinSqmIsOptedIn. --- dlls/ntdll/misc.c | 10 ++++++++++ dlls/ntdll/ntdll.spec | 1 + 2 files changed, 11 insertions(+) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index ad1b43b..2cfa900 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -31,6 +31,7 @@ #include "wine/debug.h" #include "ntdll_misc.h" +WINE_DEFAULT_DEBUG_CHANNEL(ntdll); LPCSTR debugstr_ObjectAttributes(const OBJECT_ATTRIBUTES *oa) { @@ -325,3 +326,12 @@ void * __cdecl _lfind( const void *key, const void *base, unsigned int *nmemb, return (char*)base+(size*i); return NULL; } + +/********************************************************************* + * WinSqmIsOptedIn (NTDLL.@) + */ +BOOL WINAPI WinSqmIsOptedIn(void) +{ + FIXME("() stub\n"); + return FALSE; +} diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index c3307b2..28165ef 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -969,6 +969,7 @@ @ stdcall RtlxUnicodeStringToAnsiSize(ptr) RtlUnicodeStringToAnsiSize @ stdcall RtlxUnicodeStringToOemSize(ptr) RtlUnicodeStringToOemSize @ stdcall -ret64 VerSetConditionMask(int64 long long) +@ stdcall WinSqmIsOptedIn() @ stdcall ZwAcceptConnectPort(ptr long ptr long long ptr) NtAcceptConnectPort @ stdcall ZwAccessCheck(ptr long long ptr ptr ptr ptr ptr) NtAccessCheck @ stdcall ZwAccessCheckAndAuditAlarm(ptr long ptr ptr ptr long ptr long ptr ptr ptr) NtAccessCheckAndAuditAlarm

1 0

Stefan Leichter : netapi: Add stub for NetGroupAddUser.
by Alexandre Julliard April 22, 2015

April 22, 2015

Module: wine Branch: master Commit: 11af7fda4f73ecf1c79bb5bfd088ffd1e95e4f70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11af7fda4f73ecf1c79bb5bfd… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Tue Apr 21 22:06:43 2015 +0200 netapi: Add stub for NetGroupAddUser. --- dlls/netapi32/netapi32.c | 11 +++++++++++ dlls/netapi32/netapi32.spec | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index 33c0c17..7a1d408 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -2686,6 +2686,17 @@ NET_API_STATUS WINAPI NetGetAnyDCName(LPCWSTR servername, LPCWSTR domainname, LP } /************************************************************ + * NetGroupAddUser (NETAPI32.@) + */ +NET_API_STATUS WINAPI +NetGroupAddUser(LPCWSTR servername, LPCWSTR groupname, LPCWSTR username) +{ + FIXME("(%s, %s, %s) stub!\n", debugstr_w(servername), + debugstr_w(groupname), debugstr_w(username)); + return NERR_Success; +} + +/************************************************************ * NetGroupEnum (NETAPI32.@) * */ diff --git a/dlls/netapi32/netapi32.spec b/dlls/netapi32/netapi32.spec index 9d5ac28..ede3986 100644 --- a/dlls/netapi32/netapi32.spec +++ b/dlls/netapi32/netapi32.spec @@ -95,7 +95,7 @@ @ stub NetGetDisplayInformationIndex @ stdcall NetGetJoinInformation(wstr ptr ptr) @ stub NetGroupAdd -@ stub NetGroupAddUser +@ stdcall NetGroupAddUser(wstr wstr wstr) @ stub NetGroupDel @ stub NetGroupDelUser @ stdcall NetGroupEnum(wstr long ptr long ptr ptr ptr)

1 0