wine-commits November 2014

wine-commits@winehq.org

2 participants
394 discussions

André Hentschel : gdi32: Remove unused function ( Clang).
by Alexandre Julliard 25 Nov '14

25 Nov '14

Module: wine Branch: master Commit: d83ae0ef40f047ee6748d3312c9c88979123944e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d83ae0ef40f047ee6748d3312… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 21 20:58:58 2014 +0100 gdi32: Remove unused function (Clang). --- dlls/gdi32/font.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index d9bb43a..8f52053 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -81,16 +81,6 @@ static inline INT height_to_LP( DC *dc, INT height ) return GDI_ROUND( (double)height * fabs( dc->xformVport2World.eM22 )); } -static inline INT INTERNAL_XWSTODS(DC *dc, INT width) -{ - POINT pt[2]; - pt[0].x = pt[0].y = 0; - pt[1].x = width; - pt[1].y = 0; - LPtoDP(dc->hSelf, pt, 2); - return pt[1].x - pt[0].x; -} - static inline INT INTERNAL_YWSTODS(DC *dc, INT height) { POINT pt[2];

1 0

André Hentschel : winecfg: Remove unused strings ( Clang).
by Alexandre Julliard 25 Nov '14

25 Nov '14

Module: wine Branch: master Commit: aa59d5b7bc3059d18e34149388bfb67c37da7495 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa59d5b7bc3059d18e3414938… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 21 20:58:39 2014 +0100 winecfg: Remove unused strings (Clang). --- programs/winecfg/x11drvdlg.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/programs/winecfg/x11drvdlg.c b/programs/winecfg/x11drvdlg.c index 8d914ad..809068e 100644 --- a/programs/winecfg/x11drvdlg.c +++ b/programs/winecfg/x11drvdlg.c @@ -51,8 +51,6 @@ static const WCHAR defaultW[] = {'D','e','f','a','u','l','t',0}; static const WCHAR explorerW[] = {'E','x','p','l','o','r','e','r',0}; static const WCHAR explorer_desktopsW[] = {'E','x','p','l','o','r','e','r','\\', 'D','e','s','k','t','o','p','s',0}; -static const WCHAR x11_driverW[] = {'X','1','1',' ','D','r','i','v','e','r',0}; -static const WCHAR default_resW[] = {'8','0','0','x','6','0','0',0}; static BOOL updating_ui;

1 0

André Hentschel : advapi32: Remove unused strings ( Clang).
by Alexandre Julliard 25 Nov '14

25 Nov '14

Module: wine Branch: master Commit: 6eae6955b2be11f6db8d05b1927dc00e6e5f2a3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eae6955b2be11f6db8d05b19… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 21 20:59:10 2014 +0100 advapi32: Remove unused strings (Clang). --- dlls/advapi32/security.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index cc20033..097b0da 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -187,7 +187,6 @@ static const WCHAR CREATOR_OWNER_SERVER[] = { 'C','R','E','A','T','O','R',' ','O static const WCHAR CURRENT_USER[] = { 'C','U','R','R','E','N','T','_','U','S','E','R',0 }; static const WCHAR DIALUP[] = { 'D','I','A','L','U','P',0 }; static const WCHAR Digest_Authentication[] = { 'D','i','g','e','s','t',' ','A','u','t','h','e','n','t','i','c','a','t','i','o','n',0 }; -static const WCHAR DOMAIN[] = {'D','O','M','A','I','N',0}; static const WCHAR Domain_Admins[] = { 'D','o','m','a','i','n',' ','A','d','m','i','n','s',0 }; static const WCHAR Domain_Computers[] = { 'D','o','m','a','i','n',' ','C','o','m','p','u','t','e','r','s',0 }; static const WCHAR Domain_Controllers[] = { 'D','o','m','a','i','n',' ','C','o','n','t','r','o','l','l','e','r','s',0 }; @@ -324,12 +323,8 @@ static const WCHAR SDDL_AUTO_INHERITED[] = {'A','I',0}; */ static const WCHAR SDDL_ACCESS_ALLOWED[] = {'A',0}; static const WCHAR SDDL_ACCESS_DENIED[] = {'D',0}; -static const WCHAR SDDL_OBJECT_ACCESS_ALLOWED[] = {'O','A',0}; -static const WCHAR SDDL_OBJECT_ACCESS_DENIED[] = {'O','D',0}; static const WCHAR SDDL_AUDIT[] = {'A','U',0}; static const WCHAR SDDL_ALARM[] = {'A','L',0}; -static const WCHAR SDDL_OBJECT_AUDIT[] = {'O','U',0}; -static const WCHAR SDDL_OBJECT_ALARMp[] = {'O','L',0}; /* * ACE flags

1 0

André Hentschel : crypt32/tests: Comment out an unused struct (Clang).
by Alexandre Julliard 25 Nov '14

25 Nov '14

Module: wine Branch: master Commit: 86c1d068f2903eb60d897d53419ea1b1ec462cb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86c1d068f2903eb60d897d534… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 21 20:59:11 2014 +0100 crypt32/tests: Comment out an unused struct (Clang). --- dlls/crypt32/tests/base64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index 8f19515..c6073aa 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -57,7 +57,7 @@ struct BinTests static const BYTE toEncode1[] = { 0 }; static const BYTE toEncode2[] = { 1,2 }; -static const BYTE toEncode3[] = { 1,2,3 }; +/* static const BYTE toEncode3[] = { 1,2,3 }; */ static const BYTE toEncode4[] = "abcdefghijlkmnopqrstuvwxyz01234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890" "abcdefghijlkmnopqrstuvwxyz01234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890"

1 0

André Hentschel : comctl32/tests: Remove unused structs (Clang).
by Alexandre Julliard 25 Nov '14

25 Nov '14

Module: wine Branch: master Commit: ab7228f3185a6d30c8e66d5213baf1c84e927bee URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab7228f3185a6d30c8e66d521… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 21 20:59:11 2014 +0100 comctl32/tests: Remove unused structs (Clang). --- dlls/comctl32/tests/button.c | 7 ------- dlls/comctl32/tests/tab.c | 28 ---------------------------- 2 files changed, 35 deletions(-) diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index eb4e924..badd8a7 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -427,13 +427,6 @@ static const struct message setcheck_ignored_seq[] = { 0 } }; -static const struct message setcheck_uncheck_seq[] = -{ - { BM_SETCHECK, sent }, - { WM_APP, sent|wparam|lparam, 0, 0 }, - { 0 } -}; - static const struct message setcheck_static_seq[] = { { BM_SETCHECK, sent }, diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index 2b7f6d3..f832fef 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -77,28 +77,6 @@ static HWND parent_wnd; static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; -static const struct message create_parent_wnd_seq[] = { - { WM_GETMINMAXINFO, sent }, - { WM_NCCREATE, sent }, - { WM_NCCALCSIZE, sent|wparam, 0 }, - { WM_CREATE, sent }, - { WM_SHOWWINDOW, sent|wparam, 1 }, - { WM_WINDOWPOSCHANGING, sent|wparam, 0 }, - { WM_WINDOWPOSCHANGING, sent|wparam, 0 }, - { WM_ACTIVATEAPP, sent|wparam, 1 }, - { WM_NCACTIVATE, sent|wparam, 1 }, - { WM_ACTIVATE, sent|wparam, 1 }, - { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, - { WM_IME_NOTIFY, sent|defwinproc|optional }, - { WM_SETFOCUS, sent|wparam|defwinproc, 0 }, - /* Win9x adds SWP_NOZORDER below */ - { WM_WINDOWPOSCHANGED, sent}, - { WM_NCCALCSIZE, sent|wparam|optional, 1 }, - { WM_SIZE, sent }, - { WM_MOVE, sent }, - { 0 } -}; - static const struct message add_tab_to_parent[] = { { TCM_INSERTITEMA, sent }, { TCM_INSERTITEMA, sent|optional }, @@ -158,12 +136,6 @@ static const struct message empty_sequence[] = { { 0 } }; -static const struct message set_min_tab_width_seq[] = { - { TCM_SETMINTABWIDTH, sent|wparam, 0 }, - { TCM_SETMINTABWIDTH, sent|wparam, 0 }, - { 0 } -}; - static const struct message get_item_count_seq[] = { { TCM_GETITEMCOUNT, sent|wparam|lparam, 0, 0 }, { 0 }

1 0

Bruno Jesus : user32/tests: Ensure ShowWindow returns false when window is already hidden.
by Alexandre Julliard 25 Nov '14

25 Nov '14

Module: wine Branch: master Commit: 30120041c8b742354d8e5c5a99a6abd80f0fd3a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30120041c8b742354d8e5c5a9… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Nov 24 23:54:45 2014 -0200 user32/tests: Ensure ShowWindow returns false when window is already hidden. --- dlls/user32/tests/msg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 28bb35e..778b3cf 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -4626,7 +4626,7 @@ static DWORD CALLBACK show_window_thread(LPVOID arg) HWND hwnd = arg; /* function will not return if ShowWindow(SW_HIDE) calls SendMessage() */ - ShowWindow(hwnd, SW_HIDE); + ok(ShowWindow(hwnd, SW_HIDE) == FALSE, "ShowWindow(SW_HIDE) expected FALSE\n"); return 0; } @@ -4669,7 +4669,7 @@ static void test_messages(void) ok_sequence(WmHideOverlappedSeq, "ShowWindow(SW_HIDE):overlapped", FALSE); /* test ShowWindow(SW_HIDE) on a hidden window - single threaded */ - ShowWindow(hwnd, SW_HIDE); + ok(ShowWindow(hwnd, SW_HIDE) == FALSE, "ShowWindow(SW_HIDE) expected FALSE\n"); flush_events(); ok_sequence(WmEmptySeq, "ShowWindow(SW_HIDE):overlapped", FALSE);

1 0

Stefan Dösinger : d3d8: Only one fullscreen swapchain is allowed.
by Alexandre Julliard 25 Nov '14

25 Nov '14

Module: wine Branch: master Commit: dd8bf9c87d298a05e3b6fbbcfa5e52b2b3f8e7f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd8bf9c87d298a05e3b6fbbcf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 25 10:16:55 2014 +0100 d3d8: Only one fullscreen swapchain is allowed. --- dlls/d3d8/device.c | 25 +++++++++++++++++++++++++ dlls/d3d8/tests/device.c | 38 +++++++++++++++++++++++++++++++++++++- 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index dd0b9ee..4c17e7c 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -557,11 +557,36 @@ static HRESULT WINAPI d3d8_device_CreateAdditionalSwapChain(IDirect3DDevice8 *if struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); struct wined3d_swapchain_desc desc; struct d3d8_swapchain *object; + UINT i, count; HRESULT hr; TRACE("iface %p, present_parameters %p, swapchain %p.\n", iface, present_parameters, swapchain); + if (!present_parameters->Windowed) + { + WARN("Trying to create an additional fullscreen swapchain, returning D3DERR_INVALIDCALL.\n"); + return D3DERR_INVALIDCALL; + } + + wined3d_mutex_lock(); + count = wined3d_device_get_swapchain_count(device->wined3d_device); + for (i = 0; i < count; ++i) + { + struct wined3d_swapchain *wined3d_swapchain; + + wined3d_swapchain = wined3d_device_get_swapchain(device->wined3d_device, i); + wined3d_swapchain_get_desc(wined3d_swapchain, &desc); + + if (!desc.windowed) + { + wined3d_mutex_unlock(); + WARN("Trying to create an additional swapchain in fullscreen mode, returning D3DERR_INVALIDCALL.\n"); + return D3DERR_INVALIDCALL; + } + } + wined3d_mutex_unlock(); + wined3d_swapchain_desc_from_present_parameters(&desc, present_parameters); if (SUCCEEDED(hr = d3d8_swapchain_create(device, &desc, &object))) *swapchain = &object->IDirect3DSwapChain8_iface; diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 2733664..c8f9713 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -262,12 +262,16 @@ static void test_swapchain(void) IDirect3DDevice8 *device; IDirect3D8 *d3d; ULONG refcount; - HWND window; + HWND window, window2; HRESULT hr; + struct device_desc device_desc; window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, NULL, NULL, NULL, NULL); ok(!!window, "Failed to create a window.\n"); + window2 = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + ok(!!window2, "Failed to create a window.\n"); d3d = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -356,10 +360,42 @@ static void test_swapchain(void) IDirect3DSwapChain8_Release(swapchain3); IDirect3DSwapChain8_Release(swapchain2); IDirect3DSwapChain8_Release(swapchain1); + + d3dpp.Windowed = FALSE; + d3dpp.hDeviceWindow = window; + d3dpp.BackBufferCount = 1; + hr = IDirect3DDevice8_CreateAdditionalSwapChain(device, &d3dpp, &swapchain1); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x\n", hr); + d3dpp.hDeviceWindow = window2; + hr = IDirect3DDevice8_CreateAdditionalSwapChain(device, &d3dpp, &swapchain1); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x\n", hr); + + device_desc.width = registry_mode.dmPelsWidth; + device_desc.height = registry_mode.dmPelsHeight; + device_desc.device_window = window; + device_desc.flags = CREATE_DEVICE_FULLSCREEN; + hr = reset_device(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + + d3dpp.hDeviceWindow = window; + hr = IDirect3DDevice8_CreateAdditionalSwapChain(device, &d3dpp, &swapchain1); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x\n", hr); + d3dpp.hDeviceWindow = window2; + hr = IDirect3DDevice8_CreateAdditionalSwapChain(device, &d3dpp, &swapchain1); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x\n", hr); + d3dpp.Windowed = TRUE; + d3dpp.hDeviceWindow = window; + hr = IDirect3DDevice8_CreateAdditionalSwapChain(device, &d3dpp, &swapchain1); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x\n", hr); + d3dpp.hDeviceWindow = window2; + hr = IDirect3DDevice8_CreateAdditionalSwapChain(device, &d3dpp, &swapchain1); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x\n", hr); + refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); cleanup: IDirect3D8_Release(d3d); + DestroyWindow(window2); DestroyWindow(window); }

1 0

Stefan Dösinger : d3d9: Only one fullscreen swapchain is allowed.
by Alexandre Julliard 25 Nov '14

25 Nov '14

Module: wine Branch: master Commit: 8b6a7a9c02d048949cf4b0e9b72494213d55ead2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b6a7a9c02d048949cf4b0e9b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 25 10:16:54 2014 +0100 d3d9: Only one fullscreen swapchain is allowed. --- dlls/d3d9/device.c | 25 +++++++++++++++++++++++++ dlls/d3d9/tests/device.c | 38 +++++++++++++++++++++++++++++++++++++- 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index ca902a2..67a5629 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -503,11 +503,36 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_CreateAdditionalSwapChain(ID struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct wined3d_swapchain_desc desc; struct d3d9_swapchain *object; + UINT i, count; HRESULT hr; TRACE("iface %p, present_parameters %p, swapchain %p.\n", iface, present_parameters, swapchain); + if (!present_parameters->Windowed) + { + WARN("Trying to create an additional fullscreen swapchain, returning D3DERR_INVALIDCALL.\n"); + return D3DERR_INVALIDCALL; + } + + wined3d_mutex_lock(); + count = wined3d_device_get_swapchain_count(device->wined3d_device); + for (i = 0; i < count; ++i) + { + struct wined3d_swapchain *wined3d_swapchain; + + wined3d_swapchain = wined3d_device_get_swapchain(device->wined3d_device, i); + wined3d_swapchain_get_desc(wined3d_swapchain, &desc); + + if (!desc.windowed) + { + wined3d_mutex_unlock(); + WARN("Trying to create an additional swapchain in fullscreen mode, returning D3DERR_INVALIDCALL.\n"); + return D3DERR_INVALIDCALL; + } + } + wined3d_mutex_unlock(); + wined3d_swapchain_desc_from_present_parameters(&desc, present_parameters); if (SUCCEEDED(hr = d3d9_swapchain_create(device, &desc, &object))) *swapchain = (IDirect3DSwapChain9 *)&object->IDirect3DSwapChain9Ex_iface; diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 35dad62..061846b 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1058,12 +1058,16 @@ static void test_swapchain(void) IDirect3DDevice9 *device; IDirect3D9 *d3d; ULONG refcount; - HWND window; + HWND window, window2; HRESULT hr; + struct device_desc device_desc; window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, NULL, NULL, NULL, NULL); ok(!!window, "Failed to create a window.\n"); + window2 = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + ok(!!window2, "Failed to create a window.\n"); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -1176,10 +1180,42 @@ static void test_swapchain(void) IDirect3DSwapChain9_Release(swapchain3); IDirect3DSwapChain9_Release(swapchain2); IDirect3DSwapChain9_Release(swapchain1); + + d3dpp.Windowed = FALSE; + d3dpp.hDeviceWindow = window; + d3dpp.BackBufferCount = 1; + hr = IDirect3DDevice9_CreateAdditionalSwapChain(device, &d3dpp, &swapchain1); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x\n", hr); + d3dpp.hDeviceWindow = window2; + hr = IDirect3DDevice9_CreateAdditionalSwapChain(device, &d3dpp, &swapchain1); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x\n", hr); + + device_desc.width = registry_mode.dmPelsWidth; + device_desc.height = registry_mode.dmPelsHeight; + device_desc.device_window = window; + device_desc.flags = CREATE_DEVICE_FULLSCREEN; + hr = reset_device(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + + d3dpp.hDeviceWindow = window; + hr = IDirect3DDevice9_CreateAdditionalSwapChain(device, &d3dpp, &swapchain1); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x\n", hr); + d3dpp.hDeviceWindow = window2; + hr = IDirect3DDevice9_CreateAdditionalSwapChain(device, &d3dpp, &swapchain1); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x\n", hr); + d3dpp.Windowed = TRUE; + d3dpp.hDeviceWindow = window; + hr = IDirect3DDevice9_CreateAdditionalSwapChain(device, &d3dpp, &swapchain1); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x\n", hr); + d3dpp.hDeviceWindow = window2; + hr = IDirect3DDevice9_CreateAdditionalSwapChain(device, &d3dpp, &swapchain1); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x\n", hr); + refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); cleanup: IDirect3D9_Release(d3d); + DestroyWindow(window2); DestroyWindow(window); }

1 0

Nikolay Sivov : gdi32: Remove undefs for names that are never defined.
by Alexandre Julliard 25 Nov '14

25 Nov '14

Module: wine Branch: master Commit: 2f0a4a4425bdb8a68833ee4ea5cd562fd279dc60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f0a4a4425bdb8a68833ee4ea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 24 16:23:11 2014 +0300 gdi32: Remove undefs for names that are never defined. --- dlls/gdi32/font.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index af3ea5b..d9bb43a 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1660,8 +1660,7 @@ UINT WINAPI GetOutlineTextMetricsW( output->otmsStrikeoutPosition = height_to_LP( dc, output->otmsStrikeoutPosition); output->otmsUnderscoreSize = height_to_LP( dc, output->otmsUnderscoreSize); output->otmsUnderscorePosition = height_to_LP( dc, output->otmsUnderscorePosition); -#undef WDPTOLP -#undef HDPTOLP + if(output != lpOTM) { memcpy(lpOTM, output, cbData);

1 0

Jacek Caban : mshtml: Added IHTMLTxtRange::setEndPoint implementation.
by Alexandre Julliard 25 Nov '14

25 Nov '14

Module: wine Branch: master Commit: 20b3aa62440a123aad1233c8598e9161a0b7ea8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=20b3aa62440a123aad1233c85… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 24 18:47:41 2014 +0100 mshtml: Added IHTMLTxtRange::setEndPoint implementation. --- dlls/mshtml/tests/dom.c | 75 ++++++++++++++++++++++++++++++++++++++++--------- dlls/mshtml/txtrange.c | 70 +++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 129 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 2d526fc..8a47207 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4901,6 +4901,30 @@ static IHTMLTxtRange *test_create_body_range(IHTMLDocument2 *doc) return range; } +#define range_duplicate(a) _range_duplicate(__LINE__,a) +static IHTMLTxtRange *_range_duplicate(unsigned line, IHTMLTxtRange *range) +{ + IHTMLTxtRange *ret; + HRESULT hres; + + hres = IHTMLTxtRange_duplicate(range, &ret); + ok_(__FILE__,line)(hres == S_OK, "duplicate failed: %08x\n", hres); + + return ret; +} + +#define test_range_set_end_point(a,b,c,d) _test_range_set_end_point(__LINE__,a,b,c,d) +static void _test_range_set_end_point(unsigned line, IHTMLTxtRange *range, const char *how, + IHTMLTxtRange *ref_range, HRESULT exhres) +{ + BSTR str = a2bstr(how); + HRESULT hres; + + hres = IHTMLTxtRange_setEndPoint(range, str, ref_range); + ok_(__FILE__,line)(hres == exhres, "setEndPoint failed: %08x, expected %08x\n", hres, exhres); + SysFreeString(str); +} + static void test_txtrange(IHTMLDocument2 *doc) { IHTMLTxtRange *body_range, *range, *range2; @@ -4915,11 +4939,9 @@ static void test_txtrange(IHTMLDocument2 *doc) test_range_text(body_range, "test abc 123\r\nit's text"); - hres = IHTMLTxtRange_duplicate(body_range, &range); - ok(hres == S_OK, "duplicate failed: %08x\n", hres); + range = range_duplicate(body_range); + range2 = range_duplicate(body_range); - hres = IHTMLTxtRange_duplicate(body_range, &range2); - ok(hres == S_OK, "duplicate failed: %08x\n", hres); test_range_isequal(range, range2, VARIANT_TRUE); test_range_text(range, "test abc 123\r\nit's text"); @@ -4959,8 +4981,7 @@ static void test_txtrange(IHTMLDocument2 *doc) IHTMLTxtRange_Release(range); - hres = IHTMLTxtRange_duplicate(body_range, &range); - ok(hres == S_OK, "duplicate failed: %08x\n", hres); + range = range_duplicate(body_range); test_range_text(range, "test abc 123\r\nit's text"); test_range_move(range, characterW, 3, 3); @@ -4978,8 +4999,7 @@ static void test_txtrange(IHTMLDocument2 *doc) IHTMLTxtRange_Release(range); - hres = IHTMLTxtRange_duplicate(body_range, &range); - ok(hres == S_OK, "duplicate failed: %08x\n", hres); + range = range_duplicate(body_range); test_range_move(range, wordW, 1, 1); test_range_moveend(range, characterW, 2, 2); @@ -5005,8 +5025,7 @@ static void test_txtrange(IHTMLDocument2 *doc) IHTMLTxtRange_Release(range); - hres = IHTMLTxtRange_duplicate(body_range, &range); - ok(hres == S_OK, "duplicate failed: %08x\n", hres); + range = range_duplicate(body_range); test_range_move(range, wordW, 2, 2); test_range_moveend(range, characterW, 2, 2); @@ -5030,8 +5049,7 @@ static void test_txtrange(IHTMLDocument2 *doc) IHTMLTxtRange_Release(range); - hres = IHTMLTxtRange_duplicate(body_range, &range); - ok(hres == S_OK, "duplicate failed: %08x\n", hres); + range = range_duplicate(body_range); test_range_collapse(range, TRUE); test_range_expand(range, wordW, VARIANT_TRUE, "test "); @@ -5054,7 +5072,6 @@ static void test_txtrange(IHTMLDocument2 *doc) test_range_text(range, NULL); IHTMLTxtRange_Release(range); - IHTMLTxtRange_Release(body_range); hres = IHTMLDocument2_get_selection(doc, &selection); ok(hres == S_OK, "IHTMLDocument2_get_selection failed: %08x\n", hres); @@ -5116,9 +5133,39 @@ static void test_txtrange(IHTMLDocument2 *doc) test_range_text(range, "abc \r\npaste\r\nxyz abc 123\r\nit's text"); - IHTMLElement_Release(body); + test_range_move(range, wordW, 2, 2); + test_range_collapse(range, VARIANT_TRUE); + test_range_moveend(range, characterW, 5, 5); + test_range_text(range, "paste"); + + range2 = range_duplicate(range); + + test_range_set_end_point(range, "starttostart", body_range, S_OK); + test_range_text(range, "abc \r\npaste"); + + test_range_set_end_point(range, "endtoend", body_range, S_OK); + test_range_text(range, "abc \r\npaste\r\nxyz abc 123\r\nit's text"); + + test_range_set_end_point(range, "starttoend", range2, S_OK); + test_range_text(range, "\r\nxyz abc 123\r\nit's text"); + + test_range_set_end_point(range, "starttostart", body_range, S_OK); + test_range_set_end_point(range, "endtostart", range2, S_OK); + test_range_text(range, "abc "); + + test_range_set_end_point(range, "starttoend", body_range, S_OK); + test_range_text(range, "paste\r\nxyz abc 123\r\nit's text"); + + test_range_set_end_point(range, "EndToStart", body_range, S_OK); + test_range_text(range, "abc "); + + test_range_set_end_point(range, "xxx", body_range, E_INVALIDARG); IHTMLTxtRange_Release(range); + IHTMLTxtRange_Release(range2); + IHTMLTxtRange_Release(body_range); + IHTMLElement_Release(body); + } static void test_txtrange2(IHTMLDocument2 *doc) diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index 43c9f1a..0dd3aae 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -1627,8 +1627,74 @@ static HRESULT WINAPI HTMLTxtRange_setEndPoint(IHTMLTxtRange *iface, BSTR how, IHTMLTxtRange *SourceRange) { HTMLTxtRange *This = impl_from_IHTMLTxtRange(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(how), SourceRange); - return E_NOTIMPL; + HTMLTxtRange *src_range; + nsIDOMNode *ref_node; + INT32 ref_offset; + BOOL set_start; + int how_type; + INT16 cmp; + nsresult nsres; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(how), SourceRange); + + how_type = string_to_nscmptype(how); + if(how_type == -1) + return E_INVALIDARG; + + src_range = get_range_object(This->doc, SourceRange); + if(!src_range) + return E_FAIL; + + switch(how_type) { + case NS_START_TO_START: + case NS_END_TO_START: + nsres = nsIDOMRange_GetStartContainer(src_range->nsrange, &ref_node); + assert(nsres == NS_OK); + + nsres = nsIDOMRange_GetStartOffset(src_range->nsrange, &ref_offset); + assert(nsres == NS_OK); + + set_start = how_type == NS_START_TO_START; + break; + case NS_END_TO_END: + case NS_START_TO_END: + nsres = nsIDOMRange_GetEndContainer(src_range->nsrange, &ref_node); + assert(nsres == NS_OK); + + nsres = nsIDOMRange_GetEndOffset(src_range->nsrange, &ref_offset); + assert(nsres == NS_OK); + + set_start = how_type == NS_START_TO_END; + break; + DEFAULT_UNREACHABLE; + } + + nsres = nsIDOMRange_ComparePoint(This->nsrange, ref_node, ref_offset, &cmp); + assert(nsres == NS_OK); + + if(set_start) { + if(cmp <= 0) { + nsres = nsIDOMRange_SetStart(This->nsrange, ref_node, ref_offset); + }else { + nsres = nsIDOMRange_Collapse(This->nsrange, FALSE); + assert(nsres == NS_OK); + + nsres = nsIDOMRange_SetEnd(This->nsrange, ref_node, ref_offset); + } + }else { + if(cmp >= 0) { + nsres = nsIDOMRange_SetEnd(This->nsrange, ref_node, ref_offset); + }else { + nsres = nsIDOMRange_Collapse(This->nsrange, TRUE); + assert(nsres == NS_OK); + + nsres = nsIDOMRange_SetStart(This->nsrange, ref_node, ref_offset); + } + } + assert(nsres == NS_OK); + + nsIDOMNode_Release(ref_node); + return S_OK; } static HRESULT WINAPI HTMLTxtRange_compareEndPoints(IHTMLTxtRange *iface, BSTR how,

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
40
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 November 2014