December 2014 - Wine-Commits

Jacek Caban : mshtml: Do more initialization in create_plugin_host.
by Alexandre Julliard Dec. 11, 2014

Dec. 11, 2014

Module: wine Branch: master Commit: 5bce6044519a2ccc4d0958842bfd40510545632a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bce6044519a2ccc4d0958842… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 11 16:26:09 2014 +0100 mshtml: Do more initialization in create_plugin_host. --- dlls/mshtml/pluginhost.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 8e12865..b6fcf72 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -182,7 +182,7 @@ static void load_plugin(PluginHost *host) FIXME("No IPersistPropertyBag iface\n"); } -static void activate_plugin(PluginHost *host) +static void initialize_plugin_object(PluginHost *host) { IClientSecurity *client_security; IQuickActivate *quick_activate; @@ -191,12 +191,8 @@ static void activate_plugin(PluginHost *host) IViewObjectEx *view_obj; IDispatchEx *dispex; IDispatch *disp; - RECT rect; HRESULT hres; - if(!host->plugin_unk) - return; - /* Note native calls QI on plugin for an undocumented IID and CLSID_HTMLDocument */ /* FIXME: call FreezeEvents(TRUE) */ @@ -281,6 +277,13 @@ static void activate_plugin(PluginHost *host) FIXME("Use IOleCommandTarget\n"); IOleCommandTarget_Release(cmdtrg); } +} + +static void embed_plugin_object(PluginHost *host) +{ + IOleObject *ole_obj; + RECT rect; + HRESULT hres; hres = IUnknown_QueryInterface(host->plugin_unk, &IID_IOleObject, (void**)&ole_obj); if(FAILED(hres)) { @@ -288,13 +291,11 @@ static void activate_plugin(PluginHost *host) return; } - if(ole_obj) { - get_pos_rect(host, &rect); - hres = IOleObject_DoVerb(ole_obj, OLEIVERB_INPLACEACTIVATE, NULL, &host->IOleClientSite_iface, 0, host->hwnd, &rect); - IOleObject_Release(ole_obj); - if(FAILED(hres)) - WARN("DoVerb failed: %08x\n", hres); - } + get_pos_rect(host, &rect); + hres = IOleObject_DoVerb(ole_obj, OLEIVERB_INPLACEACTIVATE, NULL, &host->IOleClientSite_iface, 0, host->hwnd, &rect); + IOleObject_Release(ole_obj); + if(FAILED(hres)) + WARN("DoVerb failed: %08x\n", hres); if(host->ip_object) { HWND hwnd; @@ -323,7 +324,7 @@ void update_plugin_window(PluginHost *host, HWND hwnd, const RECT *rect) if(!host->hwnd) { host->hwnd = hwnd; - activate_plugin(host); + embed_plugin_object(host); } if(rect_changed && host->ip_object) @@ -2103,5 +2104,8 @@ HRESULT create_plugin_host(HTMLDocumentNode *doc, HTMLPluginContainer *container container->plugin_host = host; host->element = container; + + initialize_plugin_object(host); + return S_OK; }

1 0

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

Dec. 11, 2014

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 : msrle32: Remove superfluous defines.
by Alexandre Julliard Dec. 11, 2014

Dec. 11, 2014

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

Martin Storsjo : msvcp120_app: Add forwarding dll.
by Alexandre Julliard Dec. 11, 2014

Dec. 11, 2014

Module: wine Branch: master Commit: 69269a7f01da5c628d49148546aa6aa5239e1654 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69269a7f01da5c628d4914854… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Dec 10 15:44:04 2014 +0200 msvcp120_app: Add forwarding dll. --- configure | 2 + configure.ac | 1 + dlls/msvcp120_app/Makefile.in | 1 + dlls/msvcp120_app/msvcp120_app.spec | 3846 +++++++++++++++++++++++++++++++++++ tools/make_specfiles | 4 + 5 files changed, 3854 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=69269a7f01da5c628d491…

1 0

Bruno Jesus : winmm/tests: Add joystick tests.
by Alexandre Julliard Dec. 11, 2014

Dec. 11, 2014

Module: wine Branch: master Commit: 2a5f5b89fd6ab9c41265ccf45a05453b39bee50b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a5f5b89fd6ab9c41265ccf45… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Dec 11 02:54:36 2014 -0200 winmm/tests: Add joystick tests. --- dlls/winmm/tests/Makefile.in | 1 + dlls/winmm/tests/joystick.c | 205 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 206 insertions(+) diff --git a/dlls/winmm/tests/Makefile.in b/dlls/winmm/tests/Makefile.in index 887a695..5d81e38 100644 --- a/dlls/winmm/tests/Makefile.in +++ b/dlls/winmm/tests/Makefile.in @@ -4,6 +4,7 @@ IMPORTS = winmm user32 advapi32 C_SRCS = \ capture.c \ generated.c \ + joystick.c \ mci.c \ mcicda.c \ midi.c \ diff --git a/dlls/winmm/tests/joystick.c b/dlls/winmm/tests/joystick.c new file mode 100644 index 0000000..21e90e3 --- /dev/null +++ b/dlls/winmm/tests/joystick.c @@ -0,0 +1,205 @@ +/* + * Unit tests for joystick APIs + * + * Copyright 2014 Bruno Jesus + * + * 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 "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "mmsystem.h" +#include "wine/test.h" + +static HWND window; + +static LRESULT CALLBACK proc_window(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + return DefWindowProcA(hwnd, msg, wparam, lparam); +} + +static void create_window(void) +{ + const char name[] = "Joystick Test"; + WNDCLASSA wc; + + memset(&wc, 0, sizeof(wc)); + wc.lpfnWndProc = proc_window; + wc.hInstance = 0; + wc.lpszClassName = name; + RegisterClassA(&wc); + window = CreateWindowExA(0, name, name, WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, + NULL, NULL, NULL, NULL); + ok(window != NULL, "Expected CreateWindowEx to work, error %d\n", GetLastError()); +} + +static void destroy_window(void) +{ + DestroyWindow(window); + window = NULL; +} + +static void test_api(void) +{ + MMRESULT ret; + JOYCAPSA jc; + JOYCAPSW jcw; + JOYINFO info; + union _infoex + { + JOYINFOEX ex; + char buffer[sizeof(JOYINFOEX) * 2]; + } infoex; + UINT i, par, devices, joyid, win98 = 0, win8 = 0; + UINT period[] = {0, 1, 9, 10, 100, 1000, 1001, 10000, 65535, 65536, 0xFFFFFFFF}; + UINT threshold_error = 0x600, period_win8_error = 0x7CE; + UINT flags[] = { JOY_RETURNALL, JOY_RETURNBUTTONS, JOY_RETURNCENTERED, JOY_RETURNPOV, + JOY_RETURNPOVCTS, JOY_RETURNR, JOY_RETURNRAWDATA, JOY_RETURNU, + JOY_RETURNV, JOY_RETURNX, JOY_RETURNY, JOY_RETURNZ }; + + devices = joyGetNumDevs(); + joyid = -1; + /* joyGetNumDevs does NOT return the number of joysticks connected, only slots in the OS */ + for (i = 0; i < devices; i++) + { + memset(&jc, 0, sizeof(jc)); + ret = joyGetDevCapsA(JOYSTICKID1 + i, &jc, sizeof(jc)); + if (ret == JOYERR_NOERROR) + { + joyid = JOYSTICKID1 + i; + trace("Joystick[%d] - name: '%s', axes: %d, buttons: %d, period range: %d - %d\n", + JOYSTICKID1 + i, jc.szPname, jc.wNumAxes, jc.wNumButtons, jc.wPeriodMin, jc.wPeriodMax); + ret = joyGetDevCapsW(JOYSTICKID1 + i, &jcw, sizeof(jcw)); + if (ret != MMSYSERR_NOTSUPPORTED) /* Win 98 */ + { + ok(ret == JOYERR_NOERROR, "Expected %d, got %d\n", JOYERR_NOERROR, ret); + ok(jc.wNumAxes == jcw.wNumAxes, "Expected %d == %d\n", jc.wNumAxes, jcw.wNumAxes); + ok(jc.wNumButtons == jcw.wNumButtons, "Expected %d == %d\n", jc.wNumButtons, jcw.wNumButtons); + } + else win98++; + break; + } + else + { + ok(ret == JOYERR_PARMS, "Expected %d, got %d\n", JOYERR_PARMS, ret); + ret = joyGetDevCapsW(JOYSTICKID1 + i, &jcw, sizeof(jcw)); + ok(ret == JOYERR_PARMS || (ret == MMSYSERR_NOTSUPPORTED) /* Win 98 */, + "Expected %d, got %d\n", JOYERR_PARMS, ret); + } + } + /* Test invalid joystick - If no joystick is present the driver is not initialized, + * so a NODRIVER error is returned, if at least one joystick is present the error is + * about invalid parameters. */ + ret = joyGetDevCapsA(joyid + devices, &jc, sizeof(jc)); + ok(ret == MMSYSERR_NODRIVER || ret == JOYERR_PARMS, + "Expected %d or %d, got %d\n", MMSYSERR_NODRIVER, JOYERR_PARMS, ret); + + if (joyid == -1) + { + skip("This test requires a real joystick.\n"); + return; + } + + /* Capture tests */ + ret = joySetCapture(NULL, joyid, 100, FALSE); + ok(ret == JOYERR_PARMS || broken(win98 && ret == MMSYSERR_INVALPARAM) /* Win 98 */, + "Expected %d, got %d\n", JOYERR_PARMS, ret); + ret = joySetCapture(window, joyid, 100, FALSE); + ok(ret == JOYERR_NOERROR, "Expected %d, got %d\n", JOYERR_NOERROR, ret); + ret = joySetCapture(window, joyid, 100, FALSE); /* double capture */ + if (ret == JOYERR_NOCANDO) + { + todo_wine + ok(broken(1), "Expected double capture using joySetCapture to work\n"); + if (!win98 && broken(1)) win8++; /* Windows 98 or 8 cannot cope with that */ + } + else ok(ret == JOYERR_NOERROR, "Expected %d, got %d\n", JOYERR_NOERROR, ret); + ret = joyReleaseCapture(joyid); + ok(ret == JOYERR_NOERROR, "Expected %d, got %d\n", JOYERR_NOERROR, ret); + ret = joyReleaseCapture(joyid); + ok(ret == JOYERR_NOERROR, "Expected %d, got %d\n", JOYERR_NOERROR, ret); /* double release */ + + /* Try some unusual period values for joySetCapture and unusual threshold values for joySetThreshold. + * Windows XP allows almost all test values, Windows 8 will return error on most test values, Windows + * 98 allows anything but cuts the values to their maximum supported values internally. */ + for (i = 0; i < sizeof(period) / sizeof(period[0]); i++) + { + ret = joySetCapture(window, joyid, period[i], FALSE); + if (win8 && ((1 << i) & period_win8_error)) + ok(ret == JOYERR_NOCANDO, "Test [%d]: Expected %d, got %d\n", i, JOYERR_NOCANDO, ret); + else + ok(ret == JOYERR_NOERROR, "Test [%d]: Expected %d, got %d\n", i, JOYERR_NOERROR, ret); + ret = joyReleaseCapture(joyid); + ok(ret == JOYERR_NOERROR, "Test [%d]: Expected %d, got %d\n", i, JOYERR_NOERROR, ret); + /* Reuse the periods to test the threshold */ + ret = joySetThreshold(joyid, period[i]); + if (!win98 && (1 << i) & threshold_error) + ok(ret == MMSYSERR_INVALPARAM, "Test [%d]: Expected %d, got %d\n", i, MMSYSERR_INVALPARAM, ret); + else + ok(ret == JOYERR_NOERROR, "Test [%d]: Expected %d, got %d\n", i, JOYERR_NOERROR, ret); + par = 0xdead; + ret = joyGetThreshold(joyid, &par); + ok(ret == JOYERR_NOERROR, "Test [%d]: Expected %d, got %d\n", i, JOYERR_NOERROR, ret); + if (!win98 || (win98 && i < 8)) + { + if ((1 << i) & threshold_error) + ok(par == period[8], "Test [%d]: Expected %d, got %d\n", i, period[8], par); + else + ok(par == period[i], "Test [%d]: Expected %d, got %d\n", i, period[i], par); + } + } + + /* Position tests */ + ret = joyGetPos(joyid, NULL); + ok(ret == MMSYSERR_INVALPARAM, "Expected %d, got %d\n", MMSYSERR_INVALPARAM, ret); + ret = joyGetPos(joyid, &info); + ok(ret == JOYERR_NOERROR, "Expected %d, got %d\n", JOYERR_NOERROR, ret); + ret = joyGetPosEx(joyid, NULL); + ok(ret == MMSYSERR_INVALPARAM || broken(win8 && ret == JOYERR_PARMS) /* Win 8 */, + "Expected %d, got %d\n", MMSYSERR_INVALPARAM, ret); + memset(&infoex, 0, sizeof(infoex)); + ret = joyGetPosEx(joyid, &infoex.ex); + ok(ret == JOYERR_PARMS || broken(win98 && ret == MMSYSERR_INVALPARAM), + "Expected %d, got %d\n", JOYERR_PARMS, ret); + infoex.ex.dwSize = sizeof(infoex.ex); + ret = joyGetPosEx(joyid, &infoex.ex); + ok(ret == JOYERR_NOERROR, "Expected %d, got %d\n", JOYERR_NOERROR, ret); + infoex.ex.dwSize = sizeof(infoex.ex) - 1; + ret = joyGetPosEx(joyid, &infoex.ex); + ok(ret == JOYERR_PARMS || broken(win98 && ret == MMSYSERR_INVALPARAM), + "Expected %d, got %d\n", JOYERR_PARMS, ret); + infoex.ex.dwSize = sizeof(infoex); + ret = joyGetPosEx(joyid, &infoex.ex); + ok(ret == JOYERR_NOERROR, "Expected %d, got %d\n", JOYERR_NOERROR, ret); + + infoex.ex.dwSize = sizeof(infoex.ex); + for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) + { + infoex.ex.dwFlags = flags[i]; + ret = joyGetPosEx(joyid, &infoex.ex); + ok(ret == JOYERR_NOERROR, "Expected %d, got %d\n", JOYERR_NOERROR, ret); + } +} + +START_TEST(joystick) +{ + create_window(); + test_api(); + destroy_window(); +}

1 0

Bruno Jesus : winmm: Handle invalid threshold values in joySetThreshold.
by Alexandre Julliard Dec. 11, 2014

Dec. 11, 2014

Module: wine Branch: master Commit: 125b0f74c5e57350f29062f02452270a8d893b1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=125b0f74c5e57350f29062f02… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Dec 11 02:54:01 2014 -0200 winmm: Handle invalid threshold values in joySetThreshold. --- dlls/winmm/joystick.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c index d3dcfa5..6ac67f4 100644 --- a/dlls/winmm/joystick.c +++ b/dlls/winmm/joystick.c @@ -325,7 +325,7 @@ MMRESULT WINAPI joySetThreshold(UINT wID, UINT wThreshold) { TRACE("(%04X, %d);\n", wID, wThreshold); - if (wID >= MAXJOYSTICK) return MMSYSERR_INVALPARAM; + if (wID >= MAXJOYSTICK || wThreshold > 65535) return MMSYSERR_INVALPARAM; JOY_Sticks[wID].threshold = wThreshold;

1 0

Bruno Jesus : winmm: Allow any period value for setJoyCapture.
by Alexandre Julliard Dec. 11, 2014

Dec. 11, 2014

Module: wine Branch: master Commit: 9c8978cf5c4ace98d92103029cc371db9cd02dd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c8978cf5c4ace98d92103029… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Dec 11 02:53:55 2014 -0200 winmm: Allow any period value for setJoyCapture. --- dlls/winmm/joystick.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c index f4870fe..d3dcfa5 100644 --- a/dlls/winmm/joystick.c +++ b/dlls/winmm/joystick.c @@ -299,7 +299,8 @@ MMRESULT WINAPI joySetCapture(HWND hWnd, UINT wID, UINT wPeriod, BOOL bChanged) TRACE("(%p, %04X, %d, %d);\n", hWnd, wID, wPeriod, bChanged); if (wID >= MAXJOYSTICK || hWnd == 0) return JOYERR_PARMS; - if (wPeriod<JOY_PERIOD_MIN || wPeriod>JOY_PERIOD_MAX) return JOYERR_PARMS; + if (wPeriod<JOY_PERIOD_MIN) wPeriod = JOY_PERIOD_MIN; + else if(wPeriod>JOY_PERIOD_MAX) wPeriod = JOY_PERIOD_MAX; if (!JOY_LoadDriver(wID)) return MMSYSERR_NODRIVER; if (JOY_Sticks[wID].hCapture || !IsWindow(hWnd))

1 0

Bruno Jesus : winmm: The dwSize paramater of JOYINFOEX must be set correctly.
by Alexandre Julliard Dec. 11, 2014

Dec. 11, 2014

Module: wine Branch: master Commit: 135f929a39e10ca1b373bcbd5a1400b7aecd7545 URL: http://source.winehq.org/git/wine.git/?a=commit;h=135f929a39e10ca1b373bcbd5… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Dec 11 02:53:48 2014 -0200 winmm: The dwSize paramater of JOYINFOEX must be set correctly. --- dlls/winmm/joystick.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c index 9c06fc2..f4870fe 100644 --- a/dlls/winmm/joystick.c +++ b/dlls/winmm/joystick.c @@ -220,7 +220,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 (wID >= MAXJOYSTICK || lpInfo->dwSize < sizeof(JOYINFOEX)) return JOYERR_PARMS; if (!JOY_LoadDriver(wID)) return MMSYSERR_NODRIVER; lpInfo->dwXpos = 0;

1 0

Bruno Jesus : winmm: Allow calling joyReleaseCapture multiple times.
by Alexandre Julliard Dec. 11, 2014

Dec. 11, 2014

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

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

Dec. 11, 2014

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