November 2015 - Wine-Commits

Alexandre Julliard : user32: Reduce the idle timeout before flushing surfaces to make it less noticeable.
by Alexandre Julliard Nov. 25, 2015

Nov. 25, 2015

Module: wine Branch: master Commit: bbc849df8d66b99162684dcee213b08cd67b86d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbc849df8d66b99162684dcee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 25 19:25:46 2015 +0900 user32: Reduce the idle timeout before flushing surfaces to make it less noticeable. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 87bc97b..b81c22d 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -598,7 +598,7 @@ void flush_window_surfaces( BOOL idle ) now = GetTickCount(); if (idle) last_idle = now; /* if not idle, we only flush if there's evidence that the app never goes idle */ - else if ((int)(now - last_idle) < 1000) goto done; + else if ((int)(now - last_idle) < 50) goto done; LIST_FOR_EACH_ENTRY( surface, &window_surfaces, struct window_surface, entry ) surface->funcs->flush( surface );

1 0

Vincent Povirk : comctl32/tests: Accept touchscreen-related messages in button tests.
by Alexandre Julliard Nov. 25, 2015

Nov. 25, 2015

Module: wine Branch: master Commit: 45e706a2a79beffe28eecd7ec01139a1c61431e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45e706a2a79beffe28eecd7ec… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Nov 24 15:32:59 2015 -0600 comctl32/tests: Accept touchscreen-related messages in button tests. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/button.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 8c27c0f..9977ce1 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -205,6 +205,7 @@ static const struct message setfocus_seq[] = { { WM_IME_SETCONTEXT, sent|wparam|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, + { BM_GETSTATE, sent|optional }, /* when touchscreen is present */ { WM_SETFOCUS, sent|wparam }, { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_BUTTON, BN_SETFOCUS) }, { WM_APP, sent|wparam|lparam }, @@ -227,6 +228,7 @@ static const struct message setfocus_static_seq[] = { { WM_IME_SETCONTEXT, sent|wparam|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, + { BM_GETSTATE, sent|optional }, /* when touchscreen is present */ { WM_SETFOCUS, sent|wparam, 0 }, { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_BUTTON, BN_SETFOCUS) }, { WM_COMMAND, sent|wparam|parent|optional, MAKEWPARAM(ID_BUTTON, BN_CLICKED) }, /* radio button */ @@ -239,6 +241,7 @@ static const struct message setfocus_groupbox_seq[] = { { WM_IME_SETCONTEXT, sent|wparam|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, + { BM_GETSTATE, sent|optional }, /* when touchscreen is present */ { WM_SETFOCUS, sent|wparam, 0 }, { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_BUTTON, BN_SETFOCUS) }, { WM_COMMAND, sent|wparam|parent|optional, MAKEWPARAM(ID_BUTTON, BN_CLICKED) }, /* radio button */ @@ -262,6 +265,7 @@ static const struct message setfocus_ownerdraw_seq[] = { { WM_IME_SETCONTEXT, sent|wparam|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, + { BM_GETSTATE, sent|optional }, /* when touchscreen is present */ { WM_SETFOCUS, sent|wparam, 0 }, { WM_DRAWITEM, sent|wparam|parent, ID_BUTTON }, { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_BUTTON, BN_SETFOCUS) }, @@ -287,6 +291,7 @@ static const struct message lbuttondown_seq[] = { WM_LBUTTONDOWN, sent|wparam|lparam, 0, 0 }, { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, + { BM_GETSTATE, sent|defwinproc|optional }, /* when touchscreen is present */ { WM_SETFOCUS, sent|wparam|defwinproc, 0 }, { BM_SETSTATE, sent|wparam|defwinproc, TRUE }, { 0 }

1 0

Bruno Jesus : ws2_32/tests: Check if the first IP is a default route in gethostbyname.
by Alexandre Julliard Nov. 25, 2015

Nov. 25, 2015

Module: wine Branch: master Commit: 2056de01b5eb8e4ce26150094d4eb168964d5c7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2056de01b5eb8e4ce26150094… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Nov 25 17:22:13 2015 +0800 ws2_32/tests: Check if the first IP is a default route in gethostbyname. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 97 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 96 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 045b991..3c66f7d 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -30,6 +30,7 @@ #include <wsnwlink.h> #include <mswsock.h> #include <mstcpip.h> +#include <iphlpapi.h> #include <stdio.h> #include "wine/test.h" @@ -76,6 +77,10 @@ static int (WINAPI *pWSAEnumNameSpaceProvidersA)(LPDWORD,LPWSANAMESPACE_INFOA) static int (WINAPI *pWSAEnumNameSpaceProvidersW)(LPDWORD,LPWSANAMESPACE_INFOW); static int (WINAPI *pWSAPoll)(WSAPOLLFD *,ULONG,INT); +/* Function pointers from iphlpapi */ +static DWORD (WINAPI *pGetAdaptersInfo)(PIP_ADAPTER_INFO,PULONG); +static DWORD (WINAPI *pGetIpForwardTable)(PMIB_IPFORWARDTABLE,PULONG,BOOL); + /**************** Structs and typedefs ***************/ typedef struct thread_info @@ -1207,7 +1212,7 @@ static void Init (void) { WORD ver = MAKEWORD (2, 2); WSADATA data; - HMODULE hws2_32 = GetModuleHandleA("ws2_32.dll"); + HMODULE hws2_32 = GetModuleHandleA("ws2_32.dll"), hiphlpapi; pfreeaddrinfo = (void *)GetProcAddress(hws2_32, "freeaddrinfo"); pgetaddrinfo = (void *)GetProcAddress(hws2_32, "getaddrinfo"); @@ -1223,6 +1228,13 @@ static void Init (void) pWSAEnumNameSpaceProvidersW = (void *)GetProcAddress(hws2_32, "WSAEnumNameSpaceProvidersW"); pWSAPoll = (void *)GetProcAddress(hws2_32, "WSAPoll"); + hiphlpapi = LoadLibraryA("iphlpapi.dll"); + if (hiphlpapi) + { + pGetIpForwardTable = (void *)GetProcAddress(hiphlpapi, "GetIpForwardTable"); + pGetAdaptersInfo = (void *)GetProcAddress(hiphlpapi, "GetAdaptersInfo"); + } + ok ( WSAStartup ( ver, &data ) == 0, "WSAStartup failed\n" ); tls = TlsAlloc(); } @@ -4451,6 +4463,88 @@ static void test_dns(void) int WINAPI gethostname(char *name, int namelen); +static void test_gethostbyname(void) +{ + struct hostent *he; + struct in_addr **addr_list; + char name[256], first_ip[16]; + int ret, i; + PMIB_IPFORWARDTABLE routes = NULL; + PIP_ADAPTER_INFO adapters = NULL, k; + DWORD adap_size = 0, route_size = 0; + BOOL found_default = FALSE; + BOOL local_ip = FALSE; + + ret = gethostname(name, sizeof(name)); + ok(ret == 0, "gethostname() call failed: %d\n", WSAGetLastError()); + + he = gethostbyname(name); + ok(he != NULL, "gethostbyname(\"%s\") failed: %d\n", name, WSAGetLastError()); + addr_list = (struct in_addr **)he->h_addr_list; + strcpy(first_ip, inet_ntoa(*addr_list[0])); + + trace("List of local IPs:\n"); + for(i = 0; addr_list[i] != NULL; i++) + { + char *ip = inet_ntoa(*addr_list[i]); + if (!strcmp(ip, "127.0.0.1")) + local_ip = TRUE; + trace("%s\n", ip); + } + + if (local_ip) + { + ok (i == 1, "expected 127.0.0.1 to be the only IP returned\n"); + skip("Only the loopback address is present, skipping tests\n"); + return; + } + + if (!pGetAdaptersInfo || !pGetIpForwardTable) + { + win_skip("GetAdaptersInfo and/or GetIpForwardTable not found, skipping tests\n"); + return; + } + + ret = pGetAdaptersInfo(NULL, &adap_size); + ok (ret == ERROR_BUFFER_OVERFLOW, "GetAdaptersInfo failed with a different error: %d\n", ret); + ret = pGetIpForwardTable(NULL, &route_size, FALSE); + ok (ret == ERROR_INSUFFICIENT_BUFFER, "GetIpForwardTable failed with a different error: %d\n", ret); + + adapters = HeapAlloc(GetProcessHeap(), 0, adap_size); + routes = HeapAlloc(GetProcessHeap(), 0, route_size); + + ret = pGetAdaptersInfo(adapters, &adap_size); + ok (ret == NO_ERROR, "GetAdaptersInfo failed, error: %d\n", ret); + ret = pGetIpForwardTable(routes, &route_size, FALSE); + ok (ret == NO_ERROR, "GetIpForwardTable failed, error: %d\n", ret); + + for (i = 0; !found_default && i < routes->dwNumEntries; i++) + { + /* default route (ip 0.0.0.0) ? */ + if (routes->table[i].dwForwardDest) continue; + + for (k = adapters; k != NULL; k = k->Next) + { + char *ip; + + if (k->Index != routes->table[i].dwForwardIfIndex) continue; + + /* the first IP returned from gethostbyname must be a default route */ + ip = k->IpAddressList.IpAddress.String; + if (!strcmp(first_ip, ip)) + { + found_default = TRUE; + break; + } + } + } +todo_wine + ok (found_default, "failed to find the first IP from gethostbyname!\n"); + + HeapFree(GetProcessHeap(), 0, adapters); + HeapFree(GetProcessHeap(), 0, routes); +} + static void test_gethostbyname_hack(void) { struct hostent *he; @@ -9461,6 +9555,7 @@ START_TEST( sock ) test_addr_to_print(); test_ioctlsocket(); test_dns(); + test_gethostbyname(); test_gethostbyname_hack(); test_gethostname();

1 0

Alexandre Julliard : gdiplus/tests: Check the correct fallback font when Arial is missing.
by Alexandre Julliard Nov. 25, 2015

Nov. 25, 2015

Module: wine Branch: master Commit: 9fb9cb2bb7113f664a3db12472f217b9a967e433 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fb9cb2bb7113f664a3db1247… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 25 20:30:00 2015 +0900 gdiplus/tests: Check the correct fallback font when Arial is missing. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/font.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 932b5ed..39b539b 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -726,6 +726,7 @@ static void test_font_metrics(void) static void test_font_substitution(void) { WCHAR ms_shell_dlg[LF_FACESIZE]; + char fallback_font[LF_FACESIZE]; HDC hdc; HFONT hfont; LOGFONTA lf; @@ -772,13 +773,22 @@ static void test_font_substitution(void) status = GdipCreateFontFamilyFromName(nonexistent, NULL, &family); ok(status == FontFamilyNotFound, "expected FontFamilyNotFound, got %d\n", status); + /* nonexistent fonts fallback to Arial, or something else if it's missing */ + strcpy(lf.lfFaceName,"Arial"); + status = GdipCreateFontFromLogfontA(hdc, &lf, &font); + expect(Ok, status); + status = GdipGetLogFontA(font, graphics, &lf); + expect(Ok, status); + strcpy(fallback_font,lf.lfFaceName); + trace("fallback font %s\n", fallback_font); + lstrcpyA(lf.lfFaceName, "ThisFontShouldNotExist"); status = GdipCreateFontFromLogfontA(hdc, &lf, &font); expect(Ok, status); memset(&lf, 0xfe, sizeof(lf)); status = GdipGetLogFontA(font, graphics, &lf); expect(Ok, status); - ok(!lstrcmpA(lf.lfFaceName, "Arial"), "wrong face name %s\n", lf.lfFaceName); + ok(!lstrcmpA(lf.lfFaceName, fallback_font), "wrong face name %s / %s\n", lf.lfFaceName, fallback_font); GdipDeleteFont(font); /* empty FaceName */ @@ -788,7 +798,7 @@ static void test_font_substitution(void) memset(&lf, 0xfe, sizeof(lf)); status = GdipGetLogFontA(font, graphics, &lf); expect(Ok, status); - ok(!lstrcmpA(lf.lfFaceName, "Arial"), "wrong face name %s\n", lf.lfFaceName); + ok(!lstrcmpA(lf.lfFaceName, fallback_font), "wrong face name %s / %s\n", lf.lfFaceName, fallback_font); GdipDeleteFont(font); /* zeroing out lfWeight and lfCharSet leads to font creation failure */

1 0

Henri Verbeet : dxgi: Implement dxgi_output_GetDesc().
by Alexandre Julliard Nov. 25, 2015

Nov. 25, 2015

Module: wine Branch: master Commit: af196e5f25daf99cc7bf6f2dc1fe5d48dc992e19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af196e5f25daf99cc7bf6f2dc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 24 18:06:17 2015 +0100 dxgi: Implement dxgi_output_GetDesc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/directx.c | 13 +++++++--- dlls/d3d9/directx.c | 13 +++++++--- dlls/ddraw/main.c | 6 +++-- dlls/dxgi/output.c | 28 +++++++++++++++++++-- dlls/dxgi/tests/device.c | 56 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/directx.c | 35 ++++++++++++++++++++------ dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.h | 12 ++++++++- 9 files changed, 146 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=af196e5f25daf99cc7bf6…

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard Nov. 25, 2015

Nov. 25, 2015

Module: wine Branch: master Commit: 78888687d59a3b16355bf4a851f648c56a043649 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78888687d59a3b16355bf4a85… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Tue Nov 24 20:22:17 2015 +0200 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 34 ++++++++++------------------------ 1 file changed, 10 insertions(+), 24 deletions(-) diff --git a/po/fi.po b/po/fi.po index 84fe32a..fba8b42 100644 --- a/po/fi.po +++ b/po/fi.po @@ -8566,58 +8566,44 @@ msgid "Wine" msgstr "Wine" #: winemac.rc:33 -#, fuzzy -#| msgid "Hide" msgid "Hide %@" -msgstr "Piilota" +msgstr "Piilota %@" #: winemac.rc:35 -#, fuzzy -#| msgid "Other" msgid "Hide Others" -msgstr "Muu" +msgstr "Piilota muut" #: winemac.rc:36 -#, fuzzy -#| msgid "Show" msgid "Show All" -msgstr "Näytä" +msgstr "Näytä kaikki" #: winemac.rc:37 msgid "Quit %@" -msgstr "" +msgstr "Lopeta %@" #: winemac.rc:38 msgid "Quit" -msgstr "" +msgstr "Lopeta" #: winemac.rc:40 -#, fuzzy -#| msgid "&Window" msgid "Window" -msgstr "&Ikkuna" +msgstr "Ikkuna" #: winemac.rc:41 -#, fuzzy -#| msgid "&Minimize" msgid "Minimize" -msgstr "P&ienennä" +msgstr "Pienennä" #: winemac.rc:42 -#, fuzzy -#| msgid "Zoom in" msgid "Zoom" -msgstr "Lähennä" +msgstr "Zoomaa" #: winemac.rc:43 msgid "Enter Full Screen" -msgstr "" +msgstr "Siirry kokoruututilaan" #: winemac.rc:44 -#, fuzzy -#| msgid "&Bring To Front" msgid "Bring All to Front" -msgstr "Tuo &eteen" +msgstr "Tuo kaikki eteen" #: wineps.rc:31 msgid "Paper Si&ze:"

1 0

Bernhard Übelacker : dinput: Fail in SetCooperativeLevel on invalid hwnd.
by Alexandre Julliard Nov. 25, 2015

Nov. 25, 2015

Module: wine Branch: master Commit: dd08ef4063bdf97a80441b88e41b3d5eb25cf158 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd08ef4063bdf97a80441b88e… Author: Bernhard Übelacker <bernhardu(a)vr-web.de> Date: Tue Nov 24 21:25:58 2015 +0100 dinput: Fail in SetCooperativeLevel on invalid hwnd. MotoGP 3 demo fails to accept key presses to control the driver. The game calls SetCooperativeLevel twice. First with an invalid hwnd (but not NULL) and later with the real hwnd. Signed-off-by: Bernhard Übelacker <bernhardu(a)vr-web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 4 ++-- dlls/dinput/tests/keyboard.c | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 1ba6ffc..e525f01 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1028,10 +1028,10 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetCooperativeLevel(LPDIRECTINPUTDEVICE8 if (hwnd && GetWindowLongW(hwnd, GWL_STYLE) & WS_CHILD) return E_HANDLE; - if (dwflags == (DISCL_NONEXCLUSIVE | DISCL_BACKGROUND)) + if (!hwnd && dwflags == (DISCL_NONEXCLUSIVE | DISCL_BACKGROUND)) hwnd = GetDesktopWindow(); - if (!hwnd) return E_HANDLE; + if (!IsWindow(hwnd)) return E_HANDLE; /* For security reasons native does not allow exclusive background level for mouse and keyboard only */ diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index 520740d..e51e332 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -121,6 +121,12 @@ static const HRESULT SetCoop_null_window[16] = { E_INVALIDARG, E_HANDLE, S_OK, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG}; +static const HRESULT SetCoop_invalid_window[16] = { + E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, + E_INVALIDARG, E_HANDLE, E_HANDLE, E_INVALIDARG, + E_INVALIDARG, E_HANDLE, E_HANDLE, E_INVALIDARG, + E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG}; + static const HRESULT SetCoop_real_window[16] = { E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, S_OK, S_OK, E_INVALIDARG, @@ -151,6 +157,11 @@ static void test_set_coop(IDirectInputA *pDI, HWND hwnd) } for (i=0; i<16; i++) { + hr = IDirectInputDevice_SetCooperativeLevel(pKeyboard, (HWND)0x400000, i); + ok(hr == SetCoop_invalid_window[i], "SetCooperativeLevel(invalid, %d): %08x\n", i, hr); + } + for (i=0; i<16; i++) + { hr = IDirectInputDevice_SetCooperativeLevel(pKeyboard, hwnd, i); ok(hr == SetCoop_real_window[i], "SetCooperativeLevel(hwnd, %d): %08x\n", i, hr); }

1 0

Alexandre Julliard : patches: Display the total number of regressions.
by Alexandre Julliard Nov. 25, 2015

Nov. 25, 2015

Module: tools Branch: master Commit: 99a65af2dfa0881dde9b0b8aa8aee6d77b6c80e6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=99a65af2dfa0881dde9b0b8a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 25 21:50:03 2015 +0900 patches: Display the total number of regressions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/update-regressions | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/patches/update-regressions b/patches/update-regressions index 65eb263..5e39075 100755 --- a/patches/update-regressions +++ b/patches/update-regressions @@ -129,7 +129,8 @@ print OUTPUT "<div id=\"tabs\"><ul>", "<li><a href=\"//appdb.winehq.org/\">AppDB</a></li>", "<li><a href=\"//bugs.winehq.org/\">Bugzilla</a></li>", "<li><a href=\"//forum.winehq.org/\">Forums</a></li></ul></div>\n"; -print OUTPUT "<div id=\"logo_blurb\">Wine source repository – Regressions</div>\n"; +printf OUTPUT "<div id=\"logo_blurb\">Wine source repository – Regressions (total %u)</div>\n", + $count + scalar @unknown; print OUTPUT "<div id=\"main_content\"><div id=\"content\"><div class=\"main\">\n"; printf OUTPUT "<h2>%u bisected regressions</h2>\n", $count;

1 0

Dmitry Timoshkov : oleaut32: Implement a better stub for IPicture:: SaveAsFile.
by Alexandre Julliard Nov. 24, 2015

Nov. 24, 2015

Module: wine Branch: master Commit: 212dd9c226c7f20c28697592468b3e631c250809 URL: http://source.winehq.org/git/wine.git/?a=commit;h=212dd9c226c7f20c286975924… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 24 17:27:38 2015 +0800 oleaut32: Implement a better stub for IPicture::SaveAsFile. Based on OLEPictureImpl_Save implementation. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/olepicture.c | 92 ++++++++++++++++++++++++++++++++++------ dlls/oleaut32/tests/olepicture.c | 9 ---- 2 files changed, 79 insertions(+), 22 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 5ce83e0..47430e3 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -834,19 +834,6 @@ static HRESULT WINAPI OLEPictureImpl_PictureChanged(IPicture *iface) } /************************************************************************ - * OLEPictureImpl_SaveAsFile - */ -static HRESULT WINAPI OLEPictureImpl_SaveAsFile(IPicture *iface, - IStream *pstream, - BOOL SaveMemCopy, - LONG *pcbSize) -{ - OLEPictureImpl *This = impl_from_IPicture(iface); - FIXME("(%p)->(%p, %d, %p), hacked stub.\n", This, pstream, SaveMemCopy, pcbSize); - return IStream_Write(pstream,This->data,This->datalen,(ULONG*)pcbSize); -} - -/************************************************************************ * OLEPictureImpl_get_Attributes */ static HRESULT WINAPI OLEPictureImpl_get_Attributes(IPicture *iface, @@ -1859,6 +1846,85 @@ static HRESULT WINAPI OLEPictureImpl_GetSizeMax( return E_NOTIMPL; } +/************************************************************************ + * OLEPictureImpl_SaveAsFile + */ +static HRESULT WINAPI OLEPictureImpl_SaveAsFile(IPicture *iface, + IStream *stream, BOOL mem_copy, LONG *size) +{ + OLEPictureImpl *This = impl_from_IPicture(iface); + void *data; + unsigned data_size; + ULONG written; + HRESULT hr; + + FIXME("(%p)->(%p,%d,%p): semi-stub\n", This, stream, mem_copy, size); + + switch (This->desc.picType) + { + case PICTYPE_NONE: + return S_OK; + + case PICTYPE_ICON: + if (!mem_copy) return E_FAIL; + + if (This->bIsDirty || !This->data) + { + if (!serializeIcon(This->desc.u.icon.hicon, &data, &data_size)) + return E_FAIL; + HeapFree(GetProcessHeap(), 0, This->data); + This->data = data; + This->datalen = data_size; + } + hr = IStream_Write(stream, This->data, This->datalen, &written); + if (hr == S_OK && size) *size = written; + return hr; + + case PICTYPE_BITMAP: + if (!mem_copy) return E_FAIL; + + if (This->bIsDirty || !This->data) + { + switch (This->keepOrigFormat ? This->loadtime_format : BITMAP_FORMAT_BMP) + { + case BITMAP_FORMAT_BMP: + if (!serializeBMP(This->desc.u.bmp.hbitmap, &data, &data_size)) + return E_FAIL; + break; + case BITMAP_FORMAT_JPEG: + FIXME("BITMAP_FORMAT_JPEG is not implemented\n"); + return E_NOTIMPL; + case BITMAP_FORMAT_GIF: + FIXME("BITMAP_FORMAT_GIF is not implemented\n"); + return E_NOTIMPL; + case BITMAP_FORMAT_PNG: + FIXME("BITMAP_FORMAT_PNG is not implemented\n"); + return E_NOTIMPL; + default: + FIXME("PICTYPE_BITMAP/%#x is not implemented\n", This->loadtime_format); + return E_NOTIMPL; + } + + HeapFree(GetProcessHeap(), 0, This->data); + This->data = data; + This->datalen = data_size; + } + hr = IStream_Write(stream, This->data, This->datalen, &written); + if (hr == S_OK && size) *size = written; + return hr; + + case PICTYPE_METAFILE: + FIXME("PICTYPE_METAFILE is not implemented\n"); + return E_NOTIMPL; + case PICTYPE_ENHMETAFILE: + FIXME("ENHMETAFILE is not implemented\n"); + return E_NOTIMPL; + default: + FIXME("%#x is not implemented\n", This->desc.picType); + break; + } + return E_NOTIMPL; +} /************************************************************************ * IDispatch diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 0903298..0c69cbd 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -1079,18 +1079,14 @@ static void test_load_save_bmp(void) size = -1; hr = IPicture_SaveAsFile(pic, dst_stream, TRUE, &size); ok(hr == S_OK, "IPicture_SaveasFile error %#x\n", hr); -todo_wine ok(size == 66, "expected 66, got %d\n", size); mem = GlobalLock(hmem); -todo_wine ok(!memcmp(&mem[0], "BM", 2), "got wrong bmp header %04x\n", mem[0]); GlobalUnlock(hmem); size = -1; hr = IPicture_SaveAsFile(pic, dst_stream, FALSE, &size); -todo_wine ok(hr == E_FAIL, "expected E_FAIL, got %#x\n", hr); -todo_wine ok(size == -1, "expected -1, got %d\n", size); offset.QuadPart = 0; @@ -1157,15 +1153,12 @@ static void test_load_save_icon(void) todo_wine ok(size == 766, "expected 766, got %d\n", size); mem = GlobalLock(hmem); -todo_wine ok(mem[0] == 0x00010000, "got wrong icon header %04x\n", mem[0]); GlobalUnlock(hmem); size = -1; hr = IPicture_SaveAsFile(pic, dst_stream, FALSE, &size); -todo_wine ok(hr == E_FAIL, "expected E_FAIL, got %#x\n", hr); -todo_wine ok(size == -1, "expected -1, got %d\n", size); offset.QuadPart = 0; @@ -1231,13 +1224,11 @@ static void test_load_save_empty_picture(void) size = -1; hr = IPicture_SaveAsFile(pic, dst_stream, TRUE, &size); ok(hr == S_OK, "IPicture_SaveasFile error %#x\n", hr); -todo_wine ok(size == -1, "expected -1, got %d\n", size); size = -1; hr = IPicture_SaveAsFile(pic, dst_stream, FALSE, &size); ok(hr == S_OK, "IPicture_SaveasFile error %#x\n", hr); -todo_wine ok(size == -1, "expected -1, got %d\n", size); hr = IPicture_QueryInterface(pic, &IID_IPersistStream, (void **)&src_stream);

1 0

Piotr Caban : shell32: Improved IDataObject::QueryGetData implementation.
by Alexandre Julliard Nov. 24, 2015

Nov. 24, 2015

Module: wine Branch: master Commit: 3a6ac6055511b14a7e26ba0200f36da418f80723 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a6ac6055511b14a7e26ba020… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 24 15:34:17 2015 +0100 shell32: Improved IDataObject::QueryGetData implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/dataobject.c | 2 +- dlls/shell32/tests/shlfolder.c | 58 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/dataobject.c b/dlls/shell32/dataobject.c index 64a9401..cc7b63e 100644 --- a/dlls/shell32/dataobject.c +++ b/dlls/shell32/dataobject.c @@ -349,7 +349,7 @@ static HRESULT WINAPI IDataObject_fnQueryGetData(IDataObject *iface, LPFORMATETC for (i=0; i<MAX_FORMATS; i++) { if ((This->pFormatEtc[i].cfFormat == pformatetc->cfFormat) - && (This->pFormatEtc[i].tymed == pformatetc->tymed)) + && (This->pFormatEtc[i].tymed & pformatetc->tymed)) { return S_OK; } diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 822acf6..7a53621 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -5224,6 +5224,63 @@ static void test_SHCreateShellFolderViewEx(void) IShellFolder_Release(desktop); } +static void test_DataObject(void) +{ + IShellFolder *desktop; + IDataObject *data_obj; + HRESULT hres; + IEnumIDList *peidl; + LPITEMIDLIST apidl; + FORMATETC fmt; + DWORD cf_shellidlist; + STGMEDIUM medium; + + SHGetDesktopFolder(&desktop); + + hres = IShellFolder_EnumObjects(desktop, NULL, + SHCONTF_NONFOLDERS|SHCONTF_FOLDERS|SHCONTF_INCLUDEHIDDEN, &peidl); + ok(hres == S_OK, "got %x\n", hres); + + if(IEnumIDList_Next(peidl, 1, &apidl, NULL) != S_OK) { + skip("no files on desktop - skipping GetDataObject tests\n"); + IEnumIDList_Release(peidl); + IShellFolder_Release(desktop); + return; + } + IEnumIDList_Release(peidl); + + hres = IShellFolder_GetUIObjectOf(desktop, NULL, 1, (LPCITEMIDLIST*)&apidl, + &IID_IDataObject, NULL, (void**)&data_obj); + ok(hres == S_OK, "got %x\n", hres); + pILFree(apidl); + IShellFolder_Release(desktop); + + cf_shellidlist = RegisterClipboardFormatW(CFSTR_SHELLIDLISTW); + fmt.cfFormat = cf_shellidlist; + fmt.ptd = NULL; + fmt.dwAspect = DVASPECT_CONTENT; + fmt.lindex = -1; + fmt.tymed = TYMED_HGLOBAL; + hres = IDataObject_QueryGetData(data_obj, &fmt); + ok(hres == S_OK, "got %x\n", hres); + + fmt.tymed = TYMED_HGLOBAL | TYMED_ISTREAM; + hres = IDataObject_QueryGetData(data_obj, &fmt); + ok(hres == S_OK, "got %x\n", hres); + + fmt.tymed = TYMED_ISTREAM; + hres = IDataObject_QueryGetData(data_obj, &fmt); + todo_wine ok(hres == S_FALSE, "got %x\n", hres); + + fmt.tymed = TYMED_HGLOBAL | TYMED_ISTREAM; + hres = IDataObject_GetData(data_obj, &fmt, &medium); + ok(hres == S_OK, "got %x\n", hres); + ok(medium.tymed == TYMED_HGLOBAL, "medium.tymed = %x\n", medium.tymed); + ReleaseStgMedium(&medium); + + IDataObject_Release(data_obj); +} + START_TEST(shlfolder) { init_function_pointers(); @@ -5264,6 +5321,7 @@ START_TEST(shlfolder) test_SHCreateDefaultContextMenu(); test_SHCreateShellFolderView(); test_SHCreateShellFolderViewEx(); + test_DataObject(); OleUninitialize(); }

1 0