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

Qian Hong : atl100/tests: Added class name test for AtlAxWinInit.
by Alexandre Julliard March 25, 2013

March 25, 2013

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

Huw Davies : riched20: Always write out the color table.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: a20d42de1565caf43b5693c6d455c9373a34029b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a20d42de1565caf43b5693c6d… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 25 11:05:56 2013 +0000 riched20: Always write out the color table. --- dlls/riched20/writer.c | 19 +++++++------------ 1 files changed, 7 insertions(+), 12 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index cd2362e..440cb1b 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -297,20 +297,15 @@ ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, if (!ME_StreamOutPrint(pStream, "}\r\n")) return FALSE; - /* Output colors table if not empty */ - if (pStream->nColorTblLen > 1) { - if (!ME_StreamOutPrint(pStream, "{\\colortbl;")) - return FALSE; - for (i = 1; i < pStream->nColorTblLen; i++) { - if (!ME_StreamOutPrint(pStream, "\\red%u\\green%u\\blue%u;", - pStream->colortbl[i] & 0xFF, - (pStream->colortbl[i] >> 8) & 0xFF, - (pStream->colortbl[i] >> 16) & 0xFF)) - return FALSE; - } - if (!ME_StreamOutPrint(pStream, "}")) + /* Output the color table */ + if (!ME_StreamOutPrint(pStream, "{\\colortbl;")) return FALSE; /* first entry is auto-color */ + for (i = 1; i < pStream->nColorTblLen; i++) + { + if (!ME_StreamOutPrint(pStream, "\\red%u\\green%u\\blue%u;", pStream->colortbl[i] & 0xFF, + (pStream->colortbl[i] >> 8) & 0xFF, (pStream->colortbl[i] >> 16) & 0xFF)) return FALSE; } + if (!ME_StreamOutPrint(pStream, "}")) return FALSE; return TRUE; }

1 0

Huw Davies : riched20: Set the bidi base embedding level.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: c409fc13fda7da2b60cd5ab04ad64bf21a0b5806 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c409fc13fda7da2b60cd5ab04… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 25 11:05:55 2013 +0000 riched20: Set the bidi base embedding level. --- dlls/riched20/editor.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a19ceec..f490799 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -840,6 +840,14 @@ void ME_RTFParAttrHook(RTF_Info *info) } break; } + case rtfRTLPar: + fmt.dwMask = PFM_RTLPARA; + fmt.wEffects = PFE_RTLPARA; + break; + case rtfLTRPar: + fmt.dwMask = PFM_RTLPARA; + fmt.wEffects = 0; + break; } if (fmt.dwMask) { RTFFlushOutputBuffer(info);

1 0

Dmitry Timoshkov : ws2_32: Make _is_blocking() return server error code, so that callers can act appropriately.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: c09c82b25a3c95e79f23f22571fe9a63b38b824c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c09c82b25a3c95e79f23f2257… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 22 14:59:50 2013 +0900 ws2_32: Make _is_blocking() return server error code, so that callers can act appropriately. --- dlls/ws2_32/socket.c | 49 +++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 39 insertions(+), 10 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f9e8a6c..a6a1b4c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -803,19 +803,19 @@ static void _enable_event( HANDLE s, unsigned int event, SERVER_END_REQ; } -static int _is_blocking(SOCKET s) +static NTSTATUS _is_blocking(SOCKET s, BOOL *ret) { - int ret; + NTSTATUS status; SERVER_START_REQ( get_socket_event ) { req->handle = wine_server_obj_handle( SOCKET2HANDLE(s) ); req->service = FALSE; req->c_event = 0; - wine_server_call( req ); - ret = (reply->state & FD_WINE_NONBLOCKING) == 0; + status = wine_server_call( req ); + *ret = (reply->state & FD_WINE_NONBLOCKING) == 0; } SERVER_END_REQ; - return ret; + return status; } static unsigned int _get_sock_mask(SOCKET s) @@ -835,9 +835,10 @@ static unsigned int _get_sock_mask(SOCKET s) static void _sync_sock_state(SOCKET s) { + BOOL dummy; /* do a dummy wineserver request in order to let the wineserver run through its select loop once */ - (void)_is_blocking(s); + (void)_is_blocking(s, &dummy); } static int _get_sock_error(SOCKET s, unsigned int bit) @@ -1950,7 +1951,12 @@ SOCKET WINAPI WS_accept(SOCKET s, struct WS_sockaddr *addr, BOOL is_blocking; TRACE("socket %04lx\n", s ); - is_blocking = _is_blocking(s); + status = _is_blocking(s, &is_blocking); + if (status) + { + set_error(status); + return INVALID_SOCKET; + } do { /* try accepting first (if there is a deferred connection) */ @@ -2341,6 +2347,8 @@ int WINAPI WS_connect(SOCKET s, const struct WS_sockaddr* name, int namelen) if (fd != -1) { + NTSTATUS status; + BOOL is_blocking; int ret = do_connect(fd, name, namelen); if (ret == 0) goto connect_success; @@ -2351,7 +2359,14 @@ int WINAPI WS_connect(SOCKET s, const struct WS_sockaddr* name, int namelen) _enable_event(SOCKET2HANDLE(s), FD_CONNECT|FD_READ|FD_WRITE, FD_CONNECT, FD_WINE_CONNECTED|FD_WINE_LISTENING); - if (_is_blocking(s)) + status = _is_blocking( s, &is_blocking ); + if (status) + { + release_sock_fd( s, fd ); + set_error( status ); + return SOCKET_ERROR; + } + if (is_blocking) { int result; /* block here */ @@ -3965,6 +3980,7 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, int totalLength = 0; ULONG_PTR cvalue = (lpOverlapped && ((ULONG_PTR)lpOverlapped->hEvent & 1) == 0) ? (ULONG_PTR)lpOverlapped : 0; DWORD bytes_sent; + BOOL is_blocking; TRACE("socket %04lx, wsabuf %p, nbufs %d, flags %d, to %p, tolen %d, ovl %p, func %p\n", s, lpBuffers, dwBufferCount, dwFlags, @@ -4063,7 +4079,13 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, return 0; } - if ( _is_blocking(s) ) + if ((err = _is_blocking( s, &is_blocking ))) + { + err = NtStatusToWSAError( err ); + goto error; + } + + if ( is_blocking ) { /* On a blocking non-overlapped stream socket, * sending blocks until the entire buffer is sent. */ @@ -5858,6 +5880,7 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, unsigned int i, options; int n, fd, err; struct ws2_async *wsa; + BOOL is_blocking; DWORD timeout_start = GetTickCount(); ULONG_PTR cvalue = (lpOverlapped && ((ULONG_PTR)lpOverlapped->hEvent & 1) == 0) ? (ULONG_PTR)lpOverlapped : 0; @@ -5961,7 +5984,13 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, if (n != -1) break; - if ( _is_blocking(s) ) + if ((err = _is_blocking( s, &is_blocking ))) + { + err = NtStatusToWSAError( err ); + goto error; + } + + if ( is_blocking ) { struct pollfd pfd; int timeout = GET_RCVTIMEO(fd);

1 0

Lucas Zawacki : dinput: Initialize all axis (from 0 to ABS_MAX) with -1.
by Alexandre Julliard March 25, 2013

March 25, 2013

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 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

Jacek Caban : mshtml: Added IHTMLButtonElement::name tests.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: 9fa1570fe67b067a83417e08807612612b8edce3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fa1570fe67b067a83417e088… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 18 14:06:29 2013 +0100 mshtml: Added IHTMLButtonElement::name tests. --- dlls/mshtml/tests/dom.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 57 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 2e4e3d8..54bb68c 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -913,6 +913,17 @@ static IHTMLIFrameElement2 *_get_iframe2_iface(unsigned line, IUnknown *unk) return ret; } +#define get_button_iface(u) _get_button_iface(__LINE__,u) +static IHTMLButtonElement *_get_button_iface(unsigned line, IUnknown *unk) +{ + IHTMLButtonElement *ret; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLButtonElement, (void**)&ret); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLButtonElement: %08x\n", hres); + return ret; +} + #define test_node_name(u,n) _test_node_name(__LINE__,u,n) static void _test_node_name(unsigned line, IUnknown *unk, const char *exname) { @@ -5348,6 +5359,45 @@ static void test_defaults(IHTMLDocument2 *doc) test_doc_title(doc, ""); } +#define test_button_name(a,b) _test_button_name(__LINE__,a,b) +static void _test_button_name(unsigned line, IHTMLElement *elem, const char *exname) +{ + IHTMLButtonElement *button = _get_button_iface(line, (IUnknown*)elem); + BSTR str; + HRESULT hres; + + str = (void*)0xdeadbeef; + hres = IHTMLButtonElement_get_name(button, &str); + ok_(__FILE__,line)(hres == S_OK, "get_name failed: %08x\n", hres); + if(exname) + ok_(__FILE__,line)(!strcmp_wa(str, exname), "name = %s, expected %s\n", wine_dbgstr_w(str), exname); + else + ok_(__FILE__,line)(!str, "name = %s, expected NULL\n", wine_dbgstr_w(str)); + SysFreeString(str); + IHTMLButtonElement_Release(button); +} + +#define set_button_name(a,b) _set_button_name(__LINE__,a,b) +static void _set_button_name(unsigned line, IHTMLElement *elem, const char *name) +{ + IHTMLButtonElement *button = _get_button_iface(line, (IUnknown*)elem); + BSTR str = a2bstr(name); + HRESULT hres; + + hres = IHTMLButtonElement_put_name(button, str); + ok_(__FILE__,line)(hres == S_OK, "get_name failed: %08x\n", hres); + SysFreeString(str); + IHTMLButtonElement_Release(button); + + _test_button_name(line, elem, name); +} + +static void test_button_elem(IHTMLElement *elem) +{ + test_button_name(elem, NULL); + set_button_name(elem, "button name"); +} + static void test_tr_elem(IHTMLElement *elem) { IHTMLElementCollection *col; @@ -6097,6 +6147,13 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } + elem = get_doc_elem_by_id(doc, "btnid"); + ok(elem != NULL, "elem == NULL\n"); + if(elem) { + test_button_elem(elem); + IHTMLElement_Release(elem); + } + elem = get_doc_elem_by_id(doc, "objid"); ok(elem != NULL, "elem == NULL\n"); if(elem) {

1 0

Ken Thomases : winemac: Implement rudimentary support for system tray icons as Mac status items.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: 9714e6ee6388f5715301f44495aca4ca84e87873 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9714e6ee6388f5715301f4449… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 17 22:40:54 2013 -0500 winemac: Implement rudimentary support for system tray icons as Mac status items. --- dlls/winemac.drv/Makefile.in | 2 + dlls/winemac.drv/cocoa_status_item.m | 175 +++++++++++++++++ dlls/winemac.drv/event.c | 5 + dlls/winemac.drv/image.c | 2 +- dlls/winemac.drv/macdrv.h | 3 + dlls/winemac.drv/macdrv_cocoa.h | 13 ++ dlls/winemac.drv/systray.c | 358 ++++++++++++++++++++++++++++++++++ dlls/winemac.drv/winemac.drv.spec | 3 + 8 files changed, 560 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9714e6ee6388f5715301f…

1 0

Ken Thomases : winemac: Set application Dock icon from first icon resource in process's .exe file.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: b1de532393bf2b1f3b78cfb2d6f2b7b420341755 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1de532393bf2b1f3b78cfb2d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 17 22:40:49 2013 -0500 winemac: Set application Dock icon from first icon resource in process's .exe file. --- dlls/winemac.drv/cocoa_app.h | 2 + dlls/winemac.drv/cocoa_app.m | 60 +++++++++- dlls/winemac.drv/image.c | 274 +++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/macdrv_main.c | 15 ++ 6 files changed, 352 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b1de532393bf2b1f3b78c…

1 0

Piotr Caban : msvcp: Sync implementations.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: a0a12d7b7c939dcb4740ce7fb0221457225c6c6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0a12d7b7c939dcb4740ce7fb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 19 15:38:42 2013 +0100 msvcp: Sync implementations. --- dlls/msvcp100/locale.c | 878 ++++++++++++++++++++++++++++++++++++++++++- dlls/msvcp100/msvcp100.spec | 128 ++++---- dlls/msvcp60/ios.c | 9 - dlls/msvcp60/locale.c | 796 ++++++++++++++++++++++++++++++++++++++- dlls/msvcp60/msvcp60.spec | 72 ++-- dlls/msvcp70/msvcp70.spec | 108 +++--- dlls/msvcp71/locale.c | 698 ++++++++++++++++++++++++++++++++++- dlls/msvcp71/msvcp71.spec | 108 +++--- dlls/msvcp80/msvcp80.spec | 116 +++--- 9 files changed, 2623 insertions(+), 290 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a0a12d7b7c939dcb4740c…

1 0

Aric Stewart : usp10: Correct access to -1 index of array.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: e909665db34b44c127c5ecefdfbd2991af5d2029 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e909665db34b44c127c5ecefd… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Mar 18 11:21:15 2013 -0500 usp10: Correct access to -1 index of array. Issue found by Phil Krylov. --- dlls/usp10/usp10.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index bc48ecd..878c39f 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1341,7 +1341,7 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, if (original == Script_Punctuation2) break; } - if (scriptInformation[scripts[j]].props.fComplex || asian) + if (j >= 0 && (scriptInformation[scripts[j]].props.fComplex || asian)) scripts[i] = scripts[j]; } }

1 0

André Hentschel : winedump: Dump exception info on ARM .
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: 18c95cf165a09ee0fe77f431ec31a5b101affd15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18c95cf165a09ee0fe77f431e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Mar 23 17:17:45 2013 +0100 winedump: Dump exception info on ARM. --- tools/winedump/main.c | 2 +- tools/winedump/pe.c | 82 +++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 74 insertions(+), 10 deletions(-) diff --git a/tools/winedump/main.c b/tools/winedump/main.c index 4186044..dbc2d67 100644 --- a/tools/winedump/main.c +++ b/tools/winedump/main.c @@ -228,7 +228,7 @@ static const struct my_option option_table[] = { {"-C", DUMP, 0, do_symdmngl, "-C Turns on symbol demangling"}, {"-f", DUMP, 0, do_dumphead, "-f Dumps file header information"}, {"-G", DUMP, 0, do_rawdebug, "-G Dumps raw debug information"}, - {"-j", DUMP, 1, do_dumpsect, "-j sect_name Dumps only the content of section sect_name (import, export, debug, resource, tls, clr)"}, + {"-j", DUMP, 1, do_dumpsect, "-j sect_name Dumps only the content of section sect_name (import, export, debug, resource, tls, clr, reloc, except)"}, {"-t", DUMP, 0, do_symtable, "-t Dumps symbol table"}, {"-x", DUMP, 0, do_dumpall, "-x Dumps everything"}, {NULL, NONE, 0, NULL, NULL} diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index bf29082..2029ef2 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -547,16 +547,35 @@ static void dump_dir_exported_functions(void) } -struct runtime_function +struct runtime_function_x86_64 { DWORD BeginAddress; DWORD EndAddress; DWORD UnwindData; }; +struct runtime_function_armnt +{ + DWORD BeginAddress; + union { + DWORD UnwindData; + struct { + DWORD Flag : 2; + DWORD FunctionLength : 11; + DWORD Ret : 2; + DWORD H : 1; + DWORD Reg : 3; + DWORD R : 1; + DWORD L : 1; + DWORD C : 1; + DWORD StackAdjust : 10; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; +}; + union handler_data { - struct runtime_function chain; + struct runtime_function_x86_64 chain; DWORD handler; }; @@ -567,7 +586,7 @@ struct opcode BYTE info : 4; }; -struct unwind_info +struct unwind_info_x86_64 { BYTE version : 3; BYTE flags : 5; @@ -579,6 +598,14 @@ struct unwind_info /* followed by union handler_data */ }; +struct unwind_info_armnt +{ + WORD function_length; + WORD unknown1 : 7; + WORD count : 5; + WORD unknown2 : 4; +}; + #define UWOP_PUSH_NONVOL 0 #define UWOP_ALLOC_LARGE 1 #define UWOP_ALLOC_SMALL 2 @@ -593,20 +620,20 @@ struct unwind_info #define UNW_FLAG_UHANDLER 2 #define UNW_FLAG_CHAININFO 4 -static void dump_x86_64_unwind_info( const struct runtime_function *function ) +static void dump_x86_64_unwind_info( const struct runtime_function_x86_64 *function ) { static const char * const reg_names[16] = { "rax", "rcx", "rdx", "rbx", "rsp", "rbp", "rsi", "rdi", "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15" }; const union handler_data *handler_data; - const struct unwind_info *info; + const struct unwind_info_x86_64 *info; unsigned int i, count; printf( "\nFunction %08x-%08x:\n", function->BeginAddress, function->EndAddress ); if (function->UnwindData & 1) { - const struct runtime_function *next = RVA( function->UnwindData & ~1, sizeof(*next) ); + const struct runtime_function_x86_64 *next = RVA( function->UnwindData & ~1, sizeof(*next) ); printf( " -> function %08x-%08x\n", next->BeginAddress, next->EndAddress ); return; } @@ -698,19 +725,56 @@ static void dump_x86_64_unwind_info( const struct runtime_function *function ) (ULONG)(function->UnwindData + (const char *)(&handler_data->handler + 1) - (const char *)info )); } +static void dump_armnt_unwind_info( const struct runtime_function_armnt *function ) +{ + const struct unwind_info_armnt *info; + if (function->u.s.Flag) + { + printf( "\nFunction %08x-%08x:\n", function->BeginAddress & ~1, + (function->BeginAddress & ~1) + function->u.s.FunctionLength * 2 ); + printf( " Flag %x\n", function->u.s.Flag ); + printf( " FunctionLength %x\n", function->u.s.FunctionLength ); + printf( " Ret %x\n", function->u.s.Ret ); + printf( " H %x\n", function->u.s.H ); + printf( " Reg %x\n", function->u.s.Reg ); + printf( " R %x\n", function->u.s.R ); + printf( " L %x\n", function->u.s.L ); + printf( " C %x\n", function->u.s.C ); + printf( " StackAdjust %x\n", function->u.s.StackAdjust ); + return; + } + + info = RVA( function->u.UnwindData, sizeof(*info) ); + + printf( "\nFunction %08x-%08x:\n", function->BeginAddress & ~1, + (function->BeginAddress & ~1) + info->function_length * 2 ); + printf( " unwind info at %08x\n", function->u.UnwindData ); + printf( " Flag %x\n", function->u.s.Flag ); + printf( " FunctionLength %x\n", info->function_length ); + printf( " Unknown1 %x\n", info->unknown1 ); + printf( " Count %x\n", info->count ); + printf( " Unknown2 %x\n", info->unknown2 ); +} + static void dump_dir_exceptions(void) { unsigned int i, size = 0; - const struct runtime_function *funcs = get_dir_and_size(IMAGE_FILE_EXCEPTION_DIRECTORY, &size); + const void *funcs = get_dir_and_size(IMAGE_FILE_EXCEPTION_DIRECTORY, &size); const IMAGE_FILE_HEADER *file_header = &PE_nt_headers->FileHeader; if (!funcs) return; if (file_header->Machine == IMAGE_FILE_MACHINE_AMD64) { - size /= sizeof(*funcs); + size /= sizeof(struct runtime_function_x86_64); + printf( "Exception info (%u functions):\n", size ); + for (i = 0; i < size; i++) dump_x86_64_unwind_info( (struct runtime_function_x86_64*)funcs + i ); + } + else if (file_header->Machine == IMAGE_FILE_MACHINE_ARMNT) + { + size /= sizeof(struct runtime_function_armnt); printf( "Exception info (%u functions):\n", size ); - for (i = 0; i < size; i++) dump_x86_64_unwind_info( funcs + i ); + for (i = 0; i < size; i++) dump_armnt_unwind_info( (struct runtime_function_armnt*)funcs + i ); } else printf( "Exception information not supported for %s binaries\n", get_machine_str(file_header->Machine));

1 0

Marcus Meissner : strmbase: Fixed user-after-free (Coverity).
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: 2ba014bf40d98dd1a1b97ab19e60311be7839214 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ba014bf40d98dd1a1b97ab19… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Mar 23 11:14:13 2013 +0100 strmbase: Fixed user-after-free (Coverity). --- dlls/strmbase/transform.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 0e014b0..df72d99 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -343,8 +343,8 @@ ULONG WINAPI TransformFilterImpl_Release(IBaseFilter * iface) DeleteCriticalSection(&This->csReceive); FreeMediaType(&This->pmt); QualityControlImpl_Destroy(This->qcimpl); - CoTaskMemFree(This); IUnknown_Release(This->seekthru_unk); + CoTaskMemFree(This); return 0; }

1 0

Marcus Meissner : urlmon: Pass up error on error condition (Coverity).
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: 542fe17a050b4493aa2c1ff6017b46f82b762340 URL: http://source.winehq.org/git/wine.git/?a=commit;h=542fe17a050b4493aa2c1ff60… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Mar 23 11:14:04 2013 +0100 urlmon: Pass up error on error condition (Coverity). --- dlls/urlmon/protocol.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/protocol.c b/dlls/urlmon/protocol.c index 5598780..2682465 100644 --- a/dlls/urlmon/protocol.c +++ b/dlls/urlmon/protocol.c @@ -78,7 +78,7 @@ static HRESULT start_downloading(Protocol *protocol) if(FAILED(hres)) { protocol_close_connection(protocol); report_result(protocol, hres); - return S_OK; + return hres; } if(protocol->bindf & BINDF_NEEDFILE) {

1 0

Phil Krylov : usp10: Support GPOS extension lookup subtables.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: c9cbde73c014554eb43cc24564f59973e3b55bf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9cbde73c014554eb43cc2456… Author: Phil Krylov <phil.krylov(a)gmail.com> Date: Fri Mar 8 20:24:59 2013 +0400 usp10: Support GPOS extension lookup subtables. --- dlls/usp10/opentype.c | 93 ++++++++++++++++++++++++++++++++---------------- 1 files changed, 62 insertions(+), 31 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index a48a607..166d823 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -479,6 +479,12 @@ typedef struct { GPOS_PosLookupRecord PosLookupRecord[1]; } GPOS_ChainContextPosFormat3_4; +typedef struct { + WORD PosFormat; + WORD ExtensionLookupType; + DWORD ExtensionOffset; +} GPOS_ExtensionPosFormat1; + /********** * CMAP **********/ @@ -1166,6 +1172,25 @@ static VOID GPOS_get_value_record_offsets(const BYTE* head, GPOS_ValueRecord *Va if (ValueFormat & 0xFF00) FIXME("Unhandled Value Format %x\n",ValueFormat&0xFF00); } +static const BYTE *GPOS_get_subtable(const OT_LookupTable *look, int index) +{ + int offset = GET_BE_WORD(look->SubTable[index]); + + if (GET_BE_WORD(look->LookupType) == 9) + { + const GPOS_ExtensionPosFormat1 *ext = (const GPOS_ExtensionPosFormat1 *)((const BYTE *)look + offset); + if (GET_BE_WORD(ext->PosFormat) == 1) + { + offset += GET_BE_DWORD(ext->ExtensionOffset); + } + else + { + FIXME("Unhandled Extension Positioning Format %i\n",GET_BE_WORD(ext->PosFormat)); + } + } + return (const BYTE *)look + offset; +} + static VOID GPOS_apply_SingleAdjustment(const OT_LookupTable *look, const SCRIPT_ANALYSIS *analysis, const WORD *glyphs, INT glyph_index, INT glyph_count, INT ppem, LPPOINT ptAdjust, LPPOINT ptAdvance) { @@ -1175,9 +1200,8 @@ static VOID GPOS_apply_SingleAdjustment(const OT_LookupTable *look, const SCRIPT for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++) { - const GPOS_SinglePosFormat1 *spf1; - WORD offset = GET_BE_WORD(look->SubTable[j]); - spf1 = (const GPOS_SinglePosFormat1*)((const BYTE*)look+offset); + const GPOS_SinglePosFormat1 *spf1 = (const GPOS_SinglePosFormat1*)GPOS_get_subtable(look, j); + WORD offset; if (GET_BE_WORD(spf1->PosFormat) == 1) { offset = GET_BE_WORD(spf1->Coverage); @@ -1253,9 +1277,8 @@ static INT GPOS_apply_PairAdjustment(const OT_LookupTable *look, const SCRIPT_AN for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++) { - const GPOS_PairPosFormat1 *ppf1; - WORD offset = GET_BE_WORD(look->SubTable[j]); - ppf1 = (const GPOS_PairPosFormat1*)((const BYTE*)look+offset); + const GPOS_PairPosFormat1 *ppf1 = (const GPOS_PairPosFormat1*)GPOS_get_subtable(look, j); + WORD offset; if (GET_BE_WORD(ppf1->PosFormat) == 1) { int index; @@ -1292,7 +1315,7 @@ static INT GPOS_apply_PairAdjustment(const OT_LookupTable *look, const SCRIPT_AN } else if (GET_BE_WORD(ppf1->PosFormat) == 2) { - const GPOS_PairPosFormat2 *ppf2 = (const GPOS_PairPosFormat2*)((const BYTE*)look + offset); + const GPOS_PairPosFormat2 *ppf2 = (const GPOS_PairPosFormat2*)ppf1; int index; WORD ValueFormat1 = GET_BE_WORD( ppf2->ValueFormat1 ); WORD ValueFormat2 = GET_BE_WORD( ppf2->ValueFormat2 ); @@ -1339,13 +1362,11 @@ static VOID GPOS_apply_CursiveAttachment(const OT_LookupTable *look, const SCRIP for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++) { - const GPOS_CursivePosFormat1 *cpf1; - WORD offset = GET_BE_WORD(look->SubTable[j]); - cpf1 = (const GPOS_CursivePosFormat1*)((const BYTE*)look+offset); + const GPOS_CursivePosFormat1 *cpf1 = (const GPOS_CursivePosFormat1 *)GPOS_get_subtable(look, j); if (GET_BE_WORD(cpf1->PosFormat) == 1) { int index_exit, index_entry; - offset = GET_BE_WORD( cpf1->Coverage ); + WORD offset = GET_BE_WORD( cpf1->Coverage ); index_exit = GSUB_is_glyph_covered((const BYTE*)cpf1+offset, glyphs[glyph_index]); if (index_exit != -1 && cpf1->EntryExitRecord[index_exit].ExitAnchor!= 0) { @@ -1389,10 +1410,7 @@ static int GPOS_apply_MarkToBase(ScriptCache *psc, const OT_LookupTable *look, c for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++) { - int offset; - const GPOS_MarkBasePosFormat1 *mbpf1; - offset = GET_BE_WORD(look->SubTable[j]); - mbpf1 = (const GPOS_MarkBasePosFormat1*)((const BYTE*)look+offset); + const GPOS_MarkBasePosFormat1 *mbpf1 = (const GPOS_MarkBasePosFormat1 *)GPOS_get_subtable(look, j); if (GET_BE_WORD(mbpf1->PosFormat) == 1) { int offset = GET_BE_WORD(mbpf1->MarkCoverage); @@ -1466,10 +1484,7 @@ static VOID GPOS_apply_MarkToLigature(const OT_LookupTable *look, const SCRIPT_A for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++) { - int offset; - const GPOS_MarkLigPosFormat1 *mlpf1; - offset = GET_BE_WORD(look->SubTable[j]); - mlpf1 = (const GPOS_MarkLigPosFormat1*)((const BYTE*)look+offset); + const GPOS_MarkLigPosFormat1 *mlpf1 = (const GPOS_MarkLigPosFormat1 *)GPOS_get_subtable(look, j); if (GET_BE_WORD(mlpf1->PosFormat) == 1) { int offset = GET_BE_WORD(mlpf1->MarkCoverage); @@ -1560,10 +1575,7 @@ static BOOL GPOS_apply_MarkToMark(const OT_LookupTable *look, const SCRIPT_ANALY for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++) { - int offset; - const GPOS_MarkMarkPosFormat1 *mmpf1; - offset = GET_BE_WORD(look->SubTable[j]); - mmpf1 = (const GPOS_MarkMarkPosFormat1*)((const BYTE*)look+offset); + const GPOS_MarkMarkPosFormat1 *mmpf1 = (const GPOS_MarkMarkPosFormat1 *)GPOS_get_subtable(look, j); if (GET_BE_WORD(mmpf1->PosFormat) == 1) { int offset = GET_BE_WORD(mmpf1->Mark1Coverage); @@ -1590,7 +1602,7 @@ static BOOL GPOS_apply_MarkToMark(const OT_LookupTable *look, const SCRIPT_ANALY ma = (const GPOS_MarkArray*)((const BYTE*)mmpf1 + offset); if (mark_index > GET_BE_WORD(ma->MarkCount)) { - ERR("Mark index exeeded mark count\n"); + ERR("Mark index exceeded mark count\n"); return FALSE; } mr = &ma->MarkRecord[mark_index]; @@ -1631,13 +1643,10 @@ static INT GPOS_apply_ChainContextPos(ScriptCache *psc, LPOUTLINETEXTMETRICW lpo for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++) { int offset; - const GPOS_ChainContextPosFormat3_1 *ccpf3; + const GPOS_ChainContextPosFormat3_1 *ccpf3 = (GPOS_ChainContextPosFormat3_1 *)GPOS_get_subtable(look, j); int dirLookahead = write_dir; int dirBacktrack = -1 * write_dir; - offset = GET_BE_WORD(look->SubTable[j]); - ccpf3 = (const GPOS_ChainContextPosFormat3_1*)((const BYTE*)look+offset); - if (GET_BE_WORD(ccpf3->PosFormat) == 1) { FIXME(" TODO: subtype 1 (Simple Chaining Context Glyph Positioning)\n"); @@ -1723,11 +1732,33 @@ static INT GPOS_apply_lookup(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOG int offset; const OT_LookupTable *look; int ppem = lpotm->otmTextMetrics.tmAscent + lpotm->otmTextMetrics.tmDescent - lpotm->otmTextMetrics.tmInternalLeading; + WORD type; offset = GET_BE_WORD(lookup->Lookup[lookup_index]); look = (const OT_LookupTable*)((const BYTE*)lookup + offset); - TRACE("type %i, flag %x, subtables %i\n",GET_BE_WORD(look->LookupType),GET_BE_WORD(look->LookupFlag),GET_BE_WORD(look->SubTableCount)); - switch(GET_BE_WORD(look->LookupType)) + type = GET_BE_WORD(look->LookupType); + TRACE("type %i, flag %x, subtables %i\n",type,GET_BE_WORD(look->LookupFlag),GET_BE_WORD(look->SubTableCount)); + if (type == 9) + { + if (GET_BE_WORD(look->SubTableCount)) + { + const GPOS_ExtensionPosFormat1 *ext = (const GPOS_ExtensionPosFormat1 *)((const BYTE *)look + GET_BE_WORD(look->SubTable[0])); + if (GET_BE_WORD(ext->PosFormat) == 1) + { + type = GET_BE_WORD(ext->ExtensionLookupType); + TRACE("extension type %i\n",type); + } + else + { + FIXME("Unhandled Extension Positioning Format %i\n",GET_BE_WORD(ext->PosFormat)); + } + } + else + { + WARN("lookup type is Extension Positioning but no extension subtable exists\n"); + } + } + switch (type) { case 1: { @@ -1849,7 +1880,7 @@ static INT GPOS_apply_lookup(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOG return GPOS_apply_ChainContextPos(psc, lpotm, lplogfont, analysis, piAdvance, lookup, look, glyphs, glyph_index, glyph_count, ppem, pGoffset); } default: - FIXME("We do not handle SubType %i\n",GET_BE_WORD(look->LookupType)); + FIXME("We do not handle SubType %i\n",type); } return glyph_index+1; }

1 0

Ken Thomases : winemac: Allow Command-[Shift-] Tab to switch apps even when the displays are captured.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: 6ee486644a4313366fa7c95b93d371ef3e04255a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ee486644a4313366fa7c95b9… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 17 22:40:59 2013 -0500 winemac: Allow Command-[Shift-]Tab to switch apps even when the displays are captured. --- dlls/winemac.drv/cocoa_app.m | 56 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index a417674..b14c550 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -672,6 +672,49 @@ int macdrv_err_on; [self setApplicationIconImage:nsimage]; } + - (void) handleCommandTab + { + if ([self isActive]) + { + NSRunningApplication* thisApp = [NSRunningApplication currentApplication]; + NSRunningApplication* app; + NSRunningApplication* otherValidApp = nil; + + if ([originalDisplayModes count]) + { + CGRestorePermanentDisplayConfiguration(); + CGReleaseAllDisplays(); + [originalDisplayModes removeAllObjects]; + } + + for (app in [[NSWorkspace sharedWorkspace] runningApplications]) + { + if (![app isEqual:thisApp] && !app.terminated && + app.activationPolicy == NSApplicationActivationPolicyRegular) + { + if (!app.hidden) + { + // There's another visible app. Just hide ourselves and let + // the system activate the other app. + [self hide:self]; + return; + } + + if (!otherValidApp) + otherValidApp = app; + } + } + + // Didn't find a visible GUI app. Try the Finder or, if that's not + // running, the first hidden GUI app. If even that doesn't work, we + // just fail to switch and remain the active app. + app = [[NSRunningApplication runningApplicationsWithBundleIdentifier:@"com.apple.finder"] lastObject]; + if (!app) app = otherValidApp; + [app unhide]; + [app activateWithOptions:0]; + } + } + /* * ---------- Cursor clipping methods ---------- * @@ -1084,6 +1127,19 @@ int macdrv_err_on; // Make sure next mouse move event starts over from an absolute baseline. forceNextMouseMoveAbsolute = TRUE; } + else if (type == NSKeyDown && ![anEvent isARepeat] && [anEvent keyCode] == kVK_Tab) + { + NSUInteger modifiers = [anEvent modifierFlags]; + if ((modifiers & NSCommandKeyMask) && + !(modifiers & (NSControlKeyMask | NSAlternateKeyMask))) + { + // Command-Tab and Command-Shift-Tab would normally be intercepted + // by the system to switch applications. If we're seeing it, it's + // presumably because we've captured the displays, preventing + // normal application switching. Do it manually. + [self handleCommandTab]; + } + } }

1 0