wine-commits June 2015

wine-commits@winehq.org

2 participants
610 discussions

Alexandre Julliard : user32/tests: Remove support for Win9x in clipboard test.
by Alexandre Julliard 03 Jun '15

03 Jun '15

Module: wine Branch: master Commit: 4c64d137ff5e2d67a249d4043246fe825cd705b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c64d137ff5e2d67a249d4043… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 3 17:13:40 2015 +0900 user32/tests: Remove support for Win9x in clipboard test. --- dlls/user32/tests/clipboard.c | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 01dbe93..f12e0cd 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -24,17 +24,6 @@ #include "wingdi.h" #include "winuser.h" -static BOOL is_win9x = FALSE; - -#define test_last_error(expected_error) \ - do \ - { \ - if (!is_win9x) \ - ok(GetLastError() == expected_error, \ - "Last error should be set to %d, not %d\n", \ - expected_error, GetLastError()); \ - } while (0) - static void test_ClipboardOwner(void) { HWND hWnd1, hWnd2; @@ -118,7 +107,7 @@ static void test_RegisterClipboardFormatA(void) SetLastError(0xdeadbeef); len = GetAtomNameA((ATOM)format_id, buf, 256); ok(len == 0, "GetAtomNameA should fail\n"); - test_last_error(ERROR_INVALID_HANDLE); + ok(GetLastError() == ERROR_INVALID_HANDLE, "err %d\n", GetLastError()); todo_wine { @@ -126,13 +115,13 @@ todo_wine SetLastError(0xdeadbeef); len = GlobalGetAtomNameA((ATOM)format_id, buf, 256); ok(len == 0, "GlobalGetAtomNameA should fail\n"); - test_last_error(ERROR_INVALID_HANDLE); + ok(GetLastError() == ERROR_INVALID_HANDLE, "err %d\n", GetLastError()); } SetLastError(0xdeadbeef); atom_id = FindAtomA("my_cool_clipboard_format"); ok(atom_id == 0, "FindAtomA should fail\n"); - test_last_error(ERROR_FILE_NOT_FOUND); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "err %d\n", GetLastError()); if (0) { @@ -140,7 +129,7 @@ todo_wine SetLastError(0xdeadbeef); atom_id = GlobalFindAtomA("my_cool_clipboard_format"); ok(atom_id == 0, "GlobalFindAtomA should fail\n"); - test_last_error(ERROR_FILE_NOT_FOUND); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "err %d\n", GetLastError()); } for (format_id = 0; format_id < 0xffff; format_id++) @@ -356,10 +345,6 @@ static void test_messages(void) START_TEST(clipboard) { - SetLastError(0xdeadbeef); - FindAtomW(NULL); - if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) is_win9x = TRUE; - test_RegisterClipboardFormatA(); test_ClipboardOwner(); test_synthesized();

1 0

Alexandre Julliard : user32: Merge the AcquireClipboard and EmptyClipboard driver entry points.
by Alexandre Julliard 03 Jun '15

03 Jun '15

Module: wine Branch: master Commit: 070a82e743cbcfd82f211d79b2453a84c7eedec2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=070a82e743cbcfd82f211d79b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 3 16:45:40 2015 +0900 user32: Merge the AcquireClipboard and EmptyClipboard driver entry points. --- dlls/user32/clipboard.c | 4 ---- dlls/user32/driver.c | 13 ------------- dlls/user32/user_private.h | 1 - dlls/winemac.drv/clipboard.c | 12 +----------- dlls/winemac.drv/winemac.drv.spec | 1 - dlls/winex11.drv/clipboard.c | 20 ++++++++------------ dlls/winex11.drv/window.c | 3 ++- dlls/winex11.drv/winex11.drv.spec | 1 - dlls/winex11.drv/x11drv.h | 2 +- 9 files changed, 12 insertions(+), 45 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index 666acf0..c55b830 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -295,10 +295,6 @@ BOOL WINAPI EmptyClipboard(void) * WM_DESTROYCLIPBOARD itself. */ CLIPBOARD_SetClipboardOwner(cbinfo.hWndOpen); - /* Acquire the selection. This will notify the previous owner - * to clear its cache. */ - USER_Driver->pAcquireClipboard(cbinfo.hWndOpen); - USER_Driver->pEmptyClipboard(); bCBHasChanged = TRUE; diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 400d30a..ced8836 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -120,7 +120,6 @@ static const USER_DRIVER *load_driver(void) GET_USER_FUNC(GetCursorPos); GET_USER_FUNC(SetCursorPos); GET_USER_FUNC(ClipCursor); - GET_USER_FUNC(AcquireClipboard); GET_USER_FUNC(EmptyClipboard); GET_USER_FUNC(SetClipboardData); GET_USER_FUNC(GetClipboardData); @@ -334,11 +333,6 @@ static BOOL CDECL nulldrv_ClipCursor( LPCRECT clip ) return FALSE; } -static INT CDECL nulldrv_AcquireClipboard( HWND hwnd ) -{ - return 0; -} - static BOOL CDECL nulldrv_CountClipboardFormats(void) { return 0; @@ -536,7 +530,6 @@ static USER_DRIVER null_driver = nulldrv_SetCursorPos, nulldrv_ClipCursor, /* clipboard functions */ - nulldrv_AcquireClipboard, nulldrv_CountClipboardFormats, nulldrv_EmptyClipboard, nulldrv_EndClipboardUpdate, @@ -674,11 +667,6 @@ static BOOL CDECL loaderdrv_ClipCursor( LPCRECT clip ) return load_driver()->pClipCursor( clip ); } -static INT CDECL loaderdrv_AcquireClipboard( HWND hwnd ) -{ - return load_driver()->pAcquireClipboard( hwnd ); -} - static BOOL CDECL loaderdrv_CountClipboardFormats(void) { return load_driver()->pCountClipboardFormats(); @@ -791,7 +779,6 @@ static USER_DRIVER lazy_load_driver = loaderdrv_SetCursorPos, loaderdrv_ClipCursor, /* clipboard functions */ - loaderdrv_AcquireClipboard, loaderdrv_CountClipboardFormats, loaderdrv_EmptyClipboard, loaderdrv_EndClipboardUpdate, diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 01b9728..e0c1b43 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -80,7 +80,6 @@ typedef struct tagUSER_DRIVER { BOOL (CDECL *pSetCursorPos)(INT,INT); BOOL (CDECL *pClipCursor)(LPCRECT); /* clipboard functions */ - INT (CDECL *pAcquireClipboard)(HWND); /* Acquire selection */ BOOL (CDECL *pCountClipboardFormats)(void); /* Count available clipboard formats */ void (CDECL *pEmptyClipboard)(void); /* Empty clipboard data */ void (CDECL *pEndClipboardUpdate)(void); /* End clipboard update */ diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 3851d23..97fa80e 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -1880,17 +1880,6 @@ static void check_clipboard_ownership(HWND *owner) /************************************************************************** - * AcquireClipboard (MACDRV.@) - */ -int CDECL macdrv_AcquireClipboard(HWND hwnd) -{ - TRACE("hwnd %p\n", hwnd); - check_clipboard_ownership(NULL); - return 0; -} - - -/************************************************************************** * CountClipboardFormats (MACDRV.@) */ INT CDECL macdrv_CountClipboardFormats(void) @@ -1955,6 +1944,7 @@ INT CDECL macdrv_CountClipboardFormats(void) void CDECL macdrv_EmptyClipboard(void) { TRACE("()\n"); + check_clipboard_ownership(NULL); macdrv_clear_pasteboard(); } diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index a7dbb30..a97177d 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -4,7 +4,6 @@ # USER driver -@ cdecl AcquireClipboard(long) macdrv_AcquireClipboard @ cdecl ActivateKeyboardLayout(long long) macdrv_ActivateKeyboardLayout @ cdecl Beep() macdrv_Beep @ cdecl ChangeDisplaySettingsEx(ptr ptr long long long) macdrv_ChangeDisplaySettingsEx diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 073e7cb..6c6b3b9 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -2924,9 +2924,9 @@ static DWORD WINAPI selection_thread_proc(LPVOID p) } /************************************************************************** - * AcquireClipboard (X11DRV.@) + * X11DRV_AcquireClipboard */ -int CDECL X11DRV_AcquireClipboard(HWND hWndClipWindow) +void X11DRV_AcquireClipboard(HWND hWndClipWindow) { DWORD procid; HANDLE selectionThread; @@ -2953,7 +2953,8 @@ int CDECL X11DRV_AcquireClipboard(HWND hWndClipWindow) GetCurrentThreadId(), GetWindowThreadProcessId(hWndClipWindow, NULL), hWndClipWindow); - return SendMessageW(hWndClipWindow, WM_X11DRV_ACQUIRE_SELECTION, 0, 0); + SendMessageW(hWndClipWindow, WM_X11DRV_ACQUIRE_SELECTION, 0, 0); + return; } } @@ -2966,19 +2967,13 @@ int CDECL X11DRV_AcquireClipboard(HWND hWndClipWindow) HANDLE event = CreateEventW(NULL, FALSE, FALSE, NULL); selectionThread = CreateThread(NULL, 0, selection_thread_proc, event, 0, NULL); - if (!selectionThread) + if (selectionThread) { - WARN("Could not start clipboard thread\n"); - CloseHandle(event); - return 0; + WaitForSingleObject(event, INFINITE); + CloseHandle(selectionThread); } - - WaitForSingleObject(event, INFINITE); CloseHandle(event); - CloseHandle(selectionThread); } - - return 1; } @@ -3005,6 +3000,7 @@ static void empty_clipboard(BOOL keepunowned) */ void CDECL X11DRV_EmptyClipboard(void) { + X11DRV_AcquireClipboard( GetOpenClipboardWindow() ); empty_clipboard( FALSE ); } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 7146cfc..ea37dd7 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2593,7 +2593,8 @@ LRESULT CDECL X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) switch(msg) { case WM_X11DRV_ACQUIRE_SELECTION: - return X11DRV_AcquireClipboard( hwnd ); + X11DRV_AcquireClipboard( hwnd ); + return 0; case WM_X11DRV_SET_WIN_REGION: if ((data = get_win_data( hwnd ))) { diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index ce084b5..d9bbebc 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -23,7 +23,6 @@ @ cdecl EnumDisplayMonitors(long ptr ptr long) X11DRV_EnumDisplayMonitors @ cdecl EnumDisplaySettingsEx(ptr long ptr long) X11DRV_EnumDisplaySettingsEx @ cdecl GetMonitorInfo(long ptr) X11DRV_GetMonitorInfo -@ cdecl AcquireClipboard(long) X11DRV_AcquireClipboard @ cdecl CountClipboardFormats() X11DRV_CountClipboardFormats @ cdecl CreateDesktopWindow(long) X11DRV_CreateDesktopWindow @ cdecl CreateWindow(long) X11DRV_CreateWindow diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index da13c6e..213f610 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -600,7 +600,7 @@ extern XContext win_data_context DECLSPEC_HIDDEN; extern XContext cursor_context DECLSPEC_HIDDEN; extern void X11DRV_InitClipboard(void) DECLSPEC_HIDDEN; -extern int CDECL X11DRV_AcquireClipboard(HWND hWndClipWindow) DECLSPEC_HIDDEN; +extern void X11DRV_AcquireClipboard(HWND hWndClipWindow) DECLSPEC_HIDDEN; extern void X11DRV_ResetSelectionOwner(void) DECLSPEC_HIDDEN; extern void CDECL X11DRV_SetFocus( HWND hwnd ) DECLSPEC_HIDDEN; extern void set_window_cursor( Window window, HCURSOR handle ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : user32: Get rid of the unused parameter in the EmptyClipboard driver entry point.
by Alexandre Julliard 03 Jun '15

03 Jun '15

Module: wine Branch: master Commit: b7c340de730eec2f3546f5cb63328d6f8cb8c042 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7c340de730eec2f3546f5cb6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 3 16:38:44 2015 +0900 user32: Get rid of the unused parameter in the EmptyClipboard driver entry point. --- dlls/user32/clipboard.c | 3 +-- dlls/user32/driver.c | 6 +++--- dlls/user32/user_private.h | 2 +- dlls/winemac.drv/clipboard.c | 4 ++-- dlls/winemac.drv/winemac.drv.spec | 2 +- dlls/winex11.drv/clipboard.c | 25 ++++++++++++++----------- dlls/winex11.drv/winex11.drv.spec | 2 +- 7 files changed, 23 insertions(+), 21 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index de1ec60..666acf0 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -299,8 +299,7 @@ BOOL WINAPI EmptyClipboard(void) * to clear its cache. */ USER_Driver->pAcquireClipboard(cbinfo.hWndOpen); - /* Empty the local cache */ - USER_Driver->pEmptyClipboard(FALSE); + USER_Driver->pEmptyClipboard(); bCBHasChanged = TRUE; diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index e0bc38c..400d30a 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -344,7 +344,7 @@ static BOOL CDECL nulldrv_CountClipboardFormats(void) return 0; } -static void CDECL nulldrv_EmptyClipboard( BOOL keepunowned ) +static void CDECL nulldrv_EmptyClipboard(void) { } @@ -684,9 +684,9 @@ static BOOL CDECL loaderdrv_CountClipboardFormats(void) return load_driver()->pCountClipboardFormats(); } -static void CDECL loaderdrv_EmptyClipboard( BOOL keepunowned ) +static void CDECL loaderdrv_EmptyClipboard(void) { - load_driver()->pEmptyClipboard( keepunowned ); + load_driver()->pEmptyClipboard(); } static void CDECL loaderdrv_EndClipboardUpdate(void) diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 445fd40..01b9728 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -82,7 +82,7 @@ typedef struct tagUSER_DRIVER { /* clipboard functions */ INT (CDECL *pAcquireClipboard)(HWND); /* Acquire selection */ BOOL (CDECL *pCountClipboardFormats)(void); /* Count available clipboard formats */ - void (CDECL *pEmptyClipboard)(BOOL); /* Empty clipboard data */ + void (CDECL *pEmptyClipboard)(void); /* Empty clipboard data */ void (CDECL *pEndClipboardUpdate)(void); /* End clipboard update */ UINT (CDECL *pEnumClipboardFormats)(UINT); /* Enumerate clipboard formats */ HANDLE (CDECL *pGetClipboardData)(UINT); /* Get specified selection data */ diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index fe42023..3851d23 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -1952,9 +1952,9 @@ INT CDECL macdrv_CountClipboardFormats(void) * * Empty cached clipboard data. */ -void CDECL macdrv_EmptyClipboard(BOOL keepunowned) +void CDECL macdrv_EmptyClipboard(void) { - TRACE("keepunowned %d\n", keepunowned); + TRACE("()\n"); macdrv_clear_pasteboard(); } diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index 58a894b..a7dbb30 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -14,7 +14,7 @@ @ cdecl CreateWindow(long) macdrv_CreateWindow @ cdecl DestroyCursorIcon(long) macdrv_DestroyCursorIcon @ cdecl DestroyWindow(long) macdrv_DestroyWindow -@ cdecl EmptyClipboard(long) macdrv_EmptyClipboard +@ cdecl EmptyClipboard() macdrv_EmptyClipboard @ cdecl EndClipboardUpdate() macdrv_EndClipboardUpdate @ cdecl EnumClipboardFormats(long) macdrv_EnumClipboardFormats @ cdecl EnumDisplayMonitors(long ptr ptr long) macdrv_EnumDisplayMonitors diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index a460e0a..073e7cb 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -129,7 +129,6 @@ static int selectionAcquired = 0; /* Contains the current selection static Window selectionWindow = None; /* The top level X window which owns the selection */ static Atom selectionCacheSrc = XA_PRIMARY; /* The selection source from which the clipboard cache was filled */ -void CDECL X11DRV_EmptyClipboard(BOOL keepunowned); void CDECL X11DRV_EndClipboardUpdate(void); static HANDLE X11DRV_CLIPBOARD_ImportClipboardData(Display *d, Window w, Atom prop); static HANDLE X11DRV_CLIPBOARD_ImportEnhMetaFile(Display *d, Window w, Atom prop); @@ -171,6 +170,7 @@ static BOOL X11DRV_CLIPBOARD_RenderSynthesizedDIB(Display *display); static BOOL X11DRV_CLIPBOARD_RenderSynthesizedBitmap(Display *display); static BOOL X11DRV_CLIPBOARD_RenderSynthesizedEnhMetaFile(Display *display); static void X11DRV_HandleSelectionRequest( HWND hWnd, XSelectionRequestEvent *event, BOOL bIsMultiple ); +static void empty_clipboard( BOOL keepunowned ); /* Clipboard formats */ @@ -621,7 +621,7 @@ static BOOL X11DRV_CLIPBOARD_UpdateCache(void) } else if (wSeqNo < seqno) { - X11DRV_EmptyClipboard(TRUE); + empty_clipboard( TRUE ); if (X11DRV_CLIPBOARD_QueryAvailableData(thread_init_display()) < 0) { @@ -2862,7 +2862,7 @@ static void X11DRV_CLIPBOARD_ReleaseSelection(Display *display, Atom selType, Wi selectionWindow = None; - X11DRV_EmptyClipboard(FALSE); + empty_clipboard( FALSE ); /* Reset the selection flags now that we are done */ selectionAcquired = S_NOSELECTION; @@ -2982,12 +2982,7 @@ int CDECL X11DRV_AcquireClipboard(HWND hWndClipWindow) } -/************************************************************************** - * X11DRV_EmptyClipboard - * - * Empty cached clipboard data. - */ -void CDECL X11DRV_EmptyClipboard(BOOL keepunowned) +static void empty_clipboard(BOOL keepunowned) { WINE_CLIPDATA *data, *next; @@ -3003,7 +2998,15 @@ void CDECL X11DRV_EmptyClipboard(BOOL keepunowned) TRACE(" %d entries remaining in cache.\n", ClipDataCount); } - +/************************************************************************** + * X11DRV_EmptyClipboard + * + * Empty cached clipboard data. + */ +void CDECL X11DRV_EmptyClipboard(void) +{ + empty_clipboard( FALSE ); +} /************************************************************************** * X11DRV_SetClipboardData @@ -3154,7 +3157,7 @@ void X11DRV_ResetSelectionOwner(void) WARN("Failed to find another thread to take selection ownership. Clipboard data will be lost.\n"); X11DRV_CLIPBOARD_ReleaseOwnership(); - X11DRV_EmptyClipboard(FALSE); + empty_clipboard( FALSE ); } diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index b6e5c05..ce084b5 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -28,7 +28,7 @@ @ cdecl CreateDesktopWindow(long) X11DRV_CreateDesktopWindow @ cdecl CreateWindow(long) X11DRV_CreateWindow @ cdecl DestroyWindow(long) X11DRV_DestroyWindow -@ cdecl EmptyClipboard(long) X11DRV_EmptyClipboard +@ cdecl EmptyClipboard() X11DRV_EmptyClipboard @ cdecl EndClipboardUpdate() X11DRV_EndClipboardUpdate @ cdecl EnumClipboardFormats(long) X11DRV_EnumClipboardFormats @ cdecl GetClipboardData(long) X11DRV_GetClipboardData

1 0

Jacek Caban : mshtml: Fixed leak in HTMLCurrentStyle_Create.
by Alexandre Julliard 03 Jun '15

03 Jun '15

Module: wine Branch: master Commit: f5066488e9cb1ea5c7459f397e7da1598f22aa54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5066488e9cb1ea5c7459f397… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 2 16:01:20 2015 +0200 mshtml: Fixed leak in HTMLCurrentStyle_Create. --- dlls/mshtml/htmlcurstyle.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index f0b0d98..bf46cfc 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -1338,6 +1338,7 @@ HRESULT HTMLCurrentStyle_Create(HTMLElement *elem, IHTMLCurrentStyle **p) nsAString_Init(&nsempty_str, NULL); nsres = nsIDOMWindow_GetComputedStyle(nsview, (nsIDOMElement*)elem->nselem, &nsempty_str, &nsstyle); nsAString_Finish(&nsempty_str); + nsIDOMWindow_Release(nsview); if(NS_FAILED(nsres)) { ERR("GetComputedStyle failed: %08x\n", nsres); return E_FAIL;

1 0

Jacek Caban : jscript: Added 'automagic' test.
by Alexandre Julliard 03 Jun '15

03 Jun '15

Module: wine Branch: master Commit: 326c1e61b453eb7857c1c45753e341dde1d2ba6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=326c1e61b453eb7857c1c4575… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 2 14:45:20 2015 +0200 jscript: Added 'automagic' test. --- dlls/jscript/tests/run.c | 132 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 132 insertions(+) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 40a1245..6259071 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -110,6 +110,7 @@ DEFINE_EXPECT(ActiveScriptSite_OnScriptError); DEFINE_EXPECT(invoke_func); DEFINE_EXPECT(DeleteMemberByDispID); DEFINE_EXPECT(DeleteMemberByDispID_false); +DEFINE_EXPECT(BindHandler); #define DISPID_GLOBAL_TESTPROPGET 0x1000 #define DISPID_GLOBAL_TESTPROPPUT 0x1001 @@ -140,6 +141,7 @@ DEFINE_EXPECT(DeleteMemberByDispID_false); #define DISPID_GLOBAL_DISPEXFUNC 0x101a #define DISPID_GLOBAL_TESTPROPPUTREF 0x101b #define DISPID_GLOBAL_GETSCRIPTSTATE 0x101c +#define DISPID_GLOBAL_BINDEVENTHANDLER 0x101d #define DISPID_GLOBAL_TESTPROPDELETE 0x2000 #define DISPID_GLOBAL_TESTNOPROPDELETE 0x2001 @@ -273,6 +275,13 @@ static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DW return E_NOTIMPL; } +static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *res, EXCEPINFO *pei, IServiceProvider *pspCaller) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + static HRESULT WINAPI DispatchEx_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex) { ok(0, "unexpected call %s %x\n", wine_dbgstr_w(bstrName), grfdex); @@ -583,6 +592,75 @@ static IDispatchExVtbl pureDispVtbl = { static IDispatchEx pureDisp = { &pureDispVtbl }; +static HRESULT WINAPI BindEventHandler_QueryInterface(IBindEventHandler *iface, REFIID riid, void **ppv) +{ + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI BindEventHandler_AddRef(IBindEventHandler *iface) +{ + return 2; +} + +static ULONG WINAPI BindEventHandler_Release(IBindEventHandler *iface) +{ + return 1; +} + +static HRESULT WINAPI BindEventHandler_BindHandler(IBindEventHandler *iface, const WCHAR *event, IDispatch *disp) +{ + CHECK_EXPECT(BindHandler); + ok(!strcmp_wa(event, "eventName"), "event = %s\n", wine_dbgstr_w(event)); + ok(disp != NULL, "disp = NULL\n"); + return S_OK; +} + +static const IBindEventHandlerVtbl BindEventHandlerVtbl = { + BindEventHandler_QueryInterface, + BindEventHandler_AddRef, + BindEventHandler_Release, + BindEventHandler_BindHandler +}; + +static IBindEventHandler BindEventHandler = { &BindEventHandlerVtbl }; + +static HRESULT WINAPI bindEventHandlerDisp_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDispatch) || IsEqualGUID(riid, &IID_IDispatchEx)) { + *ppv = iface; + return S_OK; + } + + if(IsEqualGUID(riid, &IID_IBindEventHandler)) { + *ppv = &BindEventHandler; + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static IDispatchExVtbl bindEventHandlerDispVtbl = { + bindEventHandlerDisp_QueryInterface, + DispatchEx_AddRef, + DispatchEx_Release, + DispatchEx_GetTypeInfoCount, + DispatchEx_GetTypeInfo, + DispatchEx_GetIDsOfNames, + DispatchEx_Invoke, + DispatchEx_GetDispID, + DispatchEx_InvokeEx, + DispatchEx_DeleteMemberByName, + DispatchEx_DeleteMemberByDispID, + DispatchEx_GetMemberProperties, + DispatchEx_GetMemberName, + DispatchEx_GetNextDispID, + DispatchEx_GetNameSpaceParent +}; + +static IDispatchEx bindEventHandlerDisp = { &bindEventHandlerDispVtbl }; + static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { if(!strcmp_wa(bstrName, "ok")) { @@ -763,6 +841,11 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD return S_OK; } + if(!strcmp_wa(bstrName, "bindEventHandler")) { + *pid = DISPID_GLOBAL_BINDEVENTHANDLER; + return S_OK; + } + if(strict_dispid_check && strcmp_wa(bstrName, "t")) ok(0, "unexpected call %s\n", wine_dbgstr_w(bstrName)); return DISP_E_UNKNOWNNAME; @@ -1127,6 +1210,11 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, return S_OK; } + case DISPID_GLOBAL_BINDEVENTHANDLER: + V_VT(pvarRes) = VT_DISPATCH; + V_DISPATCH(pvarRes) = (IDispatch*)&bindEventHandlerDisp; + return S_OK; + case DISPID_GLOBAL_PROPARGPUT: CHECK_EXPECT(global_propargput_i); ok(wFlags == INVOKE_PROPERTYPUT, "wFlags = %x\n", wFlags); @@ -1974,6 +2062,49 @@ static void test_start(void) script_engine = NULL; } +static void test_automagic(void) +{ + IActiveScriptParse *parser; + IActiveScript *engine; + BSTR str; + HRESULT hres; + + script_engine = engine = create_script(); + if(!engine) + return; + + hres = IActiveScript_QueryInterface(engine, &IID_IActiveScriptParse, (void**)&parser); + ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); + + hres = IActiveScriptParse_InitNew(parser); + ok(hres == S_OK, "InitNew failed: %08x\n", hres); + + hres = IActiveScript_SetScriptSite(engine, &ActiveScriptSite); + ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); + + hres = IActiveScript_AddNamedItem(engine, testW, SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|SCRIPTITEM_GLOBALMEMBERS); + ok(hres == S_OK, "AddNamedItem failed: %08x\n", hres); + + str = a2bstr("function bindEventHandler::eventName() {}\n" + "reportSuccess();"); + hres = IActiveScriptParse_ParseScriptText(parser, str, NULL, NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + SysFreeString(str); + + SET_EXPECT(BindHandler); + SET_EXPECT(global_success_d); + SET_EXPECT(global_success_i); + hres = IActiveScript_SetScriptState(engine, SCRIPTSTATE_STARTED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_STARTED) failed: %08x\n", hres); + CHECK_CALLED(BindHandler); + CHECK_CALLED(global_success_d); + CHECK_CALLED(global_success_i); + + IActiveScript_Release(engine); + IActiveScriptParse_Release(parser); + script_engine = NULL; +} + static HRESULT parse_script_expr(const char *expr, VARIANT *res, IActiveScript **engine_ret) { IActiveScriptParse *parser; @@ -2502,6 +2633,7 @@ static BOOL run_tests(void) test_isvisible(FALSE); test_isvisible(TRUE); test_start(); + test_automagic(); parse_script_af(0, "test.testThis2(this);"); parse_script_af(0, "(function () { test.testThis2(this); })();");

1 0

Jacek Caban : jscript: Added beginning support for 'automagic' event binding feature.
by Alexandre Julliard 03 Jun '15

03 Jun '15

Module: wine Branch: master Commit: 170bb3771f43f1120435e98ea38543d5a667f9bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=170bb3771f43f1120435e98ea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 2 14:45:10 2015 +0200 jscript: Added beginning support for 'automagic' event binding feature. --- dlls/jscript/compile.c | 18 ++++++++++----- dlls/jscript/engine.c | 60 ++++++++++++++++++++++++++++++++++++++++++-------- dlls/jscript/engine.h | 1 + dlls/jscript/lex.c | 8 ++++++- dlls/jscript/parser.h | 1 + dlls/jscript/parser.y | 17 +++++++++----- 6 files changed, 84 insertions(+), 21 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index f056be1..52e6b66 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -862,7 +862,7 @@ static HRESULT compile_function_expression(compiler_ctx_t *ctx, function_express ctx->func_tail = ctx->func_tail ? (ctx->func_tail->next = expr) : (ctx->func_head = expr); /* FIXME: not exactly right */ - if(expr->identifier) { + if(expr->identifier && !expr->event_target) { ctx->func->func_cnt++; return push_instr_bstr(ctx, OP_ident, expr->identifier); } @@ -1865,10 +1865,18 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, func->instr_off = off; - if(func_expr && func_expr->identifier) { - func->name = compiler_alloc_bstr(ctx, func_expr->identifier); - if(!func->name) - return E_OUTOFMEMORY; + if(func_expr) { + if(func_expr->identifier) { + func->name = compiler_alloc_bstr(ctx, func_expr->identifier); + if(!func->name) + return E_OUTOFMEMORY; + } + + if(func_expr->event_target) { + func->event_target = compiler_alloc_bstr(ctx, func_expr->event_target); + if(!func->event_target) + return E_OUTOFMEMORY; + } } if(func_expr) { diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index de60755..ca08d91 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -511,14 +511,16 @@ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, exprval_t *re TRACE("%s\n", debugstr_w(identifier)); - for(scope = ctx->exec_ctx->scope_chain; scope; scope = scope->next) { - if(scope->jsobj) - hres = jsdisp_get_id(scope->jsobj, identifier, fdexNameImplicit, &id); - else - hres = disp_get_id(ctx, scope->obj, identifier, identifier, fdexNameImplicit, &id); - if(SUCCEEDED(hres)) { - exprval_set_idref(ret, scope->obj, id); - return S_OK; + if(ctx->exec_ctx) { + for(scope = ctx->exec_ctx->scope_chain; scope; scope = scope->next) { + if(scope->jsobj) + hres = jsdisp_get_id(scope->jsobj, identifier, fdexNameImplicit, &id); + else + hres = disp_get_id(ctx, scope->obj, identifier, identifier, fdexNameImplicit, &id); + if(SUCCEEDED(hres)) { + exprval_set_idref(ret, scope->obj, id); + return S_OK; + } } } @@ -2504,6 +2506,43 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, bytecode_t *code, function_code return S_OK; } +static HRESULT bind_event_target(script_ctx_t *ctx, function_code_t *func, jsdisp_t *func_obj) +{ + IBindEventHandler *target; + exprval_t exprval; + IDispatch *disp; + jsval_t v; + HRESULT hres; + + hres = identifier_eval(ctx, func->event_target, &exprval); + if(FAILED(hres)) + return hres; + + hres = exprval_to_value(ctx, &exprval, &v); + exprval_release(&exprval); + if(FAILED(hres)) + return hres; + + if(!is_object_instance(v)) { + FIXME("Can't bind to %s\n", debugstr_jsval(v)); + jsval_release(v); + } + + disp = get_object(v); + hres = IDispatch_QueryInterface(disp, &IID_IBindEventHandler, (void**)&target); + if(SUCCEEDED(hres)) { + hres = IBindEventHandler_BindHandler(target, func->name, (IDispatch*)&func_obj->IDispatchEx_iface); + IBindEventHandler_Release(target); + if(FAILED(hres)) + WARN("BindEvent failed: %08x\n", hres); + }else { + FIXME("No IBindEventHandler, not yet supported binding\n"); + } + + IDispatch_Release(disp); + return hres; +} + HRESULT exec_source(exec_ctx_t *ctx, bytecode_t *code, function_code_t *func, BOOL from_eval, jsval_t *ret) { exec_ctx_t *prev_ctx; @@ -2521,7 +2560,10 @@ HRESULT exec_source(exec_ctx_t *ctx, bytecode_t *code, function_code_t *func, BO if(FAILED(hres)) return hres; - hres = jsdisp_propput_name(ctx->var_disp, func->funcs[i].name, jsval_obj(func_obj)); + if(func->funcs[i].event_target) + hres = bind_event_target(ctx->script, func->funcs+i, func_obj); + else + hres = jsdisp_propput_name(ctx->var_disp, func->funcs[i].name, jsval_obj(func_obj)); jsdisp_release(func_obj); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index bd49c99..dd8ed4c 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -127,6 +127,7 @@ typedef struct { typedef struct _function_code_t { BSTR name; + BSTR event_target; unsigned instr_off; const WCHAR *source; diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index af4b24b..57ab033 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -590,7 +590,6 @@ static int next_token(parser_ctx_t *ctx, void *lval) case ',': case '~': case '?': - case ':': return *ctx->ptr++; case '}': @@ -786,6 +785,13 @@ static int next_token(parser_ctx_t *ctx, void *lval) } return '/'; + case ':': + if(++ctx->ptr < ctx->end && *ctx->ptr == ':') { + ctx->ptr++; + return kDCOL; + } + return ':'; + case '\"': case '\'': return parse_string_literal(ctx, lval, *ctx->ptr); diff --git a/dlls/jscript/parser.h b/dlls/jscript/parser.h index ab5744a..f8d404f 100644 --- a/dlls/jscript/parser.h +++ b/dlls/jscript/parser.h @@ -285,6 +285,7 @@ struct _source_elements_t { typedef struct _function_expression_t { expression_t expr; const WCHAR *identifier; + const WCHAR *event_target; parameter_t *parameter_list; source_elements_t *source_elements; const WCHAR *src_str; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 7b36b11..59e6757 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -120,7 +120,7 @@ static parameter_list_t *parameter_list_add(parser_ctx_t*,parameter_list_t*,cons static void *new_expression(parser_ctx_t *ctx,expression_type_t,size_t); static expression_t *new_function_expression(parser_ctx_t*,const WCHAR*,parameter_list_t*, - source_elements_t*,const WCHAR*,DWORD); + source_elements_t*,const WCHAR*,const WCHAR*,DWORD); static expression_t *new_binary_expression(parser_ctx_t*,expression_type_t,expression_t*,expression_t*); static expression_t *new_unary_expression(parser_ctx_t*,expression_type_t,expression_t*); static expression_t *new_conditional_expression(parser_ctx_t*,expression_t*,expression_t*,expression_t*); @@ -166,7 +166,7 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state /* keywords */ %token kBREAK kCASE kCATCH kCONTINUE kDEFAULT kDELETE kDO kELSE kIF kFINALLY kFOR kIN %token kINSTANCEOF kNEW kNULL kRETURN kSWITCH kTHIS kTHROW kTRUE kFALSE kTRY kTYPEOF kVAR kVOID kWHILE kWITH -%token tANDAND tOROR tINC tDEC tHTMLCOMMENT kDIVEQ +%token tANDAND tOROR tINC tDEC tHTMLCOMMENT kDIVEQ kDCOL %token <srcptr> kFUNCTION '}' @@ -264,8 +264,12 @@ SourceElements /* ECMA-262 3rd Edition 13 */ FunctionExpression - : KFunction Identifier_opt left_bracket FormalParameterList_opt right_bracket '{' FunctionBody '}' - { $$ = new_function_expression(ctx, $2, $4, $7, $1, $8-$1+1); } + : KFunction left_bracket FormalParameterList_opt right_bracket '{' FunctionBody '}' + { $$ = new_function_expression(ctx, NULL, $3, $6, NULL, $1, $7-$1+1); } + | KFunction tIdentifier left_bracket FormalParameterList_opt right_bracket '{' FunctionBody '}' + { $$ = new_function_expression(ctx, $2, $4, $7, NULL, $1, $8-$1+1); } + | KFunction tIdentifier kDCOL tIdentifier left_bracket FormalParameterList_opt right_bracket '{' FunctionBody '}' + { $$ = new_function_expression(ctx, $4, $6, $9, $2, $1, $10-$1+1); } KFunction : kFUNCTION { $$ = $1; } @@ -1300,14 +1304,15 @@ static parameter_list_t *parameter_list_add(parser_ctx_t *ctx, parameter_list_t return list; } -static expression_t *new_function_expression(parser_ctx_t *ctx, const WCHAR *identifier, - parameter_list_t *parameter_list, source_elements_t *source_elements, const WCHAR *src_str, DWORD src_len) +static expression_t *new_function_expression(parser_ctx_t *ctx, const WCHAR *identifier, parameter_list_t *parameter_list, + source_elements_t *source_elements, const WCHAR *event_target, const WCHAR *src_str, DWORD src_len) { function_expression_t *ret = new_expression(ctx, EXPR_FUNC, sizeof(*ret)); ret->identifier = identifier; ret->parameter_list = parameter_list ? parameter_list->head : NULL; ret->source_elements = source_elements; + ret->event_target = event_target; ret->src_str = src_str; ret->src_len = src_len; ret->next = NULL;

1 0

Nikolay Sivov : riched20: Avoid extra host calls during CreateTextServices ().
by Alexandre Julliard 02 Jun '15

02 Jun '15

Module: wine Branch: master Commit: b75cd7e2f0f6f40655f690695ab0843fce472e88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b75cd7e2f0f6f40655f690695… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 30 10:01:45 2015 +0300 riched20: Avoid extra host calls during CreateTextServices(). --- dlls/riched20/txtsrv.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index e9c1061..1bf9cf2 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -399,7 +399,7 @@ static const ITextServicesVtbl textservices_vtbl = HRESULT WINAPI CreateTextServices(IUnknown *pUnkOuter, ITextHost *pITextHost, IUnknown **ppUnk) { ITextServicesImpl *ITextImpl; - HRESULT hres; + TRACE("%p %p --> %p\n", pUnkOuter, pITextHost, ppUnk); if (pITextHost == NULL) return E_POINTER; @@ -421,8 +421,6 @@ HRESULT WINAPI CreateTextServices(IUnknown *pUnkOuter, ITextHost *pITextHost, I ITextImpl->editor->rcFormat.right = 0; ITextImpl->editor->rcFormat.bottom = 0; - ME_HandleMessage(ITextImpl->editor, WM_CREATE, 0, 0, TRUE, &hres); - if (pUnkOuter) ITextImpl->outer_unk = pUnkOuter; else

1 0

Nikolay Sivov : riched20: Reduce code duplication in WM_SETTEXT/ WM_CREATE handler.
by Alexandre Julliard 02 Jun '15

02 Jun '15

Module: wine Branch: master Commit: 0b94369bb757305926aa46199e533d4ecc284625 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b94369bb757305926aa46199… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 30 09:14:18 2015 +0300 riched20: Reduce code duplication in WM_SETTEXT/WM_CREATE handler. --- dlls/riched20/editor.c | 152 ++++++++++++++++++++++++------------------------- 1 file changed, 74 insertions(+), 78 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 8d878a4..38861fd 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3158,13 +3158,84 @@ void ME_ReplaceSel(ME_TextEditor *editor, BOOL can_undo, const WCHAR *str, int l ME_UpdateRepaint(editor, FALSE); } +static void ME_SetText(ME_TextEditor *editor, void *text, BOOL unicode) +{ + LONG codepage = unicode ? CP_UNICODE : CP_ACP; + int textLen; + + LPWSTR wszText = ME_ToUnicode(codepage, text, &textLen); + + if (textLen > 0) + { + int len = -1; + + /* uses default style! */ + if (!(editor->styleFlags & ES_MULTILINE)) + { + WCHAR *p = wszText; + + while (*p != '\0' && *p != '\r' && *p != '\n') p++; + len = p - wszText; + } + ME_InsertTextFromCursor(editor, 0, wszText, len, editor->pBuffer->pDefaultStyle); + } + ME_EndToUnicode(codepage, wszText); +} + +static LRESULT ME_WmCreate(ME_TextEditor *editor, LPARAM lParam, BOOL unicode) +{ + CREATESTRUCTW *createW = (CREATESTRUCTW*)lParam; + CREATESTRUCTA *createA = (CREATESTRUCTA*)lParam; + void *text = NULL; + INT max; + + if (lParam) + text = unicode ? (void*)createW->lpszName : (void*)createA->lpszName; + + ME_SetDefaultFormatRect(editor); + + max = (editor->styleFlags & ES_DISABLENOSCROLL) ? 1 : 0; + if (~editor->styleFlags & ES_DISABLENOSCROLL || editor->styleFlags & WS_VSCROLL) + ITextHost_TxSetScrollRange(editor->texthost, SB_VERT, 0, max, TRUE); + + if (~editor->styleFlags & ES_DISABLENOSCROLL || editor->styleFlags & WS_HSCROLL) + ITextHost_TxSetScrollRange(editor->texthost, SB_HORZ, 0, max, TRUE); + + if (editor->styleFlags & ES_DISABLENOSCROLL) + { + if (editor->styleFlags & WS_VSCROLL) + { + ITextHost_TxEnableScrollBar(editor->texthost, SB_VERT, ESB_DISABLE_BOTH); + ITextHost_TxShowScrollBar(editor->texthost, SB_VERT, TRUE); + } + if (editor->styleFlags & WS_HSCROLL) + { + ITextHost_TxEnableScrollBar(editor->texthost, SB_HORZ, ESB_DISABLE_BOTH); + ITextHost_TxShowScrollBar(editor->texthost, SB_HORZ, TRUE); + } + } + + if (text) + { + ME_SetText(editor, text, unicode); + ME_SetCursorToStart(editor, &editor->pCursors[0]); + ME_SetCursorToStart(editor, &editor->pCursors[1]); + } + + ME_CommitUndo(editor); + ME_WrapMarkedParagraphs(editor); + ME_MoveCaret(editor); + return 0; +} + + #define UNSUPPORTED_MSG(e) \ case e: \ FIXME(#e ": stub\n"); \ *phresult = S_FALSE; \ return 0; -/* Handle messages for windowless and windoweded richedit controls. +/* Handle messages for windowless and windowed richedit controls. * * The LRESULT that is returned is a return value for window procs, * and the phresult parameter is the COM return code needed by the @@ -3689,28 +3760,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_StreamInRTFString(editor, 0, (char *)lParam); } else - { - int textLen; - LONG codepage = unicode ? CP_UNICODE : CP_ACP; - LPWSTR wszText = ME_ToUnicode(codepage, (void *)lParam, &textLen); - TRACE("WM_SETTEXT - %s\n", debugstr_w(wszText)); /* debugstr_w() */ - if (textLen > 0) - { - int len = -1; - - /* uses default style! */ - if (!(editor->styleFlags & ES_MULTILINE)) - { - WCHAR * p; - - p = wszText; - while (*p != '\0' && *p != '\r' && *p != '\n') p++; - len = p - wszText; - } - ME_InsertTextFromCursor(editor, 0, wszText, len, editor->pBuffer->pDefaultStyle); - } - ME_EndToUnicode(codepage, wszText); - } + ME_SetText(editor, (void*)lParam, unicode); } else TRACE("WM_SETTEXT - NULL\n"); @@ -4065,61 +4115,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, return (wParam >= 0x40000) ? 0 : MAKELONG( pt.x, pt.y ); } case WM_CREATE: - { - void *text = NULL; - INT max; - - ME_SetDefaultFormatRect(editor); - - max = (editor->styleFlags & ES_DISABLENOSCROLL) ? 1 : 0; - if (~editor->styleFlags & ES_DISABLENOSCROLL || editor->styleFlags & WS_VSCROLL) - ITextHost_TxSetScrollRange(editor->texthost, SB_VERT, 0, max, TRUE); - - if (~editor->styleFlags & ES_DISABLENOSCROLL || editor->styleFlags & WS_HSCROLL) - ITextHost_TxSetScrollRange(editor->texthost, SB_HORZ, 0, max, TRUE); - - if (editor->styleFlags & ES_DISABLENOSCROLL) - { - if (editor->styleFlags & WS_VSCROLL) - { - ITextHost_TxEnableScrollBar(editor->texthost, SB_VERT, ESB_DISABLE_BOTH); - ITextHost_TxShowScrollBar(editor->texthost, SB_VERT, TRUE); - } - if (editor->styleFlags & WS_HSCROLL) - { - ITextHost_TxEnableScrollBar(editor->texthost, SB_HORZ, ESB_DISABLE_BOTH); - ITextHost_TxShowScrollBar(editor->texthost, SB_HORZ, TRUE); - } - } - - if (lParam) - { - text = (unicode ? (void*)((CREATESTRUCTW*)lParam)->lpszName - : (void*)((CREATESTRUCTA*)lParam)->lpszName); - } - if (text) - { - WCHAR *textW; - int len; - LONG codepage = unicode ? CP_UNICODE : CP_ACP; - textW = ME_ToUnicode(codepage, text, &len); - if (!(editor->styleFlags & ES_MULTILINE)) - { - len = 0; - while(textW[len] != '\0' && textW[len] != '\r' && textW[len] != '\n') - len++; - } - ME_InsertTextFromCursor(editor, 0, textW, len, editor->pBuffer->pDefaultStyle); - ME_EndToUnicode(codepage, textW); - ME_SetCursorToStart(editor, &editor->pCursors[0]); - ME_SetCursorToStart(editor, &editor->pCursors[1]); - } - - ME_CommitUndo(editor); - ME_WrapMarkedParagraphs(editor); - ME_MoveCaret(editor); - return 0; - } + return ME_WmCreate(editor, lParam, unicode); case WM_DESTROY: ME_DestroyEditor(editor); return 0;

1 0

Nikolay Sivov : riched20/tests: Don't use global vars for host/ textservices.
by Alexandre Julliard 02 Jun '15

02 Jun '15

Module: wine Branch: master Commit: a50e0d71a49e4af7cc1483e993f1b20a8490d410 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a50e0d71a49e4af7cc1483e99… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 29 22:45:43 2015 +0300 riched20/tests: Don't use global vars for host/textservices. --- dlls/riched20/tests/txtsrv.c | 75 ++++++++++++++++++++++++++------------------ 1 file changed, 44 insertions(+), 31 deletions(-) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index c154e2d..1a6ca61 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -506,8 +506,6 @@ static ITextHostVtbl itextHostVtbl = { ITextHostImpl_TxGetSelectionBarWidth }; -static ITextServices *txtserv = NULL; -static ITextHostTestImpl *dummyTextHost; static void *wrapperCodeMem = NULL; #include "pshpack1.h" @@ -606,14 +604,15 @@ static void setup_thiscall_wrappers(void) /* Conformance test functions. */ /* Initialize the test texthost structure */ -static BOOL init_texthost(void) +static BOOL init_texthost(ITextServices **txtserv, ITextHost **ret) { + ITextHostTestImpl *dummyTextHost; IUnknown *init; HRESULT result; dummyTextHost = CoTaskMemAlloc(sizeof(*dummyTextHost)); if (dummyTextHost == NULL) { - skip("Insufficient memory to create ITextHost interface\n"); + win_skip("Insufficient memory to create ITextHost interface\n"); return FALSE; } dummyTextHost->ITextHost_iface.lpVtbl = &itextHostVtbl; @@ -622,54 +621,53 @@ static BOOL init_texthost(void) /* MSDN states that an IUnknown object is returned by CreateTextServices which is then queried to obtain a ITextServices object. */ - result = (*pCreateTextServices)(NULL, &dummyTextHost->ITextHost_iface, &init); + result = pCreateTextServices(NULL, &dummyTextHost->ITextHost_iface, &init); ok(result == S_OK, "Did not return S_OK when created (result = %x)\n", result); if (result != S_OK) { CoTaskMemFree(dummyTextHost); - skip("CreateTextServices failed.\n"); + win_skip("CreateTextServices failed.\n"); return FALSE; } - result = IUnknown_QueryInterface(init, pIID_ITextServices, - (void **)&txtserv); - ok((result == S_OK) && (txtserv != NULL), "Querying interface failed (result = %x, txtserv = %p)\n", result, txtserv); + result = IUnknown_QueryInterface(init, pIID_ITextServices, (void**)txtserv); + ok((result == S_OK) && (*txtserv != NULL), "Querying interface failed (result = %x, txtserv = %p)\n", result, *txtserv); IUnknown_Release(init); - if (!((result == S_OK) && (txtserv != NULL))) { + if (!((result == S_OK) && (*txtserv != NULL))) { CoTaskMemFree(dummyTextHost); - skip("Could not retrieve ITextServices interface\n"); + win_skip("Could not retrieve ITextServices interface\n"); return FALSE; } + *ret = &dummyTextHost->ITextHost_iface; return TRUE; } -static void free_texthost(void) -{ - ITextServices_Release(txtserv); - CoTaskMemFree(dummyTextHost); -} - static void test_TxGetText(void) { + ITextServices *txtserv; + ITextHost *host; HRESULT hres; BSTR rettext; - if (!init_texthost()) + if (!init_texthost(&txtserv, &host)) return; hres = ITextServices_TxGetText(txtserv, &rettext); ok(hres == S_OK, "ITextServices_TxGetText failed (result = %x)\n", hres); - free_texthost(); + ITextServices_Release(txtserv); + ITextHost_Release(host); } static void test_TxSetText(void) { + ITextServices *txtserv; + ITextHost *host; HRESULT hres; BSTR rettext; WCHAR settext[] = {'T','e','s','t',0}; - if (!init_texthost()) + if (!init_texthost(&txtserv, &host)) return; hres = ITextServices_TxSetText(txtserv, settext); @@ -684,10 +682,14 @@ static void test_TxSetText(void) "String returned differs\n"); SysFreeString(rettext); - free_texthost(); + ITextServices_Release(txtserv); + ITextHost_Release(host); } -static void test_TxGetNaturalSize(void) { +static void test_TxGetNaturalSize(void) +{ + ITextServices *txtserv; + ITextHost *host; HRESULT result; BOOL ret; @@ -710,7 +712,7 @@ static void test_TxGetNaturalSize(void) { INT charwidth_caps_text[26]; TEXTMETRICA tmInfo_text; - if (!init_texthost()) + if (!init_texthost(&txtserv, &host)) return; hdcDraw = GetDC(NULL); @@ -759,11 +761,14 @@ static void test_TxGetNaturalSize(void) { cleanup: RestoreDC(hdcDraw,1); ReleaseDC(NULL,hdcDraw); - free_texthost(); + ITextServices_Release(txtserv); + ITextHost_Release(host); } static void test_TxDraw(void) { + ITextServices *txtserv; + ITextHost *host; HDC tmphdc = GetDC(NULL); DWORD dwAspect = DVASPECT_CONTENT; HDC hicTargetDev = NULL; /* Means "default" device */ @@ -772,7 +777,8 @@ static void test_TxDraw(void) HRESULT result; RECTL client = {0,0,100,100}; - if (!init_texthost()) + + if (!init_texthost(&txtserv, &host)) return; todo_wine { @@ -782,8 +788,8 @@ static void test_TxDraw(void) ok(result == S_OK, "TxDraw failed (result = %x)\n", result); } - free_texthost(); - + ITextServices_Release(txtserv); + ITextHost_Release(host); } DEFINE_GUID(expected_iid_itextservices, 0x8d33f740, 0xcf58, 0x11ce, 0xa8, 0x9d, 0x00, 0xaa, 0x00, 0x6c, 0xad, 0xc5); @@ -872,12 +878,14 @@ static ULONG get_refcount(IUnknown *iface) static void test_QueryInterface(void) { + ITextServices *txtserv; + ITextHost *host; HRESULT hres; IRichEditOle *reole, *txtsrv_reole; ITextDocument *txtdoc, *txtsrv_txtdoc; ULONG refcount; - if(!init_texthost()) + if(!init_texthost(&txtserv, &host)) return; refcount = get_refcount((IUnknown *)txtserv); @@ -927,11 +935,15 @@ static void test_QueryInterface(void) refcount = get_refcount((IUnknown *)txtserv); ok(refcount == 1, "got wrong ref count: %d\n", refcount); - free_texthost(); + ITextServices_Release(txtserv); + ITextHost_Release(host); } START_TEST( txtsrv ) { + ITextServices *txtserv; + ITextHost *host; + setup_thiscall_wrappers(); /* Must explicitly LoadLibrary(). The test has no references to functions in @@ -947,9 +959,10 @@ START_TEST( txtsrv ) test_IIDs(); test_COM(); - if (init_texthost()) + if (init_texthost(&txtserv, &host)) { - free_texthost(); + ITextServices_Release(txtserv); + ITextHost_Release(host); test_TxGetText(); test_TxSetText();

1 0

Dmitry Timoshkov : mshtml: Handle VT_INT/VT_UI4 same way as VT_I4/ VT_UINT in IHTMLElementCollection::item.
by Alexandre Julliard 02 Jun '15

02 Jun '15

Module: wine Branch: master Commit: 242beac6374efb64658376bc56e67b26071f81da URL: http://source.winehq.org/git/wine.git/?a=commit;h=242beac6374efb64658376bc5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 1 21:52:04 2015 +0300 mshtml: Handle VT_INT/VT_UI4 same way as VT_I4/VT_UINT in IHTMLElementCollection::item. --- dlls/mshtml/htmlelemcol.c | 2 ++ dlls/mshtml/tests/dom.c | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index ca5e1d5..a57f39e 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -419,11 +419,13 @@ static HRESULT WINAPI HTMLElementCollection_item(IHTMLElementCollection *iface, switch(V_VT(&name)) { case VT_I4: + case VT_INT: if(V_I4(&name) < 0) return E_INVALIDARG; hres = get_item_idx(This, V_I4(&name), pdisp); break; + case VT_UI4: case VT_UINT: hres = get_item_idx(This, V_UINT(&name), pdisp); break; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 3e83e64..077f6e2 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2437,6 +2437,27 @@ static void _test_elem_collection(unsigned line, IUnknown *unk, ok_(__FILE__,line) (hres == S_OK, "item failed: %08x\n", hres); ok_(__FILE__,line) (disp == NULL, "disp != NULL\n"); + V_VT(&name) = VT_UI4; + V_I4(&name) = len; + disp = (void*)0xdeadbeef; + hres = IHTMLElementCollection_item(col, name, index, &disp); + ok_(__FILE__,line) (hres == S_OK, "item failed: %08x\n", hres); + ok_(__FILE__,line) (disp == NULL, "disp != NULL\n"); + + V_VT(&name) = VT_INT; + V_I4(&name) = len; + disp = (void*)0xdeadbeef; + hres = IHTMLElementCollection_item(col, name, index, &disp); + ok_(__FILE__,line) (hres == S_OK, "item failed: %08x\n", hres); + ok_(__FILE__,line) (disp == NULL, "disp != NULL\n"); + + V_VT(&name) = VT_UINT; + V_I4(&name) = len; + disp = (void*)0xdeadbeef; + hres = IHTMLElementCollection_item(col, name, index, &disp); + ok_(__FILE__,line) (hres == S_OK, "item failed: %08x\n", hres); + ok_(__FILE__,line) (disp == NULL, "disp != NULL\n"); + V_VT(&name) = VT_I4; V_I4(&name) = -1; disp = (void*)0xdeadbeef;

1 0

← Newer
1
...
54
55
56
57
58
59
60
61
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 June 2015