January 2009 - Wine-Commits

Jeff Latimer : user32/tests: Add tests for DdeGetData Ascii interface.
by Alexandre Julliard Jan. 14, 2009

Jan. 14, 2009

Module: wine Branch: master Commit: 1f5b2f7e0c3b699205e6758486647280be12f65c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f5b2f7e0c3b699205e675848… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Wed Jan 14 18:29:28 2009 +1100 user32/tests: Add tests for DdeGetData Ascii interface. --- dlls/user32/tests/dde.c | 70 +++++++++++++++++++++++++++++++++++------------ 1 files changed, 52 insertions(+), 18 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index e1ccf66..53b216f 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -559,7 +559,7 @@ static HDDEDATA CALLBACK server_ddeml_callback(UINT uType, UINT uFmt, HCONV hcon ULONG_PTR dwData1, ULONG_PTR dwData2) { char str[MAX_PATH], *ptr; - HDDEDATA ret; + HDDEDATA ret = NULL; DWORD size; static int msg_index = 0; @@ -711,7 +711,7 @@ static HDDEDATA CALLBACK server_ddeml_callback(UINT uType, UINT uFmt, HCONV hcon case XTYP_EXECUTE: { - ok(msg_index == 9 || msg_index == 10, "Expected 9 or 10, got %d\n", msg_index); + ok(msg_index >= 9 && msg_index <= 11, "Expected 9 or 11, got %d\n", msg_index); ok(uFmt == 0, "Expected 0, got %d\n", uFmt); ok(hconv == conversation, "Expected conversation handle, got %p\n", hconv); ok(dwData1 == 0, "Expected 0, got %08lx\n", dwData1); @@ -722,29 +722,50 @@ static HDDEDATA CALLBACK server_ddeml_callback(UINT uType, UINT uFmt, HCONV hcon ok(!lstrcmpA(str, "TestDDETopic"), "Expected TestDDETopic, got %s\n", str); ok(size == 12, "Expected 12, got %d\n", size); - ptr = (LPSTR)DdeAccessData(hdata, &size); - - if (msg_index == 9) + if (msg_index == 9 || msg_index == 11) { - ok(!lstrcmpA(ptr, "[Command(Var)]"), "Expected '[Command(Var)]', got %s\n", ptr); - ok(size == 15, "Expected 15, got %d\n", size); - ret = (HDDEDATA)DDE_FACK; + ptr = (LPSTR)DdeAccessData(hdata, &size); + + if (msg_index == 9) + { + ok(!lstrcmpA(ptr, "[Command(Var)]"), "Expected '[Command(Var)]', got %s\n", ptr); + ok(size == 15, "Expected 15, got %d\n", size); + ret = (HDDEDATA)DDE_FACK; + } + else + { + ok(!lstrcmpA(ptr, "[BadCommand(Var)]"), "Expected '[BadCommand(Var)]', got %s\n", ptr); + ok(size == 18, "Expected 18, got %d\n", size); + ret = (HDDEDATA)DDE_FNOTPROCESSED; + } + + DdeUnaccessData(hdata); } - else + else if (msg_index == 10) { - ok(!lstrcmpA(ptr, "[BadCommand(Var)]"), "Expected '[BadCommand(Var)]', got %s\n", ptr); - ok(size == 18, "Expected 18, got %d\n", size); - ret = (HDDEDATA)DDE_FNOTPROCESSED; - } + DWORD rsize = 0; + size = 0; + + size = DdeGetData(hdata, NULL, 0, 0); + ok(size == 17, "DdeGetData should have returned 17 not %d\n", size); + ptr = HeapAlloc(GetProcessHeap(), 0, size); + ok(ptr != NULL,"HeapAlloc should have returned ptr not NULL\n"); + rsize = DdeGetData(hdata, (LPBYTE)ptr, size, 0); + ok(rsize == size, "DdeGetData did not return %d bytes but %d\n", size, rsize); + + ok(!lstrcmpA(ptr, "[Command-2(Var)]"), "Expected '[Command-2(Var)]' got %s\n", ptr); + ok(size == 17, "Expected 17, got %d\n", size); + ret = (HDDEDATA)DDE_FACK; - DdeUnaccessData(hdata); + HeapFree(GetProcessHeap(), 0, ptr); + } return ret; } case XTYP_DISCONNECT: { - ok(msg_index == 11, "Expected 11, got %d\n", msg_index); + ok(msg_index == 12, "Expected 12, got %d\n", msg_index); ok(uFmt == 0, "Expected 0, got %d\n", uFmt); ok(hconv == conversation, "Expected conversation handle, got %p\n", hconv); ok(dwData1 == 0, "Expected 0, got %08lx\n", dwData1); @@ -833,8 +854,8 @@ static LRESULT WINAPI dde_msg_client_wndproc(HWND hwnd, UINT msg, WPARAM wparam, case WM_DDE_ACK: { - ok((msg_index >= 2 && msg_index <= 4) || (msg_index >= 6 && msg_index <= 10), - "Expected 2, 3, 4, 6, 7, 8, 9 or 10, got %d\n", msg_index); + ok((msg_index >= 2 && msg_index <= 4) || (msg_index >= 6 && msg_index <= 11), + "Expected 2, 3, 4, 6, 7, 8, 9, 10 or 11, got %d\n", msg_index); if (msg_index == 2) { @@ -851,7 +872,7 @@ static LRESULT WINAPI dde_msg_client_wndproc(HWND hwnd, UINT msg, WPARAM wparam, ok(!lstrcmpA(str, "TestDDETopic"), "Expected TestDDETopic, got %s\n", str); ok(size == 12, "Expected 12, got %d\n", size); } - else if (msg_index == 9 || msg_index == 10) + else if (msg_index >= 9 && msg_index <= 11) { ok(wparam == (WPARAM)server_hwnd, "Expected server hwnd, got %08lx\n", wparam); @@ -869,6 +890,10 @@ static LRESULT WINAPI dde_msg_client_wndproc(HWND hwnd, UINT msg, WPARAM wparam, { ok(ack->fAck == TRUE, "Expected TRUE, got %d\n", ack->fAck); ok(!lstrcmpA(ptr, "[Command(Var)]"), "Expected '[Command(Var)]', got %s\n", ptr); + } else if (msg_index == 10) + { + ok(ack->fAck == TRUE, "Expected TRUE, got %d\n", ack->fAck); + ok(!lstrcmpA(ptr, "[Command-2(Var)]"), "Expected '[Command-2(Var)]', got %s\n", ptr); } else { @@ -1107,6 +1132,15 @@ static void test_msg_client() flush_events(); GlobalFree(execute_hglobal); + execute_hglobal = create_execute("[Command-2(Var)]"); + + /* WM_DDE_EXECUTE, all params correct */ + lparam = PackDDElParam(WM_DDE_EXECUTE, 0, (UINT_PTR)execute_hglobal); + PostMessageA(server_hwnd, WM_DDE_EXECUTE, (WPARAM)client_hwnd, lparam); + + flush_events(); + + GlobalFree(execute_hglobal); execute_hglobal = create_execute("[BadCommand(Var)]"); /* WM_DDE_EXECUTE that will get rejected */

1 0

Jeff Latimer : user32: Check for NULL pData in DdeClientTransAction expecting to be passed a handle .
by Alexandre Julliard Jan. 14, 2009

Jan. 14, 2009

Module: wine Branch: master Commit: 56784f60c16046f995b34ed67432525f0c6e18b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56784f60c16046f995b34ed67… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Wed Jan 14 18:29:18 2009 +1100 user32: Check for NULL pData in DdeClientTransAction expecting to be passed a handle. --- dlls/user32/dde_client.c | 18 ++++++++++++------ dlls/user32/tests/dde.c | 5 +---- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/user32/dde_client.c b/dlls/user32/dde_client.c index d8a30c9..c052b83 100644 --- a/dlls/user32/dde_client.c +++ b/dlls/user32/dde_client.c @@ -632,6 +632,15 @@ static WDML_XACT* WDML_ClientQueueExecute(WDML_CONV* pConv, LPVOID pData, DWORD TRACE("XTYP_EXECUTE transaction\n"); + if (pData == NULL) + { + if (cbData == (DWORD)-1) + pConv->instance->lastError = DMLERR_INVALIDPARAMETER; + else + pConv->instance->lastError = DMLERR_MEMORY_ERROR; + return NULL; + } + pXAct = WDML_AllocTransaction(pConv->instance, WM_DDE_EXECUTE, 0, 0); if (!pXAct) return NULL; @@ -1154,13 +1163,10 @@ HDDEDATA WINAPI DdeClientTransaction(LPBYTE pData, DWORD cbData, HCONV hConv, HS switch (wType) { case XTYP_EXECUTE: - /* Windows simply ignores hszItem and wFmt in this case */ - if (pData == NULL) - { - pConv->instance->lastError = DMLERR_INVALIDPARAMETER; - return 0; - } + /* Windows simply ignores hszItem and wFmt in this case */ pXAct = WDML_ClientQueueExecute(pConv, pData, cbData); + if (pXAct == NULL) + return 0; break; case XTYP_POKE: if (!hszItem) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 0ece009..e1ccf66 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -427,10 +427,7 @@ todo_wine ret = DdeGetLastError(client_pid); ok(op == NULL, "Expected NULL, got %p\n", op); ok(res == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", res); - todo_wine - { - ok(ret == DMLERR_MEMORY_ERROR, "Expected DMLERR_MEMORY_ERROR, got %d\n", ret); - } + ok(ret == DMLERR_MEMORY_ERROR, "Expected DMLERR_MEMORY_ERROR, got %d\n", ret); /* XTYP_EXECUTE, no data, -1 size */ res = 0xdeadbeef;

1 0

Paul Vriens : ddrawex/tests: Don't crash on win9x.
by Alexandre Julliard Jan. 14, 2009

Jan. 14, 2009

Module: wine Branch: master Commit: 950514c8c36825b60656153635bf3f4da13dd692 URL: http://source.winehq.org/git/wine.git/?a=commit;h=950514c8c36825b6065615363… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jan 14 14:29:56 2009 +0100 ddrawex/tests: Don't crash on win9x. --- dlls/ddrawex/tests/surface.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/ddrawex/tests/surface.c b/dlls/ddrawex/tests/surface.c index dd9ebfb..211e8e9 100644 --- a/dlls/ddrawex/tests/surface.c +++ b/dlls/ddrawex/tests/surface.c @@ -81,6 +81,10 @@ static void GetDCTest_main(DDSURFACEDESC *ddsd, DDSURFACEDESC2 *ddsd2, void (*te IDirectDraw4 *dd4; hr = IDirectDraw_CreateSurface(dd1, ddsd, &surf, NULL); + if (hr == DDERR_UNSUPPORTEDMODE) { + win_skip("Unsupported mode\n"); + return; + } ok(hr == DD_OK, "IDirectDraw_CreateSurface failed: 0x%08x\n", hr); testfunc(surf, 1); IDirectDrawSurface_Release(surf); @@ -164,6 +168,10 @@ static void CapsTest(void) ddsd.dwWidth = 64; ddsd.dwHeight = 64; hr = IDirectDraw_CreateSurface(dd1, &ddsd, &surf, NULL); + if (hr == DDERR_UNSUPPORTEDMODE) { + win_skip("Unsupported mode\n"); + return; + } ok(hr == DD_OK, "Creating a SYSMEM | VIDMEM surface returned 0x%08x, expected DD_OK\n", hr); if(surf) IDirectDrawSurface_Release(surf);

1 0

Francois Gouget : configure: Check for ESound, FreeType, GPhoto2 and SANE even if their 'xxx-config' tool is missing.
by Alexandre Julliard Jan. 14, 2009

Jan. 14, 2009

Module: wine Branch: master Commit: 3fe5d80512ec5dbfbb2ee7dbb426be7d582e262e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fe5d80512ec5dbfbb2ee7dbb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 14 14:16:06 2009 +0100 configure: Check for ESound, FreeType, GPhoto2 and SANE even if their 'xxx-config' tool is missing. --- configure | 235 +++++++++++++++++++++++++++++++++++++++++++++++----------- configure.ac | 89 +++++++++++++---------- 2 files changed, 243 insertions(+), 81 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3fe5d80512ec5dbfbb2ee…

1 0

Paul Vriens : setupapi/tests: Fix some test failures on win9x.
by Alexandre Julliard Jan. 14, 2009

Jan. 14, 2009

Module: wine Branch: master Commit: b8cde623dd4eba28eba3c9014175f68429d38264 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8cde623dd4eba28eba3c9014… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jan 14 14:26:38 2009 +0100 setupapi/tests: Fix some test failures on win9x. --- dlls/setupapi/tests/query.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/tests/query.c b/dlls/setupapi/tests/query.c index 97be1a2..0b7883c 100644 --- a/dlls/setupapi/tests/query.c +++ b/dlls/setupapi/tests/query.c @@ -458,8 +458,7 @@ static void test_SetupGetTargetPath(void) ret = SetupGetTargetPathA(hinf, NULL, "CopyAlways.System32.Files", buffer, sizeof(buffer), &required); ok(ret, "SetupGetTargetPathA failed\n"); - lstrcpyA(destfile, WIN_DIR); - lstrcatA(destfile, "\\system32"); + GetSystemDirectoryA(destfile, MAX_PATH); ok(required == lstrlenA(destfile) + 1, "unexpected required size: %d\n", required); ok(!lstrcmpiA(buffer, destfile), "unexpected path: %s\n", buffer);

1 0

Francois Gouget : ddrawex: Add a trailing '\n' to a Wine trace.
by Alexandre Julliard Jan. 14, 2009

Jan. 14, 2009

Module: wine Branch: master Commit: 053d521ca70fdd054be8d43b8e49cbfc665fb9f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=053d521ca70fdd054be8d43b8… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 14 14:15:45 2009 +0100 ddrawex: Add a trailing '\n' to a Wine trace. --- dlls/ddrawex/ddraw.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddrawex/ddraw.c b/dlls/ddrawex/ddraw.c index 9014033..b581529 100644 --- a/dlls/ddrawex/ddraw.c +++ b/dlls/ddrawex/ddraw.c @@ -1514,7 +1514,7 @@ IDirectDrawFactoryImpl_CreateDirectDraw(IDirectDrawFactory* iface, IDirectDrawImpl *object = NULL; IDirectDraw *parent = NULL; - TRACE("(%p)->(%s,%p,0x%08x,0x%08x,%p,%p)", iface, debugstr_guid(pGUID), hWnd, dwCoopLevelFlags, + TRACE("(%p)->(%s,%p,0x%08x,0x%08x,%p,%p)\n", iface, debugstr_guid(pGUID), hWnd, dwCoopLevelFlags, dwReserved, pUnkOuter, ppDirectDraw); if(pUnkOuter)

1 0

Francois Gouget : widl: Add a trailing '\n' to an error() message.
by Alexandre Julliard Jan. 14, 2009

Jan. 14, 2009

Module: wine Branch: master Commit: a17f48219a942bc6b90a1a16038815b2490ec23b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a17f48219a942bc6b90a1a160… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 14 14:15:33 2009 +0100 widl: Add a trailing '\n' to an error() message. --- tools/widl/proxy.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 4e69190..0dcb737 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -566,7 +566,7 @@ static int write_proxy_methods(type_t *iface, int skip) const var_t *func = stmt->u.var; if (!is_callas(func->attrs)) { if (i != func->type->details.function->idx ) - error("widl internal error: method index mismatch"); + error("widl internal error: method index mismatch\n"); if (i) fprintf(proxy, ",\n"); if (skip || (is_local(func->attrs) && !get_callas_source(iface, func))) print_proxy( "0 /* %s_%s_Proxy */", iface->name, get_name(func));

1 0

Dylan Smith : richedit: Correct limitations on values for setting zoom ratio.
by Alexandre Julliard Jan. 14, 2009

Jan. 14, 2009

Module: wine Branch: master Commit: b81144b35075911afbd92e2e523582b55b0db58b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b81144b35075911afbd92e2e5… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jan 13 13:39:39 2009 -0500 richedit: Correct limitations on values for setting zoom ratio. --- dlls/riched20/paint.c | 17 +++++++++-------- dlls/riched20/tests/editor.c | 16 ++++++++-------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 47e4af1..565d467 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -1230,18 +1230,19 @@ ME_SetZoom(ME_TextEditor *editor, int numerator, int denominator) { /* TODO: Zoom images and objects */ - if (numerator != 0) + if (numerator == 0 && denominator == 0) { - if (denominator == 0) - return FALSE; - if (1.0 / 64.0 > (float)numerator / (float)denominator - || (float)numerator / (float)denominator > 64.0) - return FALSE; + editor->nZoomNumerator = editor->nZoomDenominator = 0; + return TRUE; } - + if (numerator <= 0 || denominator <= 0) + return FALSE; + if (numerator * 64 <= denominator || numerator / denominator >= 64) + return FALSE; + editor->nZoomNumerator = numerator; editor->nZoomDenominator = denominator; - + ME_RewrapRepaint(editor); return TRUE; } diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 4165f5e..633620b 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -6376,27 +6376,27 @@ static void test_zoom(void) ok(ret == TRUE, "EM_SETZOOM rejected valid values (%d).\n", ret); ret = SendMessage(hwnd, EM_SETZOOM, (WPARAM)2, (LPARAM)128); - todo_wine ok(ret == FALSE, "EM_SETZOOM accepted invalid values (%d).\n", ret); + ok(ret == FALSE, "EM_SETZOOM accepted invalid values (%d).\n", ret); ret = SendMessage(hwnd, EM_GETZOOM, (WPARAM)&numerator, (LPARAM)&denominator); - todo_wine ok(numerator == 127, "incorrect numerator is %d\n", numerator); - todo_wine ok(denominator == 2, "incorrect denominator is %d\n", denominator); + ok(numerator == 127, "incorrect numerator is %d\n", numerator); + ok(denominator == 2, "incorrect denominator is %d\n", denominator); ok(ret == TRUE, "EM_GETZOOM failed (%d).\n", ret); ret = SendMessage(hwnd, EM_SETZOOM, (WPARAM)128, (LPARAM)2); - todo_wine ok(ret == FALSE, "EM_SETZOOM accepted invalid values (%d).\n", ret); + ok(ret == FALSE, "EM_SETZOOM accepted invalid values (%d).\n", ret); /* See if negative numbers are accepted. */ ret = SendMessage(hwnd, EM_SETZOOM, (WPARAM)-100, (LPARAM)-100); - todo_wine ok(ret == FALSE, "EM_SETZOOM accepted invalid values (%d).\n", ret); + ok(ret == FALSE, "EM_SETZOOM accepted invalid values (%d).\n", ret); /* See if negative numbers are accepted. */ ret = SendMessage(hwnd, EM_SETZOOM, (WPARAM)0, (LPARAM)100); - todo_wine ok(ret == FALSE, "EM_SETZOOM failed (%d).\n", ret); + ok(ret == FALSE, "EM_SETZOOM failed (%d).\n", ret); ret = SendMessage(hwnd, EM_GETZOOM, (WPARAM)&numerator, (LPARAM)&denominator); - todo_wine ok(numerator == 127, "incorrect numerator is %d\n", numerator); - todo_wine ok(denominator == 2, "incorrect denominator is %d\n", denominator); + ok(numerator == 127, "incorrect numerator is %d\n", numerator); + ok(denominator == 2, "incorrect denominator is %d\n", denominator); ok(ret == TRUE, "EM_GETZOOM failed (%d).\n", ret); /* Reset the zoom value */

1 0

Francois Gouget : rpcrt4/tests: Add a trailing '\n' to ok() calls.
by Alexandre Julliard Jan. 14, 2009

Jan. 14, 2009

Module: wine Branch: master Commit: 5656e416408dca17e2ce161734e6200819ba04d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5656e416408dca17e2ce16173… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 14 14:15:26 2009 +0100 rpcrt4/tests: Add a trailing '\n' to ok() calls. --- dlls/rpcrt4/tests/server.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index ce487ee..9f39f01 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -1152,10 +1152,10 @@ array_tests(void) ok(sum_conf_array(&c[7], 1) == 7, "RPC sum_conf_array\n"); ok(sum_conf_array(&c[2], 0) == 0, "RPC sum_conf_array\n"); - ok(sum_conf_ptr_by_conf_ptr(1, c2, c) == 45, "RPC sum_conf_ptr_by_conf_ptr"); - ok(sum_conf_ptr_by_conf_ptr(3, c2, c) == 345, "RPC sum_conf_ptr_by_conf_ptr"); + ok(sum_conf_ptr_by_conf_ptr(1, c2, c) == 45, "RPC sum_conf_ptr_by_conf_ptr\n"); + ok(sum_conf_ptr_by_conf_ptr(3, c2, c) == 345, "RPC sum_conf_ptr_by_conf_ptr\n"); c2[0] = 0; - ok(sum_conf_ptr_by_conf_ptr(3, c2, c) == 300, "RPC sum_conf_ptr_by_conf_ptr"); + ok(sum_conf_ptr_by_conf_ptr(3, c2, c) == 300, "RPC sum_conf_ptr_by_conf_ptr\n"); ok(sum_unique_conf_array(ca, 4) == -2, "RPC sum_unique_conf_array\n"); ok(sum_unique_conf_ptr(ca, 5) == 3, "RPC sum_unique_conf_array\n");

1 0

Dylan Smith : richedit: Zoom in and out with mouse wheel with control held.
by Alexandre Julliard Jan. 14, 2009

Jan. 14, 2009

Module: wine Branch: master Commit: fcabbbf30fdf3da8c461cf4313a8e076af1fef51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcabbbf30fdf3da8c461cf431… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jan 13 13:39:32 2009 -0500 richedit: Zoom in and out with mouse wheel with control held. --- dlls/riched20/editor.c | 29 +++++++++++++++++++++++------ dlls/riched20/tests/editor.c | 12 ++++++------ 2 files changed, 29 insertions(+), 12 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index d022e17..3b25295 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4096,18 +4096,35 @@ static LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, { int gcWheelDelta; UINT pulScrollLines; + BOOL ctrl_is_down; if ((editor->nEventMask & ENM_MOUSEEVENTS) && !ME_FilterEvent(editor, msg, &wParam, &lParam)) return 0; - SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0); - gcWheelDelta = -GET_WHEEL_DELTA_WPARAM(wParam); - - if (abs(gcWheelDelta) >= WHEEL_DELTA && pulScrollLines) + ctrl_is_down = GetKeyState(VK_CONTROL) & 0x8000; + + gcWheelDelta = GET_WHEEL_DELTA_WPARAM(wParam); + + if (abs(gcWheelDelta) >= WHEEL_DELTA) { - /* FIXME follow the original */ - ME_ScrollDown(editor,pulScrollLines * (gcWheelDelta / WHEEL_DELTA) * 8); + if (ctrl_is_down) { + int numerator; + if (!editor->nZoomNumerator || !editor->nZoomDenominator) + { + numerator = 100; + } else { + numerator = editor->nZoomNumerator * 100 / editor->nZoomDenominator; + } + numerator = numerator + (gcWheelDelta / WHEEL_DELTA) * 10; + if (numerator >= 10 && numerator <= 500) + ME_SetZoom(editor, numerator, 100); + } else { + SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0); + /* FIXME follow the original */ + if (pulScrollLines) + ME_ScrollDown(editor,pulScrollLines * (-gcWheelDelta / WHEEL_DELTA) * 8); + } } break; } diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 7f99489..4165f5e 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -6292,8 +6292,8 @@ static void test_zoom(void) release_key(VK_CONTROL); ret = SendMessage(hwnd, EM_GETZOOM, (WPARAM)&numerator, (LPARAM)&denominator); - todo_wine ok(numerator == 110, "incorrect numerator is %d\n", numerator); - todo_wine ok(denominator == 100, "incorrect denominator is %d\n", denominator); + ok(numerator == 110, "incorrect numerator is %d\n", numerator); + ok(denominator == 100, "incorrect denominator is %d\n", denominator); ok(ret == TRUE, "EM_GETZOOM failed (%d).\n", ret); /* Test how much the mouse wheel can zoom in and out. */ @@ -6307,7 +6307,7 @@ static void test_zoom(void) release_key(VK_CONTROL); ret = SendMessage(hwnd, EM_GETZOOM, (WPARAM)&numerator, (LPARAM)&denominator); - todo_wine ok(numerator == 500, "incorrect numerator is %d\n", numerator); + ok(numerator == 500, "incorrect numerator is %d\n", numerator); ok(denominator == 100, "incorrect denominator is %d\n", denominator); ok(ret == TRUE, "EM_GETZOOM failed (%d).\n", ret); @@ -6335,7 +6335,7 @@ static void test_zoom(void) release_key(VK_CONTROL); ret = SendMessage(hwnd, EM_GETZOOM, (WPARAM)&numerator, (LPARAM)&denominator); - todo_wine ok(numerator == 10, "incorrect numerator is %d\n", numerator); + ok(numerator == 10, "incorrect numerator is %d\n", numerator); ok(denominator == 100, "incorrect denominator is %d\n", denominator); ok(ret == TRUE, "EM_GETZOOM failed (%d).\n", ret); @@ -6364,8 +6364,8 @@ static void test_zoom(void) release_key(VK_CONTROL); ret = SendMessage(hwnd, EM_GETZOOM, (WPARAM)&numerator, (LPARAM)&denominator); - todo_wine ok(numerator == 394, "incorrect numerator is %d\n", numerator); - todo_wine ok(denominator == 100, "incorrect denominator is %d\n", denominator); + ok(numerator == 394, "incorrect numerator is %d\n", numerator); + ok(denominator == 100, "incorrect denominator is %d\n", denominator); ok(ret == TRUE, "EM_GETZOOM failed (%d).\n", ret); /* Test bounds checking on EM_SETZOOM */

1 0