March 2013 - Wine-Commits - list.winehq.org

Piotr Caban : msvcrt: Fixed fgetwc behavior on multibyte characters and Unicode files.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: 6eeb000c90f640489964fdb764fe27271e0f67d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eeb000c90f640489964fdb76… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 20 10:40:45 2013 +0100 msvcrt: Fixed fgetwc behavior on multibyte characters and Unicode files. --- dlls/msvcrt/file.c | 80 ++++++++++++++++++++++---------------------------- dlls/msvcrt/msvcrt.h | 1 + 2 files changed, 36 insertions(+), 45 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 6e8b324..28dd132 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3205,60 +3205,50 @@ char * CDECL MSVCRT_fgets(char *s, int size, MSVCRT_FILE* file) /********************************************************************* * fgetwc (MSVCRT.@) - * - * In MSVCRT__O_TEXT mode, multibyte characters are read from the file, dropping - * the CR from CR/LF combinations */ MSVCRT_wint_t CDECL MSVCRT_fgetwc(MSVCRT_FILE* file) { - int c; + MSVCRT_wint_t ret; + int ch; - MSVCRT__lock_file(file); - if (!(msvcrt_get_ioinfo(file->_file)->wxflag & WX_TEXT)) - { - MSVCRT_wchar_t wc; - unsigned int i; - int j; - char *chp, *wcp; - wcp = (char *)&wc; - for(i=0; i<sizeof(wc); i++) - { - if (file->_cnt>0) - { - file->_cnt--; - chp = file->_ptr++; - wcp[i] = *chp; - } - else - { - j = MSVCRT__filbuf(file); - if(file->_cnt<=0) - { - file->_flag |= (file->_cnt == 0) ? MSVCRT__IOEOF : MSVCRT__IOERR; - file->_cnt = 0; + MSVCRT__lock_file(file); - MSVCRT__unlock_file(file); - return MSVCRT_WEOF; - } - wcp[i] = j; + if((msvcrt_get_ioinfo(file->_file)->exflag & (EF_UTF8 | EF_UTF16)) + || !(msvcrt_get_ioinfo(file->_file)->wxflag & WX_TEXT)) { + char *p; + + for(p=(char*)&ret; (MSVCRT_wint_t*)p<&ret+1; p++) { + ch = MSVCRT_fgetc(file); + if(ch == MSVCRT_EOF) { + ret = MSVCRT_WEOF; + break; + } + *p = (char)ch; + } + }else { + char mbs[MSVCRT_MB_LEN_MAX]; + int len = 0; + + ch = MSVCRT_fgetc(file); + if(ch != MSVCRT_EOF) { + mbs[0] = (char)ch; + if(MSVCRT_isleadbyte((unsigned char)mbs[0])) { + ch = MSVCRT_fgetc(file); + if(ch != MSVCRT_EOF) { + mbs[1] = (char)ch; + len = 2; + } + }else { + len = 1; + } } - } - MSVCRT__unlock_file(file); - return wc; - } - - c = MSVCRT_fgetc(file); - if ((get_locinfo()->mb_cur_max > 1) && MSVCRT_isleadbyte(c)) - { - FIXME("Treat Multibyte characters\n"); + if(!len || MSVCRT_mbtowc(&ret, mbs, len)==-1) + ret = MSVCRT_WEOF; } - MSVCRT__unlock_file(file); - if (c == MSVCRT_EOF) - return MSVCRT_WEOF; - else - return (MSVCRT_wint_t)c; + MSVCRT__unlock_file(file); + return ret; } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index e2ff7a0..3bbbe93 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -945,6 +945,7 @@ int __cdecl _getch(void); int __cdecl _ismbblead(unsigned int); int __cdecl _ismbclegal(unsigned int c); int __cdecl _ismbstrail(const unsigned char* start, const unsigned char* str); +int __cdecl MSVCRT_mbtowc(MSVCRT_wchar_t*,const char*,MSVCRT_size_t); MSVCRT_size_t __cdecl MSVCRT_mbstowcs(MSVCRT_wchar_t*,const char*,MSVCRT_size_t); MSVCRT_intptr_t __cdecl MSVCRT__spawnve(int,const char*,const char* const *,const char* const *); MSVCRT_intptr_t __cdecl MSVRT__spawnvpe(int,const char*,const char* const *,const char* const *);

1 0

Qian Hong : atl: Don't forward AtlAxWinInit to atl100.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: 6b616f3ea8386d301eaa03caf103879c3a186e56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b616f3ea8386d301eaa03caf… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri Mar 15 22:16:20 2013 +0800 atl: Don't forward AtlAxWinInit to atl100. --- dlls/atl/atl.spec | 2 +- dlls/atl/atl_main.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/atl/tests/atl_ax.c | 21 ++++++++++++++++++++ 3 files changed, 70 insertions(+), 1 deletions(-) diff --git a/dlls/atl/atl.spec b/dlls/atl/atl.spec index 1a167a7..5b31804 100644 --- a/dlls/atl/atl.spec +++ b/dlls/atl/atl.spec @@ -33,7 +33,7 @@ 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 -42 stdcall AtlAxWinInit() atl100.AtlAxWinInit +42 stdcall AtlAxWinInit() 43 stdcall AtlModuleAddCreateWndData(ptr ptr ptr) 44 stdcall AtlModuleExtractCreateWndData(ptr) 45 stdcall AtlModuleRegisterWndClassInfoW(ptr ptr ptr) diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index 2a96369..cc3cce1 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -584,3 +584,51 @@ DWORD WINAPI AtlGetVersion(void *pReserved) { return _ATL_VER; } + +/********************************************************************** + * AtlAxWin class window procedure + */ +static LRESULT CALLBACK AtlAxWin_wndproc( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam ) +{ + if ( wMsg == 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, wMsg, wParam, lParam ); +} + +BOOL WINAPI AtlAxWinInit(void) +{ + WNDCLASSEXW wcex; + const WCHAR AtlAxWin[] = {'A','t','l','A','x','W','i','n',0}; + + FIXME("semi-stub\n"); + + if ( FAILED( OleInitialize(NULL) ) ) + return FALSE; + + wcex.cbSize = sizeof(wcex); + wcex.style = CS_GLOBALCLASS; + 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 = AtlAxWin; + if ( !RegisterClassExW( &wcex ) ) + return FALSE; + + return TRUE; +} diff --git a/dlls/atl/tests/atl_ax.c b/dlls/atl/tests/atl_ax.c index 4555bd6..ea9ce32 100644 --- a/dlls/atl/tests/atl_ax.c +++ b/dlls/atl/tests/atl_ax.c @@ -35,6 +35,7 @@ #include <olectl.h> #include <ocidl.h> #include <exdisp.h> +#include <atlbase.h> static HRESULT (WINAPI *pAtlAxAttachControl)(IUnknown *, HWND, IUnknown **); @@ -114,6 +115,24 @@ static void test_AtlAxAttachControl(void) DestroyWindow(hwnd); } +static void test_ax_win(void) +{ + BOOL ret; + WNDCLASSEXW wcex; + static const WCHAR AtlAxWin[] = {'A','t','l','A','x','W','i','n',0}; + static HMODULE hinstance = 0; + + ret = AtlAxWinInit(); + ok(ret, "AtlAxWinInit failed\n"); + + hinstance = GetModuleHandleA(NULL); + memset(&wcex, 0, sizeof(wcex)); + wcex.cbSize = sizeof(wcex); + ret = GetClassInfoExW(hinstance, AtlAxWin, &wcex); + ok(ret, "AtlAxWin has not registered\n"); + ok(wcex.style == CS_GLOBALCLASS, "wcex.style %08x\n", wcex.style); +} + START_TEST(atl_ax) { init_function_pointers(); @@ -128,5 +147,7 @@ START_TEST(atl_ax) else win_skip("AtlAxAttachControl is not available\n"); + test_ax_win(); + CoUninitialize(); }

1 0

Qian Hong : atl80: Don't forward AtlAxWinInit to atl100.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: cd321cbea80d37521a1c0b23042bda0784025a62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd321cbea80d37521a1c0b230… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri Mar 15 22:15:46 2013 +0800 atl80: Don't forward AtlAxWinInit to atl100. --- configure | 1 + configure.ac | 1 + dlls/atl80/Makefile.in | 2 +- dlls/atl80/atl80.c | 60 +++++++++++++++++++++++++++++++++++++ dlls/atl80/atl80.spec | 2 +- dlls/atl80/tests/Makefile.in | 8 +++++ dlls/atl80/tests/atl.c | 67 ++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 139 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 5d292dd..5a45d6d 100755 --- a/configure +++ b/configure @@ -15682,6 +15682,7 @@ wine_fn_config_test dlls/atl/tests atl_test wine_fn_config_dll atl100 enable_atl100 implib wine_fn_config_test dlls/atl100/tests atl100_test wine_fn_config_dll atl80 enable_atl80 implib +wine_fn_config_test dlls/atl80/tests atl80_test wine_fn_config_dll authz enable_authz wine_fn_config_dll avicap32 enable_avicap32 implib wine_fn_config_dll avifil32 enable_avifil32 implib,po diff --git a/configure.ac b/configure.ac index 895596a..34341c9 100644 --- a/configure.ac +++ b/configure.ac @@ -2565,6 +2565,7 @@ WINE_CONFIG_TEST(dlls/atl/tests) WINE_CONFIG_DLL(atl100,,[implib]) WINE_CONFIG_TEST(dlls/atl100/tests) WINE_CONFIG_DLL(atl80,,[implib]) +WINE_CONFIG_TEST(dlls/atl80/tests) WINE_CONFIG_DLL(authz) WINE_CONFIG_DLL(avicap32,,[implib]) WINE_CONFIG_DLL(avifil32,,[implib,po]) diff --git a/dlls/atl80/Makefile.in b/dlls/atl80/Makefile.in index 71cb651..5cf626e 100644 --- a/dlls/atl80/Makefile.in +++ b/dlls/atl80/Makefile.in @@ -1,6 +1,6 @@ MODULE = atl80.dll IMPORTLIB = atl80 -IMPORTS = atl100 oleaut32 +IMPORTS = atl100 oleaut32 user32 ole32 EXTRADEFS = -D_ATL_VER=_ATL_VER_80 diff --git a/dlls/atl80/atl80.c b/dlls/atl80/atl80.c index 2cee94c..b5d571b 100644 --- a/dlls/atl80/atl80.c +++ b/dlls/atl80/atl80.c @@ -16,8 +16,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> +#include <stdio.h> + #define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "winuser.h" #include "atlbase.h" #include "wine/debug.h" @@ -90,3 +97,56 @@ DWORD WINAPI AtlGetVersion(void *pReserved) { return _ATL_VER; } + +/********************************************************************** + * AtlAxWin class window procedure + */ +static LRESULT CALLBACK AtlAxWin_wndproc( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam ) +{ + if ( wMsg == 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, wMsg, wParam, lParam ); +} + +BOOL WINAPI AtlAxWinInit(void) +{ + WNDCLASSEXW wcex; + const WCHAR AtlAxWin80[] = {'A','t','l','A','x','W','i','n','8','0',0}; + const WCHAR AtlAxWinLic80[] = {'A','t','l','A','x','W','i','n','L','i','c','8','0',0}; + + FIXME("semi-stub\n"); + + 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 = AtlAxWin80; + if ( !RegisterClassExW( &wcex ) ) + return FALSE; + + wcex.lpszClassName = AtlAxWinLic80; + if ( !RegisterClassExW( &wcex ) ) + return FALSE; + + return TRUE; +} diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec index dbd38aa..f8d409c 100644 --- a/dlls/atl80/atl80.spec +++ b/dlls/atl80/atl80.spec @@ -27,7 +27,7 @@ 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 -42 stdcall AtlAxWinInit() atl100.AtlAxWinInit +42 stdcall AtlAxWinInit() 43 stdcall AtlWinModuleAddCreateWndData(ptr ptr ptr) atl100.AtlWinModuleAddCreateWndData 44 stdcall AtlWinModuleExtractCreateWndData(ptr) atl100.AtlWinModuleExtractCreateWndData 45 stub AtlWinModuleRegisterWndClassInfoW diff --git a/dlls/atl80/tests/Makefile.in b/dlls/atl80/tests/Makefile.in new file mode 100644 index 0000000..c4d9222 --- /dev/null +++ b/dlls/atl80/tests/Makefile.in @@ -0,0 +1,8 @@ +TESTDLL = atl80.dll +IMPORTS = uuid atl80 oleaut32 ole32 advapi32 user32 +EXTRADEFS = -D_ATL_VER=_ATL_VER_80 + +C_SRCS = \ + atl.c + +(a)MAKE_TEST_RULES@ diff --git a/dlls/atl80/tests/atl.c b/dlls/atl80/tests/atl.c new file mode 100644 index 0000000..b88177d --- /dev/null +++ b/dlls/atl80/tests/atl.c @@ -0,0 +1,67 @@ +/* + * Copyright 2013 Qian Hong for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS +#define CONST_VTABLE + +#include <windef.h> +#include <winbase.h> +#include <winuser.h> + +#include <atlbase.h> +#include <mshtml.h> + +#include <wine/test.h> + +static void test_ax_win(void) +{ + BOOL ret; + WNDCLASSEXW wcex; + static const WCHAR AtlAxWin80[] = {'A','t','l','A','x','W','i','n','8','0',0}; + static const WCHAR AtlAxWinLic80[] = {'A','t','l','A','x','W','i','n','L','i','c','8','0',0}; + static HMODULE hinstance = 0; + + ret = AtlAxWinInit(); + ok(ret, "AtlAxWinInit failed\n"); + + hinstance = GetModuleHandleA(NULL); + + memset(&wcex, 0, sizeof(wcex)); + wcex.cbSize = sizeof(wcex); + ret = GetClassInfoExW(hinstance, AtlAxWin80, &wcex); + ok(ret, "AtlAxWin80 has not registered\n"); + ok(wcex.style == (CS_GLOBALCLASS | CS_DBLCLKS), "wcex.style %08x\n", wcex.style); + + memset(&wcex, 0, sizeof(wcex)); + wcex.cbSize = sizeof(wcex); + ret = GetClassInfoExW(hinstance, AtlAxWinLic80, &wcex); + ok(ret, "AtlAxWinLic80 has not registered\n"); + ok(wcex.style == (CS_GLOBALCLASS | CS_DBLCLKS), "wcex.style %08x\n", wcex.style); +} + +START_TEST(atl) +{ + CoInitialize(NULL); + + test_ax_win(); + + CoUninitialize(); +}

1 0

Qian Hong : atl100: Fixed register class names in AtlAxWinInit.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: ef601fcb7ee71f35c310cb767bd90ae25ea372a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef601fcb7ee71f35c310cb767… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri Mar 15 22:13:06 2013 +0800 atl100: Fixed register class names in AtlAxWinInit. --- dlls/atl100/atl_ax.c | 9 +++++++-- dlls/atl100/tests/atl.c | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/atl100/atl_ax.c b/dlls/atl100/atl_ax.c index 4874d39..cdefbea 100644 --- a/dlls/atl100/atl_ax.c +++ b/dlls/atl100/atl_ax.c @@ -86,7 +86,8 @@ static LRESULT CALLBACK AtlAxWin_wndproc( HWND hWnd, UINT wMsg, WPARAM wParam, L BOOL WINAPI AtlAxWinInit(void) { WNDCLASSEXW wcex; - const WCHAR AtlAxWin[] = {'A','t','l','A','x','W','i','n',0}; + 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}; FIXME("semi-stub\n"); @@ -105,7 +106,11 @@ BOOL WINAPI AtlAxWinInit(void) wcex.hIconSm = 0; wcex.lpfnWndProc = AtlAxWin_wndproc; - wcex.lpszClassName = AtlAxWin; + wcex.lpszClassName = AtlAxWin100; + if ( !RegisterClassExW( &wcex ) ) + return FALSE; + + wcex.lpszClassName = AtlAxWinLic100; if ( !RegisterClassExW( &wcex ) ) return FALSE; diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index 40d8583..76fa9c4 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -582,12 +582,12 @@ static void test_ax_win(void) memset(&wcex, 0, sizeof(wcex)); wcex.cbSize = sizeof(wcex); ret = GetClassInfoExW(hinstance, AtlAxWin100, &wcex); - todo_wine ok(ret, "AtlAxWin100 has not registered\n"); + ok(ret, "AtlAxWin100 has not registered\n"); memset(&wcex, 0, sizeof(wcex)); wcex.cbSize = sizeof(wcex); ret = GetClassInfoExW(hinstance, AtlAxWinLic100, &wcex); - todo_wine ok(ret, "AtlAxWinLic100 has not registered\n"); + ok(ret, "AtlAxWinLic100 has not registered\n"); } START_TEST(atl)

1 0

Jimmy Rentz : advapi32: Fix segfault in OpenService.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: c61df085432c5abe855c8df6043e46af1bf678ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=c61df085432c5abe855c8df60… Author: Jimmy Rentz <rentzjam(a)gmail.com> Date: Fri Mar 15 22:18:44 2013 -0400 advapi32: Fix segfault in OpenService. --- dlls/advapi32/service.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 4c694b1..b591449 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -950,7 +950,7 @@ DWORD SERV_OpenServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, __ENDTRY if (err != ERROR_SUCCESS) - handle = 0; + *handle = 0; TRACE("returning %p\n", *handle); return err;

1 0

Piotr Caban : vbscript: Added IMatch interface to Match2 object.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: 79632a2212cdcb5b0bb62b18547d57adeb069eef URL: http://source.winehq.org/git/wine.git/?a=commit;h=79632a2212cdcb5b0bb62b185… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 25 12:34:49 2013 +0100 vbscript: Added IMatch interface to Match2 object. --- dlls/vbscript/tests/vbscript.c | 4 ++ dlls/vbscript/vbregexp.c | 87 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/tests/vbscript.c b/dlls/vbscript/tests/vbscript.c index f37c7cb..9e86a5f 100644 --- a/dlls/vbscript/tests/vbscript.c +++ b/dlls/vbscript/tests/vbscript.c @@ -875,6 +875,10 @@ static void test_RegExp(void) ok(hres == S_OK, "QueryInterface(IID_IMatch2) returned %x\n", hres); IDispatch_Release(disp); + hres = IMatch2_QueryInterface(match, &IID_IMatch, (void**)&unk); + ok(hres == S_OK, "QueryInterface(IID_IMatch) returned %x\n", hres); + IUnknown_Release(unk); + hres = IMatch2_get_Value(match, NULL); ok(hres == E_POINTER, "get_Value returned %x, expected E_POINTER\n", hres); diff --git a/dlls/vbscript/vbregexp.c b/dlls/vbscript/vbregexp.c index b464232..ada364f 100644 --- a/dlls/vbscript/vbregexp.c +++ b/dlls/vbscript/vbregexp.c @@ -91,6 +91,7 @@ struct SubMatches { typedef struct Match2 { IMatch2 IMatch2_iface; + IMatch IMatch_iface; LONG ref; @@ -354,6 +355,9 @@ static HRESULT WINAPI Match2_QueryInterface( }else if(IsEqualGUID(riid, &IID_IMatch2)) { TRACE("(%p)->(IID_IMatch2 %p)\n", This, ppv); *ppv = &This->IMatch2_iface; + }else if(IsEqualGUID(riid, &IID_IMatch)) { + TRACE("(%p)->(IID_IMatch %p)\n", This, ppv); + *ppv = &This->IMatch_iface; }else if(IsEqualGUID(riid, &IID_IDispatchEx)) { TRACE("(%p)->(IID_IDispatchEx %p)\n", This, ppv); *ppv = NULL; @@ -510,6 +514,88 @@ static const IMatch2Vtbl Match2Vtbl = { Match2_get_SubMatches }; +static inline Match2 *impl_from_IMatch(IMatch *iface) +{ + return CONTAINING_RECORD(iface, Match2, IMatch_iface); +} + +static HRESULT WINAPI Match_QueryInterface(IMatch *iface, REFIID riid, void **ppv) +{ + Match2 *This = impl_from_IMatch(iface); + return IMatch2_QueryInterface(&This->IMatch2_iface, riid, ppv); +} + +static ULONG WINAPI Match_AddRef(IMatch *iface) +{ + Match2 *This = impl_from_IMatch(iface); + return IMatch2_AddRef(&This->IMatch2_iface); +} + +static ULONG WINAPI Match_Release(IMatch *iface) +{ + Match2 *This = impl_from_IMatch(iface); + return IMatch2_Release(&This->IMatch2_iface); +} + +static HRESULT WINAPI Match_GetTypeInfoCount(IMatch *iface, UINT *pctinfo) +{ + Match2 *This = impl_from_IMatch(iface); + return IMatch2_GetTypeInfoCount(&This->IMatch2_iface, pctinfo); +} + +static HRESULT WINAPI Match_GetTypeInfo(IMatch *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) +{ + Match2 *This = impl_from_IMatch(iface); + return IMatch2_GetTypeInfo(&This->IMatch2_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI Match_GetIDsOfNames(IMatch *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + Match2 *This = impl_from_IMatch(iface); + return IMatch2_GetIDsOfNames(&This->IMatch2_iface, riid, rgszNames, cNames, lcid, rgDispId); +} + +static HRESULT WINAPI Match_Invoke(IMatch *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + Match2 *This = impl_from_IMatch(iface); + return IMatch2_Invoke(&This->IMatch2_iface, dispIdMember, riid, lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI Match_get_Value(IMatch *iface, BSTR *pValue) +{ + Match2 *This = impl_from_IMatch(iface); + return IMatch2_get_Value(&This->IMatch2_iface, pValue); +} + +static HRESULT WINAPI Match_get_FirstIndex(IMatch *iface, LONG *pFirstIndex) +{ + Match2 *This = impl_from_IMatch(iface); + return IMatch2_get_FirstIndex(&This->IMatch2_iface, pFirstIndex); +} + +static HRESULT WINAPI Match_get_Length(IMatch *iface, LONG *pLength) +{ + Match2 *This = impl_from_IMatch(iface); + return IMatch2_get_Length(&This->IMatch2_iface, pLength); +} + +static IMatchVtbl MatchVtbl = { + Match_QueryInterface, + Match_AddRef, + Match_Release, + Match_GetTypeInfoCount, + Match_GetTypeInfo, + Match_GetIDsOfNames, + Match_Invoke, + Match_get_Value, + Match_get_FirstIndex, + Match_get_Length +}; + static HRESULT create_match2(DWORD pos, match_state_t **result, IMatch2 **match) { Match2 *ret; @@ -533,6 +619,7 @@ static HRESULT create_match2(DWORD pos, match_state_t **result, IMatch2 **match) *result = NULL; ret->IMatch2_iface.lpVtbl = &Match2Vtbl; + ret->IMatch_iface.lpVtbl = &MatchVtbl; ret->ref = 1; *match = &ret->IMatch2_iface;

1 0

Hans Leidekker : rpcrt4: Use the right port for https connections.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: 9967aed09db32909ce7116e7cad804bec8998dc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9967aed09db32909ce7116e7c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 25 13:26:03 2013 +0100 rpcrt4: Use the right port for https connections. --- dlls/rpcrt4/rpc_transport.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index fc81bbe..6adc289 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -2066,7 +2066,7 @@ static RPC_STATUS rpcrt4_http_internet_connect(RpcConnection_http *httpc) LPWSTR password = NULL; LPWSTR servername = NULL; const WCHAR *option; - INTERNET_PORT port = INTERNET_INVALID_PORT_NUMBER; /* use default port */ + INTERNET_PORT port; if (httpc->common.QOS && (httpc->common.QOS->qos->AdditionalSecurityInfoType == RPC_C_AUTHN_INFO_TYPE_HTTP)) @@ -2163,6 +2163,11 @@ static RPC_STATUS rpcrt4_http_internet_connect(RpcConnection_http *httpc) MultiByteToWideChar(CP_ACP, 0, httpc->common.NetworkAddr, -1, servername, strlen(httpc->common.NetworkAddr) + 1); } + port = (httpc->common.QOS && + (httpc->common.QOS->qos->AdditionalSecurityInfoType == RPC_C_AUTHN_INFO_TYPE_HTTP) && + (httpc->common.QOS->qos->u.HttpCredentials->Flags & RPC_C_HTTP_FLAG_USE_SSL)) ? + INTERNET_DEFAULT_HTTPS_PORT : INTERNET_DEFAULT_HTTP_PORT; + httpc->session = InternetConnectW(httpc->app_info, servername, port, user, password, INTERNET_SERVICE_HTTP, 0, 0);

1 0

André Hentschel : ntdll: Add stubs for RtlAddFunctionTable and RtlDeleteFunctionTable on ARM.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: df7f4fb72031154751f4f70fb4d54e2467cef4b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df7f4fb72031154751f4f70fb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Mar 23 17:20:28 2013 +0100 ntdll: Add stubs for RtlAddFunctionTable and RtlDeleteFunctionTable on ARM. --- dlls/kernel32/kernel32.spec | 4 ++-- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/signal_arm.c | 20 ++++++++++++++++++++ include/winnt.h | 3 +++ 4 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 93bfb77..a07a9ff 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1028,11 +1028,11 @@ @ stdcall ResetWriteWatch(ptr long) @ stdcall RestoreLastError(long) ntdll.RtlRestoreLastWin32Error @ stdcall ResumeThread(long) -@ cdecl -arch=x86_64 RtlAddFunctionTable(ptr long long) ntdll.RtlAddFunctionTable +@ cdecl -arch=arm,x86_64 RtlAddFunctionTable(ptr long long) ntdll.RtlAddFunctionTable @ stdcall -register RtlCaptureContext(ptr) ntdll.RtlCaptureContext @ stdcall RtlCaptureStackBackTrace(long long ptr ptr) ntdll.RtlCaptureStackBackTrace @ stdcall -arch=x86_64 RtlCompareMemory(ptr ptr long) ntdll.RtlCompareMemory -@ cdecl -arch=x86_64 RtlDeleteFunctionTable(ptr) ntdll.RtlDeleteFunctionTable +@ cdecl -arch=arm,x86_64 RtlDeleteFunctionTable(ptr) ntdll.RtlDeleteFunctionTable @ stdcall RtlFillMemory(ptr long long) ntdll.RtlFillMemory @ stdcall -arch=x86_64 RtlLookupFunctionEntry(long ptr ptr) ntdll.RtlLookupFunctionEntry @ stdcall RtlMoveMemory(ptr ptr long) ntdll.RtlMoveMemory diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 83e9260..d67c85e 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -409,7 +409,7 @@ # @ stub RtlAddAuditAccessObjectAce # @ stub RtlAddCompoundAce # @ stub RtlAddRange -@ cdecl -arch=x86_64 RtlAddFunctionTable(ptr long long) +@ cdecl -arch=arm,x86_64 RtlAddFunctionTable(ptr long long) @ stdcall RtlAddRefActivationContext(ptr) # @ stub RtlAddRefMemoryStream @ stdcall RtlAddVectoredExceptionHandler(long ptr) @@ -515,7 +515,7 @@ @ stdcall RtlDeleteCriticalSection(ptr) @ stub RtlDeleteElementGenericTable @ stub RtlDeleteElementGenericTableAvl -@ cdecl -arch=x86_64 RtlDeleteFunctionTable(ptr) +@ cdecl -arch=arm,x86_64 RtlDeleteFunctionTable(ptr) @ stub RtlDeleteNoSplay @ stub RtlDeleteOwnersRanges @ stub RtlDeleteRange diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index ce6a6b6..f9cde38 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -913,6 +913,26 @@ void __wine_enter_vm86( CONTEXT *context ) MESSAGE("vm86 mode not supported on this platform\n"); } + +/********************************************************************** + * RtlAddFunctionTable (NTDLL.@) + */ +BOOLEAN CDECL RtlAddFunctionTable( RUNTIME_FUNCTION *table, DWORD count, DWORD addr ) +{ + FIXME( "%p %u %x: stub\n", table, count, addr ); + return TRUE; +} + + +/********************************************************************** + * RtlDeleteFunctionTable (NTDLL.@) + */ +BOOLEAN CDECL RtlDeleteFunctionTable( RUNTIME_FUNCTION *table ) +{ + FIXME( "%p: stub\n", table ); + return TRUE; +} + /*********************************************************************** * RtlUnwind (NTDLL.@) */ diff --git a/include/winnt.h b/include/winnt.h index 447e727..a40ff75 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -1708,6 +1708,9 @@ typedef struct _CONTEXT { ULONG Cpsr; } CONTEXT; +BOOLEAN CDECL RtlAddFunctionTable(RUNTIME_FUNCTION*,DWORD,DWORD); +BOOLEAN CDECL RtlDeleteFunctionTable(RUNTIME_FUNCTION*); + #endif /* __arm__ */ #ifdef __aarch64__

1 0

André Hentschel : winedump: Recognize IMAGE_DEBUG_TYPE_CLSID.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: 5d712e7ea08fed6e0a926458d9870422b0121d14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d712e7ea08fed6e0a926458d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Mar 23 17:16:20 2013 +0100 winedump: Recognize IMAGE_DEBUG_TYPE_CLSID. --- include/winnt.h | 1 + tools/winedump/pe.c | 3 +++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index b701de3..447e727 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3436,6 +3436,7 @@ typedef struct _IMAGE_DEBUG_DIRECTORY { #define IMAGE_DEBUG_TYPE_OMAP_FROM_SRC 8 #define IMAGE_DEBUG_TYPE_BORLAND 9 #define IMAGE_DEBUG_TYPE_RESERVED10 10 +#define IMAGE_DEBUG_TYPE_CLSID 11 typedef enum ReplacesCorHdrNumericDefines { diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index b6c8a34..bf29082 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -871,6 +871,7 @@ static void dump_dir_debug_dir(const IMAGE_DEBUG_DIRECTORY* idd, int idx) case IMAGE_DEBUG_TYPE_OMAP_FROM_SRC:str = "OMAP_FROM_SRC"; break; case IMAGE_DEBUG_TYPE_BORLAND: str = "BORLAND"; break; case IMAGE_DEBUG_TYPE_RESERVED10: str = "RESERVED10"; break; + case IMAGE_DEBUG_TYPE_CLSID: str = "CLSID"; break; } printf(" Type: %u (%s)\n", idd->Type, str); printf(" SizeOfData: %u\n", idd->SizeOfData); @@ -915,6 +916,8 @@ static void dump_dir_debug_dir(const IMAGE_DEBUG_DIRECTORY* idd, int idx) break; case IMAGE_DEBUG_TYPE_RESERVED10: break; + case IMAGE_DEBUG_TYPE_CLSID: + break; } printf("\n"); }

1 0

Andrew Eikum : riched20: EM_FINDTEXT implementation should match richedit character type.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: 3f02c241631ee2fff6bfbb2b075187479e4ad4c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f02c241631ee2fff6bfbb2b0… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Mar 22 11:34:42 2013 -0500 riched20: EM_FINDTEXT implementation should match richedit character type. --- dlls/riched20/editor.c | 42 ++++++++----- dlls/riched20/tests/editor.c | 137 ++++++++++++++++++++++++++++++------------ 2 files changed, 125 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3f02c241631ee2fff6bfb…

1 0