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

Jason Edmeades : cmd: Fix 'if exist' with a directory\ as a parameter.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: bc9d68bcbee5c9d4f4582f766a4f552870385361 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc9d68bcbee5c9d4f4582f76… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Mon Aug 27 20:41:52 2018 +0100 cmd: Fix 'if exist' with a directory\ as a parameter. 'if exists' takes a parameter which can be directory, directory\ or directory\. for example, and should equate to true if the directory exists. The syntax directory\ is explicitly rejected by FindFirstFile and hence was not working - look for this specific case, and if found append a '.'. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45506 Signed-off-by: Jason Edmeades <us(a)edmeades.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 9 ++++++++- programs/cmd/tests/test_builtins.cmd | 20 ++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 4 ++++ 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index cb4a7b9..25d5be1 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2861,7 +2861,14 @@ void WCMD_if (WCHAR *p, CMD_LIST **cmdList) } else if (!lstrcmpiW (condition, existW)) { WIN32_FIND_DATAW fd; - HANDLE hff = FindFirstFileW(WCMD_parameter(p, 1+negate, NULL, FALSE, FALSE), &fd); + HANDLE hff; + WCHAR *param = WCMD_parameter(p, 1+negate, NULL, FALSE, FALSE); + int len = strlenW(param); + + /* FindFirstFile does not like a directory path ending in '\', append a '.' */ + if (len && param[len-1] == '\\') strcatW(param, dotW); + + hff = FindFirstFileW(param, &fd); test = (hff != INVALID_HANDLE_VALUE ); if (test) FindClose(hff); diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 0e88ad1..b36afa4 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1046,6 +1046,26 @@ if exist idontexist\ba* ( ) else ( echo exist wildcard bad subdir broken works ) +if exist subdir ( + echo exist subdir ok +) else ( + echo ERROR exist subdir not working +) +if exist subdir\. ( + echo exist subdir with . ok +) else ( + echo ERROR exist subdir with . not working +) +if exist subdir\ ( + echo exist subdir with \ ok +) else ( + echo ERROR exist subdir with \ not working +) +if exist "subdir\" ( + echo exist subdir with \ and quotes ok +) else ( + echo ERROR exist subdir with \ and quotes not working +) del foo subdir\bar rd subdir diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 1f2b5dd..764e454 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -783,6 +783,10 @@ exist simple wildcard works exist wildcard works negate exist wildcard works exist wildcard bad subdir broken works +exist subdir ok +exist subdir with . ok +exist subdir with \ ok +exist subdir with \ and quotes ok ------ for numbers negative numbers handled negative numbers handled

1 0

Jason Edmeades : cmd: Correct handling of %~0 for batch call.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: 987fee3791d24a63aacc0b49f59275b62c943815 URL: https://source.winehq.org/git/wine.git/?a=commit;h=987fee3791d24a63aacc0b49… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Mon Aug 27 20:41:53 2018 +0100 cmd: Correct handling of %~0 for batch call. When a batch label is called, %0 and %~0 should be the label being called, and if you start adding modifiers to it (eg %~d0) then you get details of the batch program containing the label. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44369 Signed-off-by: Jason Edmeades <us(a)edmeades.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/batch.c | 23 +++++++++++++---------- programs/cmd/tests/test_builtins.cmd | 9 +++++++++ programs/cmd/tests/test_builtins.cmd.exp | 3 +++ 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 1ed5197..5b05d88 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -460,10 +460,19 @@ void WCMD_HandleTildaModifiers(WCHAR **start, BOOL atExecute) } if (lastModifier == firstModifier) return; /* Invalid syntax */ - /* Extract the parameter to play with */ - if (*lastModifier == '0') { + /* So now, firstModifier points to beginning of modifiers, lastModifier + points to the variable just after the modifiers. Process modifiers + in a specific order, remembering there could be duplicates */ + modifierLen = lastModifier - firstModifier; + finaloutput[0] = 0x00; + + /* Extract the parameter to play with + Special case param 0 - With %~0 you get the batch label which was called + whereas if you start applying other modifiers to it, you get the filename + the batch label is in */ + if (*lastModifier == '0' && modifierLen > 1) { strcpyW(outputparam, context->batchfileW); - } else if ((*lastModifier >= '1' && *lastModifier <= '9')) { + } else if ((*lastModifier >= '0' && *lastModifier <= '9')) { strcpyW(outputparam, WCMD_parameter (context -> command, *lastModifier-'0' + context -> shift_count[*lastModifier-'0'], @@ -473,12 +482,6 @@ void WCMD_HandleTildaModifiers(WCHAR **start, BOOL atExecute) strcpyW(outputparam, forloopcontext.variable[foridx]); } - /* So now, firstModifier points to beginning of modifiers, lastModifier - points to the variable just after the modifiers. Process modifiers - in a specific order, remembering there could be duplicates */ - modifierLen = lastModifier - firstModifier; - finaloutput[0] = 0x00; - /* 1. Handle '~' : Strip surrounding quotes */ if (outputparam[0]=='"' && memchrW(firstModifier, '~', modifierLen) != NULL) { @@ -728,7 +731,7 @@ void WCMD_call (WCHAR *command) { li.QuadPart = 0; li.u.LowPart = SetFilePointer(context -> h, li.u.LowPart, &li.u.HighPart, FILE_CURRENT); - WCMD_batch (param1, command, TRUE, gotoLabel, context->h); + WCMD_batch (context->batchfileW, command, TRUE, gotoLabel, context->h); SetFilePointer(context -> h, li.u.LowPart, &li.u.HighPart, FILE_BEGIN); diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index b36afa4..de9c889 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -687,6 +687,15 @@ echo '%~xs1' goto :eof :endEchoFuns +echo ------------ Testing parameter zero ------------ +call :func parm1 parm2 +goto :endParm0 +:func +echo %~0 %~1 +echo [%0] [%~d0] [%~p0] [%~n0] [%~x0] [%~s0] +goto :EOF +:endParm0 + echo ------------ Testing variable delayed expansion ------------ rem NT4 doesn't support this echo --- default mode (load-time expansion) diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 764e454..3829318 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -578,6 +578,9 @@ N @drive@ '' '.eh'@or_broken@'' +------------ Testing parameter zero ------------ +:func parm1 +[:func] [@drive@] [@path@] [test] [.cmd] [@drive@@shortpath(a)test.cmd] ------------ Testing variable delayed expansion ------------ --- default mode (load-time expansion) foo

1 0

Jacek Caban : mshtml: Skip set_style_property fixups in IE9+ mode.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: ec13283af2af8e88872d4d31e2dee6aeebabe280 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec13283af2af8e88872d4d31… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 29 14:09:15 2018 +0200 mshtml: Skip set_style_property 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 | 5 +++-- dlls/mshtml/tests/style.c | 42 +++--------------------------------------- 2 files changed, 6 insertions(+), 41 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 31d38c8..5c48a24 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -565,7 +565,7 @@ static inline HRESULT set_style_property(HTMLStyle *style, styleid_t sid, const WCHAR *val = NULL; HRESULT hres; - if(value && *value) { + if(value && *value && dispex_compat_mode(&style->dispex) < COMPAT_MODE_IE9) { unsigned flags = style_tbl[sid].flags; if(style_tbl[sid].allowed_values) { @@ -4780,7 +4780,8 @@ HRESULT HTMLStyle_Create(HTMLElement *elem, HTMLStyle **ret) nsIDOMCSSStyleDeclaration_AddRef(nsstyle); - init_dispex(&style->dispex, (IUnknown*)&style->IHTMLStyle_iface, &HTMLStyle_dispex); + init_dispex_with_compat_mode(&style->dispex, (IUnknown*)&style->IHTMLStyle_iface, &HTMLStyle_dispex, + dispex_compat_mode(&elem->node.event_target.dispex)); *ret = style; return S_OK; diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 12877e9..1fc26c2 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -284,7 +284,6 @@ static void _test_border_styles(unsigned line, IHTMLStyle *pStyle, BSTR Name) if(compat_mode < COMPAT_IE9) ok_(__FILE__,line) (FAILED(hres), "invalid value passed.\n"); else - todo_wine ok_(__FILE__,line) (hres == S_OK, "invalid value returned: %08x\n", hres); VariantClear(&arg); @@ -364,21 +363,6 @@ static void _test_text_decoration(unsigned line, IHTMLStyle *style, const char * SysFreeString(str); } -#define test_text_decoration_todo(a,b) _test_text_decoration_todo(__LINE__,a,b) -static void _test_text_decoration_todo(unsigned line, IHTMLStyle *style, const char *exdec) -{ - BSTR str; - HRESULT hres; - - hres = IHTMLStyle_get_textDecoration(style, &str); - ok_(__FILE__,line)(hres == S_OK, "get_textDecoration failed: %08x\n", hres); - if(exdec) - todo_wine ok_(__FILE__,line)(!strcmp_wa(str, exdec), "textDecoration = %s, expected %s\n", wine_dbgstr_w(str), exdec); - else - todo_wine ok_(__FILE__,line)(!str, "textDecoration = %s, expected NULL\n", wine_dbgstr_w(str)); - SysFreeString(str); -} - static void test_set_csstext(IHTMLStyle *style) { VARIANT v; @@ -639,10 +623,7 @@ static void test_style5(IHTMLStyle5 *style5) hres = IHTMLStyle5_get_minWidth(style5, &v); ok(hres == S_OK, "get_minWidth failed: %08x\n", hres); - if(compat_mode < COMPAT_IE9) - test_var_bstr(&v, "10px"); - else - test_var_bstr_todo(&v, "10%"); + test_var_bstr(&v, compat_mode < COMPAT_IE9 ? "10px" : "10%"); VariantClear(&v); hres = IHTMLStyle5_put_minWidth(style5, vdefault); @@ -717,10 +698,7 @@ static void test_style5(IHTMLStyle5 *style5) hres = IHTMLStyle5_get_maxHeight(style5, &v); ok(hres == S_OK, "get_maxHeight failed: %08x\n", hres); - if(compat_mode < COMPAT_IE9) - test_var_bstr(&v, "100px"); - else - test_var_bstr_todo(&v, "70%"); + test_var_bstr(&v, compat_mode < COMPAT_IE9 ? "100px" : "70%"); VariantClear(&v); hres = IHTMLStyle5_put_maxHeight(style5, vdefault); @@ -873,7 +851,6 @@ static void test_body_style(IHTMLStyle *style) str = a2bstr("test"); hres = IHTMLStyle_put_fontWeight(style, str); - todo_wine_if(compat_mode >= COMPAT_IE9) ok(hres == (compat_mode < COMPAT_IE9 ? E_INVALIDARG : S_OK), "put_fontWeight failed: %08x\n", hres); SysFreeString(str); @@ -971,7 +948,6 @@ static void test_body_style(IHTMLStyle *style) str = a2bstr("test"); hres = IHTMLStyle_put_fontVariant(style, str); - todo_wine_if(compat_mode >= COMPAT_IE9) ok(hres == (compat_mode < COMPAT_IE9 ? E_INVALIDARG : S_OK), "fontVariant failed: %08x\n", hres); SysFreeString(str); @@ -1141,7 +1117,6 @@ static void test_body_style(IHTMLStyle *style) str = a2bstr("invalid"); hres = IHTMLStyle_put_textDecoration(style, str); - todo_wine_if(compat_mode >= COMPAT_IE9) ok(hres == (compat_mode < COMPAT_IE9 ? E_INVALIDARG : S_OK), "put_textDecoration failed: %08x\n", hres); SysFreeString(str); @@ -1158,14 +1133,10 @@ static void test_body_style(IHTMLStyle *style) str = a2bstr("invalid"); hres = IHTMLStyle_put_textDecoration(style, str); - todo_wine_if(compat_mode >= COMPAT_IE9) ok(hres == (compat_mode < COMPAT_IE9 ? E_INVALIDARG : S_OK), "put_textDecoration failed: %08x\n", hres); SysFreeString(str); - if(compat_mode < COMPAT_IE9) - test_text_decoration(style, NULL); - else - test_text_decoration_todo(style, "blink"); + test_text_decoration(style, compat_mode < COMPAT_IE9 ? NULL : "blink"); hres = IHTMLStyle_put_textDecoration(style, sDefault); ok(hres == S_OK, "put_textDecoration failed: %08x\n", hres); @@ -1799,7 +1770,6 @@ static void test_body_style(IHTMLStyle *style) str = a2bstr("test"); hres = IHTMLStyle_put_fontStyle(style, str); - todo_wine_if(compat_mode >= COMPAT_IE9) ok(hres == (compat_mode < COMPAT_IE9 ? E_INVALIDARG : S_OK), "put_fontStyle failed: %08x\n", hres); SysFreeString(str); @@ -1832,7 +1802,6 @@ static void test_body_style(IHTMLStyle *style) str = a2bstr("test"); hres = IHTMLStyle_put_overflow(style, str); - todo_wine_if(compat_mode >= COMPAT_IE9) ok(hres == (compat_mode < COMPAT_IE9 ? E_INVALIDARG : S_OK), "put_overflow failed: %08x\n", hres); SysFreeString(str); @@ -2111,7 +2080,6 @@ static void test_body_style(IHTMLStyle *style) if(compat_mode < COMPAT_IE9) ok(!strcmp_wa(V_BSTR(&v), "10px"), "paddingLeft = %s\n", wine_dbgstr_w(V_BSTR(&v))); else - todo_wine ok(!V_BSTR(&v), "paddingLeft = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -2124,7 +2092,6 @@ static void test_body_style(IHTMLStyle *style) str = a2bstr("invalid"); hres = IHTMLStyle_put_backgroundRepeat(style, str); - todo_wine_if(compat_mode >= COMPAT_IE9) ok(hres == (compat_mode < COMPAT_IE9 ? E_INVALIDARG : S_OK), "put_backgroundRepeat failed: %08x\n", hres); SysFreeString(str); @@ -2410,7 +2377,6 @@ static void test_body_style(IHTMLStyle *style) hres = IHTMLStyle_get_borderRightWidth(style, &v); ok(hres == S_OK, "get_borderRightWidth: %08x\n", hres); - todo_wine_if(compat_mode >= COMPAT_IE9) ok(!strcmp_wa(V_BSTR(&v), compat_mode < COMPAT_IE9 ? "10px" : "1px"), "borderRightWidth = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -2431,7 +2397,6 @@ static void test_body_style(IHTMLStyle *style) hres = IHTMLStyle_get_borderBottomWidth(style, &v); ok(hres == S_OK, "get_borderBottomWidth: %08x\n", hres); - todo_wine_if(compat_mode >= COMPAT_IE9) ok(!strcmp_wa(V_BSTR(&v), compat_mode < COMPAT_IE9 ? "10px" : "1px"), "borderBottomWidth = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -2452,7 +2417,6 @@ static void test_body_style(IHTMLStyle *style) hres = IHTMLStyle_get_borderLeftWidth(style, &v); ok(hres == S_OK, "get_borderLeftWidth: %08x\n", hres); - todo_wine_if(compat_mode >= COMPAT_IE9) ok(!strcmp_wa(V_BSTR(&v), compat_mode < COMPAT_IE9 ? "10px" : "1px"), "expected 10px = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v);

1 0

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

29 Aug '18

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

Jacek Caban : mshtml: Introduce get_current_style_property helper.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: cccabee8b20afa73cef4b492a5fbed7fff3aff3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=cccabee8b20afa73cef4b492… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 29 14:09:41 2018 +0200 mshtml: Introduce get_current_style_property helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlcurstyle.c | 59 +++++++++++++++++++++++++--------------------- 1 file changed, 32 insertions(+), 27 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cccabee8b20afa73cef4…

1 0

Jacek Caban : mshtml: Introduce get_current_style_property_var helper.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: 889ccb883a3b883462940a83903eb95f2de45ec8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=889ccb883a3b883462940a83… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 29 14:10:00 2018 +0200 mshtml: Introduce get_current_style_property_var helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlcurstyle.c | 69 +++++++++++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=889ccb883a3b88346294…

1 0

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

29 Aug '18

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

Jacek Caban : mshtml: Skip fixups in get_nsstyle_property_var in IE9+ mode.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: 869b4477642ad85d47eabbdb1310758d97f45571 URL: https://source.winehq.org/git/wine.git/?a=commit;h=869b4477642ad85d47eabbdb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 29 14:10:33 2018 +0200 mshtml: Skip fixups in get_nsstyle_property_var 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 | 11 +++++------ dlls/mshtml/htmlstyle.h | 2 +- dlls/mshtml/tests/style.c | 2 -- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index 007be63..2887aec 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -53,7 +53,7 @@ static inline HRESULT get_current_style_property(HTMLCurrentStyle *current_style static inline HRESULT get_current_style_property_var(HTMLCurrentStyle *This, styleid_t sid, VARIANT *v) { - return get_nsstyle_property_var(This->nsstyle, sid, v); + return get_nsstyle_property_var(This->nsstyle, sid, COMPAT_MODE_QUIRKS, v); } static inline HTMLCurrentStyle *impl_from_IHTMLCurrentStyle(IHTMLCurrentStyle *iface) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 4ec24a3..6fc5779 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -685,22 +685,21 @@ HRESULT get_nsstyle_property(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, return hres; } -HRESULT get_nsstyle_property_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, VARIANT *p) +HRESULT get_nsstyle_property_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, compat_mode_t compat_mode, VARIANT *p) { + unsigned flags = style_tbl[sid].flags; nsAString str_value; const PRUnichar *value; BOOL set = FALSE; - unsigned flags; HRESULT hres = S_OK; - flags = style_tbl[sid].flags; nsAString_Init(&str_value, NULL); get_nsstyle_attr_nsval(nsstyle, sid, &str_value); nsAString_GetData(&str_value, &value); - if(flags & ATTR_STR_TO_INT) { + if((flags & ATTR_STR_TO_INT) && (*value || compat_mode < COMPAT_MODE_IE9)) { const PRUnichar *ptr = value; BOOL neg = FALSE; INT i = 0; @@ -723,7 +722,7 @@ HRESULT get_nsstyle_property_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t s if(!set) { BSTR str; - hres = nsstyle_to_bstr(value, flags, &str); + hres = nsstyle_to_bstr(value, compat_mode < COMPAT_MODE_IE9 ? flags : 0, &str); if(SUCCEEDED(hres)) { V_VT(p) = VT_BSTR; V_BSTR(p) = str; @@ -743,7 +742,7 @@ static inline HRESULT get_style_property(HTMLStyle *This, styleid_t sid, BSTR *p static inline HRESULT get_style_property_var(HTMLStyle *This, styleid_t sid, VARIANT *v) { - return get_nsstyle_property_var(This->nsstyle, sid, v); + return get_nsstyle_property_var(This->nsstyle, sid, dispex_compat_mode(&This->dispex), v); } static HRESULT check_style_attr_value(HTMLStyle *This, styleid_t sid, LPCWSTR exval, VARIANT_BOOL *p) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index ac0db1c..5969406 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -124,7 +124,7 @@ typedef enum { HRESULT HTMLStyle_Create(HTMLElement*,HTMLStyle**) 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_nsstyle_property_var(nsIDOMCSSStyleDeclaration*,styleid_t,compat_mode_t,VARIANT*) DECLSPEC_HIDDEN; HRESULT get_elem_style(HTMLElement*,styleid_t,BSTR*) DECLSPEC_HIDDEN; HRESULT set_elem_style(HTMLElement*,styleid_t,const WCHAR*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 51b44fb..62bebc5 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -1715,9 +1715,7 @@ static void test_body_style(IHTMLStyle *style) ok(V_VT(&v) == VT_I4, "V_VT(v)=%d\n", V_VT(&v)); ok(!V_I4(&v), "V_I4(v) != 0\n"); }else { - todo_wine ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); - if(V_VT(&v) == VT_BSTR) todo_wine ok(!V_BSTR(&v), "zIndex = %s\n", wine_dbgstr_w(V_BSTR(&v))); } VariantClear(&v);

1 0

Jacek Caban : mshtml.idl: Add IHTMLCSSStyleDeclaration2 declaration.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: c71e363a6ed377c2df3cd98d6d11268a14135305 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c71e363a6ed377c2df3cd98d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 29 14:19:01 2018 +0200 mshtml.idl: Add IHTMLCSSStyleDeclaration2 declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtmdid.h | 116 +++++++++ include/mshtml.idl | 696 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 812 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c71e363a6ed377c2df3c…

1 0

Alex Henrie : shell32: Add web folder icons.
by Alexandre Julliard 29 Aug '18

29 Aug '18

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