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

Matteo Bruni : ddraw/tests: Add more d3d7 lighting tests.
by Alexandre Julliard April 22, 2015

April 22, 2015

Module: wine Branch: master Commit: 319e7fb2019f58c9368f7fcb455c9cfd6ce1d93d URL: http://source.winehq.org/git/wine.git/?a=commit;h=319e7fb2019f58c9368f7fcb4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Apr 21 15:11:20 2015 +0200 ddraw/tests: Add more d3d7 lighting tests. --- dlls/ddraw/tests/ddraw7.c | 225 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/visual.c | 132 +-------------------------- 2 files changed, 229 insertions(+), 128 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=319e7fb2019f58c9368f7…

1 0

Matteo Bruni : d3d8/tests: Add a lighting test with non-affine worldview matrix.
by Alexandre Julliard April 22, 2015

April 22, 2015

Module: wine Branch: master Commit: 589f1072df9535104c074e5382ef7d8ce28f0f33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=589f1072df9535104c074e538… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Apr 21 15:11:19 2015 +0200 d3d8/tests: Add a lighting test with non-affine worldview matrix. --- dlls/d3d8/tests/visual.c | 110 ++++++++++++++++++++++++----------------------- 1 file changed, 56 insertions(+), 54 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 737bb91..652e2dd 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -185,6 +185,7 @@ static void lighting_test(void) ULONG refcount; HWND window; HRESULT hr; + unsigned int i; static const struct { @@ -238,6 +239,13 @@ static void lighting_test(void) {{-10.0f, -9.0f, 11.0f}, {-1.0f, 0.0f, 0.0f}, 0xff0000ff}, {{-10.0f, -9.0f, 9.0f}, {-1.0f, 0.0f, 0.0f}, 0xff0000ff}, {{-10.0f, -11.0f, 9.0f}, {-1.0f, 0.0f, 0.0f}, 0xff0000ff}, + }, + translatedquad[] = + { + {{-11.0f, -11.0f, -10.0f}, {0.0f, 0.0f, -1.0f}, 0xff0000ff}, + {{-11.0f, -9.0f, -10.0f}, {0.0f, 0.0f, -1.0f}, 0xff0000ff}, + {{ -9.0f, -9.0f, -10.0f}, {0.0f, 0.0f, -1.0f}, 0xff0000ff}, + {{ -9.0f, -11.0f, -10.0f}, {0.0f, 0.0f, -1.0f}, 0xff0000ff}, }; static const WORD indices[] = {0, 1, 2, 2, 3, 0}; static const D3DMATRIX mat = @@ -252,7 +260,7 @@ static void lighting_test(void) 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, - 0.0f, 0.0f, 0.0f, 1.0f, + 0.0f, 0.0f, 0.5f, 1.0f, }}}, mat_transf = {{{ @@ -260,7 +268,34 @@ static void lighting_test(void) 0.0f, 1.0f, 0.0f, 0.0f, -1.0f, 0.0f, 0.0f, 0.0f, 10.f, 10.0f, 10.0f, 1.0f, - }}}; + }}}, + mat_nonaffine = + {{{ + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, -1.0f, + 10.f, 10.0f, 10.0f, 0.0f, + }}}; + static const struct + { + const D3DMATRIX *world_matrix; + const void *quad; + unsigned int size; + DWORD expected; + const char *message; + BOOL todo; + } + tests[] = + { + {&mat, nquad, sizeof(nquad[0]), 0x000000ff, + "Lit quad with light", FALSE}, + {&mat_singular, nquad, sizeof(nquad[0]), 0x000000ff, + "Lit quad with singular world matrix", FALSE}, + {&mat_transf, rotatedquad, sizeof(rotatedquad[0]), 0x000000ff, + "Lit quad with transformation matrix", FALSE}, + {&mat_nonaffine, translatedquad, sizeof(translatedquad[0]), 0x00000000, + "Lit quad with non-affine matrix", TRUE}, + }; window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 0, 0, 640, 480, NULL, NULL, NULL, NULL); @@ -340,66 +375,33 @@ static void lighting_test(void) IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); - hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, TRUE); - ok(SUCCEEDED(hr), "Failed to enable lighting, hr %#x.\n", hr); hr = IDirect3DDevice8_LightEnable(device, 0, TRUE); ok(SUCCEEDED(hr), "Failed to enable light 0, hr %#x.\n", hr); - hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); - ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); - - hr = IDirect3DDevice8_BeginScene(device); - ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); - - hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, - 2, indices, D3DFMT_INDEX16, nquad, sizeof(nquad[0])); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); - - hr = IDirect3DDevice8_EndScene(device); - ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - - color = getPixelColor(device, 320, 240); - ok(color == 0x000000ff, "Lit quad with light has color 0x%08x.\n", color); - - hr = IDirect3DDevice8_SetTransform(device, D3DTS_WORLD, &mat_singular); - ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr); - - hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); - ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); - - hr = IDirect3DDevice8_BeginScene(device); - ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); - - hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, - 2, indices, D3DFMT_INDEX16, nquad, sizeof(nquad[0])); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); - - hr = IDirect3DDevice8_EndScene(device); - ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - - color = getPixelColor(device, 160, 240); - ok(color == 0x00ffffff, "Cleared area has color 0x%08x.\n", color); - color = getPixelColor(device, 480, 240); - ok(color == 0x000000ff, "Lit quad with singular world matrix has color 0x%08x.\n", color); - - hr = IDirect3DDevice8_SetTransform(device, D3DTS_WORLD, &mat_transf); - ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr); + for (i = 0; i < sizeof(tests) / sizeof(tests[0]); ++i) + { + hr = IDirect3DDevice8_SetTransform(device, D3DTS_WORLD, tests[i].world_matrix); + ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr); - hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); - ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); - hr = IDirect3DDevice8_BeginScene(device); - ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); - hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, - 2, indices, D3DFMT_INDEX16, rotatedquad, sizeof(rotatedquad[0])); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, + 2, indices, D3DFMT_INDEX16, tests[i].quad, tests[i].size); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); - hr = IDirect3DDevice8_EndScene(device); - ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - color = getPixelColor(device, 320, 240); - ok(color == 0x000000ff, "Lit quad with transformation matrix has color 0x%08x.\n", color); + color = getPixelColor(device, 320, 240); + if (tests[i].todo) + todo_wine ok(color == tests[i].expected, "%s has color 0x%08x.\n", tests[i].message, color); + else + ok(color == tests[i].expected, "%s has color 0x%08x.\n", tests[i].message, color); + } refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Matteo Bruni : d3d9/tests: Add a lighting test with non-affine worldview matrix.
by Alexandre Julliard April 22, 2015

April 22, 2015

Module: wine Branch: master Commit: 92cb56a2f8d430bb703831ef0f29cbb38eb9aced URL: http://source.winehq.org/git/wine.git/?a=commit;h=92cb56a2f8d430bb703831ef0… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Apr 21 15:11:18 2015 +0200 d3d9/tests: Add a lighting test with non-affine worldview matrix. --- dlls/d3d9/tests/visual.c | 108 ++++++++++++++++++++++++----------------------- 1 file changed, 55 insertions(+), 53 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 518a48a..eb715d7 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -262,6 +262,7 @@ static void lighting_test(void) ULONG refcount; HWND window; HRESULT hr; + unsigned int i; static const D3DMATRIX mat = {{{ @@ -275,7 +276,7 @@ static void lighting_test(void) 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, - 0.0f, 0.0f, 0.0f, 1.0f, + 0.0f, 0.0f, 0.5f, 1.0f, }}}, mat_transf = {{{ @@ -283,6 +284,13 @@ static void lighting_test(void) 0.0f, 1.0f, 0.0f, 0.0f, -1.0f, 0.0f, 0.0f, 0.0f, 10.f, 10.0f, 10.0f, 1.0f, + }}}, + mat_nonaffine = + {{{ + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, -1.0f, + 10.f, 10.0f, 10.0f, 0.0f, }}}; static const struct { @@ -343,8 +351,35 @@ static void lighting_test(void) {{-10.0f, -9.0f, 11.0f}, {-1.0f, 0.0f, 0.0f}, 0xff0000ff}, {{-10.0f, -9.0f, 9.0f}, {-1.0f, 0.0f, 0.0f}, 0xff0000ff}, {{-10.0f, -11.0f, 9.0f}, {-1.0f, 0.0f, 0.0f}, 0xff0000ff}, + }, + translatedquad[] = + { + {{-11.0f, -11.0f, -10.0f}, {0.0f, 0.0f, -1.0f}, 0xff0000ff}, + {{-11.0f, -9.0f, -10.0f}, {0.0f, 0.0f, -1.0f}, 0xff0000ff}, + {{ -9.0f, -9.0f, -10.0f}, {0.0f, 0.0f, -1.0f}, 0xff0000ff}, + {{ -9.0f, -11.0f, -10.0f}, {0.0f, 0.0f, -1.0f}, 0xff0000ff}, }; static const WORD indices[] = {0, 1, 2, 2, 3, 0}; + static const struct + { + const D3DMATRIX *world_matrix; + const void *quad; + unsigned int size; + DWORD expected; + const char *message; + BOOL todo; + } + tests[] = + { + {&mat, nquad, sizeof(nquad[0]), 0x000000ff, + "Lit quad with light", FALSE}, + {&mat_singular, nquad, sizeof(nquad[0]), 0x000000ff, + "Lit quad with singular world matrix", FALSE}, + {&mat_transf, rotatedquad, sizeof(rotatedquad[0]), 0x000000ff, + "Lit quad with transformation matrix", FALSE}, + {&mat_nonaffine, translatedquad, sizeof(translatedquad[0]), 0x00000000, + "Lit quad with non-affine matrix", TRUE}, + }; window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 0, 0, 640, 480, NULL, NULL, NULL, NULL); @@ -424,66 +459,33 @@ static void lighting_test(void) IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, TRUE); - ok(SUCCEEDED(hr), "Failed to enable lighting, hr %#x.\n", hr); hr = IDirect3DDevice9_LightEnable(device, 0, TRUE); ok(SUCCEEDED(hr), "Failed to enable light 0, hr %#x.\n", hr); - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); - ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); - - hr = IDirect3DDevice9_BeginScene(device); - ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); - - hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, - 2, indices, D3DFMT_INDEX16, nquad, sizeof(nquad[0])); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); - - hr = IDirect3DDevice9_EndScene(device); - ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - - color = getPixelColor(device, 320, 240); - ok(color == 0x000000ff, "Lit quad with light has color 0x%08x.\n", color); - - hr = IDirect3DDevice9_SetTransform(device, D3DTS_WORLD, &mat_singular); - ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr); - - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); - ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); - - hr = IDirect3DDevice9_BeginScene(device); - ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); - - hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, - 2, indices, D3DFMT_INDEX16, nquad, sizeof(nquad[0])); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); - - hr = IDirect3DDevice9_EndScene(device); - ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - - color = getPixelColor(device, 160, 240); - ok(color == 0x00ffffff, "Cleared area has color 0x%08x.\n", color); - color = getPixelColor(device, 480, 240); - ok(color == 0x000000ff, "Lit quad with singular world matrix has color 0x%08x.\n", color); - - hr = IDirect3DDevice9_SetTransform(device, D3DTS_WORLD, &mat_transf); - ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr); + for (i = 0; i < sizeof(tests) / sizeof(tests[0]); ++i) + { + hr = IDirect3DDevice9_SetTransform(device, D3DTS_WORLD, tests[i].world_matrix); + ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr); - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); - ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); - hr = IDirect3DDevice9_BeginScene(device); - ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, - 2, indices, D3DFMT_INDEX16, rotatedquad, sizeof(rotatedquad[0])); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, + 2, indices, D3DFMT_INDEX16, tests[i].quad, tests[i].size); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); - hr = IDirect3DDevice9_EndScene(device); - ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - color = getPixelColor(device, 320, 240); - ok(color == 0x000000ff, "Lit quad with transformation matrix has color 0x%08x.\n", color); + color = getPixelColor(device, 320, 240); + if (tests[i].todo) + todo_wine ok(color == tests[i].expected, "%s has color 0x%08x.\n", tests[i].message, color); + else + ok(color == tests[i].expected, "%s has color 0x%08x.\n", tests[i].message, color); + } hr = IDirect3DDevice9_SetTransform(device, D3DTS_WORLD, &mat); ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr);

1 0

Matteo Bruni : opengl32: Update to the current OpenGL spec.
by Alexandre Julliard April 22, 2015

April 22, 2015

Module: wine Branch: master Commit: 6c6f92ee42b518d0e6cd97195b4ca9b4fae20114 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c6f92ee42b518d0e6cd97195… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Apr 21 15:11:17 2015 +0200 opengl32: Update to the current OpenGL spec. --- dlls/opengl32/opengl_ext.c | 181 ++++++++++++++++++++++++++++++++++++-------- dlls/opengl32/opengl_norm.c | 58 +++++++++++--- include/wine/wgl.h | 56 ++++++++++++-- include/wine/wgl_driver.h | 39 +++++++--- 4 files changed, 275 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6c6f92ee42b518d0e6cd9…

1 0

Thomas Faber : ntdll/tests: Ensure 4-byte alignment for ATOM_BASIC_INFORMATION.
by Alexandre Julliard April 22, 2015

April 22, 2015

Module: wine Branch: master Commit: bb781b44681ea5743fa62b6c2a71d32ce882b9c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb781b44681ea5743fa62b6c2… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Tue Apr 21 17:14:08 2015 +0200 ntdll/tests: Ensure 4-byte alignment for ATOM_BASIC_INFORMATION. --- dlls/ntdll/tests/atom.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/atom.c b/dlls/ntdll/tests/atom.c index 0fed630..972a54e 100644 --- a/dlls/ntdll/tests/atom.c +++ b/dlls/ntdll/tests/atom.c @@ -432,9 +432,9 @@ static void test_Global(void) { NTSTATUS res; RTL_ATOM atom; - char ptr[sizeof(ATOM_BASIC_INFORMATION) + 255 * sizeof(WCHAR)]; + ULONG ptr[(sizeof(ATOM_BASIC_INFORMATION) + 255 * sizeof(WCHAR)) / sizeof(ULONG)]; ATOM_BASIC_INFORMATION* abi = (ATOM_BASIC_INFORMATION*)ptr; - ULONG ptr_size = sizeof(ATOM_BASIC_INFORMATION) + 255 * sizeof(WCHAR); + ULONG ptr_size = sizeof(ptr); if (pNtAddAtomNT4) res = pNtAddAtomNT4(testAtom1, &atom);

1 0

Stefan Dösinger : wined3d: Shadow format flags in the resource.
by Alexandre Julliard April 22, 2015

April 22, 2015

Module: wine Branch: master Commit: 9076612e2de0d52f2f526241283157b11eb989e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9076612e2de0d52f2f5262412… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Apr 22 11:30:15 2015 +0200 wined3d: Shadow format flags in the resource. --- dlls/wined3d/context.c | 7 ++++--- dlls/wined3d/cs.c | 4 +++- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/resource.c | 39 ++++++++++++++++++++------------------ dlls/wined3d/shader.c | 2 +- dlls/wined3d/state.c | 4 ++-- dlls/wined3d/surface.c | 43 ++++++++++++++++++++++++++---------------- dlls/wined3d/texture.c | 4 ++-- dlls/wined3d/volume.c | 11 ++++++----- dlls/wined3d/wined3d_private.h | 1 + 10 files changed, 69 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9076612e2de0d52f2f526…

1 0

Nikolay Sivov : wbemprox: Fix BSTR leaks caused by incorrect use of SafeArrayPutElement() (Valgrind ).
by Alexandre Julliard April 22, 2015

April 22, 2015

Module: wine Branch: master Commit: 84a8ae79d289e403456a740f701d0ebe90ae88d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84a8ae79d289e403456a740f7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 22 13:13:55 2015 +0300 wbemprox: Fix BSTR leaks caused by incorrect use of SafeArrayPutElement() (Valgrind). --- dlls/wbemprox/query.c | 2 ++ dlls/wbemprox/reg.c | 13 ++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 7ae9a0f..6f66603 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -700,6 +700,7 @@ SAFEARRAY *to_safearray( const struct array *array, CIMTYPE type ) SafeArrayDestroy( ret ); return NULL; } + SysFreeString( str ); } else if (SafeArrayPutElement( ret, &i, ptr ) != S_OK) { @@ -1002,6 +1003,7 @@ HRESULT get_properties( const struct view *view, LONG flags, SAFEARRAY **props ) SafeArrayDestroy( sa ); return E_OUTOFMEMORY; } + SysFreeString( str ); j++; } *props = sa; diff --git a/dlls/wbemprox/reg.c b/dlls/wbemprox/reg.c index 4bf249b..7544c3c 100644 --- a/dlls/wbemprox/reg.c +++ b/dlls/wbemprox/reg.c @@ -51,6 +51,12 @@ static HRESULT to_bstr_array( BSTR *strings, DWORD count, VARIANT *var ) return S_OK; } +static void free_bstr_array( BSTR *strings, DWORD count ) +{ + while (count--) + SysFreeString( *(strings++) ); +} + static HRESULT to_i4_array( DWORD *values, DWORD count, VARIANT *var ) { SAFEARRAY *sa; @@ -114,7 +120,11 @@ static HRESULT enum_key( HKEY root, const WCHAR *subkey, VARIANT *names, VARIANT } i++; } - if (hr == S_OK && !res) hr = to_bstr_array( strings, i, names ); + if (hr == S_OK && !res) + { + hr = to_bstr_array( strings, i, names ); + free_bstr_array( strings, i ); + } set_variant( VT_UI4, res, NULL, retval ); RegCloseKey( hkey ); heap_free( strings ); @@ -218,6 +228,7 @@ static HRESULT enum_values( HKEY root, const WCHAR *subkey, VARIANT *names, VARI if (hr == S_OK && !res) { hr = to_bstr_array( value_names, i, names ); + free_bstr_array( value_names, i ); if (hr == S_OK) hr = to_i4_array( value_types, i, types ); }

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.41
by Jeremy Newman April 21, 2015

April 21, 2015

Module: website Branch: master Commit: 63f436288a4cabf492febe9297cc9321f167216d URL: http://source.winehq.org/git/website.git/?a=commit;h=63f436288a4cabf492febe… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Mon Apr 20 19:03:29 2015 +0200 Polish translation for release 1.7.41 --- news/pl/2015041701.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/pl/2015041701.xml b/news/pl/2015041701.xml new file mode 100644 index 0000000..f89f56b --- /dev/null +++ b/news/pl/2015041701.xml @@ -0,0 +1,16 @@ +<news> +<date>Kwiecień 17, 2015</date> +<title>Wydano Wine 1.7.41</title> +<body> + Wydanie rozwojowe Wine 1.7.41 jest już dostępne. + <a href="{$root}/announce/1.7.41">Co nowego</a> w tym wydaniu: +<ul> + <li>W powłoce obsługiwanych jest więcej Znanych Folderów.</li> + <li>Szersza obsługa dla obiektów zadań jądra.</li> + <li>Więcej ulepszeń w zakresie łatek MSI.</li> + <li>Kilka poprawek do mechanizmu skórek.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.41.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

Nikolay Sivov : dwrite: Added a helper to get source text pointer.
by Alexandre Julliard April 21, 2015

April 21, 2015

Module: wine Branch: master Commit: e0403efc21dcc550fead30dd2110fe8af7f4e0d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0403efc21dcc550fead30dd2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 21 13:36:01 2015 +0300 dwrite: Added a helper to get source text pointer. --- dlls/dwrite/analyzer.c | 87 +++++++++++++++++++++++++++++++------------------- 1 file changed, 55 insertions(+), 32 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 5985d2d..02d90db 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -676,19 +676,66 @@ static ULONG WINAPI dwritetextanalyzer_Release(IDWriteTextAnalyzer2 *iface) return 1; } +/* This helper tries to get 'length' chars from a source, allocating a buffer only if source failed to provide enough + data after a first request. */ +static HRESULT get_text_source_ptr(IDWriteTextAnalysisSource *source, UINT32 position, UINT32 length, const WCHAR **text, WCHAR **buff) +{ + HRESULT hr; + UINT32 len; + + *buff = NULL; + *text = NULL; + len = 0; + hr = IDWriteTextAnalysisSource_GetTextAtPosition(source, position, text, &len); + if (FAILED(hr)) return hr; + + if (len < length) { + UINT32 read; + + *buff = heap_alloc(length*sizeof(WCHAR)); + if (!*buff) + return E_OUTOFMEMORY; + memcpy(*buff, *text, len*sizeof(WCHAR)); + read = len; + + while (read < length && *text) { + *text = NULL; + len = 0; + hr = IDWriteTextAnalysisSource_GetTextAtPosition(source, read, text, &len); + if (FAILED(hr)) { + heap_free(*buff); + return hr; + } + memcpy(*buff + read, *text, min(len, length-read)*sizeof(WCHAR)); + read += len; + } + + *text = *buff; + } + + return hr; +} + static HRESULT WINAPI dwritetextanalyzer_AnalyzeScript(IDWriteTextAnalyzer2 *iface, IDWriteTextAnalysisSource* source, UINT32 position, UINT32 length, IDWriteTextAnalysisSink* sink) { + WCHAR *buff = NULL; const WCHAR *text; HRESULT hr; - UINT32 len; TRACE("(%p %u %u %p)\n", source, position, length, sink); - hr = IDWriteTextAnalysisSource_GetTextAtPosition(source, position, &text, &len); - if (FAILED(hr)) return hr; + if (length == 0) + return S_OK; + + hr = get_text_source_ptr(source, position, length, &text, &buff); + if (FAILED(hr)) + return hr; - return analyze_script(text, len, sink); + hr = analyze_script(text, length, sink); + heap_free(buff); + + return hr; } static HRESULT WINAPI dwritetextanalyzer_AnalyzeBidi(IDWriteTextAnalyzer2 *iface, @@ -698,7 +745,7 @@ static HRESULT WINAPI dwritetextanalyzer_AnalyzeBidi(IDWriteTextAnalyzer2 *iface UINT8 baselevel, level, explicit_level; WCHAR *buff = NULL; const WCHAR *text; - UINT32 len, pos, i; + UINT32 pos, i; HRESULT hr; TRACE("(%p %u %u %p)\n", source, position, length, sink); @@ -706,33 +753,9 @@ static HRESULT WINAPI dwritetextanalyzer_AnalyzeBidi(IDWriteTextAnalyzer2 *iface if (length == 0) return S_OK; - /* get some, check for length */ - text = NULL; - len = 0; - hr = IDWriteTextAnalysisSource_GetTextAtPosition(source, position, &text, &len); - if (FAILED(hr)) return hr; - - if (len < length) { - UINT32 read; - - buff = heap_alloc(length*sizeof(WCHAR)); - if (!buff) - return E_OUTOFMEMORY; - memcpy(buff, text, len*sizeof(WCHAR)); - read = len; - - while (read < length && text) { - text = NULL; - len = 0; - hr = IDWriteTextAnalysisSource_GetTextAtPosition(source, read, &text, &len); - if (FAILED(hr)) - goto done; - memcpy(&buff[read], text, min(len, length-read)*sizeof(WCHAR)); - read += len; - } - - text = buff; - } + hr = get_text_source_ptr(source, position, length, &text, &buff); + if (FAILED(hr)) + return hr; levels = heap_alloc(length*sizeof(*levels)); explicit = heap_alloc(length*sizeof(*explicit));

1 0

Henri Verbeet : wined3d: Completely initialize "correction_params" in shader_glsl_load_constants() (Valgrind).
by Alexandre Julliard April 21, 2015

April 21, 2015

Module: wine Branch: master Commit: de1450788b99f8976b1c49b74d352f6a24bb2cde URL: http://source.winehq.org/git/wine.git/?a=commit;h=de1450788b99f8976b1c49b74… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 21 12:25:52 2015 +0200 wined3d: Completely initialize "correction_params" in shader_glsl_load_constants() (Valgrind). Leaving the last two elements uninitialized is mostly harmless since the shader doesn't actually use them, but the driver might try to do some kind of analysis on them. --- dlls/wined3d/glsl_shader.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b1a0f85..84fc1a2 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -944,17 +944,15 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context if (update_mask & WINED3D_SHADER_CONST_PS_Y_CORR) { - float correction_params[4]; - - if (context->render_offscreen) + float correction_params[] = { - correction_params[0] = 0.0f; - correction_params[1] = 1.0f; - } else { /* position is window relative, not viewport relative */ - correction_params[0] = (float) context->current_rt->resource.height; - correction_params[1] = -1.0f; - } + context->render_offscreen ? 0.0f : (float)context->current_rt->resource.height, + context->render_offscreen ? 1.0f : -1.0f, + 0.0f, + 0.0f, + }; + GL_EXTCALL(glUniform4fv(prog->ps.ycorrection_location, 1, correction_params)); }

1 0

Hans Leidekker : winhttp: Fix a memory leak (valgrind).
by Alexandre Julliard April 21, 2015

April 21, 2015

Module: wine Branch: master Commit: 1c5e704af607511191b35bb45214a24f400c870f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c5e704af607511191b35bb45… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 21 11:21:45 2015 +0200 winhttp: Fix a memory leak (valgrind). --- dlls/winhttp/session.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 0eca509..9becdfe 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -566,6 +566,7 @@ static void request_destroy( object_header_t *hdr ) CloseHandle( request->task_thread ); CloseHandle( request->task_cancel ); CloseHandle( request->task_wait ); + request->task_cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection( &request->task_cs ); } release_object( &request->connect->hdr );

1 0

Hans Leidekker : winhttp: Initialize some variables (valgrind).
by Alexandre Julliard April 21, 2015

April 21, 2015

Module: wine Branch: master Commit: d36f8d52cfb861f07b9d6f09f86b5391f56c2343 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d36f8d52cfb861f07b9d6f09f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 21 11:21:06 2015 +0200 winhttp: Initialize some variables (valgrind). --- dlls/winhttp/tests/winhttp.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index ac944f2..705d654 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -889,6 +889,7 @@ static void test_secure_connection(void) ret = WinHttpReceiveResponse(req, NULL); ok(ret, "failed to receive response %u\n", GetLastError()); + status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); ok(ret, "failed unexpectedly %u\n", GetLastError()); @@ -943,6 +944,7 @@ static void test_request_parameter_defaults(void) ret = WinHttpReceiveResponse(req, NULL); ok(ret, "failed to receive response %u\n", GetLastError()); + status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); ok(ret, "failed unexpectedly %u\n", GetLastError()); @@ -977,6 +979,7 @@ static void test_request_parameter_defaults(void) ok(lstrlenW(version) == size / sizeof(WCHAR), "unexpected size %u\n", size); HeapFree(GetProcessHeap(), 0, version); + status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); ok(ret, "failed unexpectedly %u\n", GetLastError()); @@ -1952,6 +1955,7 @@ static void test_basic_request(int port, const WCHAR *verb, const WCHAR *path) ret = WinHttpReceiveResponse(req, NULL); ok(ret, "failed to receive response %u\n", GetLastError()); + status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); ok(ret, "failed to query status code %u\n", GetLastError()); @@ -2052,6 +2056,7 @@ static void test_basic_authentication(int port) ret = WinHttpReceiveResponse(req, NULL); ok(ret, "failed to receive response %u\n", GetLastError()); + status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); ok(ret, "failed to query status code %u\n", GetLastError()); @@ -2106,6 +2111,7 @@ static void test_basic_authentication(int port) ret = WinHttpReceiveResponse(req, NULL); ok(ret, "failed to receive response %u\n", GetLastError()); + status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); ok(ret, "failed to query status code %u\n", GetLastError()); @@ -2186,6 +2192,7 @@ static void test_no_content(int port) ret = WinHttpReceiveResponse(req, NULL); ok(ret, "expected success\n"); + status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); @@ -2320,6 +2327,7 @@ static void test_not_modified(int port) ret = WinHttpReceiveResponse(request, NULL); ok(ret, "WinHttpReceiveResponse failed: %u\n", GetLastError()); + status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL);

1 0

Hans Leidekker : msi: Fix a trace.
by Alexandre Julliard April 21, 2015

April 21, 2015

Module: wine Branch: master Commit: 6ef2d26a534b98f67485b7e59c84d46b7800567b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ef2d26a534b98f67485b7e59… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 21 11:19:45 2015 +0200 msi: Fix a trace. Reported by Marcus Meissner. --- dlls/msi/files.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 8977a9c..9b46762 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -137,18 +137,14 @@ static msi_file_state calculate_install_state( MSIPACKAGE *package, MSIFILE *fil { if (msi_compare_font_versions( font_version, file->Version ) < 0) { - TRACE("overwriting %s (new version %s old version %u.%u.%u.%u)\n", - debugstr_w(file->File), debugstr_w(file->Version), - HIWORD(file_version->dwFileVersionMS), LOWORD(file_version->dwFileVersionMS), - HIWORD(file_version->dwFileVersionLS), LOWORD(file_version->dwFileVersionLS)); + TRACE("overwriting %s (new version %s old version %s)\n", + debugstr_w(file->File), debugstr_w(file->Version), debugstr_w(font_version)); state = msifs_overwrite; } else { - TRACE("keeping %s (new version %s old version %u.%u.%u.%u)\n", - debugstr_w(file->File), debugstr_w(file->Version), - HIWORD(file_version->dwFileVersionMS), LOWORD(file_version->dwFileVersionMS), - HIWORD(file_version->dwFileVersionLS), LOWORD(file_version->dwFileVersionLS)); + TRACE("keeping %s (new version %s old version %s)\n", + debugstr_w(file->File), debugstr_w(file->Version), debugstr_w(font_version)); state = msifs_present; } msi_free( font_version );

1 0

Qian Hong : ntdll: Correctly document the offset of ntdll_thread_data.
by Alexandre Julliard April 21, 2015

April 21, 2015

Module: wine Branch: master Commit: 604c4dba80ecf52671d7da9ba40e2d886a9b2c05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=604c4dba80ecf52671d7da9ba… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Apr 21 03:11:04 2015 +0800 ntdll: Correctly document the offset of ntdll_thread_data. This is a follow up of 16ddc624050a9780c16abb0421e093925bc351cf. --- dlls/ntdll/ntdll_misc.h | 2 +- tools/winebuild/relay.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 674fcbc..cbd19db 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -214,7 +214,7 @@ struct debug_info char output[1024]; /* current output line */ }; -/* thread private data, stored in NtCurrentTeb()->SystemReserved2 */ +/* thread private data, stored in NtCurrentTeb()->SpareBytes1 */ struct ntdll_thread_data { #ifdef __i386__ diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c index cb4b0ca..e9228a0 100644 --- a/tools/winebuild/relay.c +++ b/tools/winebuild/relay.c @@ -34,7 +34,7 @@ #define STACKOFFSET 0xc0 /* FIELD_OFFSET(TEB,WOW32Reserved) */ /* fix this if the ntdll_thread_regs structure is changed */ -#define GS_OFFSET 0x1d8 /* FIELD_OFFSET(TEB,SystemReserved2) + FIELD_OFFSET(ntdll_thread_data,gs) */ +#define GS_OFFSET 0x1d8 /* FIELD_OFFSET(TEB,SpareBytes1) + FIELD_OFFSET(ntdll_thread_data,gs) */ #define DPMI_VIF_OFFSET (0x1fc + 0) /* FIELD_OFFSET(TEB,GdiTebBatch) + FIELD_OFFSET(WINE_VM86_TEB_INFO,dpmi_vif) */ #define VM86_PENDING_OFFSET (0x1fc + 4) /* FIELD_OFFSET(TEB,GdiTebBatch) + FIELD_OFFSET(WINE_VM86_TEB_INFO,vm86_pending) */

1 0

Nikolay Sivov : dwrite: Fix script position reported with SetScriptAnalysis().
by Alexandre Julliard April 21, 2015

April 21, 2015

Module: wine Branch: master Commit: 0c27e5cd66baa735421d3d34e70310715626f009 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c27e5cd66baa735421d3d34e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 21 13:38:09 2015 +0300 dwrite: Fix script position reported with SetScriptAnalysis(). --- dlls/dwrite/analyzer.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 02d90db..85681b2 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -204,7 +204,7 @@ static inline UINT16 get_char_script(WCHAR c) return script; } -static HRESULT analyze_script(const WCHAR *text, UINT32 len, IDWriteTextAnalysisSink *sink) +static HRESULT analyze_script(const WCHAR *text, UINT32 position, UINT32 len, IDWriteTextAnalysisSink *sink) { DWRITE_SCRIPT_ANALYSIS sa; UINT32 pos, i, length; @@ -213,7 +213,7 @@ static HRESULT analyze_script(const WCHAR *text, UINT32 len, IDWriteTextAnalysis sa.script = get_char_script(*text); - pos = 0; + pos = position; length = 1; for (i = 1; i < len; i++) @@ -233,7 +233,7 @@ static HRESULT analyze_script(const WCHAR *text, UINT32 len, IDWriteTextAnalysis sa.shapes = sa.script != Script_Common ? DWRITE_SCRIPT_SHAPES_DEFAULT : DWRITE_SCRIPT_SHAPES_NO_VISUAL; hr = IDWriteTextAnalysisSink_SetScriptAnalysis(sink, pos, length, &sa); if (FAILED(hr)) return hr; - pos = i; + pos = position + i; length = 1; sa.script = script; } @@ -732,7 +732,7 @@ static HRESULT WINAPI dwritetextanalyzer_AnalyzeScript(IDWriteTextAnalyzer2 *ifa if (FAILED(hr)) return hr; - hr = analyze_script(text, length, sink); + hr = analyze_script(text, position, length, sink); heap_free(buff); return hr;

1 0

Henri Verbeet : wined3d: Introduce a function to compile ARB vertex/ fragment programs.
by Alexandre Julliard April 21, 2015

April 21, 2015

Module: wine Branch: master Commit: c7780791ea8bfb8355e703563a0573ed87d15f30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7780791ea8bfb8355e703563… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 21 12:25:51 2015 +0200 wined3d: Introduce a function to compile ARB vertex/fragment programs. --- dlls/wined3d/arb_program_shader.c | 188 +++++++++----------------------------- 1 file changed, 41 insertions(+), 147 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c7780791ea8bfb8355e70…

1 0

Henri Verbeet : wined3d: Initialize "type.padding" in arbfp_blit_set() ( Valgrind).
by Alexandre Julliard April 21, 2015

April 21, 2015

Module: wine Branch: master Commit: 8063d4cfcc31bc72ae13e43abd0121a031e61fac URL: http://source.winehq.org/git/wine.git/?a=commit;h=8063d4cfcc31bc72ae13e43ab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 21 12:25:50 2015 +0200 wined3d: Initialize "type.padding" in arbfp_blit_set() (Valgrind). --- dlls/wined3d/arb_program_shader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 797c204..1507182 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7715,6 +7715,7 @@ static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, } type.fixup = fixup; type.use_color_key = !!color_key; + type.padding = 0; entry = wine_rb_get(&priv->shaders, &type); if (entry)

1 0

Henri Verbeet : d3d9/tests: Release "d3d9ex" after we' re done with it in test_wndproc() (Valgrind).
by Alexandre Julliard April 21, 2015

April 21, 2015

Module: wine Branch: master Commit: ca00d72da3d959df1e6a6d619ee19da3f0a7be7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca00d72da3d959df1e6a6d619… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 21 12:25:49 2015 +0200 d3d9/tests: Release "d3d9ex" after we're done with it in test_wndproc() (Valgrind). --- dlls/d3d9/tests/d3d9ex.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 0a7fe90..8048bdc 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -2160,10 +2160,11 @@ static void test_wndproc(void) } } + IDirect3D9Ex_Release(d3d9ex); + if (!d3d_width) { skip("Could not find adequate modes, skipping mode tests.\n"); - IDirect3D9Ex_Release(d3d9ex); return; }

1 0

Hans Leidekker : msi: Initialize a variable (valgrind).
by Alexandre Julliard April 21, 2015

April 21, 2015

Module: wine Branch: master Commit: 4710e973f8df0c3ef3b4b9b357d66f7794b47787 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4710e973f8df0c3ef3b4b9b35… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 21 11:20:42 2015 +0200 msi: Initialize a variable (valgrind). --- dlls/msi/automation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 228d887..01765cb 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -1366,7 +1366,7 @@ static HRESULT session_invoke( { SessionObject *session = (SessionObject*)This; WCHAR *szString; - DWORD dwLen; + DWORD dwLen = 0; MSIHANDLE msiHandle; LANGID langId; UINT ret;

1 0

Hans Leidekker : msi: Fix an invalid memory access (valgrind).
by Alexandre Julliard April 21, 2015

April 21, 2015

Module: wine Branch: master Commit: e6ce4de3930018b95bddbe8d259cbbaa1309d1f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6ce4de3930018b95bddbe8d2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 21 11:20:24 2015 +0200 msi: Fix an invalid memory access (valgrind). --- dlls/msi/table.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 256034b..700a61a 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -899,7 +899,7 @@ static UINT save_table( MSIDATABASE *db, const MSITABLE *t, UINT bytes_per_strre } rawsize = 0; - for (i = 0; i < t->row_count; i++) + for (i = 0; i < row_count; i++) { UINT ofs = 0, ofs_mem = 0;

1 0

Hans Leidekker : msi: Initialize a variable (valgrind).
by Alexandre Julliard April 21, 2015

April 21, 2015

Module: wine Branch: master Commit: 55b678e18686862e25d1dc310d27a6f2c751dadf URL: http://source.winehq.org/git/wine.git/?a=commit;h=55b678e18686862e25d1dc310… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 21 11:20:04 2015 +0200 msi: Initialize a variable (valgrind). --- dlls/msi/msi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 2c476fa..2b531da 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -4201,7 +4201,7 @@ UINT WINAPI MsiProvideComponentA( LPCSTR product, LPCSTR feature, LPCSTR compone { WCHAR *productW = NULL, *componentW = NULL, *featureW = NULL, *bufW = NULL; UINT r = ERROR_OUTOFMEMORY; - DWORD lenW; + DWORD lenW = 0; int len; TRACE("%s, %s, %s, %x, %p, %p\n", debugstr_a(product), debugstr_a(component), debugstr_a(feature), mode, buf, buflen);

1 0

Dmitry Timoshkov : server: GetQueueStatus should clear only checked queue changed bits.
by Alexandre Julliard April 21, 2015

April 21, 2015

Module: wine Branch: master Commit: c0e876cb9e0f0d5663eddeda0fdbf7d2b491f9a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0e876cb9e0f0d5663eddeda0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 21 16:01:37 2015 +0800 server: GetQueueStatus should clear only checked queue changed bits. --- dlls/user32/input.c | 4 ++-- dlls/user32/tests/msg.c | 1 - include/wine/server_protocol.h | 4 ++-- server/protocol.def | 2 +- server/queue.c | 2 +- server/request.h | 2 +- server/trace.c | 2 +- 7 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 57594a7..4fcc531 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -434,7 +434,7 @@ DWORD WINAPI GetQueueStatus( UINT flags ) SERVER_START_REQ( get_queue_status ) { - req->clear = 1; + req->clear_bits = flags; wine_server_call( req ); ret = MAKELONG( reply->changed_bits & flags, reply->wake_bits & flags ); } @@ -454,7 +454,7 @@ BOOL WINAPI GetInputState(void) SERVER_START_REQ( get_queue_status ) { - req->clear = 0; + req->clear_bits = 0; wine_server_call( req ); ret = reply->wake_bits & (QS_KEY | QS_MOUSEBUTTON); } diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 4794b12..50e1e2b 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -14699,7 +14699,6 @@ static void test_SendMessage_other_thread(int thread_n) } ret = GetQueueStatus(QS_SENDMESSAGE|QS_POSTMESSAGE); -todo_wine ok(ret == MAKELONG(QS_POSTMESSAGE, QS_SENDMESSAGE|QS_POSTMESSAGE), "wrong status %08x\n", ret); trace("main: call GetMessage\n"); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index d27914a..37dad95 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2822,7 +2822,7 @@ struct set_queue_mask_reply struct get_queue_status_request { struct request_header __header; - int clear; + unsigned int clear_bits; }; struct get_queue_status_reply { @@ -5972,6 +5972,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 467 +#define SERVER_PROTOCOL_VERSION 468 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 54501e8..5d57f96 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2059,7 +2059,7 @@ enum char_info_mode /* Get the current message queue status */ @REQ(get_queue_status) - int clear; /* should we clear the change bits? */ + unsigned int clear_bits; /* should we clear the change bits? */ @REPLY unsigned int wake_bits; /* wake bits */ unsigned int changed_bits; /* changed bits since last time */ diff --git a/server/queue.c b/server/queue.c index 3a321cd..912df3a 100644 --- a/server/queue.c +++ b/server/queue.c @@ -2198,7 +2198,7 @@ DECL_HANDLER(get_queue_status) { reply->wake_bits = queue->wake_bits; reply->changed_bits = queue->changed_bits; - if (req->clear) queue->changed_bits = 0; + queue->changed_bits &= ~req->clear_bits; } else reply->wake_bits = reply->changed_bits = 0; } diff --git a/server/request.h b/server/request.h index f94235f..daa5301 100644 --- a/server/request.h +++ b/server/request.h @@ -1416,7 +1416,7 @@ C_ASSERT( sizeof(struct set_queue_mask_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct set_queue_mask_reply, wake_bits) == 8 ); C_ASSERT( FIELD_OFFSET(struct set_queue_mask_reply, changed_bits) == 12 ); C_ASSERT( sizeof(struct set_queue_mask_reply) == 16 ); -C_ASSERT( FIELD_OFFSET(struct get_queue_status_request, clear) == 12 ); +C_ASSERT( FIELD_OFFSET(struct get_queue_status_request, clear_bits) == 12 ); C_ASSERT( sizeof(struct get_queue_status_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_queue_status_reply, wake_bits) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_queue_status_reply, changed_bits) == 12 ); diff --git a/server/trace.c b/server/trace.c index 20895b1..6ac0549 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2546,7 +2546,7 @@ static void dump_set_queue_mask_reply( const struct set_queue_mask_reply *req ) static void dump_get_queue_status_request( const struct get_queue_status_request *req ) { - fprintf( stderr, " clear=%d", req->clear ); + fprintf( stderr, " clear_bits=%08x", req->clear_bits ); } static void dump_get_queue_status_reply( const struct get_queue_status_reply *req )

1 0

Nikolay Sivov : wshom.ocx: Fix BSTR allocation for string registry values (Valgrind).
by Alexandre Julliard April 21, 2015

April 21, 2015

Module: wine Branch: master Commit: a8150b53b67b30cf87c4c401c66aade9af751ddd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8150b53b67b30cf87c4c401c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 20 15:53:32 2015 +0300 wshom.ocx: Fix BSTR allocation for string registry values (Valgrind). --- dlls/wshom.ocx/shell.c | 2 +- dlls/wshom.ocx/tests/wshom.c | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 826e290..f9ec9dc 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -1376,7 +1376,7 @@ static HRESULT WINAPI WshShell3_RegRead(IWshShell3 *iface, BSTR name, VARIANT *v case REG_SZ: case REG_EXPAND_SZ: V_VT(value) = VT_BSTR; - V_BSTR(value) = SysAllocStringLen((WCHAR*)data, datalen - sizeof(WCHAR)); + V_BSTR(value) = SysAllocString((WCHAR*)data); if (!V_BSTR(value)) hr = E_OUTOFMEMORY; break; diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index 9591c5c..46ffc58 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -276,7 +276,7 @@ static void test_registry(void) { static const WCHAR keypathW[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R','\\', 'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\','T','e','s','t','\\',0}; - + static const WCHAR regsz2W[] = {'r','e','g','s','z','2',0}; static const WCHAR regszW[] = {'r','e','g','s','z',0}; static const WCHAR regdwordW[] = {'r','e','g','d','w','o','r','d',0}; static const WCHAR regbinaryW[] = {'r','e','g','b','i','n','a','r','y',0}; @@ -332,6 +332,9 @@ static void test_registry(void) ret = RegSetValueExA(root, "regsz", 0, REG_SZ, (const BYTE*)"foobar", 7); ok(ret == 0, "got %d\n", ret); + ret = RegSetValueExA(root, "regsz2", 0, REG_SZ, (const BYTE*)"foobar\0f", 9); + ok(ret == 0, "got %d\n", ret); + ret = RegSetValueExA(root, "regmultisz", 0, REG_MULTI_SZ, (const BYTE*)"foo\0bar\0", 9); ok(ret == 0, "got %d\n", ret); @@ -355,6 +358,18 @@ static void test_registry(void) VariantClear(&value); SysFreeString(name); + /* REG_SZ with embedded NULL */ + lstrcpyW(pathW, keypathW); + lstrcatW(pathW, regsz2W); + name = SysAllocString(pathW); + VariantInit(&value); + hr = IWshShell3_RegRead(sh3, name, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&value) == VT_BSTR, "got %d\n", V_VT(&value)); + ok(SysStringLen(V_BSTR(&value)) == 6, "len %d\n", SysStringLen(V_BSTR(&value))); + VariantClear(&value); + SysFreeString(name); + /* REG_DWORD */ lstrcpyW(pathW, keypathW); lstrcatW(pathW, regdwordW);

1 0

Henri Verbeet : wined3d: Slightly simplify get_info_log_line().
by Alexandre Julliard April 21, 2015

April 21, 2015

Module: wine Branch: master Commit: 6e4ad78ff4aa501adb38c5e0a880d4842b7d05a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e4ad78ff4aa501adb38c5e0a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 21 12:25:53 2015 +0200 wined3d: Slightly simplify get_info_log_line(). --- dlls/wined3d/glsl_shader.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 84fc1a2..655bb33 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -279,11 +279,9 @@ static void shader_glsl_append_imm_vec4(struct wined3d_shader_buffer *buffer, co shader_addline(buffer, "vec4(%s, %s, %s, %s)", str[0], str[1], str[2], str[3]); } -/* Extract a line from the info log. - * Note that this modifies the source string. */ -static char *get_info_log_line(char **ptr) +static const char *get_info_log_line(const char **ptr) { - char *p, *q; + const char *p, *q; p = *ptr; if (!(q = strstr(p, "\n"))) @@ -292,7 +290,6 @@ static char *get_info_log_line(char **ptr) *ptr += strlen(p); return p; } - *q = '\0'; *ptr = q + 1; return p; @@ -316,7 +313,7 @@ static void print_glsl_info_log(const struct wined3d_gl_info *gl_info, GLuint id * that if there are errors. */ if (length > 1) { - char *ptr, *line; + const char *ptr, *line; log = HeapAlloc(GetProcessHeap(), 0, length); /* The info log is supposed to be zero-terminated, but at least some @@ -333,12 +330,12 @@ static void print_glsl_info_log(const struct wined3d_gl_info *gl_info, GLuint id if (gl_info->quirks & WINED3D_QUIRK_INFO_LOG_SPAM) { WARN("Info log received from GLSL shader #%u:\n", id); - while ((line = get_info_log_line(&ptr))) WARN(" %s\n", line); + while ((line = get_info_log_line(&ptr))) WARN(" %.*s", (int)(ptr - line), line); } else { FIXME("Info log received from GLSL shader #%u:\n", id); - while ((line = get_info_log_line(&ptr))) FIXME(" %s\n", line); + while ((line = get_info_log_line(&ptr))) FIXME(" %.*s", (int)(ptr - line), line); } HeapFree(GetProcessHeap(), 0, log); } @@ -373,7 +370,7 @@ static void shader_glsl_dump_program_source(const struct wined3d_gl_info *gl_inf GL_EXTCALL(glGetAttachedShaders(program, shader_count, NULL, shaders)); for (i = 0; i < shader_count; ++i) { - char *ptr, *line; + const char *ptr, *line; GLint tmp; GL_EXTCALL(glGetShaderiv(shaders[i], GL_SHADER_SOURCE_LENGTH, &tmp)); @@ -401,7 +398,7 @@ static void shader_glsl_dump_program_source(const struct wined3d_gl_info *gl_inf ptr = source; GL_EXTCALL(glGetShaderSource(shaders[i], source_size, NULL, source)); - while ((line = get_info_log_line(&ptr))) FIXME(" %s\n", line); + while ((line = get_info_log_line(&ptr))) FIXME(" %.*s", (int)(ptr - line), line); FIXME("\n"); }

1 0

Hans Leidekker : iexplore: Update version to 9.0.8112.16421.
by Alexandre Julliard April 21, 2015

April 21, 2015

Module: wine Branch: master Commit: ae84730e3429fc156f6729444e4b3fef22cd6a11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae84730e3429fc156f6729444… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 21 11:19:20 2015 +0200 iexplore: Update version to 9.0.8112.16421. --- programs/iexplore/iexplore.inf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/iexplore/iexplore.inf b/programs/iexplore/iexplore.inf index a45df9f..41622b1 100644 --- a/programs/iexplore/iexplore.inf +++ b/programs/iexplore/iexplore.inf @@ -33,9 +33,9 @@ HKLM,"Software\Microsoft\Windows\CurrentVersion\App Paths\iexplore.exe","Path",, [IE.Reg] -HKLM,"Software\Microsoft\Internet Explorer","Build",,"86001" -HKLM,"Software\Microsoft\Internet Explorer","Version",,"8.0.6001.18702" -HKLM,"Software\Microsoft\Internet Explorer","W2kVersion",,"8.0.6001.18702" +HKLM,"Software\Microsoft\Internet Explorer","Build",,"98112" +HKLM,"Software\Microsoft\Internet Explorer","Version",,"9.0.8112.16421" +HKLM,"Software\Microsoft\Internet Explorer","W2kVersion",,"9.0.8112.16421" [Strings]

1 0

Michael Stefaniuc : rpcrt4: Don't open code CONTAINING_RECORD().
by Alexandre Julliard April 21, 2015

April 21, 2015

Module: wine Branch: master Commit: 0a8427dc156a6e97f83886e108f48993e8df33cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a8427dc156a6e97f83886e10… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 21 10:22:04 2015 +0200 rpcrt4: Don't open code CONTAINING_RECORD(). --- dlls/rpcrt4/cstub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c index 0ddb1aa..838ed03 100644 --- a/dlls/rpcrt4/cstub.c +++ b/dlls/rpcrt4/cstub.c @@ -59,7 +59,7 @@ typedef struct static inline cstdstubbuffer_delegating_t *impl_from_delegating( IRpcStubBuffer *iface ) { - return (cstdstubbuffer_delegating_t*)((char *)iface - FIELD_OFFSET(cstdstubbuffer_delegating_t, stub_buffer)); + return CONTAINING_RECORD(iface, cstdstubbuffer_delegating_t, stub_buffer); } HRESULT CStdStubBuffer_Construct(REFIID riid,

1 0

Dmitry Timoshkov : user32/tests: Add PeekMessage(PM_NOREMOVE) call to inter-thread messages test.
by Alexandre Julliard April 21, 2015

April 21, 2015

Module: wine Branch: master Commit: d31e8a311871ba98f22b2a33b2fb7bdbba9cc2eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d31e8a311871ba98f22b2a33b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 21 16:01:30 2015 +0800 user32/tests: Add PeekMessage(PM_NOREMOVE) call to inter-thread messages test. --- dlls/user32/tests/msg.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index b014dd9..4794b12 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -14609,6 +14609,9 @@ static const struct message send_message_2[] = { }; static const struct message send_message_3[] = { { WM_USER+3, sent|wparam|lparam, 0, 0 }, + { 0 } +}; +static const struct message send_message_4[] = { { WM_USER+1, sent|wparam|lparam, 0, 0 }, { 0 } }; @@ -14716,10 +14719,15 @@ todo_wine ok(ret == MAKELONG(QS_SENDMESSAGE, QS_SENDMESSAGE|QS_POSTMESSAGE), "wrong status %08x\n", ret); trace("main: call PeekMessage\n"); + ok(PeekMessageA(&msg, 0, 0, 0, PM_NOREMOVE), "PeekMessage should not fail\n"); + ok(msg.message == WM_USER+1, "expected WM_USER+1, got %04x\n", msg.message); + ok_sequence(send_message_3, "SendMessage from other thread 3", thread_n == 2); + + trace("main: call PeekMessage\n"); ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "PeekMessage should not fail\n"); ok(msg.message == WM_USER+1, "expected WM_USER+1, got %04x\n", msg.message); DispatchMessageA(&msg); - ok_sequence(send_message_3, "SendMessage from other thread 3", thread_n == 2); + ok_sequence(send_message_4, "SendMessage from other thread 4", FALSE); /* intentionally yield */ MsgWaitForMultipleObjects(0, NULL, FALSE, 100, qs_all_input); @@ -14733,7 +14741,7 @@ else trace("main: call PeekMessage\n"); ok(!PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "PeekMessage should fail\n"); - ok_sequence(WmEmptySeq, "SendMessage from other thread 4", thread_n == 2); + ok_sequence(WmEmptySeq, "SendMessage from other thread 5", thread_n == 2); ret = GetQueueStatus(QS_SENDMESSAGE|QS_POSTMESSAGE); ok(ret == 0, "wrong status %08x\n", ret);

1 0

Andrey Gusev : Ukrainian translation for release 1.7.41
by Jeremy Newman April 20, 2015

April 20, 2015

Module: website Branch: master Commit: fa15d9870746621e9a3ee3bff46a07f34f39c77e URL: http://source.winehq.org/git/website.git/?a=commit;h=fa15d9870746621e9a3ee3… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Apr 17 18:11:21 2015 +0300 Ukrainian translation for release 1.7.41 --- news/uk/2015041701.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/uk/2015041701.xml b/news/uk/2015041701.xml new file mode 100644 index 0000000..924f375 --- /dev/null +++ b/news/uk/2015041701.xml @@ -0,0 +1,16 @@ +<news> +<date>17 квітня 2015</date> +<title>Випущено Wine 1.7.41</title> +<body> + Розробницький реліз Wine 1.7.41 наразі доступний. + <a href="{$root}/announce/1.7.41">Що нового</a> в цьому релізі: +<ul> + <li>Більша підтримка Known Folders у Shell.</li> + <li>Більша підтримка для Kernel Job Objects.</li> + <li>Більше вдосконалень для підтримки патчів для MSI.</li> + <li>Деякі виправлення оформлення.</li> + <li>Виправлення різних помилок.</li> +</ul> +Вихідний код <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.41.tar.bz2">вже доступний</a>. +Готові пакунки в процесі створення і в найближчий час будуть доступні у відповідних <a href="{$root}/download">місцях</a>. +</body></news>

1 0

Huw Davies : rpcrt4/tests: Avoid a double-free.
by Alexandre Julliard April 20, 2015

April 20, 2015

Module: wine Branch: master Commit: b24ce98af36431d1b7715db4090d903b82d095c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b24ce98af36431d1b7715db40… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 20 09:57:29 2015 +0100 rpcrt4/tests: Avoid a double-free. Commit 4cf70b1418260fda95d69bcb50374a64f1ce895b was causing the tests to crash. The reason is due to a Wine bug in NdrPointerUnmarshall(). Windows returns the same pointer (which is later released in a call to NdrPointerFree()), while Wine makes a copy which Valgrind correctly spots is leaked. --- dlls/rpcrt4/tests/ndr_marshall.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 917c9e5..411ba8b 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -1560,6 +1560,11 @@ todo_wine { ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called); } + /* Prevent a memory leak when running with Wine. + Remove once the todo_wine block above is fixed. */ + if (mem != mem_orig) + HeapFree(GetProcessHeap(), 0, mem_orig); + my_free_called = 0; StubMsg.Buffer = StubMsg.BufferStart; NdrPointerFree( &StubMsg, mem, fmtstr_conf_str ); @@ -1590,7 +1595,6 @@ todo_wine { "mem not pointing at buffer %p/%p\n", mem, StubMsg.BufferStart + 12 ); ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called); } - HeapFree(GetProcessHeap(), 0, mem_orig); my_alloc_called = 0; mem = mem_orig = HeapAlloc(GetProcessHeap(), 0, sizeof(memsrc));

1 0

Huw Davies : dssenh/tests: Fix some tests on Win 8.
by Alexandre Julliard April 20, 2015

April 20, 2015

Module: wine Branch: master Commit: ad9910bdfbb2294dccf89520647ce1407e698750 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad9910bdfbb2294dccf895206… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 20 08:56:39 2015 +0100 dssenh/tests: Fix some tests on Win 8. --- dlls/dssenh/tests/dssenh.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index 8b83586..feb9a30 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -20,6 +20,8 @@ #include <string.h> #include <stdio.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "wine/test.h" #include "windef.h" #include "winbase.h" @@ -186,6 +188,7 @@ struct keylength_test { DWORD expectedError; BOOL brokenResult; DWORD brokenError; + DWORD altError; }; static const struct keylength_test baseDSS_keylength[] = { @@ -197,7 +200,7 @@ static const struct keylength_test baseDSS_keylength[] = { /* min 512 max 1024 increment by 64 */ {AT_SIGNATURE, 448 << 16, FALSE, NTE_BAD_FLAGS}, {AT_SIGNATURE, 512 << 16, TRUE}, - {AT_SIGNATURE, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {AT_SIGNATURE, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS, STATUS_INVALID_PARAMETER}, /* WinNT4 and Win2k */ {AT_SIGNATURE, 768 << 16, TRUE}, {AT_SIGNATURE, 1024 << 16, TRUE}, {AT_SIGNATURE, 1088 << 16, FALSE, NTE_BAD_FLAGS}, @@ -214,7 +217,7 @@ static const struct keylength_test baseDSS_keylength[] = { /* min 512 max 1024, increment by 64 */ {CALG_DSS_SIGN, 448 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DSS_SIGN, 512 << 16, TRUE}, - {CALG_DSS_SIGN, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {CALG_DSS_SIGN, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS, STATUS_INVALID_PARAMETER}, /* WinNT4 and Win2k */ {CALG_DSS_SIGN, 768 << 16, TRUE}, {CALG_DSS_SIGN, 1024 << 16, TRUE}, {CALG_DSS_SIGN, 1088 << 16, FALSE, NTE_BAD_FLAGS} @@ -230,7 +233,7 @@ static const struct keylength_test dssDH_keylength[] = { {AT_KEYEXCHANGE, 1088 << 16, FALSE, NTE_BAD_FLAGS}, {AT_SIGNATURE, 448 << 16, FALSE, NTE_BAD_FLAGS}, {AT_SIGNATURE, 512 << 16, TRUE}, - {AT_SIGNATURE, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {AT_SIGNATURE, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS, STATUS_INVALID_PARAMETER}, /* WinNT4 and Win2k */ {AT_SIGNATURE, 768 << 16, TRUE}, {AT_SIGNATURE, 1024 << 16, TRUE}, {AT_SIGNATURE, 1088 << 16, FALSE, NTE_BAD_FLAGS}, @@ -248,7 +251,7 @@ static const struct keylength_test dssDH_keylength[] = { {CALG_DH_SF, 1088 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DSS_SIGN, 448 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DSS_SIGN, 512 << 16, TRUE}, - {CALG_DSS_SIGN, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {CALG_DSS_SIGN, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS, STATUS_INVALID_PARAMETER}, /* WinNT4 and Win2k */ {CALG_DSS_SIGN, 768 << 16, TRUE}, {CALG_DSS_SIGN, 1024 << 16, TRUE}, {CALG_DSS_SIGN, 1088 << 16, FALSE, NTE_BAD_FLAGS} @@ -269,7 +272,7 @@ static const struct keylength_test dssENH_keylength[] = { {AT_KEYEXCHANGE, 4160 << 16, FALSE, NTE_BAD_FLAGS}, {AT_SIGNATURE, 448 << 16, FALSE, NTE_BAD_FLAGS}, {AT_SIGNATURE, 512 << 16, TRUE}, - {AT_SIGNATURE, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {AT_SIGNATURE, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS, STATUS_INVALID_PARAMETER}, /* WinNT4 and Win2k */ {AT_SIGNATURE, 768 << 16, TRUE}, {AT_SIGNATURE, 1024 << 16, TRUE}, {AT_SIGNATURE, 1032 << 16, FALSE, NTE_BAD_FLAGS}, @@ -287,7 +290,7 @@ static const struct keylength_test dssENH_keylength[] = { {CALG_DH_SF, 1032 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DSS_SIGN, 448 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DSS_SIGN, 512 << 16, TRUE}, - {CALG_DSS_SIGN, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {CALG_DSS_SIGN, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS, STATUS_INVALID_PARAMETER}, /* WinNT4 and Win2k */ {CALG_DSS_SIGN, 768 << 16, TRUE}, {CALG_DSS_SIGN, 1024 << 16, TRUE}, {CALG_DSS_SIGN, 1088 << 16, FALSE, NTE_BAD_FLAGS} @@ -307,7 +310,7 @@ static void test_keylength_array(HCRYPTPROV hProv,const struct keylength_test *t /* success */ if(tests[i].expectedResult) { - ok(result, "Expected a key, got %08x\n", GetLastError()); + ok(result, "%d: Expected a key, got %08x\n", i, GetLastError()); result = CryptDestroyKey(key); ok(result, "Expected no errors.\n"); } @@ -315,19 +318,21 @@ static void test_keylength_array(HCRYPTPROV hProv,const struct keylength_test *t { /* error but success on older system */ if(tests[i].brokenResult) ok((!result && GetLastError() == tests[i].expectedError) || - broken(result), "Expected a key, got %x.\n", GetLastError()); + broken(result), "%d: Didn't really expect a key, got %x, %d\n", + i, GetLastError(), result); else { /* error */ if(!tests[i].brokenError) ok(!result && GetLastError() == tests[i].expectedError, - "Expected a key, got %x.\n", GetLastError()); + "%d: Expected an error, got %x, %d.\n", i, GetLastError(), result); /* error but different error on older system */ else ok(!result && (GetLastError() == tests[i].expectedError || - broken(GetLastError() == tests[i].brokenError)), - "Expected a key, got %x.\n", GetLastError()); + GetLastError() == tests[i].altError || + broken(GetLastError() == tests[i].brokenError) ), + "%d: Expected an error, got %x, %d.\n", i, GetLastError(), result); } } }

1 0

Marcus Meissner : ntdll: Potential buffer overwrite (Coverity).
by Alexandre Julliard April 20, 2015

April 20, 2015

Module: wine Branch: master Commit: 33d4125a8f471ab52455051479609cbb6da9ca0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=33d4125a8f471ab5245505147… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Apr 19 11:59:22 2015 +0200 ntdll: Potential buffer overwrite (Coverity). --- dlls/ntdll/cdrom.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 34910e7..25a3fde 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -3090,8 +3090,11 @@ NTSTATUS CDROM_DeviceIoControl(HANDLE hDevice, sz = sizeof(DVD_REGION); if (lpInBuffer != NULL || nInBufferSize != 0) status = STATUS_INVALID_PARAMETER; else if (nOutBufferSize < sz) status = STATUS_BUFFER_TOO_SMALL; - TRACE("doing DVD_Get_REGION\n"); - status = DVD_GetRegion(fd, lpOutBuffer); + else + { + TRACE("doing DVD_Get_REGION\n"); + status = DVD_GetRegion(fd, lpOutBuffer); + } break; case IOCTL_DVD_READ_STRUCTURE: sz = sizeof(DVD_LAYER_DESCRIPTOR);

1 0

Huw Davies : comctl32: Invalidate the toolbar if the button size is changed.
by Alexandre Julliard April 20, 2015

April 20, 2015

Module: wine Branch: master Commit: 60e305d983be66f923ffd793e7635d460e5d87fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=60e305d983be66f923ffd793e… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 17 13:24:18 2015 +0100 comctl32: Invalidate the toolbar if the button size is changed. --- dlls/comctl32/toolbar.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 7727ee2..83cb674 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -4364,6 +4364,7 @@ static LRESULT TOOLBAR_SetButtonSize (TOOLBAR_INFO *infoPtr, LPARAM lParam) { INT cx = (short)LOWORD(lParam), cy = (short)HIWORD(lParam); + int top = default_top_margin(infoPtr); if ((cx < 0) || (cy < 0)) { @@ -4386,15 +4387,20 @@ TOOLBAR_SetButtonSize (TOOLBAR_INFO *infoPtr, LPARAM lParam) */ if (cx == 0) cx = 24; if (cy == 0) cy = 22; - + cx = max(cx, infoPtr->szPadding.cx + infoPtr->nBitmapWidth); cy = max(cy, infoPtr->szPadding.cy + infoPtr->nBitmapHeight); - infoPtr->nButtonWidth = cx; - infoPtr->nButtonHeight = cy; - - infoPtr->iTopMargin = default_top_margin(infoPtr); - TOOLBAR_LayoutToolbar(infoPtr); + if (cx != infoPtr->nButtonWidth || cy != infoPtr->nButtonHeight || + top != infoPtr->iTopMargin) + { + infoPtr->nButtonWidth = cx; + infoPtr->nButtonHeight = cy; + infoPtr->iTopMargin = top; + + TOOLBAR_LayoutToolbar( infoPtr ); + InvalidateRect( infoPtr->hwndSelf, NULL, TRUE ); + } return TRUE; }

1 0

Huw Davies : comctl32: TBSTYLE_EX_MIXEDBUTTONS doesn' t mean buttons should be auto-sized.
by Alexandre Julliard April 20, 2015

April 20, 2015

Module: wine Branch: master Commit: 5b7b911f0691a866e8639e54a3646b826d9197bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b7b911f0691a866e8639e54a… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 17 13:24:17 2015 +0100 comctl32: TBSTYLE_EX_MIXEDBUTTONS doesn't mean buttons should be auto-sized. --- dlls/comctl32/tests/toolbar.c | 52 ++++++++++++++++++++++++++++++++++++++++++- dlls/comctl32/toolbar.c | 3 +-- 2 files changed, 52 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index cdfe7dd..d3088f9 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -748,7 +748,7 @@ static void tbsize_addbutton(tbsize_result_t *tbsr, int left, int top, int right static tbsize_result_t *tbsize_results; -#define tbsize_results_num 24 +#define tbsize_results_num 28 static void init_tbsize_results(void) { int fontheight = system_font_height(); @@ -991,6 +991,18 @@ static void init_tbsize_results(void) { tbsize_results[23] = init_tbsize_result(2, 0, 0, 672, 42, 67, 41); tbsize_addbutton(&tbsize_results[23], 0, 2, 672, 25 + fontheight); tbsize_addbutton(&tbsize_results[23], 0, 25 + fontheight, 672, 48 + 2*fontheight); + + tbsize_results[24] = init_tbsize_result(1, 0, 0, 672, 42, 67, 40); + tbsize_addbutton(&tbsize_results[24], 0, 2, 11 + string_width(STRING2), 24); + + tbsize_results[25] = init_tbsize_result(1, 0, 0, 672, 42, 67, 40); + tbsize_addbutton(&tbsize_results[25], 0, 2, 40, 24); + + tbsize_results[26] = init_tbsize_result(1, 0, 0, 672, 42, 67, 40); + tbsize_addbutton(&tbsize_results[26], 0, 2, 40, 24); + + tbsize_results[27] = init_tbsize_result(1, 0, 0, 672, 42, 67, 40); + tbsize_addbutton(&tbsize_results[27], 0, 2, 40, 24); } static void free_tbsize_results(void) { @@ -1062,6 +1074,11 @@ static TBBUTTON buttons3[] = { {0, 32, TBSTATE_ENABLED, BTNS_AUTOSIZE, {0, }, 0, 1}, {0, 33, TBSTATE_ENABLED, BTNS_AUTOSIZE, {0, }, 0, (UINT_PTR)STRING2} }; +static TBBUTTON buttons4[] = { + {0, 40, TBSTATE_ENABLED, BTNS_AUTOSIZE, {0, }, 0, (UINT_PTR)STRING2}, + {0, 41, TBSTATE_ENABLED, 0, {0, }, 0, (UINT_PTR)STRING2}, + {0, 41, TBSTATE_ENABLED, BTNS_SHOWTEXT, {0, }, 0, (UINT_PTR)STRING2} +}; static void test_sizes(void) { @@ -1300,8 +1317,41 @@ static void test_sizes(void) { tbinfo.dwMask = TBIF_SIZE; ok(SendMessageA(hToolbar, TB_SETBUTTONINFOA, 33, (LPARAM)&tbinfo) != 0, "TB_SETBUTTONINFOA failed\n"); + tbsize_numtests++; } + /* Single BTNS_AUTOSIZE button with string. */ + rebuild_toolbar(&hToolbar); + ok(SendMessageA(hToolbar, TB_ADDBUTTONSA, 1, (LPARAM)&buttons4[0]) == 1, "TB_ADDBUTTONSA failed\n"); + ok(SendMessageA(hToolbar, TB_SETBUTTONSIZE, 0, MAKELPARAM(40, 20)) == 1, "TB_SETBUTTONSIZE failed\n"); + SendMessageA(hToolbar, TB_AUTOSIZE, 0, 0 ); + check_sizes(); + + /* Single non-BTNS_AUTOSIZE button with string. */ + rebuild_toolbar(&hToolbar); + ok(SendMessageA(hToolbar, TB_ADDBUTTONSA, 1, (LPARAM)&buttons4[1]) == 1, "TB_ADDBUTTONSA failed\n"); + ok(SendMessageA(hToolbar, TB_SETBUTTONSIZE, 0, MAKELPARAM(40, 20)) == 1, "TB_SETBUTTONSIZE failed\n"); + SendMessageA(hToolbar, TB_AUTOSIZE, 0, 0 ); + check_sizes(); + + /* Single non-BTNS_AUTOSIZE button with string with TBSTYLE_EX_MIXEDBUTTONS set. */ + rebuild_toolbar(&hToolbar); + SendMessageA(hToolbar, TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_MIXEDBUTTONS); + style = SendMessageA(hToolbar, TB_GETSTYLE, 0, 0); + ok(SendMessageA(hToolbar, TB_ADDBUTTONSA, 1, (LPARAM)&buttons4[1]) == 1, "TB_ADDBUTTONSA failed\n"); + ok(SendMessageA(hToolbar, TB_SETBUTTONSIZE, 0, MAKELPARAM(40, 20)) == 1, "TB_SETBUTTONSIZE failed\n"); + SendMessageA(hToolbar, TB_AUTOSIZE, 0, 0 ); + check_sizes(); + + /* Single non-BTNS_AUTOSIZE, BTNS_SHOWTEXT button with string with TBSTYLE_EX_MIXEDBUTTONS set. */ + rebuild_toolbar(&hToolbar); + SendMessageA(hToolbar, TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_MIXEDBUTTONS); + style = SendMessageA(hToolbar, TB_GETSTYLE, 0, 0); + ok(SendMessageA(hToolbar, TB_ADDBUTTONSA, 1, (LPARAM)&buttons4[2]) == 1, "TB_ADDBUTTONSA failed\n"); + ok(SendMessageA(hToolbar, TB_SETBUTTONSIZE, 0, MAKELPARAM(40, 20)) == 1, "TB_SETBUTTONSIZE failed\n"); + SendMessageA(hToolbar, TB_AUTOSIZE, 0, 0 ); + check_sizes(); + free_tbsize_results(); DestroyWindow(hToolbar); } diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index a329c26..7727ee2 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -1689,8 +1689,7 @@ TOOLBAR_LayoutToolbar(TOOLBAR_INFO *infoPtr) { if (btnPtr->cx) cx = btnPtr->cx; - else if ((infoPtr->dwExStyle & TBSTYLE_EX_MIXEDBUTTONS) || - (btnPtr->fsStyle & BTNS_AUTOSIZE)) + else if (btnPtr->fsStyle & BTNS_AUTOSIZE) { SIZE sz; HDC hdc;

1 0

Nikolay Sivov : dxdiagn/tests: Fix a couple of leaks (Valgrind).
by Alexandre Julliard April 20, 2015

April 20, 2015

Module: wine Branch: master Commit: 2c59f6fe464f416b617d8b6c48f03285e9b45740 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c59f6fe464f416b617d8b6c4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 20 14:58:07 2015 +0300 dxdiagn/tests: Fix a couple of leaks (Valgrind). --- dlls/dxdiagn/tests/container.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dxdiagn/tests/container.c b/dlls/dxdiagn/tests/container.c index ce0fb77..5bc5161 100644 --- a/dlls/dxdiagn/tests/container.c +++ b/dlls/dxdiagn/tests/container.c @@ -701,6 +701,7 @@ static void test_GetProp(void) IDxDiagContainer_AddRef(child); ref = IDxDiagContainer_Release(child); ok(ref == 2, "Expected reference count to be 2, got %u\n", ref); + IDxDiagContainer_Release(child); IDxDiagContainer_Release(child); cleanup: @@ -1010,6 +1011,7 @@ static void test_DxDiag_DisplayDevices(void) trace("Testing container %s\n", wine_dbgstr_w(child_container)); test_container_properties(child, property_tests, sizeof(property_tests)/sizeof(property_tests[0])); } + IDxDiagContainer_Release(child); } cleanup:

1 0

Dmitry Timoshkov : user32/tests: Add a test for sending inter-thread messages.
by Alexandre Julliard April 20, 2015

April 20, 2015

Module: wine Branch: master Commit: 4ae80d15d957d627529a912e9cd9b7dd1ea1daea URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ae80d15d957d627529a912e9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 20 18:54:06 2015 +0800 user32/tests: Add a test for sending inter-thread messages. --- dlls/user32/tests/msg.c | 150 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 150 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 5f10a89..b014dd9 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -14598,6 +14598,153 @@ static void test_TrackPopupMenuEmpty(void) DestroyWindow(hwnd); } +static const struct message send_message_1[] = { + { WM_USER+2, sent|wparam|lparam, 0, 0 }, + { WM_USER, sent|wparam|lparam, 0, 0 }, + { 0 } +}; +static const struct message send_message_2[] = { + { WM_USER+4, sent|wparam|lparam, 0, 0 }, + { 0 } +}; +static const struct message send_message_3[] = { + { WM_USER+3, sent|wparam|lparam, 0, 0 }, + { WM_USER+1, sent|wparam|lparam, 0, 0 }, + { 0 } +}; + +static DWORD WINAPI SendMessage_thread_1(void *param) +{ + struct wnd_event *wnd_event = param; + + trace("thread: starting\n"); + WaitForSingleObject(wnd_event->start_event, INFINITE); + + trace("thread: call PostMessage\n"); + PostMessageA(wnd_event->hwnd, WM_USER, 0, 0); + + trace("thread: call PostMessage\n"); + PostMessageA(wnd_event->hwnd, WM_USER+1, 0, 0); + + trace("thread: call SendMessage\n"); + SendMessageA(wnd_event->hwnd, WM_USER+2, 0, 0); + + trace("thread: call SendMessage\n"); + SendMessageA(wnd_event->hwnd, WM_USER+3, 0, 0); + + return 0; +} + +static DWORD WINAPI SendMessage_thread_2(void *param) +{ + struct wnd_event *wnd_event = param; + + trace("thread: starting\n"); + WaitForSingleObject(wnd_event->start_event, INFINITE); + + trace("thread: call PostMessage\n"); + PostMessageA(wnd_event->hwnd, WM_USER, 0, 0); + + trace("thread: call PostMessage\n"); + PostMessageA(wnd_event->hwnd, WM_USER+1, 0, 0); + + /* this leads to sending an internal message under Wine */ + trace("thread: call EnableWindow\n"); + EnableWindow(wnd_event->hwnd, TRUE); + + trace("thread: call SendMessage\n"); + SendMessageA(wnd_event->hwnd, WM_USER+2, 0, 0); + + trace("thread: call SendMessage\n"); + SendMessageA(wnd_event->hwnd, WM_USER+3, 0, 0); + + return 0; +} + +static void test_SendMessage_other_thread(int thread_n) +{ + DWORD qs_all_input = QS_ALLINPUT & ~QS_RAWINPUT; + HANDLE hthread; + struct wnd_event wnd_event; + DWORD tid, ret; + MSG msg; + + wnd_event.start_event = CreateEventA(NULL, 0, 0, NULL); + + wnd_event.hwnd = CreateWindowExA(0, "TestWindowClass", NULL, WS_OVERLAPPEDWINDOW, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok(wnd_event.hwnd != 0, "CreateWindowEx failed\n"); + + hthread = CreateThread(NULL, 0, thread_n == 1 ? SendMessage_thread_1 : SendMessage_thread_2, &wnd_event, 0, &tid); + ok(hthread != NULL, "CreateThread failed, error %d\n", GetLastError()); + CloseHandle(hthread); + + flush_events(); + flush_sequence(); + + ret = GetQueueStatus(QS_SENDMESSAGE); + ok(ret == 0, "wrong status %08x\n", ret); + + SetEvent(wnd_event.start_event); + + /* wait for other thread's SendMessage */ + for (;;) + { + ret = GetQueueStatus(QS_SENDMESSAGE); + if (ret == MAKELONG(QS_SENDMESSAGE, QS_SENDMESSAGE)) break; + Sleep(50); + } + + ret = GetQueueStatus(QS_SENDMESSAGE|QS_POSTMESSAGE); +todo_wine + ok(ret == MAKELONG(QS_POSTMESSAGE, QS_SENDMESSAGE|QS_POSTMESSAGE), "wrong status %08x\n", ret); + + trace("main: call GetMessage\n"); + GetMessageA(&msg, 0, 0, 0); + ok(msg.message == WM_USER, "expected WM_USER, got %04x\n", msg.message); + DispatchMessageA(&msg); + ok_sequence(send_message_1, "SendMessage from other thread 1", thread_n == 2); + + /* intentionally yield */ + MsgWaitForMultipleObjects(0, NULL, FALSE, 100, qs_all_input); + + trace("main: call SendMessage\n"); + SendMessageA(wnd_event.hwnd, WM_USER+4, 0, 0); + ok_sequence(send_message_2, "SendMessage from other thread 2", FALSE); + + ret = GetQueueStatus(QS_SENDMESSAGE|QS_POSTMESSAGE); + ok(ret == MAKELONG(QS_SENDMESSAGE, QS_SENDMESSAGE|QS_POSTMESSAGE), "wrong status %08x\n", ret); + + trace("main: call PeekMessage\n"); + ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "PeekMessage should not fail\n"); + ok(msg.message == WM_USER+1, "expected WM_USER+1, got %04x\n", msg.message); + DispatchMessageA(&msg); + ok_sequence(send_message_3, "SendMessage from other thread 3", thread_n == 2); + + /* intentionally yield */ + MsgWaitForMultipleObjects(0, NULL, FALSE, 100, qs_all_input); + + ret = GetQueueStatus(QS_SENDMESSAGE|QS_POSTMESSAGE); + /* FIXME: remove once Wine is fixed */ +if (thread_n == 2) todo_wine + ok(ret == 0, "wrong status %08x\n", ret); +else + ok(ret == 0, "wrong status %08x\n", ret); + + trace("main: call PeekMessage\n"); + ok(!PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "PeekMessage should fail\n"); + ok_sequence(WmEmptySeq, "SendMessage from other thread 4", thread_n == 2); + + ret = GetQueueStatus(QS_SENDMESSAGE|QS_POSTMESSAGE); + ok(ret == 0, "wrong status %08x\n", ret); + + trace("main: call DestroyWindow\n"); + DestroyWindow(msg.hwnd); + + flush_events(); + flush_sequence(); +} + static void init_funcs(void) { HMODULE hKernel32 = GetModuleHandleA("kernel32.dll"); @@ -14675,6 +14822,9 @@ START_TEST(msg) pUnhookWinEvent = 0; } hEvent_hook = 0; + + test_SendMessage_other_thread(1); + test_SendMessage_other_thread(2); test_SetFocus(); test_SetParent(); test_PostMessage();

1 0

Marcus Meissner : inetcomm: Avoid overlapping memcpy (Coverity).
by Alexandre Julliard April 20, 2015

April 20, 2015

Module: wine Branch: master Commit: a57b06c5acac1bed5a4aa632ab939ca5a1cd028d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a57b06c5acac1bed5a4aa632a… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Apr 19 11:50:42 2015 +0200 inetcomm: Avoid overlapping memcpy (Coverity). --- dlls/inetcomm/mimeole.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 6a6cbd8..94fb558 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -1613,13 +1613,13 @@ static HRESULT create_body_offset_list(IStream *stm, const char *boundary, struc if(overlap == buf) /* 1st iteration */ { - memcpy(buf, buf + PARSER_BUF_SIZE - overlap_no, overlap_no); + memmove(buf, buf + PARSER_BUF_SIZE - overlap_no, overlap_no); overlap = buf + overlap_no; start += read - overlap_no; } else { - memcpy(buf, buf + PARSER_BUF_SIZE, overlap_no); + memmove(buf, buf + PARSER_BUF_SIZE, overlap_no); start += read; } } while(1);

1 0

Sebastian Lackner : msxml3: Add a missing break (Coverity).
by Alexandre Julliard April 20, 2015

April 20, 2015

Module: wine Branch: master Commit: 45e00e55161fb4bb33222592523878c399b833d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45e00e55161fb4bb332225925… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Apr 18 23:31:02 2015 +0200 msxml3: Add a missing break (Coverity). --- dlls/msxml3/node.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 7119a43..1ddc9bf 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -2055,6 +2055,7 @@ IXMLDOMNode *create_node( xmlNodePtr node ) new_node->ref = 1; init_xmlnode(&new_node->node, node, &new_node->IXMLDOMNode_iface, NULL); pUnk = (IUnknown*)&new_node->IXMLDOMNode_iface; + break; } default: ERR("Called for unsupported node type %d\n", node->type);

1 0

Thomas Faber : comctl32: Avoid use-after-free in DPA_Merge (DPH).
by Alexandre Julliard April 20, 2015

April 20, 2015

Module: wine Branch: master Commit: 13b65faf4e758439afc5139098b4231407c5bb0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=13b65faf4e758439afc513909… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Apr 18 12:08:29 2015 +0200 comctl32: Avoid use-after-free in DPA_Merge (DPH). --- dlls/comctl32/dpa.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/dpa.c b/dlls/comctl32/dpa.c index 148d3f1..b5b7ff8 100644 --- a/dlls/comctl32/dpa.c +++ b/dlls/comctl32/dpa.c @@ -303,16 +303,14 @@ BOOL WINAPI DPA_Merge (HDPA hdpa1, HDPA hdpa2, DWORD dwFlags, hdpa1->nItemCount, hdpa2->nItemCount); - /* working but untrusted implementation */ - - pWork1 = &(hdpa1->ptrs[hdpa1->nItemCount - 1]); - pWork2 = &(hdpa2->ptrs[hdpa2->nItemCount - 1]); - nIndex = hdpa1->nItemCount - 1; nCount = hdpa2->nItemCount - 1; do { + pWork1 = &hdpa1->ptrs[nIndex]; + pWork2 = &hdpa2->ptrs[nCount]; + if (nIndex < 0) { if ((nCount >= 0) && (dwFlags & DPAM_UNION)) { /* Now insert the remaining new items into DPA 1 */ @@ -343,10 +341,8 @@ BOOL WINAPI DPA_Merge (HDPA hdpa1, HDPA hdpa2, DWORD dwFlags, return FALSE; nCount--; - pWork2--; *pWork1 = ptr; nIndex--; - pWork1--; } else if (nResult > 0) { @@ -361,7 +357,6 @@ BOOL WINAPI DPA_Merge (HDPA hdpa1, HDPA hdpa2, DWORD dwFlags, (pfnMerge)(DPAMM_DELETE, ptr, NULL, lParam); } nIndex--; - pWork1--; } else { @@ -377,7 +372,6 @@ BOOL WINAPI DPA_Merge (HDPA hdpa1, HDPA hdpa2, DWORD dwFlags, DPA_InsertPtr (hdpa1, nIndex+1, ptr); } nCount--; - pWork2--; } }

1 0

Jacek Caban : mshtml: Fixed binding event scripts to window objects.
by Alexandre Julliard April 20, 2015

April 20, 2015

Module: wine Branch: master Commit: 7c85ed6aabf2ea5ca021d3cefce80541a12f2247 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c85ed6aabf2ea5ca021d3cef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 17 16:35:24 2015 +0200 mshtml: Fixed binding event scripts to window objects. --- dlls/mshtml/htmlevent.c | 7 ++++--- dlls/mshtml/htmlevent.h | 2 +- dlls/mshtml/script.c | 32 ++++++++++++++++++-------------- 3 files changed, 23 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index a14ce72..30ce6b1 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1529,11 +1529,12 @@ HRESULT detach_event(event_target_t *event_target, HTMLDocument *doc, BSTR name, return S_OK; } -void bind_node_event(HTMLDocumentNode *doc, event_target_t **event_target, HTMLDOMNode *node, const WCHAR *event, IDispatch *disp) +void bind_target_event(HTMLDocumentNode *doc, event_target_t **event_target, DispatchEx *dispex, + const WCHAR *event, IDispatch *disp) { eventid_t eid; - TRACE("(%p %p %p %s %p)\n", doc, event_target, node, debugstr_w(event), disp); + TRACE("(%p %p %p %s %p)\n", doc, event_target, dispex, debugstr_w(event), disp); eid = attr_to_eid(event); if(eid == EVENTID_LAST) { @@ -1541,7 +1542,7 @@ void bind_node_event(HTMLDocumentNode *doc, event_target_t **event_target, HTMLD return; } - set_event_handler_disp(&node->dispex, event_target, doc, eid, disp); + set_event_handler_disp(dispex, event_target, doc, eid, disp); } void update_cp_events(HTMLInnerWindow *window, event_target_t **event_target_ptr, cp_static_data_t *cp) diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 0517834..86d5816 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -64,7 +64,7 @@ void update_cp_events(HTMLInnerWindow*,event_target_t**,cp_static_data_t*) DECLS HRESULT doc_init_events(HTMLDocumentNode*) DECLSPEC_HIDDEN; void detach_events(HTMLDocumentNode *doc) DECLSPEC_HIDDEN; HRESULT create_event_obj(IHTMLEventObj**) DECLSPEC_HIDDEN; -void bind_node_event(HTMLDocumentNode*,event_target_t**,HTMLDOMNode*,const WCHAR*,IDispatch*) DECLSPEC_HIDDEN; +void bind_target_event(HTMLDocumentNode*,event_target_t**,DispatchEx*,const WCHAR*,IDispatch*) DECLSPEC_HIDDEN; void init_nsevents(HTMLDocumentNode*) DECLSPEC_HIDDEN; void release_nsevents(HTMLDocumentNode*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 4590854..e3c9498 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -1314,9 +1314,9 @@ IDispatch *get_script_disp(ScriptHost *script_host) return disp; } -static event_target_t **find_event_target(HTMLDocumentNode *doc, HTMLScriptElement *script_elem, HTMLDOMNode **ret_target_node) +static event_target_t **find_event_target(HTMLDocumentNode *doc, HTMLScriptElement *script_elem, DispatchEx **ret_target_dispex) { - HTMLDOMNode *target_node = NULL; + DispatchEx *target_dispex = NULL; event_target_t **target = NULL; const PRUnichar *target_id; nsAString target_id_str; @@ -1336,22 +1336,26 @@ static event_target_t **find_event_target(HTMLDocumentNode *doc, HTMLScriptEleme FIXME("Empty for attribute\n"); }else if(!strcmpW(target_id, documentW)) { target = &doc->node.event_target; - target_node = &doc->node; - IHTMLDOMNode_AddRef(&target_node->IHTMLDOMNode_iface); + target_dispex = &doc->node.dispex; + htmldoc_addref(&doc->basedoc); }else if(!strcmpW(target_id, windowW)) { - target = &doc->body_event_target; + if(doc->window) { + target_dispex = &doc->window->dispex; + IDispatchEx_AddRef(&target_dispex->IDispatchEx_iface); + target = &doc->body_event_target; + } }else { HTMLElement *target_elem; hres = get_doc_elem_by_id(doc, target_id, &target_elem); if(SUCCEEDED(hres) && target_elem) { - target_node = &target_elem->node; + target_dispex = &target_elem->node.dispex; target = &target_elem->node.event_target; } } nsAString_Finish(&target_id_str); - *ret_target_node = target_node; + *ret_target_dispex = target_dispex; return target; } @@ -1449,7 +1453,7 @@ void bind_event_scripts(HTMLDocumentNode *doc) HTMLScriptElement *script_elem; event_target_t **event_target; nsIDOMNodeList *node_list; - HTMLDOMNode *target_node; + DispatchEx *target_dispex; nsIDOMNode *script_node; nsAString selector_str; IDispatch *event_disp; @@ -1496,10 +1500,10 @@ void bind_event_scripts(HTMLDocumentNode *doc) event_disp = parse_event_elem(doc, script_elem, &event); if(event_disp) { - event_target = find_event_target(doc, script_elem, &target_node); + event_target = find_event_target(doc, script_elem, &target_dispex); if(event_target) { - if(target_node) - hres = IHTMLDOMNode_QueryInterface(&target_node->IHTMLDOMNode_iface, &IID_HTMLPluginContainer, + if(target_dispex) + hres = IDispatchEx_QueryInterface(&target_dispex->IDispatchEx_iface, &IID_HTMLPluginContainer, (void**)&plugin_container); else hres = E_NOINTERFACE; @@ -1507,10 +1511,10 @@ void bind_event_scripts(HTMLDocumentNode *doc) if(SUCCEEDED(hres)) bind_activex_event(doc, plugin_container, event, event_disp); else - bind_node_event(doc, event_target, target_node, event, event_disp); + bind_target_event(doc, event_target, target_dispex, event, event_disp); - if(target_node) { - IHTMLDOMNode_Release(&target_node->IHTMLDOMNode_iface); + if(target_dispex) { + IDispatchEx_Release(&target_dispex->IDispatchEx_iface); if(plugin_container) node_release(&plugin_container->element.node); }

1 0

Huw Davies : riched20/tests: Fix test on 64-bit win8.
by Alexandre Julliard April 20, 2015

April 20, 2015

Module: wine Branch: master Commit: ef072b1eb241238ea1be7fe850492ad60bf17ea9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef072b1eb241238ea1be7fe85… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 17 14:18:36 2015 +0100 riched20/tests: Fix test on 64-bit win8. --- dlls/riched20/tests/editor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 65752af..09437ef 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -3412,7 +3412,7 @@ static DWORD CALLBACK test_esCallback_written_1(DWORD_PTR dwCookie, LONG *pcb) { char** str = (char**)dwCookie; - ok(cb == *pcb, "cb %d, *pcb %d\n", cb, *pcb); + ok(*pcb == cb || *pcb == 0, "cb %d, *pcb %d\n", cb, *pcb); *pcb = 0; if (cb > 0) { memcpy(*str, pbBuff, cb);

1 0