January 2014 - Wine-Commits

Jacek Caban : wmp: Added WindowsMediaPlayer class factory.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 068a9daec7a27ec10478468297939f01e2404605 URL: http://source.winehq.org/git/wine.git/?a=commit;h=068a9daec7a27ec1047846829… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jan 25 18:21:57 2014 +0100 wmp: Added WindowsMediaPlayer class factory. --- dlls/wmp/wmp_main.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 66 insertions(+), 1 deletion(-) diff --git a/dlls/wmp/wmp_main.c b/dlls/wmp/wmp_main.c index c0933f2..ebce0a5 100644 --- a/dlls/wmp/wmp_main.c +++ b/dlls/wmp/wmp_main.c @@ -16,9 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + +#include "initguid.h" #include "windows.h" #include "ole2.h" #include "rpcproxy.h" +#include "wmp.h" #include "wine/debug.h" @@ -26,6 +30,62 @@ WINE_DEFAULT_DEBUG_CHANNEL(wmp); static HINSTANCE wmp_instance; +static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", iface, ppv); + *ppv = iface; + }else if(IsEqualGUID(&IID_IClassFactory, riid)) { + TRACE("(%p)->(IID_IClassFactory %p)\n", iface, ppv); + *ppv = iface; + } + + if(*ppv) { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + FIXME("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) +{ + TRACE("(%p)\n", iface); + return 2; +} + +static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) +{ + TRACE("(%p)\n", iface); + return 1; +} + +static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock) +{ + TRACE("(%p)->(%x)\n", iface, fLock); + return S_OK; +} + +static HRESULT WINAPI WMPFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, + REFIID riid, void **ppv) +{ + FIXME("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static const IClassFactoryVtbl WMPFactoryVtbl = { + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + WMPFactory_CreateInstance, + ClassFactory_LockServer +}; + +static IClassFactory WMPFactory = { &WMPFactoryVtbl }; + /****************************************************************** * DllMain (wmp.@) */ @@ -50,7 +110,12 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { - FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + if(IsEqualGUID(&CLSID_WindowsMediaPlayer, rclsid)) { + TRACE("(CLSID_WindowsMediaPlayer %s %p)\n", debugstr_guid(riid), ppv); + return IClassFactory_QueryInterface(&WMPFactory, riid, ppv); + } + + FIXME("Unknown object %s\n", debugstr_guid(rclsid)); return CLASS_E_CLASSNOTAVAILABLE; }

1 0

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

Jan. 27, 2014

Module: wine Branch: master Commit: 6f95257b8bfdbee1d077f3d7245049168857316c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f95257b8bfdbee1d077f3d72… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jan 25 18:21:44 2014 +0100 wmp: Added typelib. --- configure | 2 +- configure.ac | 2 +- dlls/wmp/Makefile.in | 2 ++ dlls/wmp/wmp_typelib.idl | 21 +++++++++++++++++++++ 4 files changed, 25 insertions(+), 2 deletions(-) diff --git a/configure b/configure index e3b45e2..312c19f 100755 --- a/configure +++ b/configure @@ -17103,7 +17103,7 @@ wine_fn_config_test dlls/wldap32/tests wldap32_test wine_fn_config_dll wmi enable_wmi wine_fn_config_dll wmiutils enable_wmiutils clean wine_fn_config_test dlls/wmiutils/tests wmiutils_test -wine_fn_config_dll wmp enable_wmp +wine_fn_config_dll wmp enable_wmp clean wine_fn_config_dll wmvcore enable_wmvcore wine_fn_config_dll wnaspi32 enable_wnaspi32 implib wine_fn_config_dll wow32 enable_win16 implib diff --git a/configure.ac b/configure.ac index 7744044..fbfbb5c 100644 --- a/configure.ac +++ b/configure.ac @@ -3226,7 +3226,7 @@ WINE_CONFIG_TEST(dlls/wldap32/tests) WINE_CONFIG_DLL(wmi) WINE_CONFIG_DLL(wmiutils,,[clean]) WINE_CONFIG_TEST(dlls/wmiutils/tests) -WINE_CONFIG_DLL(wmp) +WINE_CONFIG_DLL(wmp,,[clean]) WINE_CONFIG_DLL(wmvcore) WINE_CONFIG_DLL(wnaspi32,,[implib]) WINE_CONFIG_DLL(wow32,enable_win16,[implib]) diff --git a/dlls/wmp/Makefile.in b/dlls/wmp/Makefile.in index 7d34324..36b78ed 100644 --- a/dlls/wmp/Makefile.in +++ b/dlls/wmp/Makefile.in @@ -2,3 +2,5 @@ MODULE = wmp.dll C_SRCS = \ wmp_main.c + +IDL_SRCS = wmp_typelib.idl diff --git a/dlls/wmp/wmp_typelib.idl b/dlls/wmp/wmp_typelib.idl new file mode 100644 index 0000000..2c40b68 --- /dev/null +++ b/dlls/wmp/wmp_typelib.idl @@ -0,0 +1,21 @@ +/* + * Copyright 2014 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep regtypelib + +#include "wmp.idl"

1 0

Jacek Caban : atl90: Share atl_ax.c with atl100.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 1a130126053105d9022f7a83fc95587bdb415ff2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a130126053105d9022f7a83f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 20 14:46:56 2014 +0100 atl90: Share atl_ax.c with atl100. --- dlls/atl100/atl_ax.c | 17 ++++++++++++---- dlls/atl90/Makefile.in | 7 +++++-- dlls/atl90/atl90.c | 53 ------------------------------------------------ dlls/atl90/atl90.spec | 18 ++++++++-------- 4 files changed, 27 insertions(+), 68 deletions(-) diff --git a/dlls/atl100/atl_ax.c b/dlls/atl100/atl_ax.c index 50ebe3b..0f0f3c6 100644 --- a/dlls/atl100/atl_ax.c +++ b/dlls/atl100/atl_ax.c @@ -86,8 +86,17 @@ static LRESULT CALLBACK AtlAxWin_wndproc( HWND hWnd, UINT wMsg, WPARAM wParam, L BOOL WINAPI AtlAxWinInit(void) { WNDCLASSEXW wcex; - const WCHAR AtlAxWin100[] = {'A','t','l','A','x','W','i','n','1','0','0',0}; - const WCHAR AtlAxWinLic100[] = {'A','t','l','A','x','W','i','n','L','i','c','1','0','0',0}; + +#if _ATL_VER == _ATL_VER_90 +#define ATL_NAME_SUFFIX '9','0',0 +#elif _ATL_VER == _ATL_VER_100 +#define ATL_NAME_SUFFIX '1','0','0',0 +#else +#error Unsupported version +#endif + + const WCHAR AtlAxWinW[] = {'A','t','l','A','x','W','i','n',ATL_NAME_SUFFIX}; + const WCHAR AtlAxWinLicW[] = {'A','t','l','A','x','W','i','n','L','i','c',ATL_NAME_SUFFIX}; FIXME("version %04x semi-stub\n", _ATL_VER); @@ -106,11 +115,11 @@ BOOL WINAPI AtlAxWinInit(void) wcex.hIconSm = 0; wcex.lpfnWndProc = AtlAxWin_wndproc; - wcex.lpszClassName = AtlAxWin100; + wcex.lpszClassName = AtlAxWinW; if ( !RegisterClassExW( &wcex ) ) return FALSE; - wcex.lpszClassName = AtlAxWinLic100; + wcex.lpszClassName = AtlAxWinLicW; if ( !RegisterClassExW( &wcex ) ) return FALSE; diff --git a/dlls/atl90/Makefile.in b/dlls/atl90/Makefile.in index f52b7d5..677aaae 100644 --- a/dlls/atl90/Makefile.in +++ b/dlls/atl90/Makefile.in @@ -1,7 +1,10 @@ MODULE = atl90.dll -IMPORTS = atl100 oleaut32 user32 ole32 +IMPORTS = atl100 oleaut32 user32 ole32 uuid EXTRADEFS = -D_ATL_VER=_ATL_VER_90 +PARENTSRC = ../atl100 -C_SRCS = atl90.c +C_SRCS = \ + atl90.c \ + atl_ax.c RC_SRCS = atl90.rc diff --git a/dlls/atl90/atl90.c b/dlls/atl90/atl90.c index 06e8066..9dd0b70 100644 --- a/dlls/atl90/atl90.c +++ b/dlls/atl90/atl90.c @@ -40,56 +40,3 @@ DWORD WINAPI AtlGetVersion(void *reserved) TRACE("version %04x (%p)\n", _ATL_VER, reserved); return _ATL_VER; } - -/********************************************************************** - * AtlAxWin class window procedure - */ -static LRESULT CALLBACK AtlAxWin_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) -{ - if ( msg == WM_CREATE ) - { - DWORD len = GetWindowTextLengthW( hwnd ) + 1; - WCHAR *ptr = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); - if (!ptr) - return 1; - GetWindowTextW( hwnd, ptr, len ); - AtlAxCreateControlEx( ptr, hwnd, NULL, NULL, NULL, NULL, NULL ); - HeapFree( GetProcessHeap(), 0, ptr ); - return 0; - } - return DefWindowProcW( hwnd, msg, wparam, lparam ); -} - -BOOL WINAPI AtlAxWinInit(void) -{ - WNDCLASSEXW wcex; - const WCHAR AtlAxWin90[] = {'A','t','l','A','x','W','i','n','9','0',0}; - const WCHAR AtlAxWinLic90[] = {'A','t','l','A','x','W','i','n','L','i','c','9','0',0}; - - FIXME("version %04x semi-stub\n", _ATL_VER); - - if ( FAILED( OleInitialize(NULL) ) ) - return FALSE; - - wcex.cbSize = sizeof(wcex); - wcex.style = CS_GLOBALCLASS | CS_DBLCLKS; - wcex.cbClsExtra = 0; - wcex.cbWndExtra = 0; - wcex.hInstance = GetModuleHandleW( NULL ); - wcex.hIcon = NULL; - wcex.hCursor = NULL; - wcex.hbrBackground = NULL; - wcex.lpszMenuName = NULL; - wcex.hIconSm = 0; - - wcex.lpfnWndProc = AtlAxWin_wndproc; - wcex.lpszClassName = AtlAxWin90; - if ( !RegisterClassExW( &wcex ) ) - return FALSE; - - wcex.lpszClassName = AtlAxWinLic90; - if ( !RegisterClassExW( &wcex ) ) - return FALSE; - - return TRUE; -} diff --git a/dlls/atl90/atl90.spec b/dlls/atl90/atl90.spec index 045969e..35facf8 100644 --- a/dlls/atl90/atl90.spec +++ b/dlls/atl90/atl90.spec @@ -18,20 +18,20 @@ 31 stdcall AtlComQIPtrAssign(ptr ptr ptr) atl100.AtlComQIPtrAssign 32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) atl100.AtlInternalQueryInterface 34 stdcall AtlGetVersion(ptr) -35 stdcall AtlAxDialogBoxW(long wstr long ptr long) atl100.AtlAxDialogBoxW -36 stdcall AtlAxDialogBoxA(long str long ptr long) atl100.AtlAxDialogBoxA -37 stdcall AtlAxCreateDialogW(long wstr long ptr long) atl100.AtlAxCreateDialogW -38 stdcall AtlAxCreateDialogA(long str long ptr long) atl100.AtlAxCreateDialogA -39 stdcall AtlAxCreateControl(ptr ptr ptr ptr) atl100.AtlAxCreateControl -40 stdcall AtlAxCreateControlEx(ptr ptr ptr ptr ptr ptr ptr) atl100.AtlAxCreateControlEx -41 stdcall AtlAxAttachControl(ptr ptr ptr) atl100.AtlAxAttachControl +35 stdcall AtlAxDialogBoxW(long wstr long ptr long) +36 stdcall AtlAxDialogBoxA(long str long ptr long) +37 stdcall AtlAxCreateDialogW(long wstr long ptr long) +38 stdcall AtlAxCreateDialogA(long str long ptr long) +39 stdcall AtlAxCreateControl(ptr ptr ptr ptr) +40 stdcall AtlAxCreateControlEx(ptr ptr ptr ptr ptr ptr ptr) +41 stdcall AtlAxAttachControl(ptr ptr ptr) 42 stdcall AtlAxWinInit() 43 stdcall AtlWinModuleAddCreateWndData(ptr ptr ptr) atl100.AtlWinModuleAddCreateWndData 44 stdcall AtlWinModuleExtractCreateWndData(ptr) atl100.AtlWinModuleExtractCreateWndData 45 stub AtlWinModuleRegisterWndClassInfoW 46 stub AtlWinModuleRegisterWndClassInfoA -47 stdcall AtlAxGetControl(long ptr) atl100.AtlAxGetControl -48 stdcall AtlAxGetHost(long ptr) atl100.AtlAxGetHost +47 stdcall AtlAxGetControl(long ptr) +48 stdcall AtlAxGetHost(long ptr) 49 stdcall AtlRegisterClassCategoriesHelper(ptr ptr long) atl100.AtlRegisterClassCategoriesHelper 50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) atl100.AtlIPersistStreamInit_Load 51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) atl100.AtlIPersistStreamInit_Save

1 0

Piotr Caban : msvcrt: Fix str*coll functions behavior in C locale.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 619944cf58ae738ed984b9ab7dfb42ae1653edd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=619944cf58ae738ed984b9ab7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 23 15:10:14 2014 +0100 msvcrt: Fix str*coll functions behavior in C locale. --- dlls/msvcrt/string.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 10fb35f..446c119 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -489,6 +489,8 @@ int CDECL MSVCRT_strcoll_l( const char* str1, const char* str2, MSVCRT__locale_t else locinfo = locale->locinfo; + if(!locinfo->lc_handle[MSVCRT_LC_COLLATE]) + return strcmp(str1, str2); return CompareStringA(locinfo->lc_handle[MSVCRT_LC_COLLATE], 0, str1, -1, str2, -1)-CSTR_EQUAL; } @@ -512,6 +514,8 @@ int CDECL MSVCRT__stricoll_l( const char* str1, const char* str2, MSVCRT__locale else locinfo = locale->locinfo; + if(!locinfo->lc_handle[MSVCRT_LC_COLLATE]) + return strcasecmp(str1, str2); return CompareStringA(locinfo->lc_handle[MSVCRT_LC_COLLATE], NORM_IGNORECASE, str1, -1, str2, -1)-CSTR_EQUAL; } @@ -536,6 +540,8 @@ int CDECL MSVCRT__strncoll_l( const char* str1, const char* str2, MSVCRT_size_t else locinfo = locale->locinfo; + if(!locinfo->lc_handle[MSVCRT_LC_COLLATE]) + return strncmp(str1, str2, count); return CompareStringA(locinfo->lc_handle[MSVCRT_LC_COLLATE], 0, str1, count, str2, count)-CSTR_EQUAL; } @@ -559,6 +565,8 @@ int CDECL MSVCRT__strnicoll_l( const char* str1, const char* str2, MSVCRT_size_t else locinfo = locale->locinfo; + if(!locinfo->lc_handle[MSVCRT_LC_COLLATE]) + return strncasecmp(str1, str2, count); return CompareStringA(locinfo->lc_handle[MSVCRT_LC_COLLATE], NORM_IGNORECASE, str1, count, str2, count)-CSTR_EQUAL; }

1 0

Jacek Caban : d3d9.h: Added __uuidof() support to interfaces.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 34a4789900c284906afae11ced74ee3494269463 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34a4789900c284906afae11ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 22 11:49:19 2014 +0100 d3d9.h: Added __uuidof() support to interfaces. --- include/d3d9.h | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/include/d3d9.h b/include/d3d9.h index 098fc9a..20625b0 100644 --- a/include/d3d9.h +++ b/include/d3d9.h @@ -203,6 +203,10 @@ DECLARE_INTERFACE_(IDirect3D9,IUnknown) }; #undef INTERFACE +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IDirect3D9, 0x81BDCBCA, 0x64D4, 0x426D, 0xAE, 0x8D, 0xAD, 0x1, 0x47, 0xF4, 0x27, 0x5C); +#endif + #if !defined(__cplusplus) || defined(CINTERFACE) /*** IUnknown methods ***/ #define IDirect3D9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) @@ -288,6 +292,10 @@ DECLARE_INTERFACE_(IDirect3D9Ex,IDirect3D9) }; #undef INTERFACE +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IDirect3D9Ex, 0x02177241, 0x69FC, 0x400C, 0x8F, 0xF1, 0x93, 0xA4, 0x4D, 0xF6, 0x86, 0x1D); +#endif + #if !defined(__cplusplus) || defined(CINTERFACE) /*** IUnknown methods ***/ #define IDirect3D9Ex_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) @@ -358,6 +366,10 @@ DECLARE_INTERFACE_(IDirect3DVolume9,IUnknown) }; #undef INTERFACE +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IDirect3DVolume9, 0x24f416e6, 0x1f67, 0x4aa7, 0xb8, 0x8e, 0xd3, 0x3f, 0x6f, 0x31, 0x28, 0xa1); +#endif + #if !defined(__cplusplus) || defined(CINTERFACE) /*** IUnknown methods ***/ #define IDirect3DVolume9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) @@ -410,6 +422,10 @@ DECLARE_INTERFACE_(IDirect3DSwapChain9,IUnknown) }; #undef INTERFACE +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IDirect3DSwapChain9, 0x794950f2, 0xadfc, 0x458a, 0x90, 0x5e, 0x10, 0xa1, 0xb, 0xb, 0x50, 0x3b); +#endif + #if !defined(__cplusplus) || defined(CINTERFACE) /*** IUnknown methods ***/ #define IDirect3DSwapChain9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) @@ -464,6 +480,10 @@ DECLARE_INTERFACE_(IDirect3DSwapChain9Ex,IDirect3DSwapChain9) }; #undef INTERFACE +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IDirect3DSwapChain9Ex, 0x91886caf, 0x1c3d, 0x4d2e, 0xa0, 0xab, 0x3e, 0x4c, 0x7d, 0x8d, 0x33, 0x3); +#endif + #if !defined(__cplusplus) || defined(CINTERFACE) /*** IUnknown methods ***/ #define IDirect3DSwapChain9Ex_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) @@ -522,6 +542,10 @@ DECLARE_INTERFACE_(IDirect3DResource9,IUnknown) }; #undef INTERFACE +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IDirect3DResource9, 0x5eec05d, 0x8f7d, 0x4362, 0xb9, 0x99, 0xd1, 0xba, 0xf3, 0x57, 0xc7, 0x4); +#endif + #if !defined(__cplusplus) || defined(CINTERFACE) /*** IUnknown methods ***/ #define IDirect3DResource9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) @@ -581,6 +605,10 @@ DECLARE_INTERFACE_(IDirect3DSurface9,IDirect3DResource9) }; #undef INTERFACE +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IDirect3DSurface9, 0xcfbaf3a, 0x9ff6, 0x429a, 0x99, 0xb3, 0xa2, 0x79, 0x6a, 0xf8, 0xb8, 0x9b); +#endif + #if !defined(__cplusplus) || defined(CINTERFACE) /*** IUnknown methods ***/ #define IDirect3DSurface9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) @@ -651,6 +679,10 @@ DECLARE_INTERFACE_(IDirect3DVertexBuffer9,IDirect3DResource9) }; #undef INTERFACE +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IDirect3DVertexBuffer9, 0xb64bb1b5, 0xfd70, 0x4df6, 0xbf, 0x91, 0x19, 0xd0, 0xa1, 0x24, 0x55, 0xe3); +#endif + #if !defined(__cplusplus) || defined(CINTERFACE) /*** IUnknown methods ***/ #define IDirect3DVertexBuffer9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) @@ -715,6 +747,10 @@ DECLARE_INTERFACE_(IDirect3DIndexBuffer9,IDirect3DResource9) }; #undef INTERFACE +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IDirect3DIndexBuffer9, 0x7c9dd65e, 0xd3f7, 0x4529, 0xac, 0xee, 0x78, 0x58, 0x30, 0xac, 0xde, 0x35); +#endif + #if !defined(__cplusplus) || defined(CINTERFACE) /*** IUnknown methods ***/ #define IDirect3DIndexBuffer9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) @@ -782,6 +818,10 @@ DECLARE_INTERFACE_(IDirect3DBaseTexture9,IDirect3DResource9) }; #undef INTERFACE +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IDirect3DBaseTexture9, 0x580ca87e, 0x1d3c, 0x4d54, 0x99, 0x1d, 0xb7, 0xd3, 0xe3, 0xc2, 0x98, 0xce); +#endif + #if !defined(__cplusplus) || defined(CINTERFACE) /*** IUnknown methods ***/ #define IDirect3DBaseTexture9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) @@ -862,6 +902,10 @@ DECLARE_INTERFACE_(IDirect3DCubeTexture9,IDirect3DBaseTexture9) }; #undef INTERFACE +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IDirect3DCubeTexture9, 0xfff32f81, 0xd953, 0x473a, 0x92, 0x23, 0x93, 0xd6, 0x52, 0xab, 0xa9, 0x3f); +#endif + #if !defined(__cplusplus) || defined(CINTERFACE) /*** IUnknown methods ***/ #define IDirect3DCubeTexture9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) @@ -953,6 +997,10 @@ DECLARE_INTERFACE_(IDirect3DTexture9,IDirect3DBaseTexture9) }; #undef INTERFACE +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IDirect3DTexture9, 0x85c31227, 0x3de5, 0x4f00, 0x9b, 0x3a, 0xf1, 0x1a, 0xc3, 0x8c, 0x18, 0xb5); +#endif + #if !defined(__cplusplus) || defined(CINTERFACE) /*** IUnknown methods ***/ #define IDirect3DTexture9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) @@ -1044,6 +1092,10 @@ DECLARE_INTERFACE_(IDirect3DVolumeTexture9,IDirect3DBaseTexture9) }; #undef INTERFACE +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IDirect3DVolumeTexture9, 0x2518526c, 0xe789, 0x4111, 0xa7, 0xb9, 0x47, 0xef, 0x32, 0x8d, 0x13, 0xe6); +#endif + #if !defined(__cplusplus) || defined(CINTERFACE) /*** IUnknown methods ***/ #define IDirect3DVolumeTexture9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) @@ -1116,6 +1168,10 @@ DECLARE_INTERFACE_(IDirect3DVertexDeclaration9,IUnknown) }; #undef INTERFACE +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IDirect3DVertexDeclaration9, 0xdd13c59c, 0x36fa, 0x4098, 0xa8, 0xfb, 0xc7, 0xed, 0x39, 0xdc, 0x85, 0x46); +#endif + #if !defined(__cplusplus) || defined(CINTERFACE) /*** IUnknown methods ***/ #define IDirect3DVertexDeclaration9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) @@ -1150,6 +1206,10 @@ DECLARE_INTERFACE_(IDirect3DVertexShader9,IUnknown) }; #undef INTERFACE +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IDirect3DVertexShader9, 0xefc5557e, 0x6265, 0x4613, 0x8a, 0x94, 0x43, 0x85, 0x78, 0x89, 0xeb, 0x36); +#endif + #if !defined(__cplusplus) || defined(CINTERFACE) /*** IUnknown methods ***/ #define IDirect3DVertexShader9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) @@ -1184,6 +1244,10 @@ DECLARE_INTERFACE_(IDirect3DPixelShader9,IUnknown) }; #undef INTERFACE +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IDirect3DPixelShader9, 0x6d3bdbdc, 0x5b02, 0x4415, 0xb8, 0x52, 0xce, 0x5e, 0x8b, 0xcc, 0xb2, 0x89); +#endif + #if !defined(__cplusplus) || defined(CINTERFACE) /*** IUnknown methods ***/ #define IDirect3DPixelShader9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) @@ -1219,6 +1283,10 @@ DECLARE_INTERFACE_(IDirect3DStateBlock9,IUnknown) }; #undef INTERFACE +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IDirect3DStateBlock9, 0xb07c4fe5, 0x310d, 0x4ba8, 0xa2, 0x3c, 0x4f, 0xf, 0x20, 0x6f, 0x21, 0x8b); +#endif + #if !defined(__cplusplus) || defined(CINTERFACE) /*** IUnknown methods ***/ #define IDirect3DStateBlock9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) @@ -1258,6 +1326,10 @@ DECLARE_INTERFACE_(IDirect3DQuery9,IUnknown) }; #undef INTERFACE +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IDirect3DQuery9, 0xd9771460, 0xa695, 0x4f26, 0xbb, 0xd3, 0x27, 0xb8, 0x40, 0xb5, 0x41, 0xcc); +#endif + #if !defined(__cplusplus) || defined(CINTERFACE) /*** IUnknown methods ***/ #define IDirect3DQuery9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) @@ -1419,6 +1491,10 @@ DECLARE_INTERFACE_(IDirect3DDevice9,IUnknown) }; #undef INTERFACE +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IDirect3DDevice9, 0xd0223b96, 0xbf7a, 0x43fd, 0x92, 0xbd, 0xa4, 0x3b, 0xd, 0x82, 0xb9, 0xeb); +#endif + #if !defined(__cplusplus) || defined(CINTERFACE) /*** IUnknown methods ***/ #define IDirect3DDevice9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) @@ -1824,6 +1900,10 @@ DECLARE_INTERFACE_(IDirect3DDevice9Ex,IDirect3DDevice9) }; #undef INTERFACE +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IDirect3DDevice9Ex, 0xb18b10ce, 0x2649, 0x405a, 0x87, 0xf, 0x95, 0xf7, 0x77, 0xd4, 0x31, 0x3a); +#endif + #if !defined(__cplusplus) || defined(CINTERFACE) /*** IUnknown methods ***/ #define IDirect3DDevice9Ex_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)

1 0

Jacek Caban : mshtml: Added more refcnt tests.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 2350597df284f99a7605d077b37d5b834fc64351 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2350597df284f99a7605d077b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 21 15:54:57 2014 +0100 mshtml: Added more refcnt tests. --- dlls/mshtml/tests/activex.c | 56 ++++++++++++++++++++++++++++--------------- 1 file changed, 37 insertions(+), 19 deletions(-) diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index 147c9a7..10db835 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -119,6 +119,7 @@ static ITypeInfo *actxtest_typeinfo, *class_typeinfo; static HWND container_hwnd, plugin_hwnd; static int plugin_behavior; static BOOL no_quickact; +static LONG activex_refcnt; #define TESTACTIVEX_CLSID "{178fc163-f585-4e24-9c13-4bb7f6680746}" @@ -398,12 +399,12 @@ static HRESULT WINAPI OleControl_QueryInterface(IOleControl *iface, REFIID riid, static ULONG WINAPI OleControl_AddRef(IOleControl *iface) { - return 2; + return ++activex_refcnt; } static ULONG WINAPI OleControl_Release(IOleControl *iface) { - return 1; + return --activex_refcnt; } static HRESULT WINAPI OleControl_GetControlInfo(IOleControl *iface, CONTROLINFO *pCI) @@ -459,12 +460,12 @@ static HRESULT WINAPI QuickActivate_QueryInterface(IQuickActivate *iface, REFIID static ULONG WINAPI QuickActivate_AddRef(IQuickActivate *iface) { - return 2; + return ++activex_refcnt; } static ULONG WINAPI QuickActivate_Release(IQuickActivate *iface) { - return 1; + return --activex_refcnt; } static HRESULT WINAPI QuickActivate_QuickActivate(IQuickActivate *iface, QACONTAINER *container, QACONTROL *control) @@ -547,12 +548,12 @@ static HRESULT WINAPI PersistPropertyBag_QueryInterface(IPersistPropertyBag *ifa static ULONG WINAPI PersistPropertyBag_AddRef(IPersistPropertyBag *iface) { - return 2; + return ++activex_refcnt; } static ULONG WINAPI PersistPropertyBag_Release(IPersistPropertyBag *iface) { - return 1; + return --activex_refcnt; } static HRESULT WINAPI PersistPropertyBag_GetClassID(IPersistPropertyBag *face, CLSID *pClassID) @@ -689,12 +690,12 @@ static HRESULT WINAPI Dispatch_QueryInterface(IDispatch *iface, REFIID riid, voi static ULONG WINAPI Dispatch_AddRef(IDispatch *iface) { - return 2; + return ++activex_refcnt; } static ULONG WINAPI Dispatch_Release(IDispatch *iface) { - return 1; + return --activex_refcnt; } static HRESULT WINAPI Dispatch_GetTypeInfoCount(IDispatch *iface, UINT *pctinfo) @@ -832,12 +833,12 @@ static HRESULT WINAPI ProvideClassInfo_QueryInterface(IProvideClassInfo *iface, static ULONG WINAPI ProvideClassInfo_AddRef(IProvideClassInfo *iface) { - return 2; + return ++activex_refcnt; } static ULONG WINAPI ProvideClassInfo_Release(IProvideClassInfo *iface) { - return 1; + return --activex_refcnt; } static HRESULT WINAPI ProvideClassInfo_GetClassInfo(IProvideClassInfo *iface, ITypeInfo **ppTI) @@ -865,12 +866,12 @@ static HRESULT WINAPI ConnectionPointContainer_QueryInterface(IConnectionPointCo static ULONG WINAPI ConnectionPointContainer_AddRef(IConnectionPointContainer *iface) { - return 2; + return ++activex_refcnt; } static ULONG WINAPI ConnectionPointContainer_Release(IConnectionPointContainer *iface) { - return 1; + return --activex_refcnt; } static HRESULT WINAPI ConnectionPointContainer_EnumConnectionPoints(IConnectionPointContainer *iface, @@ -892,6 +893,7 @@ static HRESULT WINAPI ConnectionPointContainer_FindConnectionPoint(IConnectionPo CHECK_EXPECT(FindConnectionPoint); ok(IsEqualGUID(riid, &DIID_DispActiveXTest), "riid = %s\n", debugstr_guid(riid)); + IConnectionPoint_AddRef(&ConnectionPoint); *ppCP = &ConnectionPoint; return S_OK; } @@ -913,12 +915,12 @@ static HRESULT WINAPI ViewObjectEx_QueryInterface(IViewObjectEx *iface, REFIID r static ULONG WINAPI ViewObjectEx_AddRef(IViewObjectEx *iface) { - return 2; + return ++activex_refcnt; } static ULONG WINAPI ViewObjectEx_Release(IViewObjectEx *iface) { - return 1; + return --activex_refcnt; } static HRESULT WINAPI ViewObjectEx_Draw(IViewObjectEx *iface, DWORD dwDrawAspect, LONG lindex, void *pvAspect, DVTARGETDEVICE *ptd, @@ -1032,12 +1034,12 @@ static HRESULT WINAPI OleObject_QueryInterface(IOleObject *iface, REFIID riid, v static ULONG WINAPI OleObject_AddRef(IOleObject *iface) { - return 2; + return ++activex_refcnt; } static ULONG WINAPI OleObject_Release(IOleObject *iface) { - return 1; + return --activex_refcnt; } static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite *pClientSite) @@ -1291,12 +1293,12 @@ static HRESULT WINAPI OleInPlaceObject_QueryInterface(IOleInPlaceObjectWindowles static ULONG WINAPI OleInPlaceObject_AddRef(IOleInPlaceObjectWindowless *iface) { - return 2; + return ++activex_refcnt; } static ULONG WINAPI OleInPlaceObject_Release(IOleInPlaceObjectWindowless *iface) { - return 1; + return --activex_refcnt; } static HRESULT WINAPI OleInPlaceObject_GetWindow(IOleInPlaceObjectWindowless *iface, @@ -1456,6 +1458,7 @@ static HRESULT ax_qi(REFIID riid, void **ppv) }else if(IsEqualGUID(riid, &IID_ITestActiveX)) { CHECK_EXPECT(QI_ITestActiveX); *ppv = &wrapped_iface; + return S_OK; }else if(IsEqualGUID(riid, &IID_IOleWindow) || IsEqualGUID(riid, &IID_IOleInPlaceObject) || IsEqualGUID(&IID_IOleInPlaceObjectWindowless, riid)) { *ppv = plugin_behavior == TEST_DISPONLY ? NULL : &OleInPlaceObjectWindowless; @@ -1464,7 +1467,11 @@ static HRESULT ax_qi(REFIID riid, void **ppv) *ppv = NULL; } - return *ppv ? S_OK : E_NOINTERFACE; + if(!*ppv) + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) @@ -1504,6 +1511,7 @@ static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown ok(!outer, "outer = %p\n", outer); ok(IsEqualGUID(riid, &IID_IUnknown), "riid = %s\n", debugstr_guid(riid)); + activex_refcnt++; *ppv = &OleControl; return S_OK; } @@ -1739,6 +1747,7 @@ static void test_container(IHTMLDocument2 *doc_obj) ok(hres == S_OK, "QueryService(CLSID_TestActiveX) failed: %08x\n", hres); ok(unk == (IUnknown*)&OleObject, "unexpected unk %p\n", unk); CHECK_CALLED(QueryService_TestActiveX); + IUnknown_Release(unk); IServiceProvider_Release(serv_prov); @@ -2359,12 +2368,15 @@ static void release_doc(IHTMLDocument2 *doc) DestroyWindow(plugin_hwnd); plugin_hwnd = NULL; } + + ok(!activex_refcnt, "activex_refcnt = %d\n", activex_refcnt); } static void init_test(int behavior) { plugin_behavior = behavior; + activex_refcnt = 0; no_quickact = behavior == TEST_NOQUICKACT || behavior == TEST_DISPONLY; } @@ -2399,6 +2411,7 @@ static void test_event_call(void) static void test_flash_ax(void) { IHTMLDocument2 *doc; + IOleClientSite *cs; init_test(TEST_FLASH); @@ -2440,6 +2453,9 @@ static void test_flash_ax(void) test_container(notif_doc); test_object_elem(notif_doc); + IOleClientSite_AddRef(client_site); + cs = client_site; + SET_EXPECT(UIDeactivate); SET_EXPECT(Invoke_ENABLED); SET_EXPECT(Invoke_VALID); @@ -2454,6 +2470,8 @@ static void test_flash_ax(void) CHECK_CALLED(InPlaceDeactivate); CHECK_CALLED(Close); CHECK_CALLED(SetClientSite_NULL); + + IOleClientSite_Release(cs); } static void test_noquickact_ax(void)

1 0

Akihiro Sagawa : gdi32: Fix regression due to sub-pixel shift calculations fixes.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: e06d2dbc6772bf4f038847f2c7825ecdefcf4b90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e06d2dbc6772bf4f038847f2c… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Jan 24 01:47:54 2014 +0900 gdi32: Fix regression due to sub-pixel shift calculations fixes. --- dlls/gdi32/freetype.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 722a211..5f4a570 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6744,11 +6744,13 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, { gm.gmBlackBoxX += 2; gm.gmptGlyphOrigin.x -= 1; + left -= (1 << 6); } else { gm.gmBlackBoxY += 2; gm.gmptGlyphOrigin.y += 1; + top += (1 << 6); } }

1 0

Piotr Caban : msvcp60: Add std::_Fpz export.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 76db3b0debb9489b54650bf36379c246ed702f90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76db3b0debb9489b54650bf36… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 20 18:18:50 2014 +0100 msvcp60: Add std::_Fpz export. --- dlls/msvcp60/main.c | 3 +++ dlls/msvcp60/msvcp60.spec | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp60/main.c b/dlls/msvcp60/main.c index e9c6975..3c5e36f 100644 --- a/dlls/msvcp60/main.c +++ b/dlls/msvcp60/main.c @@ -54,6 +54,9 @@ DEFINE_VTBL_WRAPPER(48); #endif +/* ?_Fpz(a)std@@3_JB */ +const __int64 std_Fpz = 0; + void* (__cdecl *MSVCRT_operator_new)(MSVCP_size_t); void (__cdecl *MSVCRT_operator_delete)(void*); diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 648be15..dd553da 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -2077,7 +2077,7 @@ @ stub -arch=win64 ?_Fput@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@KA?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AEAVios_base(a)2@DPEBD_K3(a)Z @ stub -arch=win32 ?_Fput@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@KA?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@AAVios_base(a)2@GPBDII(a)Z @ stub -arch=win64 ?_Fput@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@KA?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@AEAVios_base(a)2@GPEBD_K3(a)Z -@ stub ?_Fpz(a)std@@3_JB +@ extern ?_Fpz(a)std@@3_JB std_Fpz @ thiscall -arch=win32 ?_Freeze@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@AAEXXZ(ptr) basic_string_char__Freeze @ cdecl -arch=win64 ?_Freeze@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@AEAAXXZ(ptr) basic_string_char__Freeze @ thiscall -arch=win32 ?_Freeze@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@AAEXXZ(ptr) basic_string_wchar__Freeze

1 0

Piotr Caban : msvcp90: Fix ios_base_setf implementation.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 47f4e08a93eac8acbcf1ca307b30d5e531a8dbc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47f4e08a93eac8acbcf1ca307… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 20 15:08:45 2014 +0100 msvcp90: Fix ios_base_setf implementation. --- dlls/msvcp60/ios.c | 7 ++++++- dlls/msvcp90/ios.c | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index a853f6d..b223d10 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -4494,7 +4494,12 @@ IOSB_fmtflags __thiscall ios_base_setf_mask(ios_base *this, IOSB_fmtflags flags, DEFINE_THISCALL_WRAPPER(ios_base_setf, 8) IOSB_fmtflags __thiscall ios_base_setf(ios_base *this, IOSB_fmtflags flags) { - return ios_base_setf_mask(this, flags, ~0); + IOSB_fmtflags ret = this->fmtfl; + + TRACE("(%p %x)\n", this, flags); + + this->fmtfl |= flags & FMTFLAG_mask; + return ret; } /* ?setstate(a)ios_base@std@@QAEXH_N(a)Z */ diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index c4ef9a0..98d1696 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -5165,7 +5165,12 @@ IOSB_fmtflags __thiscall ios_base_setf_mask(ios_base *this, IOSB_fmtflags flags, DEFINE_THISCALL_WRAPPER(ios_base_setf, 8) IOSB_fmtflags __thiscall ios_base_setf(ios_base *this, IOSB_fmtflags flags) { - return ios_base_setf_mask(this, flags, ~0); + IOSB_fmtflags ret = this->fmtfl; + + TRACE("(%p %x)\n", this, flags); + + this->fmtfl |= flags & FMTFLAG_mask; + return ret; } /* ?setstate(a)ios_base@std@@QAEXH_N(a)Z */

1 0

Piotr Caban : msvcp90: Fix basic_istream<wchar>::read implementation.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 75bcbece56e5158f19c1f9d0dfee50102417bc40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75bcbece56e5158f19c1f9d0d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 20 15:08:13 2014 +0100 msvcp90: Fix basic_istream<wchar>::read implementation. --- dlls/msvcp60/ios.c | 4 ++-- dlls/msvcp90/ios.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 693c376..a853f6d 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -7156,7 +7156,7 @@ static basic_istream_char* basic_istream_char__Read_s(basic_istream_char *this, DEFINE_THISCALL_WRAPPER(basic_istream_char_read, 12) basic_istream_char* __thiscall basic_istream_char_read(basic_istream_char *this, char *str, streamsize count) { - return basic_istream_char__Read_s(this, str, count, count); + return basic_istream_char__Read_s(this, str, -1, count); } /* ?_Readsome_s@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEHPADIH(a)Z */ @@ -8397,7 +8397,7 @@ static basic_istream_wchar* basic_istream_wchar__Read_s(basic_istream_wchar *thi DEFINE_THISCALL_WRAPPER(basic_istream_wchar_read, 12) basic_istream_wchar* __thiscall basic_istream_wchar_read(basic_istream_wchar *this, wchar_t *str, streamsize count) { - return basic_istream_wchar__Read_s(this, str, count, count); + return basic_istream_wchar__Read_s(this, str, -1, count); } /* ?_Readsome_s@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QAEHPA_WIH(a)Z */ diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index a89352e..c4ef9a0 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -8111,7 +8111,7 @@ DEFINE_THISCALL_WRAPPER(basic_istream_char_read, 12) #endif basic_istream_char* __thiscall basic_istream_char_read(basic_istream_char *this, char *str, streamsize count) { - return basic_istream_char__Read_s(this, str, count, count); + return basic_istream_char__Read_s(this, str, -1, count); } /* ?_Readsome_s@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEHPADIH(a)Z */ @@ -9418,7 +9418,7 @@ DEFINE_THISCALL_WRAPPER(basic_istream_wchar_read, 12) #endif basic_istream_wchar* __thiscall basic_istream_wchar_read(basic_istream_wchar *this, wchar_t *str, streamsize count) { - return basic_istream_wchar__Read_s(this, str, count, count); + return basic_istream_wchar__Read_s(this, str, -1, count); } /* ?_Readsome_s@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QAEHPA_WIH(a)Z */

1 0