wine-commits March 2013

wine-commits@winehq.org

2 participants
531 discussions

Lucas Zawacki : dinput: Initialize all axis (from 0 to ABS_MAX) with -1.
by Alexandre Julliard 25 Mar '13

25 Mar '13

Module: wine Branch: master Commit: 45a19b0c9b32b9a02be11b597a7db5341b310474 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45a19b0c9b32b9a02be11b597… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Wed Mar 20 19:35:08 2013 -0300 dinput: Initialize all axis (from 0 to ABS_MAX) with -1. --- dlls/dinput/joystick_linuxinput.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 0a044a5..5ed9bde 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -445,9 +445,10 @@ static JoystickImpl *alloc_device(REFGUID rguid, IDirectInputImpl *dinput, unsig newDevice->generic.base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": JoystickImpl*->base.crit"); /* Count number of available axes - supported Axis & POVs */ - for (i = 0; i < WINE_JOYSTICK_MAX_AXES; i++) + for (i = 0; i < ABS_MAX; i++) { - if (test_bit(newDevice->joydev->absbits, i)) + if (i < WINE_JOYSTICK_MAX_AXES && + test_bit(newDevice->joydev->absbits, i)) { newDevice->generic.device_axis_count++; newDevice->dev_axes_to_di[i] = idx;

1 0

Piotr Caban : msvcrt: Fixed fgetwc behavior on multibyte characters and Unicode files.
by Alexandre Julliard 25 Mar '13

25 Mar '13

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

Piotr Caban : msvcrt: Remove incorrect cast in fgetws function.
by Alexandre Julliard 25 Mar '13

25 Mar '13

Module: wine Branch: master Commit: cde73251d818afdb135b722889d6f083fdb6c45a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cde73251d818afdb135b72288… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 20 10:39:37 2013 +0100 msvcrt: Remove incorrect cast in fgetws function. --- dlls/msvcrt/file.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 28aefc1..6e8b324 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3315,7 +3315,7 @@ MSVCRT_wint_t CDECL MSVCRT_getwchar(void) */ MSVCRT_wchar_t * CDECL MSVCRT_fgetws(MSVCRT_wchar_t *s, int size, MSVCRT_FILE* file) { - int cc = MSVCRT_WEOF; + MSVCRT_wint_t cc = MSVCRT_WEOF; MSVCRT_wchar_t * buf_start = s; TRACE(":file(%p) fd (%d) str (%p) len (%d)\n", @@ -3325,7 +3325,7 @@ MSVCRT_wchar_t * CDECL MSVCRT_fgetws(MSVCRT_wchar_t *s, int size, MSVCRT_FILE* f while ((size >1) && (cc = MSVCRT_fgetwc(file)) != MSVCRT_WEOF && cc != '\n') { - *s++ = (char)cc; + *s++ = cc; size --; } if ((cc == MSVCRT_WEOF) && (s == buf_start)) /* If nothing read, return 0*/

1 0

Qian Hong : atl: Don't forward AtlAxWinInit to atl100.
by Alexandre Julliard 25 Mar '13

25 Mar '13

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 25 Mar '13

25 Mar '13

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 + +@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 types in AtlAxWinInit.
by Alexandre Julliard 25 Mar '13

25 Mar '13

Module: wine Branch: master Commit: ed62fcb70085c8228e2ad16953dc66a16bde73d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed62fcb70085c8228e2ad1695… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri Mar 15 22:14:01 2013 +0800 atl100: Fixed register class types in AtlAxWinInit. --- dlls/atl100/atl_ax.c | 2 +- dlls/atl100/tests/atl.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/atl100/atl_ax.c b/dlls/atl100/atl_ax.c index cdefbea..319b3e8 100644 --- a/dlls/atl100/atl_ax.c +++ b/dlls/atl100/atl_ax.c @@ -95,7 +95,7 @@ BOOL WINAPI AtlAxWinInit(void) return FALSE; wcex.cbSize = sizeof(wcex); - wcex.style = 0; + wcex.style = CS_GLOBALCLASS | CS_DBLCLKS; wcex.cbClsExtra = 0; wcex.cbWndExtra = 0; wcex.hInstance = GetModuleHandleW( NULL ); diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index 76fa9c4..1304ac1 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -583,11 +583,13 @@ static void test_ax_win(void) wcex.cbSize = sizeof(wcex); ret = GetClassInfoExW(hinstance, AtlAxWin100, &wcex); ok(ret, "AtlAxWin100 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, AtlAxWinLic100, &wcex); ok(ret, "AtlAxWinLic100 has not registered\n"); + ok(wcex.style == (CS_GLOBALCLASS | CS_DBLCLKS), "wcex.style %08x\n", wcex.style); } START_TEST(atl)

1 0

Qian Hong : atl100: Fixed register class names in AtlAxWinInit.
by Alexandre Julliard 25 Mar '13

25 Mar '13

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

Qian Hong : atl100/tests: Added class name test for AtlAxWinInit.
by Alexandre Julliard 25 Mar '13

25 Mar '13

Module: wine Branch: master Commit: c02bf8817e04cee335003527668ed954d24e1def URL: http://source.winehq.org/git/wine.git/?a=commit;h=c02bf8817e04cee3350035276… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri Mar 15 22:11:55 2013 +0800 atl100/tests: Added class name test for AtlAxWinInit. --- dlls/atl100/tests/Makefile.in | 2 +- dlls/atl100/tests/atl.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletions(-) diff --git a/dlls/atl100/tests/Makefile.in b/dlls/atl100/tests/Makefile.in index 0b8353e..7ca6123 100644 --- a/dlls/atl100/tests/Makefile.in +++ b/dlls/atl100/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = atl100.dll -IMPORTS = uuid atl100 oleaut32 ole32 advapi32 +IMPORTS = uuid atl100 oleaut32 ole32 advapi32 user32 EXTRADEFS = -D_ATL_VER=_ATL_VER_100 C_SRCS = \ diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index e7c3703..40d8583 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -22,6 +22,10 @@ #define COBJMACROS #define CONST_VTABLE +#include <windef.h> +#include <winbase.h> +#include <winuser.h> + #include <atlbase.h> #include <mshtml.h> @@ -562,6 +566,30 @@ static void test_source_iface(void) ok(maj_ver == 4 && min_ver == 0, "ver = %d.%d\n", maj_ver, min_ver); } +static void test_ax_win(void) +{ + BOOL ret; + WNDCLASSEXW wcex; + static const WCHAR AtlAxWin100[] = {'A','t','l','A','x','W','i','n','1','0','0',0}; + static const WCHAR AtlAxWinLic100[] = {'A','t','l','A','x','W','i','n','L','i','c','1','0','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, AtlAxWin100, &wcex); + todo_wine 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"); +} + START_TEST(atl) { CoInitialize(NULL); @@ -571,6 +599,7 @@ START_TEST(atl) test_typelib(); test_cp(); test_source_iface(); + test_ax_win(); CoUninitialize(); }

1 0

Jimmy Rentz : advapi32: Fix segfault in OpenService.
by Alexandre Julliard 25 Mar '13

25 Mar '13

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

Jacek Caban : jscript: Return buffer pointer separately from jsstr_t from jsstr_alloc_len.
by Alexandre Julliard 25 Mar '13

25 Mar '13

Module: wine Branch: master Commit: 4ece40f86bf6d7cd52ad2958a645ec162813dd8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ece40f86bf6d7cd52ad2958a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 25 12:28:38 2013 +0100 jscript: Return buffer pointer separately from jsstr_t from jsstr_alloc_len. --- dlls/jscript/array.c | 34 ++++++++++++------------ dlls/jscript/date.c | 64 +++++++++++++++++++++++++++++----------------- dlls/jscript/engine.c | 4 +- dlls/jscript/error.c | 16 +++++++---- dlls/jscript/function.c | 11 ++++--- dlls/jscript/global.c | 59 +++++++++++++++++++----------------------- dlls/jscript/jsstr.c | 21 +++++++++------ dlls/jscript/jsstr.h | 2 +- dlls/jscript/number.c | 6 +--- dlls/jscript/object.c | 7 +++-- dlls/jscript/string.c | 40 ++++++++++++++-------------- 11 files changed, 141 insertions(+), 123 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4ece40f86bf6d7cd52ad2…

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
54
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2013