October 2012 - Wine-Commits

Jason Edmeades : cmd: Correct for /f string and command set handling.
by Alexandre Julliard Oct. 24, 2012

Oct. 24, 2012

Module: wine Branch: master Commit: 182c5459b02f1154712afb219a8384e661effc65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=182c5459b02f1154712afb219… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Tue Oct 23 00:28:18 2012 +0100 cmd: Correct for /f string and command set handling. --- programs/cmd/builtins.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 6e252fe..721a1b7 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2039,6 +2039,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { (forf_usebackq && *itemStart != '\''))) { HANDLE input; + WCHAR *itemparm; WINE_TRACE("Processing for filespec from item %d '%s'\n", itemNum, wine_dbgstr_w(item)); @@ -2049,12 +2050,13 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { (!forf_usebackq && *itemStart == '\'')) { /* Use itemstart because the command is the whole set, not just the first token */ - input = WCMD_forf_getinputhandle(forf_usebackq, itemStart, TRUE); + itemparm = itemStart; } else { /* Use item because the file to process is just the first item in the set */ - input = WCMD_forf_getinputhandle(forf_usebackq, item, FALSE); + itemparm = item; } + input = WCMD_forf_getinputhandle(forf_usebackq, itemparm, (itemparm==itemStart)); /* Process the input file */ if (input == INVALID_HANDLE_VALUE) { @@ -2074,6 +2076,12 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { CloseHandle (input); } + /* When we have processed the item as a whole command, abort future set processing */ + if (itemparm==itemStart) { + thisSet = NULL; + break; + } + /* Filesets - A string literal */ } else if (doFileset && ((!forf_usebackq && *itemStart == '"') || (forf_usebackq && *itemStart == '\''))) { @@ -2082,6 +2090,10 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { strcpyW(buffer, item); WCMD_parse_line(cmdStart, firstCmd, &cmdEnd, variable, buffer, &doExecuted, &forf_skip, forf_eol); + + /* Only one string can be supplied in the whole set, abort future set processing */ + thisSet = NULL; + break; } WINE_TRACE("Post-command, cmdEnd = %p\n", cmdEnd); @@ -2089,7 +2101,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { } /* Move onto the next set line */ - thisSet = thisSet->nextcommand; + if (thisSet) thisSet = thisSet->nextcommand; } /* If /L is provided, now run the for loop */

1 0

Jason Edmeades : cmd: Add for /f delims= support.
by Alexandre Julliard Oct. 24, 2012

Oct. 24, 2012

Module: wine Branch: master Commit: 51b0d941d0b9c9dc60ecbcc99ed0eacae4329e85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51b0d941d0b9c9dc60ecbcc99… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Tue Oct 23 22:05:06 2012 +0100 cmd: Add for /f delims= support. --- programs/cmd/batch.c | 29 ++++++++++++++++++++++------- programs/cmd/builtins.c | 13 +++++++------ programs/cmd/tests/test_builtins.cmd.exp | 12 ++++++------ programs/cmd/wcmd.h | 2 ++ 4 files changed, 37 insertions(+), 19 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 1c0bc24..7b037d7 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -121,9 +121,10 @@ void WCMD_batch (WCHAR *file, WCHAR *command, BOOL called, WCHAR *startLabel, HA } /******************************************************************* - * WCMD_parameter + * WCMD_parameter_with_delims * - * Extracts a delimited parameter from an input string + * Extracts a delimited parameter from an input string, providing + * the delimiters characters to use * * PARAMS * s [I] input string, non NULL @@ -135,6 +136,7 @@ void WCMD_batch (WCHAR *file, WCHAR *command, BOOL called, WCHAR *startLabel, HA * wholecmdline [I] True to indicate this routine is being used to parse the * command line, and special logic for arg0->1 transition * needs to be applied. + * delims[I] The delimiter characters to use * * RETURNS * Success: The nth delimited parameter found in s @@ -150,10 +152,9 @@ void WCMD_batch (WCHAR *file, WCHAR *command, BOOL called, WCHAR *startLabel, HA * other API calls, e.g. c:\"a b"\c is returned as c:\a b\c. However, some commands * need to preserve the exact syntax (echo, for, etc) hence the raw option. */ -WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **start, WCHAR **end, BOOL raw, - BOOL wholecmdline) +WCHAR *WCMD_parameter_with_delims (WCHAR *s, int n, WCHAR **start, WCHAR **end, + BOOL raw, BOOL wholecmdline, const WCHAR *delims) { - static const WCHAR defaultDelims[] = { ' ', '\t', ',', '=', ';', '\0' }; int curParamNb = 0; static WCHAR param[MAX_PATH]; WCHAR *p = s, *begin; @@ -165,7 +166,7 @@ WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **start, WCHAR **end, BOOL raw, while (TRUE) { /* Absorb repeated word delimiters until we get to the next token (or the end!) */ - while (*p && (strchrW(defaultDelims, *p) != NULL)) + while (*p && (strchrW(delims, *p) != NULL)) p++; if (*p == '\0') return param; @@ -179,7 +180,7 @@ WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **start, WCHAR **end, BOOL raw, /* Loop character by character, but just need to special case quotes */ while (*p) { /* Once we have found a delimiter, break */ - if (strchrW(defaultDelims, *p) != NULL) break; + if (strchrW(delims, *p) != NULL) break; /* Very odd special case - Seems as if a ( acts as a delimiter which is not swallowed but is effective only when it comes between the program @@ -218,6 +219,20 @@ WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **start, WCHAR **end, BOOL raw, } } +/******************************************************************* + * WCMD_parameter + * + * Extracts a delimited parameter from an input string, using a + * default set of delimiter characters. For parameters, see the main + * function above. + */ +WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **start, WCHAR **end, BOOL raw, + BOOL wholecmdline) +{ + static const WCHAR defaultDelims[] = { ' ', '\t', ',', '=', ';', '\0' }; + return WCMD_parameter_with_delims (s, n, start, end, raw, wholecmdline, defaultDelims); +} + /**************************************************************************** * WCMD_fgets * diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 4bb4702..8eaa9e7 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1600,7 +1600,7 @@ static BOOL WCMD_parse_forf_options(WCHAR *options, WCHAR *eol, int *skip, } if (*pos==' ' && *(pos+1)==0) delims[i++] = *pos; delims[i++] = 0; /* Null terminate the delims */ - WINE_FIXME("Found delims as '%s'\n", wine_dbgstr_w(delims)); + WINE_TRACE("Found delims as '%s'\n", wine_dbgstr_w(delims)); /* Save the tokens being requested */ } else if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, @@ -1694,6 +1694,7 @@ static void WCMD_add_dirstowalk(DIRECTORY_STACK *dirsToWalk) { * doExecuted [O] - Set to TRUE if the DO is ever executed once * forf_skip [I/O] - How many lines to skip first * forf_eol [I] - The 'end of line' (comment) character + * forf_delims [I] - The delimiters to use when breaking the string apart */ static void WCMD_parse_line(CMD_LIST *cmdStart, const WCHAR *firstCmd, @@ -1702,7 +1703,8 @@ static void WCMD_parse_line(CMD_LIST *cmdStart, WCHAR *buffer, BOOL *doExecuted, int *forf_skip, - WCHAR forf_eol) { + WCHAR forf_eol, + WCHAR *forf_delims) { WCHAR *parm, *where; @@ -1713,7 +1715,7 @@ static void WCMD_parse_line(CMD_LIST *cmdStart, } /* Extract the parameter */ - parm = WCMD_parameter (buffer, 0, &where, NULL, FALSE, FALSE); + parm = WCMD_parameter_with_delims(buffer, 0, &where, NULL, FALSE, FALSE, forf_delims); WINE_TRACE("Parsed parameter: %s from %s\n", wine_dbgstr_w(parm), wine_dbgstr_w(buffer)); @@ -2070,7 +2072,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { /* Read line by line until end of file */ while (WCMD_fgets(buffer, sizeof(buffer)/sizeof(WCHAR), input)) { WCMD_parse_line(cmdStart, firstCmd, &cmdEnd, variable, buffer, &doExecuted, - &forf_skip, forf_eol); + &forf_skip, forf_eol, forf_delims); buffer[0] = 0; } CloseHandle (input); @@ -2090,7 +2092,6 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { Note that the last quote is removed from the set and the string terminates there to mimic windows */ WCHAR *strend = strrchrW(itemStart, forf_usebackq?'\'':'"'); - if (strend) { *strend = 0x00; itemStart++; @@ -2099,7 +2100,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { /* Copy the item away from the global buffer used by WCMD_parameter */ strcpyW(buffer, itemStart); WCMD_parse_line(cmdStart, firstCmd, &cmdEnd, variable, buffer, &doExecuted, - &forf_skip, forf_eol); + &forf_skip, forf_eol, forf_delims); /* Only one string can be supplied in the whole set, abort future set processing */ thisSet = NULL; diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index c15a58d..9b5eb3b 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -826,14 +826,14 @@ ad z(a)y a|d no output -(a)todo_wine@no output +no output ------ delims option -(a)todo_wine@a -(a)todo_wine@a(a)space@ -(a)todo_wine@a d a -(a)todo_wine@C r -(a)todo_wine@foo bar baz +a(a)space@ +a d +a +C r +foo bar baz @todo_wine(a)c:\ ------ skip option c diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index d4d148f..26b89c6 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -108,6 +108,8 @@ static inline BOOL WCMD_is_console_handle(HANDLE h) } WCHAR *WCMD_fgets (WCHAR *buf, DWORD n, HANDLE stream); WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **start, WCHAR **end, BOOL raw, BOOL wholecmdline); +WCHAR *WCMD_parameter_with_delims (WCHAR *s, int n, WCHAR **start, WCHAR **end, BOOL raw, + BOOL wholecmdline, const WCHAR *delims); WCHAR *WCMD_skip_leading_spaces (WCHAR *string); BOOL WCMD_keyword_ws_found(const WCHAR *keyword, int len, const WCHAR *ptr); void WCMD_HandleTildaModifiers(WCHAR **start, const WCHAR *forVariable, const WCHAR *forValue, BOOL justFors);

1 0

André Hentschel : msi/tests: Make multiline macros blocks (coverity).
by Alexandre Julliard Oct. 24, 2012

Oct. 24, 2012

Module: wine Branch: master Commit: 1e361aa8cb9b6f0030fd1b24e2a0b07c7de24b5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e361aa8cb9b6f0030fd1b24e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 24 02:05:15 2012 +0200 msi/tests: Make multiline macros blocks (coverity). --- dlls/msi/tests/action.c | 30 ++++++++++++++++++++---------- 1 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 1fcb82d..0a825cd 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -2610,36 +2610,46 @@ static void check_reg_dword5(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD e check_reg_str(prodkey, name, expected, TRUE, __LINE__); #define CHECK_DEL_REG_STR(prodkey, name, expected) \ - check_reg_str(prodkey, name, expected, TRUE, __LINE__); \ - RegDeleteValueA(prodkey, name); + do { \ + check_reg_str(prodkey, name, expected, TRUE, __LINE__); \ + RegDeleteValueA(prodkey, name); \ + } while(0) #define CHECK_REG_ISTR(prodkey, name, expected) \ check_reg_str(prodkey, name, expected, FALSE, __LINE__); #define CHECK_DEL_REG_ISTR(prodkey, name, expected) \ - check_reg_str(prodkey, name, expected, FALSE, __LINE__); \ - RegDeleteValueA(prodkey, name); + do { \ + check_reg_str(prodkey, name, expected, FALSE, __LINE__); \ + RegDeleteValueA(prodkey, name); \ + } while(0) #define CHECK_REG_DWORD(prodkey, name, expected) \ check_reg_dword(prodkey, name, expected, __LINE__); #define CHECK_DEL_REG_DWORD(prodkey, name, expected) \ - check_reg_dword(prodkey, name, expected, __LINE__); \ - RegDeleteValueA(prodkey, name); + do { \ + check_reg_dword(prodkey, name, expected, __LINE__); \ + RegDeleteValueA(prodkey, name); \ + } while(0) #define CHECK_REG_DWORD2(prodkey, name, expected1, expected2) \ check_reg_dword2(prodkey, name, expected1, expected2, __LINE__); #define CHECK_DEL_REG_DWORD2(prodkey, name, expected1, expected2) \ - check_reg_dword2(prodkey, name, expected1, expected2, __LINE__); \ - RegDeleteValueA(prodkey, name); + do { \ + check_reg_dword2(prodkey, name, expected1, expected2, __LINE__); \ + RegDeleteValueA(prodkey, name); \ + } while(0) #define CHECK_REG_DWORD4(prodkey, name, expected1, expected2, expected3, expected4) \ check_reg_dword4(prodkey, name, expected1, expected2, expected3, expected4, __LINE__); #define CHECK_DEL_REG_DWORD5(prodkey, name, expected1, expected2, expected3, expected4 ,expected5) \ - check_reg_dword5(prodkey, name, expected1, expected2, expected3, expected4, expected5, __LINE__); \ - RegDeleteValueA(prodkey, name); + do { \ + check_reg_dword5(prodkey, name, expected1, expected2, expected3, expected4, expected5, __LINE__); \ + RegDeleteValueA(prodkey, name); \ + } while(0) static void get_date_str(LPSTR date) {

1 0

Nikolay Sivov : dwrite: Implement some font properties accessors for IDWriteTextFormat.
by Alexandre Julliard Oct. 24, 2012

Oct. 24, 2012

Module: wine Branch: master Commit: 8089f73e87c1077c3b13d61f1ff8bb858530aac0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8089f73e87c1077c3b13d61f1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 23 08:37:48 2012 -0400 dwrite: Implement some font properties accessors for IDWriteTextFormat. --- dlls/dwrite/layout.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index a2d1ef9..e793e49 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -871,29 +871,29 @@ static HRESULT WINAPI dwritetextformat_GetFontFamilyName(IDWriteTextFormat *ifac static DWRITE_FONT_WEIGHT WINAPI dwritetextformat_GetFontWeight(IDWriteTextFormat *iface) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat(iface); - FIXME("(%p): stub\n", This); - return DWRITE_FONT_WEIGHT_NORMAL; + TRACE("(%p)\n", This); + return This->format.weight; } static DWRITE_FONT_STYLE WINAPI dwritetextformat_GetFontStyle(IDWriteTextFormat *iface) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat(iface); - FIXME("(%p): stub\n", This); - return DWRITE_FONT_STYLE_NORMAL; + TRACE("(%p)\n", This); + return This->format.style; } static DWRITE_FONT_STRETCH WINAPI dwritetextformat_GetFontStretch(IDWriteTextFormat *iface) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat(iface); - FIXME("(%p): stub\n", This); - return DWRITE_FONT_STRETCH_NORMAL; + TRACE("(%p)\n", This); + return This->format.stretch; } static FLOAT WINAPI dwritetextformat_GetFontSize(IDWriteTextFormat *iface) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat(iface); - FIXME("(%p): stub\n", This); - return 0.0; + TRACE("(%p)\n", This); + return This->format.size; } static UINT32 WINAPI dwritetextformat_GetLocaleNameLength(IDWriteTextFormat *iface)

1 0

Akihiro Sagawa : ntdll: Calculate SystemProcessInformation' s ReturnLength and return it.
by Alexandre Julliard Oct. 24, 2012

Oct. 24, 2012

Module: wine Branch: master Commit: bb4a31a8ed8396436e69d774fe804fde4f46c3eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb4a31a8ed8396436e69d774f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Oct 23 23:52:35 2012 +0900 ntdll: Calculate SystemProcessInformation's ReturnLength and return it. --- dlls/ntdll/nt.c | 7 ++++--- dlls/ntdll/tests/info.c | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 92db541..ab08190 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1739,9 +1739,8 @@ NTSTATUS WINAPI NtQuerySystemInformation( /* spi->ti will be set later on */ - len += procstructlen; } - else ret = STATUS_INFO_LENGTH_MISMATCH; + len += procstructlen; } } SERVER_END_REQ; @@ -1751,7 +1750,8 @@ NTSTATUS WINAPI NtQuerySystemInformation( if (ret == STATUS_NO_MORE_FILES) ret = STATUS_SUCCESS; break; } - else /* Length is already checked for */ + + if (Length >= len) { int i, j; @@ -1799,6 +1799,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( } } if (ret == STATUS_SUCCESS && last) last->NextEntryOffset = 0; + if (len > Length) ret = STATUS_INFO_LENGTH_MISMATCH; if (hSnap) NtClose(hSnap); } break; diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 5dba2da..c670731 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -289,7 +289,7 @@ static void test_query_process(void) ReturnLength = 0; status = pNtQuerySystemInformation(SystemProcessInformation, NULL, 0, &ReturnLength); ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_LENGTH_MISMATCH got %08x\n", status); - todo_wine ok( ReturnLength > 0 || broken(ReturnLength == 0) /* NT4, Win2K */, + ok( ReturnLength > 0 || broken(ReturnLength == 0) /* NT4, Win2K */, "Expected a ReturnLength to show the needed length\n"); /* W2K3 and later returns the needed length, the rest returns 0, so we have to loop */

1 0

Jacek Caban : mshtml: Added IHTMLFrameBase:: marginHeight property implementation.
by Alexandre Julliard Oct. 24, 2012

Oct. 24, 2012

Module: wine Branch: master Commit: 00d3126c2392ee64d73293addf6f737e85e732a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00d3126c2392ee64d73293add… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 24 12:40:43 2012 +0200 mshtml: Added IHTMLFrameBase::marginHeight property implementation. --- dlls/mshtml/htmlframebase.c | 62 ++++++++++++++++++++++++++++++++++++++++--- dlls/mshtml/tests/dom.c | 32 ++++++++++++++++++++++ 2 files changed, 90 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlframebase.c b/dlls/mshtml/htmlframebase.c index acb493a..5431187 100644 --- a/dlls/mshtml/htmlframebase.c +++ b/dlls/mshtml/htmlframebase.c @@ -35,6 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); static const WCHAR autoW[] = {'a','u','t','o',0}; static const WCHAR yesW[] = {'y','e','s',0}; static const WCHAR noW[] = {'n','o',0}; +static const WCHAR pxW[] = {'p','x',0}; HRESULT set_frame_doc(HTMLFrameBase *frame, nsIDOMDocument *nsdoc) { @@ -286,15 +287,68 @@ static HRESULT WINAPI HTMLFrameBase_get_marginWidth(IHTMLFrameBase *iface, VARIA static HRESULT WINAPI HTMLFrameBase_put_marginHeight(IHTMLFrameBase *iface, VARIANT v) { HTMLFrameBase *This = impl_from_IHTMLFrameBase(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + if(V_VT(&v) != VT_BSTR) { + FIXME("unsupported %s\n", debugstr_variant(&v)); + return E_NOTIMPL; + } + + nsAString_InitDepend(&nsstr, V_BSTR(&v)); + if(This->nsframe) + nsres = nsIDOMHTMLFrameElement_SetMarginHeight(This->nsframe, &nsstr); + else + nsres = nsIDOMHTMLIFrameElement_SetMarginHeight(This->nsiframe, &nsstr); + nsAString_Finish(&nsstr); + return NS_SUCCEEDED(nsres) ? S_OK : E_FAIL; } static HRESULT WINAPI HTMLFrameBase_get_marginHeight(IHTMLFrameBase *iface, VARIANT *p) { HTMLFrameBase *This = impl_from_IHTMLFrameBase(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + HRESULT hres = S_OK; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&nsstr, NULL); + if(This->nsframe) + nsres = nsIDOMHTMLFrameElement_GetMarginHeight(This->nsframe, &nsstr); + else + nsres = nsIDOMHTMLIFrameElement_GetMarginHeight(This->nsiframe, &nsstr); + if(NS_SUCCEEDED(nsres)) { + const PRUnichar *str, *end; + + nsAString_GetData(&nsstr, &str); + + if(*str) { + BSTR ret; + + end = strstrW(str, pxW); + if(!end) + end = str+strlenW(str); + ret = SysAllocStringLen(str, end-str); + if(ret) { + V_VT(p) = VT_BSTR; + V_BSTR(p) = ret; + }else { + hres = E_OUTOFMEMORY; + } + }else { + V_VT(p) = VT_BSTR; + V_BSTR(p) = NULL; + } + }else { + ERR("SetMarginHeight failed: %08x\n", nsres); + hres = E_FAIL; + } + + nsAString_Finish(&nsstr); + return hres; } static HRESULT WINAPI HTMLFrameBase_put_noResize(IHTMLFrameBase *iface, VARIANT_BOOL v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 20e9e4c..f3dcc29 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4448,6 +4448,34 @@ static void _test_framebase_put_name(unsigned line, IHTMLElement *elem, const ch IHTMLFrameBase_Release(fbase); } +#define test_framebase_marginheight(a,b) _test_framebase_marginheight(__LINE__,a,b) +static void _test_framebase_marginheight(unsigned line, IHTMLFrameBase *framebase, const char *exval) +{ + VARIANT v; + HRESULT hres; + + hres = IHTMLFrameBase_get_marginHeight(framebase, &v); + ok_(__FILE__,line)(hres == S_OK, "get_marginHeight failed: %08x\n", hres); + ok_(__FILE__,line)(V_VT(&v) == VT_BSTR, "V_VT(marginHeight) = %d\n", V_VT(&v)); + if(exval) + ok_(__FILE__,line)(!strcmp_wa(V_BSTR(&v), exval), "marginHeight = %s, expected %s\n", wine_dbgstr_w(V_BSTR(&v)), exval); + else + ok_(__FILE__,line)(!V_BSTR(&v), "marginHeight = %s, expected NULL\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); +} + +#define set_framebase_marginheight(a,b) _set_framebase_marginheight(__LINE__,a,b) +static void _set_framebase_marginheight(unsigned line, IHTMLFrameBase *framebase, const char *val) +{ + VARIANT v; + HRESULT hres; + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr(val); + hres = IHTMLFrameBase_put_marginHeight(framebase, v); + ok_(__FILE__,line)(hres == S_OK, "put_marginHeight failed: %08x\n", hres); + VariantClear(&v); +} static void test_framebase(IUnknown *unk) { IHTMLFrameBase *fbase; @@ -4497,6 +4525,10 @@ static void test_framebase(IUnknown *unk) ok(hres == S_OK, "get_frameBorder failed: %08x\n", hres); ok(!strcmp_wa(str, "1"), "frameBorder = %s, expected \"1\"\n", wine_dbgstr_w(str)); + test_framebase_marginheight(fbase, NULL); + set_framebase_marginheight(fbase, "1px"); + test_framebase_marginheight(fbase, "1"); + IHTMLFrameBase_Release(fbase); }

1 0

Jacek Caban : mshtml: Added IHTMLFrameBase:: marginWidth property implementation.
by Alexandre Julliard Oct. 24, 2012

Oct. 24, 2012

Module: wine Branch: master Commit: 81cdfc61fd6527d1640e871586f064d9dee6b38b URL: http://source.winehq.org/git/wine.git/?a=commit;h=81cdfc61fd6527d1640e87158… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 24 12:41:01 2012 +0200 mshtml: Added IHTMLFrameBase::marginWidth property implementation. --- dlls/mshtml/htmlframebase.c | 61 ++++++++++++++++++++++++++++++++++++++++--- dlls/mshtml/tests/dom.c | 34 ++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlframebase.c b/dlls/mshtml/htmlframebase.c index 5431187..a11adca 100644 --- a/dlls/mshtml/htmlframebase.c +++ b/dlls/mshtml/htmlframebase.c @@ -273,15 +273,68 @@ static HRESULT WINAPI HTMLFrameBase_get_frameSpacing(IHTMLFrameBase *iface, VARI static HRESULT WINAPI HTMLFrameBase_put_marginWidth(IHTMLFrameBase *iface, VARIANT v) { HTMLFrameBase *This = impl_from_IHTMLFrameBase(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + if(V_VT(&v) != VT_BSTR) { + FIXME("unsupported %s\n", debugstr_variant(&v)); + return E_NOTIMPL; + } + + nsAString_InitDepend(&nsstr, V_BSTR(&v)); + if(This->nsframe) + nsres = nsIDOMHTMLFrameElement_SetMarginWidth(This->nsframe, &nsstr); + else + nsres = nsIDOMHTMLIFrameElement_SetMarginWidth(This->nsiframe, &nsstr); + nsAString_Finish(&nsstr); + return NS_SUCCEEDED(nsres) ? S_OK : E_FAIL; } static HRESULT WINAPI HTMLFrameBase_get_marginWidth(IHTMLFrameBase *iface, VARIANT *p) { HTMLFrameBase *This = impl_from_IHTMLFrameBase(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + HRESULT hres = S_OK; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&nsstr, NULL); + if(This->nsframe) + nsres = nsIDOMHTMLFrameElement_GetMarginWidth(This->nsframe, &nsstr); + else + nsres = nsIDOMHTMLIFrameElement_GetMarginWidth(This->nsiframe, &nsstr); + if(NS_SUCCEEDED(nsres)) { + const PRUnichar *str, *end; + + nsAString_GetData(&nsstr, &str); + + if(*str) { + BSTR ret; + + end = strstrW(str, pxW); + if(!end) + end = str+strlenW(str); + ret = SysAllocStringLen(str, end-str); + if(ret) { + V_VT(p) = VT_BSTR; + V_BSTR(p) = ret; + }else { + hres = E_OUTOFMEMORY; + } + }else { + V_VT(p) = VT_BSTR; + V_BSTR(p) = NULL; + } + }else { + ERR("GetMarginWidth failed: %08x\n", nsres); + hres = E_FAIL; + } + + nsAString_Finish(&nsstr); + return hres; } static HRESULT WINAPI HTMLFrameBase_put_marginHeight(IHTMLFrameBase *iface, VARIANT v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index f3dcc29..26567d2 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4476,6 +4476,36 @@ static void _set_framebase_marginheight(unsigned line, IHTMLFrameBase *framebase ok_(__FILE__,line)(hres == S_OK, "put_marginHeight failed: %08x\n", hres); VariantClear(&v); } + +#define test_framebase_marginwidth(a,b) _test_framebase_marginwidth(__LINE__,a,b) +static void _test_framebase_marginwidth(unsigned line, IHTMLFrameBase *framebase, const char *exval) +{ + VARIANT v; + HRESULT hres; + + hres = IHTMLFrameBase_get_marginWidth(framebase, &v); + ok_(__FILE__,line)(hres == S_OK, "get_marginWidth failed: %08x\n", hres); + ok_(__FILE__,line)(V_VT(&v) == VT_BSTR, "V_VT(marginWidth) = %d\n", V_VT(&v)); + if(exval) + ok_(__FILE__,line)(!strcmp_wa(V_BSTR(&v), exval), "marginWidth = %s, expected %s\n", wine_dbgstr_w(V_BSTR(&v)), exval); + else + ok_(__FILE__,line)(!V_BSTR(&v), "marginWidth = %s, expected NULL\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); +} + +#define set_framebase_marginwidth(a,b) _set_framebase_marginwidth(__LINE__,a,b) +static void _set_framebase_marginwidth(unsigned line, IHTMLFrameBase *framebase, const char *val) +{ + VARIANT v; + HRESULT hres; + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr(val); + hres = IHTMLFrameBase_put_marginWidth(framebase, v); + ok_(__FILE__,line)(hres == S_OK, "put_marginWidth failed: %08x\n", hres); + VariantClear(&v); +} + static void test_framebase(IUnknown *unk) { IHTMLFrameBase *fbase; @@ -4529,6 +4559,10 @@ static void test_framebase(IUnknown *unk) set_framebase_marginheight(fbase, "1px"); test_framebase_marginheight(fbase, "1"); + test_framebase_marginwidth(fbase, NULL); + set_framebase_marginwidth(fbase, "2px"); + test_framebase_marginwidth(fbase, "2"); + IHTMLFrameBase_Release(fbase); }

1 0

Nikolay Sivov : dwrite: Partially implement IDWriteFontFace:: GetGlyphIndices().
by Alexandre Julliard Oct. 24, 2012

Oct. 24, 2012

Module: wine Branch: master Commit: 4dbacf05fb9503417d7c745a0b93be8000cd81ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dbacf05fb9503417d7c745a0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 24 16:05:01 2012 -0400 dwrite: Partially implement IDWriteFontFace::GetGlyphIndices(). --- dlls/dwrite/font.c | 41 ++++++++++++++++++++++++++++++++++++----- 1 files changed, 36 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 4b697e9..7d332b7 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -154,11 +154,14 @@ struct dwrite_font { DWRITE_FONT_STRETCH stretch; DWRITE_FONT_WEIGHT weight; DWRITE_FONT_METRICS metrics; + WCHAR *facename; }; struct dwrite_fontface { IDWriteFontFace IDWriteFontFace_iface; LONG ref; + + LOGFONTW logfont; }; static HRESULT create_fontfamily(const WCHAR *familyname, IDWriteFontFamily **family); @@ -282,8 +285,30 @@ static HRESULT WINAPI dwritefontface_GetGlyphIndices(IDWriteFontFace *iface, UIN UINT32 count, UINT16 *glyph_indices) { struct dwrite_fontface *This = impl_from_IDWriteFontFace(iface); - FIXME("(%p)->(%p %u %p): stub\n", This, codepoints, count, glyph_indices); - return E_NOTIMPL; + HFONT hfont; + WCHAR *str; + HDC hdc; + int i; + + TRACE("(%p)->(%p %u %p)\n", This, codepoints, count, glyph_indices); + + str = heap_alloc(count*sizeof(WCHAR)); + if (!str) return E_OUTOFMEMORY; + + for (i = 0; i < count; i++) + str[i] = codepoints[i] < 0x10000 ? codepoints[i] : '?'; + + hdc = CreateCompatibleDC(0); + hfont = CreateFontIndirectW(&This->logfont); + SelectObject(hdc, hfont); + + GetGlyphIndicesW(hdc, str, count, glyph_indices, 0); + heap_free(str); + + DeleteDC(hdc); + DeleteObject(hfont); + + return S_OK; } static HRESULT WINAPI dwritefontface_TryGetFontTable(IDWriteFontFace *iface, UINT32 table_tag, @@ -357,7 +382,7 @@ static const IDWriteFontFaceVtbl dwritefontfacevtbl = { dwritefontface_GetGdiCompatibleGlyphMetrics }; -static HRESULT create_fontface(IDWriteFontFace **face) +static HRESULT create_fontface(struct dwrite_font *font, IDWriteFontFace **face) { struct dwrite_fontface *This; @@ -368,6 +393,11 @@ static HRESULT create_fontface(IDWriteFontFace **face) This->IDWriteFontFace_iface.lpVtbl = &dwritefontfacevtbl; This->ref = 1; + + memset(&This->logfont, 0, sizeof(This->logfont)); + This->logfont.lfItalic = font->style == DWRITE_FONT_STYLE_ITALIC; + strcpyW(This->logfont.lfFaceName, font->facename); + *face = &This->IDWriteFontFace_iface; return S_OK; @@ -409,6 +439,7 @@ static ULONG WINAPI dwritefont_Release(IDWriteFont *iface) { if (This->face) IDWriteFontFace_Release(This->face); IDWriteFontFamily_Release(This->family); + heap_free(This->facename); heap_free(This); } @@ -498,7 +529,7 @@ static HRESULT WINAPI dwritefont_CreateFontFace(IDWriteFont *iface, IDWriteFontF if (!This->face) { - HRESULT hr = create_fontface(&This->face); + HRESULT hr = create_fontface(This, &This->face); if (FAILED(hr)) return hr; } @@ -525,7 +556,6 @@ static const IDWriteFontVtbl dwritefontvtbl = { dwritefont_CreateFontFace }; - static HRESULT WINAPI dwritefontfamily_QueryInterface(IDWriteFontFamily *iface, REFIID riid, void **obj) { struct dwrite_fontfamily *This = impl_from_IDWriteFontFamily(iface); @@ -925,6 +955,7 @@ HRESULT create_font_from_logfont(const LOGFONTW *logfont, IDWriteFont **font) This->face = NULL; This->family = family; This->style = logfont->lfItalic ? DWRITE_FONT_STYLE_ITALIC : DWRITE_FONT_STYLE_NORMAL; + This->facename = heap_strdupW(logfont->lfFaceName); *font = &This->IDWriteFont_iface;

1 0

Alexandre Julliard : gdi32: Add a DC hook flag to reset the DC state.
by Alexandre Julliard Oct. 24, 2012

Oct. 24, 2012

Module: wine Branch: master Commit: 4396a79edebc381bb5b394c0a1f315efb07da372 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4396a79edebc381bb5b394c0a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 24 18:24:03 2012 +0200 gdi32: Add a DC hook flag to reset the DC state. --- dlls/gdi32/dc.c | 94 ++++++++++++++++++++++++++++++++++++-------- dlls/gdi32/tests/dc.c | 3 - dlls/user32/painting.c | 16 +------- include/wine/gdi_driver.h | 1 + 4 files changed, 80 insertions(+), 34 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 030304c..b59c154 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -71,28 +71,20 @@ static inline DC *get_dc_obj( HDC hdc ) /*********************************************************************** - * alloc_dc_ptr + * set_initial_dc_state */ -DC *alloc_dc_ptr( WORD magic ) +static void set_initial_dc_state( DC *dc ) { - DC *dc; - - if (!(dc = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*dc) ))) return NULL; - - dc->nulldrv.funcs = &null_driver; - dc->physDev = &dc->nulldrv; - dc->module = gdi32_module; - dc->thread = GetCurrentThreadId(); - dc->refcount = 1; + dc->wndOrgX = 0; + dc->wndOrgY = 0; dc->wndExtX = 1; dc->wndExtY = 1; + dc->vportOrgX = 0; + dc->vportOrgY = 0; dc->vportExtX = 1; dc->vportExtY = 1; dc->miterLimit = 10.0f; /* 10.0 is the default, from MSDN */ - dc->hPen = GDI_inc_ref_count( GetStockObject( BLACK_PEN )); - dc->hBrush = GDI_inc_ref_count( GetStockObject( WHITE_BRUSH )); - dc->hFont = GDI_inc_ref_count( GetStockObject( SYSTEM_FONT )); - dc->hPalette = GetStockObject( DEFAULT_PALETTE ); + dc->layout = 0; dc->font_code_page = CP_ACP; dc->ROPmode = R2_COPYPEN; dc->polyFillMode = ALTERNATE; @@ -103,9 +95,17 @@ DC *alloc_dc_ptr( WORD magic ) dc->dcBrushColor = RGB( 255, 255, 255 ); dc->dcPenColor = RGB( 0, 0, 0 ); dc->textColor = RGB( 0, 0, 0 ); + dc->brushOrgX = 0; + dc->brushOrgY = 0; + dc->mapperFlags = 0; dc->textAlign = TA_LEFT | TA_TOP | TA_NOUPDATECP; + dc->charExtra = 0; + dc->breakExtra = 0; + dc->breakRem = 0; dc->MapMode = MM_TEXT; dc->GraphicsMode = GM_COMPATIBLE; + dc->CursPosX = 0; + dc->CursPosY = 0; dc->ArcDirection = AD_COUNTERCLOCKWISE; dc->xformWorld2Wnd.eM11 = 1.0f; dc->xformWorld2Wnd.eM12 = 0.0f; @@ -118,6 +118,28 @@ DC *alloc_dc_ptr( WORD magic ) dc->vport2WorldValid = TRUE; reset_bounds( &dc->bounds ); +} + +/*********************************************************************** + * alloc_dc_ptr + */ +DC *alloc_dc_ptr( WORD magic ) +{ + DC *dc; + + if (!(dc = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*dc) ))) return NULL; + + dc->nulldrv.funcs = &null_driver; + dc->physDev = &dc->nulldrv; + dc->module = gdi32_module; + dc->thread = GetCurrentThreadId(); + dc->refcount = 1; + dc->hPen = GDI_inc_ref_count( GetStockObject( BLACK_PEN )); + dc->hBrush = GDI_inc_ref_count( GetStockObject( WHITE_BRUSH )); + dc->hFont = GDI_inc_ref_count( GetStockObject( SYSTEM_FONT )); + dc->hPalette = GetStockObject( DEFAULT_PALETTE ); + + set_initial_dc_state( dc ); if (!(dc->hSelf = alloc_gdi_handle( dc, magic, &dc_funcs ))) { @@ -520,6 +542,44 @@ BOOL nulldrv_RestoreDC( PHYSDEV dev, INT level ) /*********************************************************************** + * reset_dc_state + */ +static BOOL reset_dc_state( HDC hdc ) +{ + DC *dc, *dcs, *next; + + if (!(dc = get_dc_ptr( hdc ))) return FALSE; + + set_initial_dc_state( dc ); + SetBkColor( hdc, RGB( 255, 255, 255 )); + SetTextColor( hdc, RGB( 0, 0, 0 )); + SelectObject( hdc, GetStockObject( WHITE_BRUSH )); + SelectObject( hdc, GetStockObject( SYSTEM_FONT )); + SelectObject( hdc, GetStockObject( BLACK_PEN )); + SetVirtualResolution( hdc, 0, 0, 0, 0 ); + GDISelectPalette( hdc, GetStockObject( DEFAULT_PALETTE ), FALSE ); + SetBoundsRect( hdc, NULL, DCB_DISABLE ); + AbortPath( hdc ); + + if (dc->hClipRgn) DeleteObject( dc->hClipRgn ); + if (dc->hMetaRgn) DeleteObject( dc->hMetaRgn ); + dc->hClipRgn = 0; + dc->hMetaRgn = 0; + update_dc_clipping( dc ); + + for (dcs = dc->saved_dc; dcs; dcs = next) + { + next = dcs->saved_dc; + free_dc_state( dcs ); + } + dc->saved_dc = NULL; + dc->saveLevel = 0; + release_dc_ptr( dc ); + return TRUE; +} + + +/*********************************************************************** * SaveDC (GDI32.@) */ INT WINAPI SaveDC( HDC hdc ) @@ -1217,8 +1277,6 @@ WORD WINAPI SetHookFlags( HDC hdc, WORD flags ) if (!dc) return 0; - /* "Undocumented Windows" info is slightly confusing. */ - TRACE("hDC %p, flags %04x\n",hdc,flags); if (flags & DCHF_INVALIDATEVISRGN) @@ -1227,6 +1285,8 @@ WORD WINAPI SetHookFlags( HDC hdc, WORD flags ) ret = InterlockedExchange( &dc->dirty, 0 ); GDI_ReleaseObj( hdc ); + + if (flags & DCHF_RESETDC) ret = reset_dc_state( hdc ); return ret; } diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index e286044..8baacc2 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -124,10 +124,7 @@ static void test_savedc_2(void) rc_clip.left, rc_clip.top, rc_clip.right, rc_clip.bottom); ret = SaveDC(hdc); -todo_wine -{ ok(ret == 1, "ret = %d\n", ret); -} ret = IntersectClipRect(hdc, 0, 0, 50, 50); if (ret == COMPLEXREGION) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index e9705fe..b2ddfe6 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -178,16 +178,6 @@ static void update_visible_region( struct dce *dce ) /*********************************************************************** - * reset_dce_attrs - */ -static void reset_dce_attrs( struct dce *dce ) -{ - RestoreDC( dce->hdc, 1 ); /* initial save level is always 1 */ - SaveDC( dce->hdc ); /* save the state again for next time */ -} - - -/*********************************************************************** * release_dce */ static void release_dce( struct dce *dce ) @@ -235,8 +225,6 @@ static struct dce *alloc_dce(void) HeapFree( GetProcessHeap(), 0, dce ); return 0; } - SaveDC( dce->hdc ); - dce->hwnd = 0; dce->clip_rgn = 0; dce->flags = 0; @@ -352,7 +340,7 @@ void free_dce( struct dce *dce, HWND hwnd ) if (!--dce->count) { /* turn it into a cache entry */ - reset_dce_attrs( dce ); + SetHookFlags( dce->hdc, DCHF_RESETDC ); release_dce( dce ); dce->flags |= DCX_CACHE; } @@ -470,7 +458,7 @@ static INT release_dc( HWND hwnd, HDC hdc, BOOL end_paint ) dce = (struct dce *)GetDCHook( hdc, NULL ); if (dce && dce->count) { - if (!(dce->flags & DCX_NORESETATTRS)) reset_dce_attrs( dce ); + if (!(dce->flags & DCX_NORESETATTRS)) SetHookFlags( dce->hdc, DCHF_RESETDC ); if (end_paint || (dce->flags & DCX_CACHE)) delete_clip_rgn( dce ); if (dce->flags & DCX_CACHE) dce->count = 0; ret = TRUE; diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 3d4e6c5..1f6376c 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -265,6 +265,7 @@ static inline ULONG window_surface_release( struct window_surface *surface ) #define DCHC_DELETEDC 0x0002 #define DCHF_INVALIDATEVISRGN 0x0001 #define DCHF_VALIDATEVISRGN 0x0002 +#define DCHF_RESETDC 0x0004 /* Wine extension */ typedef BOOL (CALLBACK *DCHOOKPROC)(HDC,WORD,DWORD_PTR,LPARAM);

1 0

Piotr Caban : ieframe: Added CSS_NORESIZE style to toolbar window.
by Alexandre Julliard Oct. 24, 2012

Oct. 24, 2012

Module: wine Branch: master Commit: d272c27673919e38d98e6b8e52b9f1f1479d893c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d272c27673919e38d98e6b8e5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 24 15:45:18 2012 +0200 ieframe: Added CSS_NORESIZE style to toolbar window. --- dlls/ieframe/iexplore.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index 7d6c6ed..5b85205 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -440,6 +440,7 @@ static void create_rebar(HWND hwnd) WCHAR addr[40]; HIMAGELIST imagelist; WCHAR idb_ietoolbar[] = {'I','D','B','_','I','E','T','O','O','L','B','A','R',0}; + SIZE toolbar_size; LoadStringW(ieframe_instance, IDS_ADDRESS, addr, sizeof(addr)/sizeof(addr[0])); @@ -450,11 +451,10 @@ static void create_rebar(HWND hwnd) rebarinf.cbSize = sizeof(rebarinf); rebarinf.fMask = 0; rebarinf.himl = NULL; - rebarinf.cbSize = sizeof(rebarinf); SendMessageW(hwndRebar, RB_SETBARINFO, 0, (LPARAM)&rebarinf); - hwndToolbar = CreateWindowExW(TBSTYLE_EX_MIXEDBUTTONS, TOOLBARCLASSNAMEW, NULL, TBSTYLE_FLAT | WS_CHILD | WS_VISIBLE, + hwndToolbar = CreateWindowExW(TBSTYLE_EX_MIXEDBUTTONS, TOOLBARCLASSNAMEW, NULL, TBSTYLE_FLAT | WS_CHILD | WS_VISIBLE | CCS_NORESIZE, 0, 0, 0, 0, hwndRebar, (HMENU)IDC_BROWSE_TOOLBAR, ieframe_instance, NULL); imagelist = ImageList_LoadImageW(ieframe_instance, idb_ietoolbar, 32, 0, CLR_NONE, IMAGE_BITMAP, LR_CREATEDIBSECTION); @@ -469,14 +469,13 @@ static void create_rebar(HWND hwnd) add_tb_separator(hwndToolbar); add_tb_button(hwndToolbar, 5, ID_BROWSE_PRINT, IDS_TB_PRINT); SendMessageW(hwndToolbar, TB_SETBUTTONSIZE, 0, MAKELPARAM(55,50)); - SendMessageW(hwndToolbar, TB_AUTOSIZE, 0, 0); + SendMessageW(hwndToolbar, TB_GETMAXSIZE, 0, (LPARAM)&toolbar_size); bandinf.cbSize = sizeof(bandinf); - bandinf.fMask = RBBIM_STYLE | RBBIM_CHILD | RBBIM_CHILDSIZE | RBBIM_SIZE; + bandinf.fMask = RBBIM_STYLE | RBBIM_CHILD | RBBIM_CHILDSIZE; bandinf.fStyle = RBBS_CHILDEDGE; - bandinf.cx = 100; - bandinf.cxMinChild = 0; - bandinf.cyMinChild = 52; + bandinf.cxMinChild = toolbar_size.cx; + bandinf.cyMinChild = toolbar_size.cy+2; bandinf.hwndChild = hwndToolbar; SendMessageW(hwndRebar, RB_INSERTBANDW, -1, (LPARAM)&bandinf); @@ -487,6 +486,7 @@ static void create_rebar(HWND hwnd) bandinf.fMask |= RBBIM_TEXT; bandinf.fStyle = RBBS_CHILDEDGE | RBBS_BREAK; bandinf.lpText = addr; + bandinf.cxMinChild = 100; bandinf.cyMinChild = 20; bandinf.hwndChild = hwndAddress;

1 0