wine-commits December 2014

wine-commits@winehq.org

2 participants
319 discussions

Bruno Jesus : winmm: Allow calling joyReleaseCapture multiple times.
by Alexandre Julliard 11 Dec '14

11 Dec '14

Module: wine Branch: master Commit: 3db2e9113e5afbd9d68b373a27920e7dd9a07815 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3db2e9113e5afbd9d68b373a2… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Dec 11 02:53:36 2014 -0200 winmm: Allow calling joyReleaseCapture multiple times. --- dlls/winmm/joystick.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c index d4b500a..9c06fc2 100644 --- a/dlls/winmm/joystick.c +++ b/dlls/winmm/joystick.c @@ -279,11 +279,14 @@ MMRESULT WINAPI joyReleaseCapture(UINT wID) if (wID >= MAXJOYSTICK) return JOYERR_PARMS; if (!JOY_LoadDriver(wID)) return MMSYSERR_NODRIVER; - if (!JOY_Sticks[wID].hCapture) return JOYERR_NOCANDO; - - KillTimer(JOY_Sticks[wID].hCapture, JOY_Sticks[wID].wTimer); - JOY_Sticks[wID].hCapture = 0; - JOY_Sticks[wID].wTimer = 0; + if (JOY_Sticks[wID].hCapture) + { + KillTimer(JOY_Sticks[wID].hCapture, JOY_Sticks[wID].wTimer); + JOY_Sticks[wID].hCapture = 0; + JOY_Sticks[wID].wTimer = 0; + } + else + TRACE("Joystick is not captured, ignoring request.\n"); return JOYERR_NOERROR; }

1 0

Bruno Jesus : winmm: Handle NULL parameter in joyGetPos/joyGetPosEx.
by Alexandre Julliard 11 Dec '14

11 Dec '14

Module: wine Branch: master Commit: 45f46bd3596e7d31df7fa7f4ea5e28485a30e8f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45f46bd3596e7d31df7fa7f4e… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Dec 11 02:53:26 2014 -0200 winmm: Handle NULL parameter in joyGetPos/joyGetPosEx. --- dlls/winmm/joystick.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c index ddd556d..d4b500a 100644 --- a/dlls/winmm/joystick.c +++ b/dlls/winmm/joystick.c @@ -219,6 +219,7 @@ MMRESULT WINAPI DECLSPEC_HOTPATCH joyGetPosEx(UINT wID, LPJOYINFOEX lpInfo) { TRACE("(%d, %p);\n", wID, lpInfo); + if (!lpInfo) return MMSYSERR_INVALPARAM; if (wID >= MAXJOYSTICK) return JOYERR_PARMS; if (!JOY_LoadDriver(wID)) return MMSYSERR_NODRIVER; @@ -244,6 +245,7 @@ MMRESULT WINAPI joyGetPos(UINT wID, LPJOYINFO lpInfo) { TRACE("(%d, %p);\n", wID, lpInfo); + if (!lpInfo) return MMSYSERR_INVALPARAM; if (wID >= MAXJOYSTICK) return JOYERR_PARMS; if (!JOY_LoadDriver(wID)) return MMSYSERR_NODRIVER;

1 0

André Hentschel : kernel32: Make GetTickCount and GetTickCount64 hotpatchable.
by Alexandre Julliard 11 Dec '14

11 Dec '14

Module: wine Branch: master Commit: 1005f3a6fa9d1aeb3e0e912815d12f7b1ed94b0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1005f3a6fa9d1aeb3e0e91281… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Dec 11 00:06:30 2014 +0100 kernel32: Make GetTickCount and GetTickCount64 hotpatchable. --- dlls/kernel32/kernel_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index 6afc1cb..e24100b 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -179,7 +179,7 @@ INT WINAPI MulDiv( INT nMultiplicand, INT nMultiplier, INT nDivisor) /****************************************************************************** * GetTickCount64 (KERNEL32.@) */ -ULONGLONG WINAPI GetTickCount64(void) +ULONGLONG WINAPI DECLSPEC_HOTPATCH GetTickCount64(void) { LARGE_INTEGER counter, frequency; @@ -202,7 +202,7 @@ ULONGLONG WINAPI GetTickCount64(void) * NOTES * The value returned will wrap around every 2^32 milliseconds. */ -DWORD WINAPI GetTickCount(void) +DWORD WINAPI DECLSPEC_HOTPATCH GetTickCount(void) { return GetTickCount64(); }

1 0

André Hentschel : gdiplus/tests: Fix compiler warnings with flag -Wunused-macros.
by Alexandre Julliard 11 Dec '14

11 Dec '14

Module: wine Branch: master Commit: e63b0a0a45b67a31baa164c2b63b11253e11f6c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e63b0a0a45b67a31baa164c2b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 10 23:47:50 2014 +0100 gdiplus/tests: Fix compiler warnings with flag -Wunused-macros. --- dlls/gdiplus/tests/graphics.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index bd227dc..c9cc463 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -28,7 +28,6 @@ #define expect(expected, got) ok((got) == (expected), "Expected %d, got %d\n", (INT)(expected), (INT)(got)) #define expectf_(expected, got, precision) ok(fabs((expected) - (got)) <= (precision), "Expected %f, got %f\n", (expected), (got)) #define expectf(expected, got) expectf_((expected), (got), 0.001) -#define TABLE_LEN (23) static const REAL mm_per_inch = 25.4; static const REAL point_per_inch = 72.0;

1 0

André Hentschel : iccvid: Fix compiler warnings with flag -Wunused-macros.
by Alexandre Julliard 11 Dec '14

11 Dec '14

Module: wine Branch: master Commit: 3977851004f410ca9478aae7320007f11bdbfcc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3977851004f410ca9478aae73… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 10 23:47:22 2014 +0100 iccvid: Fix compiler warnings with flag -Wunused-macros. --- dlls/iccvid/iccvid.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/iccvid/iccvid.c b/dlls/iccvid/iccvid.c index b1cdd69..4a59dae 100644 --- a/dlls/iccvid/iccvid.c +++ b/dlls/iccvid/iccvid.c @@ -58,8 +58,6 @@ static HINSTANCE ICCVID_hModule; #define ICCVID_MAGIC mmioFOURCC('c', 'v', 'i', 'd') #define compare_fourcc(fcc1, fcc2) (((fcc1)^(fcc2))&~0x20202020) - -#define DBUG 0 #define MAX_STRIPS 32 /* ------------------------------------------------------------------------ */

1 0

André Hentschel : itss/tests: Fix compiler warnings with flag -Wunused-macros.
by Alexandre Julliard 11 Dec '14

11 Dec '14

Module: wine Branch: master Commit: a6657bb084dfba0664dc360ad3740f450b76709a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6657bb084dfba0664dc360ad… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 10 23:47:20 2014 +0100 itss/tests: Fix compiler warnings with flag -Wunused-macros. --- dlls/itss/tests/protocol.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/itss/tests/protocol.c b/dlls/itss/tests/protocol.c index 6fd3431..663411f 100644 --- a/dlls/itss/tests/protocol.c +++ b/dlls/itss/tests/protocol.c @@ -41,12 +41,6 @@ called_ ## func = TRUE; \ }while(0) -#define CHECK_EXPECT2(func) \ - do { \ - ok(expect_ ##func, "unexpected call " #func "\n"); \ - called_ ## func = TRUE; \ - }while(0) - #define SET_CALLED(func) \ expect_ ## func = called_ ## func = FALSE

1 0

André Hentschel : msrle32: Remove superfluous defines.
by Alexandre Julliard 11 Dec '14

11 Dec '14

Module: wine Branch: master Commit: 4d24fc415fffefa6659fcafff70cd5f608b71943 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d24fc415fffefa6659fcafff… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 10 23:47:12 2014 +0100 msrle32: Remove superfluous defines. --- dlls/msrle32/msrle32.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index aba94a0..bd02ae6 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -36,13 +36,10 @@ static HINSTANCE MSRLE32_hModule = 0; #define compare_fourcc(fcc1, fcc2) (((fcc1)^(fcc2))&~0x20202020) -#define ABS(a) ((a) < 0 ? -(a) : (a)) -#define SQR(a) ((a) * (a)) - static inline WORD ColorCmp(WORD clr1, WORD clr2) { UINT a = clr1 - clr2; - return SQR(a); + return a * a; } static inline WORD Intensity(RGBQUAD clr) {

1 0

Jacek Caban : mshtml: Added support for IDM_CUT command in browser mode.
by Alexandre Julliard 10 Dec '14

10 Dec '14

Module: wine Branch: master Commit: 44c22801e3d13b5bba79fe09b686dd05783ad972 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44c22801e3d13b5bba79fe09b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 10 19:02:37 2014 +0100 mshtml: Added support for IDM_CUT command in browser mode. --- dlls/mshtml/olecmd.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index a49949d..c45e9c9 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -573,13 +573,26 @@ static HRESULT query_mshtml_cut(HTMLDocument *This, OLECMD *cmd) static HRESULT exec_mshtml_cut(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) { + nsIClipboardCommands *clipboard_commands; + nsresult nsres; + TRACE("(%p)->(%08x %p %p)\n", This, cmdexecopt, in, out); if(This->doc_obj->usermode == EDITMODE) return editor_exec_cut(This, cmdexecopt, in, out); - FIXME("Unimplemented in browse mode\n"); - return E_NOTIMPL; + clipboard_commands = get_clipboard_commands(This); + if(!clipboard_commands) + return E_UNEXPECTED; + + nsres = nsIClipboardCommands_CutSelection(clipboard_commands); + nsIClipboardCommands_Release(clipboard_commands); + if(NS_FAILED(nsres)) { + ERR("Paste failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT query_mshtml_paste(HTMLDocument *This, OLECMD *cmd)

1 0

Jacek Caban : mshtml: Added support for IDM_PASTE command in browser mode.
by Alexandre Julliard 10 Dec '14

10 Dec '14

Module: wine Branch: master Commit: 935e7f059efb4565dcbb201b03d7e71a9e5147a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=935e7f059efb4565dcbb201b0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 10 19:02:31 2014 +0100 mshtml: Added support for IDM_PASTE command in browser mode. --- dlls/mshtml/nsiface.idl | 23 +++++++++++++++++++++++ dlls/mshtml/olecmd.c | 39 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 60 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 3bb5020..1d8e263 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -3548,6 +3548,29 @@ interface nsIHTMLEditor : nsISupports [ object, + uuid(b8100c90-73be-11d2-92a5-00105a1b0d64), + local +] +interface nsIClipboardCommands : nsISupports +{ + nsresult CanCutSelection(bool *_retval); + nsresult CanCopySelection(bool *_retval); + nsresult CanCopyLinkLocation(bool *_retval); + nsresult CanCopyImageLocation(bool *_retval); + nsresult CanCopyImageContents(bool *_retval); + nsresult CanPaste(bool *_retval); + nsresult CutSelection(); + nsresult CopySelection(); + nsresult CopyLinkLocation(); + nsresult CopyImageLocation(); + nsresult CopyImageContents(); + nsresult Paste(); + nsresult SelectAll(); + nsresult SelectNone(); +} + +[ + object, uuid(edb99640-8378-4106-8673-e701a086eb1c), local ] diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index eea3aa2..a49949d 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -62,6 +62,28 @@ void do_ns_command(HTMLDocument *This, const char *cmd, nsICommandParams *nspara nsICommandManager_Release(cmdmgr); } +static nsIClipboardCommands *get_clipboard_commands(HTMLDocument *doc) +{ + nsIClipboardCommands *clipboard_commands; + nsIDocShell *doc_shell; + nsresult nsres; + + nsres = get_nsinterface((nsISupports*)doc->window->nswindow, &IID_nsIDocShell, (void**)&doc_shell); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIDocShell interface\n"); + return NULL; + } + + nsres = nsIDocShell_QueryInterface(doc_shell, &IID_nsIClipboardCommands, (void**)&clipboard_commands); + nsIDocShell_Release(doc_shell); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIClipboardCommands interface\n"); + return NULL; + } + + return clipboard_commands; +} + /********************************************************** * IOleCommandTarget implementation */ @@ -569,13 +591,26 @@ static HRESULT query_mshtml_paste(HTMLDocument *This, OLECMD *cmd) static HRESULT exec_mshtml_paste(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) { + nsIClipboardCommands *clipboard_commands; + nsresult nsres; + TRACE("(%p)->(%08x %p %p)\n", This, cmdexecopt, in, out); if(This->doc_obj->usermode == EDITMODE) return editor_exec_paste(This, cmdexecopt, in, out); - FIXME("Unimplemented in browse mode\n"); - return E_NOTIMPL; + clipboard_commands = get_clipboard_commands(This); + if(!clipboard_commands) + return E_UNEXPECTED; + + nsres = nsIClipboardCommands_Paste(clipboard_commands); + nsIClipboardCommands_Release(clipboard_commands); + if(NS_FAILED(nsres)) { + ERR("Paste failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT exec_browsemode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out)

1 0

Jacek Caban : mshtml: Added support for copy, paste and cut commands in execCommand.
by Alexandre Julliard 10 Dec '14

10 Dec '14

Module: wine Branch: master Commit: 6b463d85099b8da81ea234884dea27e048e65ff3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b463d85099b8da81ea234884… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 10 18:59:04 2014 +0100 mshtml: Added support for copy, paste and cut commands in execCommand. --- dlls/mshtml/htmldoc.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 7a577d9..2d89b45 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1096,6 +1096,10 @@ static HRESULT WINAPI HTMLDocument_clear(IHTMLDocument2 *iface) return S_OK; } +static const WCHAR copyW[] = + {'c','o','p','y',0}; +static const WCHAR cutW[] = + {'c','u','t',0}; static const WCHAR fontnameW[] = {'f','o','n','t','n','a','m','e',0}; static const WCHAR indentW[] = @@ -1106,6 +1110,8 @@ static const WCHAR insertunorderedlistW[] = {'i','n','s','e','r','t','u','n','o','r','d','e','r','e','d','l','i','s','t',0}; static const WCHAR outdentW[] = {'o','u','t','d','e','n','t',0}; +static const WCHAR pasteW[] = + {'p','a','s','t','e',0}; static const WCHAR respectvisibilityindesignW[] = {'r','e','s','p','e','c','t','v','i','s','i','b','i','l','i','t','y','i','n','d','e','s','i','g','n',0}; @@ -1113,11 +1119,14 @@ static const struct { const WCHAR *name; OLECMDID id; }command_names[] = { + {copyW, IDM_COPY}, + {cutW, IDM_CUT}, {fontnameW, IDM_FONTNAME}, {indentW, IDM_INDENT}, {insertorderedlistW, IDM_ORDERLIST}, {insertunorderedlistW, IDM_UNORDERLIST}, {outdentW, IDM_OUTDENT}, + {pasteW, IDM_PASTE}, {respectvisibilityindesignW, IDM_RESPECTVISIBILITY_INDESIGN} };

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
32
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 December 2014