August 2018 - Wine-Commits - list.winehq.org

Alistair Leslie-Hughes : dpnet: Implement IDirectPlay8Client SetSPCaps.
by Alexandre Julliard Aug. 29, 2018

Aug. 29, 2018

Module: wine Branch: master Commit: 598b52ce38dc2b82910c390164eb95e8972df9b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=598b52ce38dc2b82910c3901… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Aug 28 02:13:33 2018 +0000 dpnet: Implement IDirectPlay8Client SetSPCaps. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/client.c | 14 +++++++++++--- dlls/dpnet/tests/client.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 3 deletions(-) diff --git a/dlls/dpnet/client.c b/dlls/dpnet/client.c index 3b3361f..ea491ef 100644 --- a/dlls/dpnet/client.c +++ b/dlls/dpnet/client.c @@ -309,9 +309,17 @@ static HRESULT WINAPI IDirectPlay8ClientImpl_SetCaps(IDirectPlay8Client *iface, static HRESULT WINAPI IDirectPlay8ClientImpl_SetSPCaps(IDirectPlay8Client *iface, const GUID * const pguidSP, const DPN_SP_CAPS * const pdpspCaps, const DWORD dwFlags) { - IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); - FIXME("(%p):(%x): Stub\n", This, dwFlags); - return DPN_OK; + IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); + + TRACE("(%p)->(%p,%p,%x): stub\n", iface, pguidSP, pdpspCaps, dwFlags); + + if(!This->msghandler || pdpspCaps->dwSize != sizeof(DPN_SP_CAPS)) + return DPNERR_INVALIDPARAM; + + /* Only dwSystemBufferSize is set by this call. */ + This->spcaps.dwSystemBufferSize = pdpspCaps->dwSystemBufferSize; + + return DPN_OK; } static HRESULT WINAPI IDirectPlay8ClientImpl_GetSPCaps(IDirectPlay8Client *iface, diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index 47d8b01..af56d85 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -140,6 +140,9 @@ static BOOL test_init_dp(void) hr = IDirectPlay8Client_Initialize(client, NULL, NULL, 0); ok(hr == DPNERR_INVALIDPARAM, "got %x\n", hr); + hr = IDirectPlay8Client_SetSPCaps(client, &CLSID_DP8SP_TCPIP, &caps, 0); + ok(hr == DPNERR_INVALIDPARAM, "SetSPCaps failed with %x\n", hr); + hr = IDirectPlay8Client_Initialize(client, NULL, DirectPlayMessageHandler, 0); ok(hr == S_OK, "IDirectPlay8Client_Initialize failed with %x\n", hr); @@ -415,6 +418,33 @@ static void test_get_sp_caps(void) ok(caps.dwBuffersPerThread == 1, "expected 1, got %d\n", caps.dwBuffersPerThread); ok(caps.dwSystemBufferSize == 0x10000 || broken(caps.dwSystemBufferSize == 0x2000 /* before Win8 */), "expected 0x10000, got 0x%x\n", caps.dwSystemBufferSize); + + caps.dwNumThreads = 2; + caps.dwDefaultEnumCount = 3; + caps.dwDefaultEnumRetryInterval = 1400; + caps.dwDefaultEnumTimeout = 1400; + caps.dwMaxEnumPayloadSize = 900; + caps.dwBuffersPerThread = 2; + caps.dwSystemBufferSize = 0x0ffff; + hr = IDirectPlay8Client_SetSPCaps(client, &CLSID_DP8SP_TCPIP, &caps, 0); + ok(hr == DPN_OK, "SetSPCaps failed with %x\n", hr); + + hr = IDirectPlay8Client_GetSPCaps(client, &CLSID_DP8SP_TCPIP, &caps, 0); + ok(hr == DPN_OK, "GetSPCaps failed with %x\n", hr); + + ok(caps.dwSize == sizeof(DPN_SP_CAPS), "got %d\n", caps.dwSize); + ok(caps.dwNumThreads >= 3, "got %d\n", caps.dwNumThreads); + ok(caps.dwDefaultEnumCount == 5, "expected 5, got %d\n", caps.dwDefaultEnumCount); + ok(caps.dwDefaultEnumRetryInterval == 1500, "expected 1500, got %d\n", caps.dwDefaultEnumRetryInterval); + ok(caps.dwDefaultEnumTimeout == 1500, "expected 1500, got %d\n", caps.dwDefaultEnumTimeout); + ok(caps.dwMaxEnumPayloadSize == 983, "expected 983, got %d\n", caps.dwMaxEnumPayloadSize); + ok(caps.dwBuffersPerThread == 1, "expected 1, got %d\n", caps.dwBuffersPerThread); + ok(caps.dwSystemBufferSize == 0x0ffff, "expected 0x0ffff, got 0x%x\n", caps.dwSystemBufferSize); + + /* Reset the System setting back to its default. */ + caps.dwSystemBufferSize = 0x10000; + hr = IDirectPlay8Client_SetSPCaps(client, &CLSID_DP8SP_TCPIP, &caps, 0); + ok(hr == DPN_OK, "SetSPCaps failed with %x\n", hr); } static void test_lobbyclient(void)

1 0

Józef Kucia : dxgi: Move D3D12 helper functions closer to the top of the file.
by Alexandre Julliard Aug. 29, 2018

Aug. 29, 2018

Module: wine Branch: master Commit: 278ddcbfba3f39a06a2ea00590cd237fda9e0cfe URL: https://source.winehq.org/git/wine.git/?a=commit;h=278ddcbfba3f39a06a2ea005… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 29 12:53:34 2018 +0200 dxgi: Move D3D12 helper functions closer to the top of the file. We need to re-create a Vulkan swapchain in ResizeBuffers(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 1190 ++++++++++++++++++++++++------------------------- 1 file changed, 595 insertions(+), 595 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=278ddcbfba3f39a06a2e…

1 0

Alex Henrie : shell32: Rename icon 12 from "cdrom" to "optical drive".
by Alexandre Julliard Aug. 29, 2018

Aug. 29, 2018

Module: wine Branch: master Commit: f1f9b81e29fd8a23450fab9d95d5114af51e9118 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1f9b81e29fd8a23450fab9d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 28 23:47:36 2018 -0600 shell32: Rename icon 12 from "cdrom" to "optical drive". Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/Makefile.in | 2 +- dlls/shell32/folders.c | 2 +- dlls/shell32/resources/{cdrom.ico => optical_drive.ico} | Bin dlls/shell32/resources/{cdrom.svg => optical_drive.svg} | 0 dlls/shell32/shell32.rc | 4 ++-- dlls/shell32/shresdef.h | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index 7411def..74a3c13 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -63,7 +63,6 @@ IDL_SRCS = \ SVG_SRCS = \ resources/blank.svg \ - resources/cdrom.svg \ resources/control.svg \ resources/copy.svg \ resources/delete.svg \ @@ -85,6 +84,7 @@ SVG_SRCS = \ resources/netdrive2.svg \ resources/network.svg \ resources/optical_disc.svg \ + resources/optical_drive.svg \ resources/printer.svg \ resources/ramdisk.svg \ resources/recent.svg \ diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c index c18369f..5bb1a33 100644 --- a/dlls/shell32/folders.c +++ b/dlls/shell32/folders.c @@ -255,7 +255,7 @@ static HRESULT WINAPI IExtractIconW_fnGetIconLocation(IExtractIconW * iface, UIN switch(GetDriveTypeA(sTemp)) { case DRIVE_REMOVABLE: icon_idx = IDI_SHELL_FLOPPY; break; - case DRIVE_CDROM: icon_idx = IDI_SHELL_CDROM; break; + case DRIVE_CDROM: icon_idx = IDI_SHELL_OPTICAL_DRIVE; break; case DRIVE_REMOTE: icon_idx = IDI_SHELL_NETDRIVE; break; case DRIVE_RAMDISK: icon_idx = IDI_SHELL_RAMDISK; break; } diff --git a/dlls/shell32/resources/cdrom.ico b/dlls/shell32/resources/optical_drive.ico similarity index 100% rename from dlls/shell32/resources/cdrom.ico rename to dlls/shell32/resources/optical_drive.ico diff --git a/dlls/shell32/resources/cdrom.svg b/dlls/shell32/resources/optical_drive.svg similarity index 100% rename from dlls/shell32/resources/cdrom.svg rename to dlls/shell32/resources/optical_drive.svg diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index c04a37f..0b0c54a 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -462,8 +462,8 @@ IDI_SHELL_NETDRIVE ICON resources/netdrive.ico /* @makedep: resources/netdrive2.ico */ IDI_SHELL_NETDRIVE2 ICON resources/netdrive2.ico -/* @makedep: resources/cdrom.ico */ -IDI_SHELL_CDROM ICON resources/cdrom.ico +/* @makedep: resources/optical_drive.ico */ +IDI_SHELL_OPTICAL_DRIVE ICON resources/optical_drive.ico /* @makedep: resources/ramdisk.ico */ IDI_SHELL_RAMDISK ICON resources/ramdisk.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 61fb1e1..c529bdf 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -180,7 +180,7 @@ #define IDI_SHELL_DRIVE 9 #define IDI_SHELL_NETDRIVE 10 #define IDI_SHELL_NETDRIVE2 11 -#define IDI_SHELL_CDROM 12 +#define IDI_SHELL_OPTICAL_DRIVE 12 #define IDI_SHELL_RAMDISK 13 #define IDI_SHELL_ENTIRE_NETWORK 14 #define IDI_SHELL_NETWORK 15

1 0

Alex Henrie : shell32: Add web folder icons.
by Alexandre Julliard Aug. 29, 2018

Aug. 29, 2018

Module: wine Branch: master Commit: 1794e51649dabf06f7814268c99d8fc8949f5b5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1794e51649dabf06f7814268… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 28 23:47:23 2018 -0600 shell32: Add web folder icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 11 +++++++++++ dlls/shell32/shresdef.h | 3 +++ 2 files changed, 14 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 06b483e..749d24e 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -707,6 +707,17 @@ IDI_SHELL_CHECKLIST_FOLDER ICON resources/folder.ico /* @makedep: resources/network.ico */ IDI_SHELL_NET_CONNECTIONS ICON resources/network.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder.ico */ +IDI_SHELL_NEW_WEB_FOLDER ICON resources/folder.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/document.ico */ +IDI_SHELL_NEW_WEB_PAGE ICON resources/document.ico + +/* @makedep: resources/internet.ico */ +IDI_SHELL_WEB_FOLDERS ICON resources/internet.ico + /* @makedep: resources/mydocs.ico */ IDI_SHELL_MY_DOCUMENTS ICON resources/mydocs.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 6761596..0e6d070 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -263,6 +263,9 @@ #define IDI_SHELL_FAVORITES_FOLDER 173 #define IDI_SHELL_CHECKLIST_FOLDER 174 #define IDI_SHELL_NET_CONNECTIONS 175 +#define IDI_SHELL_NEW_WEB_FOLDER 176 +#define IDI_SHELL_NEW_WEB_PAGE 178 +#define IDI_SHELL_WEB_FOLDERS 193 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_RENAME 242 #define IDI_SHELL_COPY 243

1 0

Jacek Caban : mshtml: Skip fixups in get_nsstyle_property in IE9+ mode.
by Alexandre Julliard Aug. 29, 2018

Aug. 29, 2018

Module: wine Branch: master Commit: 8b998a7dd7c0b5128eb3a7b02757f38e718620a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b998a7dd7c0b5128eb3a7b0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 29 14:10:13 2018 +0200 mshtml: Skip fixups in get_nsstyle_property in IE9+ mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlcurstyle.c | 2 +- dlls/mshtml/htmlstyle.c | 8 ++++---- dlls/mshtml/htmlstyle.h | 2 +- dlls/mshtml/tests/style.c | 2 -- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index c2e3ee3..007be63 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -48,7 +48,7 @@ struct HTMLCurrentStyle { static inline HRESULT get_current_style_property(HTMLCurrentStyle *current_style, styleid_t sid, BSTR *p) { - return get_nsstyle_property(current_style->nsstyle, sid, p); + return get_nsstyle_property(current_style->nsstyle, sid, COMPAT_MODE_QUIRKS, p); } static inline HRESULT get_current_style_property_var(HTMLCurrentStyle *This, styleid_t sid, VARIANT *v) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 7fa126d..4ec24a3 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -667,7 +667,7 @@ static HRESULT nsstyle_to_bstr(const WCHAR *val, DWORD flags, BSTR *p) return S_OK; } -HRESULT get_nsstyle_property(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, BSTR *p) +HRESULT get_nsstyle_property(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, compat_mode_t compat_mode, BSTR *p) { nsAString str_value; const PRUnichar *value; @@ -678,7 +678,7 @@ HRESULT get_nsstyle_property(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, get_nsstyle_attr_nsval(nsstyle, sid, &str_value); nsAString_GetData(&str_value, &value); - hres = nsstyle_to_bstr(value, style_tbl[sid].flags, p); + hres = nsstyle_to_bstr(value, compat_mode < COMPAT_MODE_IE9 ? style_tbl[sid].flags : 0, p); nsAString_Finish(&str_value); TRACE("%s -> %s\n", debugstr_w(style_tbl[sid].name), debugstr_w(*p)); @@ -738,7 +738,7 @@ HRESULT get_nsstyle_property_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t s static inline HRESULT get_style_property(HTMLStyle *This, styleid_t sid, BSTR *p) { - return get_nsstyle_property(This->nsstyle, sid, p); + return get_nsstyle_property(This->nsstyle, sid, dispex_compat_mode(&This->dispex), p); } static inline HRESULT get_style_property_var(HTMLStyle *This, styleid_t sid, VARIANT *v) @@ -4796,7 +4796,7 @@ HRESULT get_elem_style(HTMLElement *elem, styleid_t styleid, BSTR *ret) if(FAILED(hres)) return hres; - hres = get_nsstyle_property(style, styleid, ret); + hres = get_nsstyle_property(style, styleid, COMPAT_MODE_IE11, ret); nsIDOMCSSStyleDeclaration_Release(style); return hres; } diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 10f0de5..ac0db1c 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -123,7 +123,7 @@ typedef enum { HRESULT HTMLStyle_Create(HTMLElement*,HTMLStyle**) DECLSPEC_HIDDEN; -HRESULT get_nsstyle_property(nsIDOMCSSStyleDeclaration*,styleid_t,BSTR*) DECLSPEC_HIDDEN; +HRESULT get_nsstyle_property(nsIDOMCSSStyleDeclaration*,styleid_t,compat_mode_t,BSTR*) DECLSPEC_HIDDEN; HRESULT get_nsstyle_property_var(nsIDOMCSSStyleDeclaration*,styleid_t,VARIANT*) DECLSPEC_HIDDEN; HRESULT get_elem_style(HTMLElement*,styleid_t,BSTR*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 1a22d54..51b44fb 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -704,7 +704,6 @@ static void test_style6(IHTMLStyle6 *style) if(compat_mode < COMPAT_IE9) ok(str && !*str, "outline = %s\n", wine_dbgstr_w(str)); else - todo_wine ok(!str, "outline = %s\n", wine_dbgstr_w(str)); SysFreeString(str); @@ -2524,7 +2523,6 @@ static void test_body_style(IHTMLStyle *style) hres = IHTMLStyle_get_clip(style, &str); ok(hres == S_OK, "get_clip failed: %08x\n", hres); - todo_wine_if(compat_mode >= COMPAT_IE9) ok(!strcmp_wa(str, compat_mode < COMPAT_IE9 ? "rect(0px 1px 500px 505px)" : "rect(0px, 1px, 500px, 505px)"), "clip = %s\n", wine_dbgstr_w(str)); SysFreeString(str);

1 0

Alex Henrie : shell32: Add remaining folder icons.
by Alexandre Julliard Aug. 29, 2018

Aug. 29, 2018

Module: wine Branch: master Commit: 5e53fb4bdf2d90b3ce276ca817f5383a76c75449 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e53fb4bdf2d90b3ce276ca8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 28 23:47:34 2018 -0600 shell32: Add remaining folder icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 36 ++++++++++++++++++++++++++++++++++++ dlls/shell32/shresdef.h | 10 ++++++++++ 2 files changed, 46 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 0e595cb..5ff23f9 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -786,12 +786,28 @@ IDI_SHELL_NETWORK_FAX ICON resources/printer.ico IDI_SHELL_RESTRICTED ICON resources/restricted.ico /* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder.ico */ +IDI_SHELL_DEFAULT_FOLDER ICON resources/folder.ico + +/* FIXME: Following resource is not yet added */ /* @makedep: resources/security.ico */ IDI_SHELL_USERS ICON resources/security.ico /* @makedep: resources/mydocs.ico */ IDI_SHELL_MY_DOCUMENTS ICON resources/mydocs.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/mydocs.ico */ +IDI_SHELL_MY_PICTURES ICON resources/mydocs.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/mydocs.ico */ +IDI_SHELL_MY_MUSIC ICON resources/mydocs.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/mydocs.ico */ +IDI_SHELL_MY_VIDEOS ICON resources/mydocs.ico + /* @makedep: resources/rename.ico */ IDI_SHELL_RENAME ICON resources/rename.ico @@ -802,6 +818,18 @@ IDI_SHELL_COPY ICON resources/copy.ico IDI_SHELL_EMPTY_RECYCLE_BIN2 ICON resources/trash_file.ico /* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder.ico */ +IDI_SHELL_NEW_NETWORK_FOLDER ICON resources/folder.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder.ico */ +IDI_SHELL_TO_FOLDER ICON resources/folder.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder.ico */ +IDI_SHELL_SHARED_FOLDER ICON resources/folder.ico + +/* FIXME: Following resource is not yet added */ /* @makedep: resources/security.ico */ IDI_SHELL_USERS_XP ICON resources/security.ico @@ -812,9 +840,17 @@ IDI_SHELL_USERS_XP2 ICON resources/security.ico /* @makedep: resources/optical_disc.ico */ IDI_SHELL_OPTICAL_DISC ICON resources/optical_disc.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder.ico */ +IDI_SHELL_NEW_FOLDER ICON resources/folder.ico + /* @makedep: resources/favorites.ico */ IDI_SHELL_FAVORITES_SMALL ICON resources/favorites.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder.ico */ +IDI_SHELL_APP_FOLDER_SMALL ICON resources/folder.ico + /* @makedep: resources/restricted.ico */ IDI_SHELL_RESTRICTED2 ICON resources/restricted.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 73b46fd..33f28cf 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -286,16 +286,26 @@ #define IDI_SHELL_DEFAULT_NETWORK_FAX 198 #define IDI_SHELL_NETWORK_FAX 199 #define IDI_SHELL_RESTRICTED 200 +/* 201 - 209 not used on Windows */ +#define IDI_SHELL_DEFAULT_FOLDER 210 /* 211 - 219 not used on Windows */ #define IDI_SHELL_USERS 220 #define IDI_SHELL_MY_DOCUMENTS 235 +#define IDI_SHELL_MY_PICTURES 236 +#define IDI_SHELL_MY_MUSIC 237 +#define IDI_SHELL_MY_VIDEOS 238 #define IDI_SHELL_RENAME 242 #define IDI_SHELL_COPY 243 #define IDI_SHELL_EMPTY_RECYCLE_BIN2 254 +#define IDI_SHELL_NEW_NETWORK_FOLDER 258 +#define IDI_SHELL_TO_FOLDER 264 +#define IDI_SHELL_SHARED_FOLDER 267 #define IDI_SHELL_USERS_XP 269 #define IDI_SHELL_USERS_XP2 279 #define IDI_SHELL_OPTICAL_DISC 302 +#define IDI_SHELL_NEW_FOLDER 319 #define IDI_SHELL_FAVORITES_SMALL 322 +#define IDI_SHELL_APP_FOLDER_SMALL 326 #define IDI_SHELL_RESTRICTED2 338 /*

1 0

Alex Henrie : shell32: Add fax machine icons.
by Alexandre Julliard Aug. 29, 2018

Aug. 29, 2018

Module: wine Branch: master Commit: 5feff6404505831060a9ee6627efc2345907c043 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5feff6404505831060a9ee66… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 28 23:47:32 2018 -0600 shell32: Add fax machine icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 16 ++++++++++++++++ dlls/shell32/shresdef.h | 5 +++++ 2 files changed, 21 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index ab4a0f2..0f3fe43 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -767,6 +767,22 @@ IDI_SHELL_WEB_FOLDERS ICON resources/internet.ico IDI_SHELL_PASSWORDS ICON resources/security.ico /* FIXME: Following resource is not yet added */ +/* @makedep: resources/printer.ico */ +IDI_SHELL_FAX ICON resources/printer.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/printer.ico */ +IDI_SHELL_DEFAULT_FAX ICON resources/printer.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/printer.ico */ +IDI_SHELL_DEFAULT_NETWORK_FAX ICON resources/printer.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/printer.ico */ +IDI_SHELL_NETWORK_FAX ICON resources/printer.ico + +/* FIXME: Following resource is not yet added */ /* @makedep: resources/security.ico */ IDI_SHELL_USERS ICON resources/security.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 2b5bfbf..b0f0b2d 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -280,6 +280,11 @@ #define IDI_SHELL_FULL_RECYCLE_BIN_95 192 #define IDI_SHELL_WEB_FOLDERS 193 #define IDI_SHELL_PASSWORDS 194 +/* 195 not used on Windows */ +#define IDI_SHELL_FAX 196 +#define IDI_SHELL_DEFAULT_FAX 197 +#define IDI_SHELL_DEFAULT_NETWORK_FAX 198 +#define IDI_SHELL_NETWORK_FAX 199 /* 211 - 219 not used on Windows */ #define IDI_SHELL_USERS 220 #define IDI_SHELL_MY_DOCUMENTS 235

1 0

Alex Henrie : shell32: Add one-click-open and two-click-open icons.
by Alexandre Julliard Aug. 29, 2018

Aug. 29, 2018

Module: wine Branch: master Commit: fe157e542aa7af5a57f890108c4849580ad0d61e URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe157e542aa7af5a57f89010… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 28 23:47:28 2018 -0600 shell32: Add one-click-open and two-click-open icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 8 ++++++++ dlls/shell32/shresdef.h | 2 ++ 2 files changed, 10 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index cfd7006..896c63d 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -746,6 +746,14 @@ IDI_SHELL_MAXIMIZED_WINDOW ICON resources/window.ico /* @makedep: resources/window.ico */ IDI_SHELL_FLOATING_WINDOWS ICON resources/window.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder_open.ico */ +IDI_SHELL_ONE_CLICK_OPEN ICON resources/folder_open.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder_open.ico */ +IDI_SHELL_TWO_CLICK_OPEN ICON resources/folder_open.ico + /* @makedep: resources/internet.ico */ IDI_SHELL_WEB_FOLDERS ICON resources/internet.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 3876c16..e901460 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -273,6 +273,8 @@ #define IDI_SHELL_WINDOW_WITHOUT_SIDEBAR 183 #define IDI_SHELL_MAXIMIZED_WINDOW 184 #define IDI_SHELL_FLOATING_WINDOWS 185 +#define IDI_SHELL_ONE_CLICK_OPEN 186 +#define IDI_SHELL_TWO_CLICK_OPEN 187 #define IDI_SHELL_WEB_FOLDERS 193 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_RENAME 242

1 0

Alex Henrie : shell32: Add window-on-monitor and desktop-on-monitor icons.
by Alexandre Julliard Aug. 29, 2018

Aug. 29, 2018

Module: wine Branch: master Commit: 8017c259ca76ae7f1547e75ed256b8b457fe1340 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8017c259ca76ae7f1547e75e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 28 23:47:26 2018 -0600 shell32: Add window-on-monitor and desktop-on-monitor icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 8 ++++++++ dlls/shell32/shresdef.h | 2 ++ 2 files changed, 10 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 2b34345..c01b8be 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -722,6 +722,14 @@ IDI_SHELL_NEW_WEB_PAGE ICON resources/document.ico /* @makedep: resources/internet.ico */ IDI_SHELL_REMOTE_CONNECTION ICON resources/internet.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/mycomputer.ico */ +IDI_SHELL_WINDOW_ON_MONITOR ICON resources/mycomputer.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/mycomputer.ico */ +IDI_SHELL_DESKTOP_ON_MONITOR ICON resources/mycomputer.ico + /* @makedep: resources/internet.ico */ IDI_SHELL_WEB_FOLDERS ICON resources/internet.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index f7e51dc..f70b084 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -267,6 +267,8 @@ #define IDI_SHELL_VISUAL_SETTINGS 177 #define IDI_SHELL_NEW_WEB_PAGE 178 #define IDI_SHELL_REMOTE_CONNECTION 179 +#define IDI_SHELL_WINDOW_ON_MONITOR 180 +#define IDI_SHELL_DESKTOP_ON_MONITOR 181 #define IDI_SHELL_WEB_FOLDERS 193 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_RENAME 242

1 0

Jacek Caban : mshtml: Skip var_to_nsstyle fixups in IE9+ mode.
by Alexandre Julliard Aug. 29, 2018

Aug. 29, 2018

Module: wine Branch: master Commit: 1f122a29d97b6a1986d089fd42cef2b8b97a1949 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f122a29d97b6a1986d089fd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 29 14:09:28 2018 +0200 mshtml: Skip var_to_nsstyle fixups in IE9+ mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 10 +++++----- dlls/mshtml/tests/style.c | 40 +++------------------------------------- 2 files changed, 8 insertions(+), 42 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 5c48a24..7fa126d 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -523,7 +523,7 @@ static HRESULT set_nsstyle_property(nsIDOMCSSStyleDeclaration *nsstyle, styleid_ return S_OK; } -static HRESULT var_to_styleval(const VARIANT *v, styleid_t sid, WCHAR *buf, const WCHAR **ret) +static HRESULT var_to_styleval(HTMLStyle *style, const VARIANT *v, styleid_t sid, WCHAR *buf, const WCHAR **ret) { switch(V_VT(v)) { case VT_NULL: @@ -539,7 +539,7 @@ static HRESULT var_to_styleval(const VARIANT *v, styleid_t sid, WCHAR *buf, cons return S_OK; case VT_I4: { - unsigned flags = style_tbl[sid].flags; + unsigned flags = dispex_compat_mode(&style->dispex) < COMPAT_MODE_IE9 ? style_tbl[sid].flags : 0; static const WCHAR formatW[] = {'%','d',0}; static const WCHAR hex_formatW[] = {'#','%','0','6','x',0}; @@ -598,7 +598,7 @@ static HRESULT set_style_property_var(HTMLStyle *style, styleid_t sid, VARIANT * WCHAR buf[14]; HRESULT hres; - hres = var_to_styleval(value, sid, buf, &val); + hres = var_to_styleval(style, value, sid, buf, &val); if(FAILED(hres)) return hres; @@ -1202,7 +1202,7 @@ static HRESULT WINAPI HTMLStyle_put_backgroundPositionX(IHTMLStyle *iface, VARIA TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); - hres = var_to_styleval(&v, STYLEID_BACKGROUND_POSITION_X, buf, &val); + hres = var_to_styleval(This, &v, STYLEID_BACKGROUND_POSITION_X, buf, &val); if(FAILED(hres)) return hres; @@ -1295,7 +1295,7 @@ static HRESULT WINAPI HTMLStyle_put_backgroundPositionY(IHTMLStyle *iface, VARIA TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); - hres = var_to_styleval(&v, STYLEID_BACKGROUND_POSITION_Y, buf, &val); + hres = var_to_styleval(This, &v, STYLEID_BACKGROUND_POSITION, buf, &val); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 1fc26c2..1a22d54 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -107,16 +107,6 @@ static void _test_var_bstr(unsigned line, const VARIANT *v, const char *expect) ok_(__FILE__,line)(!V_BSTR(v), "V_BSTR(v) = %s, expected NULL\n", wine_dbgstr_w(V_BSTR(v))); } -#define test_var_bstr_todo(a,b) _test_var_bstr_todo(__LINE__,a,b) -static void _test_var_bstr_todo(unsigned line, const VARIANT *v, const char *expect) -{ - ok_(__FILE__,line)(V_VT(v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(v)); - if(expect) - todo_wine ok_(__FILE__,line)(!strcmp_wa(V_BSTR(v), expect), "V_BSTR(v) = %s, expected %s\n", wine_dbgstr_w(V_BSTR(v)), expect); - else - todo_wine ok_(__FILE__,line)(!V_BSTR(v), "V_BSTR(v) = %s, expected NULL\n", wine_dbgstr_w(V_BSTR(v))); -} - #define get_elem2_iface(u) _get_elem2_iface(__LINE__,u) static IHTMLElement2 *_get_elem2_iface(unsigned line, IUnknown *unk) { @@ -451,10 +441,7 @@ static void test_style2(IHTMLStyle2 *style2) V_VT(&v) = VT_EMPTY; hres = IHTMLStyle2_get_bottom(style2, &v); ok(hres == S_OK, "get_bottom failed: %08x\n", hres); - if(compat_mode < COMPAT_IE9) - test_var_bstr(&v, "4px"); - else - test_var_bstr_todo(&v, NULL); + test_var_bstr(&v, compat_mode < COMPAT_IE9 ? "4px" : NULL); /* overflowX */ str = (void*)0xdeadbeef; @@ -791,7 +778,6 @@ static void test_body_style(IHTMLStyle *style) if(compat_mode < COMPAT_IE9) ok(!strcmp_wa(V_BSTR(&v), "6px"), "V_BSTR(marginRight) = %s\n", wine_dbgstr_w(V_BSTR(&v))); else - todo_wine ok(!V_BSTR(&v), "mariginRight = %s\n", wine_dbgstr_w(V_BSTR(&v))); V_VT(&v) = VT_NULL; @@ -812,7 +798,6 @@ static void test_body_style(IHTMLStyle *style) if(compat_mode < COMPAT_IE9) ok(!strcmp_wa(V_BSTR(&v), "6px"), "V_BSTR(marginBottom) = %s\n", wine_dbgstr_w(V_BSTR(&v))); else - todo_wine ok(!V_BSTR(&v), "mariginBottom = %s\n", wine_dbgstr_w(V_BSTR(&v))); V_VT(&v) = VT_NULL; @@ -833,7 +818,6 @@ static void test_body_style(IHTMLStyle *style) if(compat_mode < COMPAT_IE9) ok(!strcmp_wa(V_BSTR(&v), "6px"), "V_BSTR(marginLeft) = %s\n", wine_dbgstr_w(V_BSTR(&v))); else - todo_wine ok(!V_BSTR(&v), "mariginLeft = %s\n", wine_dbgstr_w(V_BSTR(&v))); str = (void*)0xdeadbeef; @@ -994,7 +978,6 @@ static void test_body_style(IHTMLStyle *style) if(compat_mode < COMPAT_IE9) ok(!strcmp_wa(V_BSTR(&v), "12px"), "fontSize = %s\n", wine_dbgstr_w(V_BSTR(&v))); else - todo_wine ok(!V_BSTR(&v), "fontSize = %s\n", wine_dbgstr_w(V_BSTR(&v))); V_VT(&v) = VT_NULL; @@ -1194,23 +1177,18 @@ static void test_body_style(IHTMLStyle *style) hres = IHTMLStyle_get_width(style, &v); ok(hres == S_OK, "get_width failed: %08x\n", hres); - if(compat_mode < COMPAT_IE9) - test_var_bstr(&v, "100px"); - else - test_var_bstr_todo(&v, "auto"); + test_var_bstr(&v, compat_mode < COMPAT_IE9 ? "100px" : "auto"); VariantClear(&v); l = 0xdeadbeef; hres = IHTMLStyle_get_pixelWidth(style, &l); ok(hres == S_OK, "get_pixelWidth failed: %08x\n", hres); - todo_wine_if(compat_mode >= COMPAT_IE9) ok(l == (compat_mode < COMPAT_IE9 ? 100 : 0), "pixelWidth = %d\n", l); V_VT(&v) = VT_EMPTY; hres = IHTMLStyle_get_width(style, &v); ok(hres == S_OK, "get_width failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); - todo_wine_if(compat_mode >= COMPAT_IE9) ok(!strcmp_wa(V_BSTR(&v), compat_mode < COMPAT_IE9 ? "100px" : "auto"), "V_BSTR(v)=%s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -1293,7 +1271,6 @@ static void test_body_style(IHTMLStyle *style) hres = IHTMLStyle_get_marginTop(style, &v); ok(hres == S_OK, "get_marginTop failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(marginTop) = %d\n", V_VT(&v)); - todo_wine_if(compat_mode >= COMPAT_IE9) ok(!strcmp_wa(V_BSTR(&v), compat_mode < COMPAT_IE9 ? "5px" : "6px"), "V_BSTR(marginTop) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -1606,20 +1583,17 @@ static void test_body_style(IHTMLStyle *style) hres = IHTMLStyle_get_height(style, &v); ok(hres == S_OK, "get_height failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); - todo_wine_if(compat_mode >= COMPAT_IE9) ok(!strcmp_wa(V_BSTR(&v), compat_mode < COMPAT_IE9 ? "64px" : "50px"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); hres = IHTMLStyle_get_posHeight(style, &f); ok(hres == S_OK, "get_posHeight failed: %08x\n", hres); - todo_wine_if(compat_mode >= COMPAT_IE9) ok(f == (compat_mode < COMPAT_IE9 ? 64.0 : 50), "expected 64.0 got %f\n", f); l = 0xdeadbeef; hres = IHTMLStyle_get_pixelHeight(style, &l); ok(hres == S_OK, "get_pixelHeight failed: %08x\n", hres); - todo_wine_if(compat_mode >= COMPAT_IE9) ok(l == (compat_mode < COMPAT_IE9 ? 64 : 50), "pixelHeight = %d\n", l); str = (void*)0xdeadbeef; @@ -1669,7 +1643,6 @@ static void test_body_style(IHTMLStyle *style) hres = IHTMLStyle_get_verticalAlign(style, &v); ok(hres == S_OK, "get_verticalAlign failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); - todo_wine_if(compat_mode >= COMPAT_IE9) ok(!strcmp_wa(V_BSTR(&v), compat_mode < COMPAT_IE9 ? "100px" : "middle"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -1708,7 +1681,6 @@ static void test_body_style(IHTMLStyle *style) if(compat_mode < COMPAT_IE9) ok(!strcmp_wa(V_BSTR(&v), "6px"), "textIndent = %s\n", wine_dbgstr_w(V_BSTR(&v))); else - todo_wine ok(!V_BSTR(&v), "textIndent = %s\n", wine_dbgstr_w(V_BSTR(&v))); str = (void*)0xdeadbeef; @@ -2002,7 +1974,6 @@ static void test_body_style(IHTMLStyle *style) if(compat_mode < COMPAT_IE9) ok(!strcmp_wa(V_BSTR(&v), "6px"), "paddingTop = %s\n", wine_dbgstr_w(V_BSTR(&v))); else - todo_wine ok(!V_BSTR(&v), "paddingTop = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -2022,7 +1993,6 @@ static void test_body_style(IHTMLStyle *style) if(compat_mode < COMPAT_IE9) ok(!strcmp_wa(V_BSTR(&v), "6px"), "paddingRight = %s\n", wine_dbgstr_w(V_BSTR(&v))); else - todo_wine ok(!V_BSTR(&v), "paddingRight = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -2042,7 +2012,6 @@ static void test_body_style(IHTMLStyle *style) if(compat_mode < COMPAT_IE9) ok(!strcmp_wa(V_BSTR(&v), "6px"), "paddingBottom = %s\n", wine_dbgstr_w(V_BSTR(&v))); else - todo_wine ok(!V_BSTR(&v), "paddingBottom = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -2979,10 +2948,7 @@ static void test_current_style(IHTMLCurrentStyle *current_style) hres = IHTMLCurrentStyle_get_verticalAlign(current_style, &v); ok(hres == S_OK, "get_verticalAlign failed: %08x\n", hres); - if(compat_mode < COMPAT_IE9) - test_var_bstr(&v, "100px"); - else - test_var_bstr_todo(&v, "middle"); + test_var_bstr(&v, compat_mode < COMPAT_IE9 ? "100px" : "middle"); VariantClear(&v); hres = IHTMLCurrentStyle_get_marginRight(current_style, &v);

1 0