wine-commits July 2011

wine-commits@winehq.org

2 participants
838 discussions

Frédéric Delanoy : cmd: Avoid excess newline after TYPE outputs file contents.
by Alexandre Julliard 15 Jul '11

15 Jul '11

Module: wine Branch: master Commit: 4b4dd300f6832be491610943b01b80118f978c27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b4dd300f6832be491610943b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jul 14 20:07:14 2011 +0200 cmd: Avoid excess newline after TYPE outputs file contents. --- programs/cmd/builtins.c | 2 -- programs/cmd/tests/test_builtins.cmd | 10 ++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 9 +++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 0352e59..86fd54c 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2532,8 +2532,6 @@ void WCMD_type (WCHAR *command) { WCMD_output_asis (buffer); } CloseHandle (h); - if (!writeHeaders) - WCMD_output_asis (newline); } } } diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 3011e4d..bcff6e8 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -58,6 +58,16 @@ echo P%ERRORLEVEL% echo %ERRORLEVEL%S echo P%ERRORLEVEL%S +echo ------------ Testing type ------------ +echo bar> foobaz +@echo on +type foobaz +echo *** +@echo off +type foobaz +echo *** +del foobaz + echo ------------ Testing if/else -------------- echo if/else should work with blocks if 0 == 0 ( diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 229adc4..eb55151 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -70,6 +70,15 @@ ERRORLEVEL P0 0S P0S +------------ Testing type ------------ + +@pwd@>type foobaz@space@ +bar + +@pwd@>echo ***@space@ +*** +bar +*** ------------ Testing if/else -------------- if/else should work with blocks if seems to work

1 0

Frédéric Delanoy : cmd: Do not show prompt when echo mode is off.
by Alexandre Julliard 15 Jul '11

15 Jul '11

Module: wine Branch: master Commit: f43297f989625496aef799256207650eb657134f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f43297f989625496aef799256… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jul 14 14:08:09 2011 +0200 cmd: Do not show prompt when echo mode is off. --- programs/cmd/wcmdmain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 28394c1..bd572d2 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2555,7 +2555,7 @@ int wmain (int argc, WCHAR *argvW[]) /* Read until EOF (which for std input is never, but if redirect in place, may occur */ - WCMD_show_prompt (); + if (echo_mode) WCMD_show_prompt(); if (WCMD_ReadAndParseLine(NULL, &toExecute, GetStdHandle(STD_INPUT_HANDLE)) == NULL) break;

1 0

Frédéric Delanoy : cmd: Avoid printing an excess newline after version is displayed on startup.
by Alexandre Julliard 15 Jul '11

15 Jul '11

1 0

Frédéric Delanoy : cmd: Output a empty line before version in VER.
by Alexandre Julliard 15 Jul '11

15 Jul '11

Module: wine Branch: master Commit: 123d5d0d600e52c75533ae3e88c7d15d7548d9ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=123d5d0d600e52c75533ae3e8… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jul 14 13:54:41 2011 +0200 cmd: Output a empty line before version in VER. --- programs/cmd/wcmdmain.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 5280679..28394c1 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1519,6 +1519,7 @@ void WCMD_execute (WCHAR *command, WCHAR *redirects, WCMD_type (p); break; case WCMD_VER: + WCMD_output(newline); WCMD_version (); break; case WCMD_VERIFY:

1 0

Jacek Caban : mshtml: Added IHTMLStyle::clip tests.
by Alexandre Julliard 15 Jul '11

15 Jul '11

Module: wine Branch: master Commit: d1d2b46d79e6cbdb9723aa815072a9ac715fbb75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1d2b46d79e6cbdb9723aa815… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 15 15:38:18 2011 +0200 mshtml: Added IHTMLStyle::clip tests. --- dlls/mshtml/tests/dom.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 21f183c..b629071 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5691,6 +5691,21 @@ static void test_default_style(IHTMLStyle *style) hres = IHTMLStyle_put_borderLeftColor(style, vDefault); ok(hres == S_OK, "put_borderLeftColor: %08x\n", hres); + /* clip */ + hres = IHTMLStyle_get_clip(style, &str); + ok(hres == S_OK, "get_clip failed: %08x\n", hres); + ok(!str, "clip = %s\n", wine_dbgstr_w(str)); + + str = a2bstr("rect(0px 1px 500px 505px)"); + hres = IHTMLStyle_put_clip(style, str); + ok(hres == S_OK, "put_clip failed: %08x\n", hres); + SysFreeString(str); + + hres = IHTMLStyle_get_clip(style, &str); + ok(hres == S_OK, "get_clip failed: %08x\n", hres); + ok(!strcmp_wa(str, "rect(0px 1px 500px 505px)"), "clip = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle2, (void**)&style2); ok(hres == S_OK, "Could not get IHTMLStyle2 iface: %08x\n", hres); if(SUCCEEDED(hres)) {

1 0

Jacek Caban : mshtml: Added IHTMLStyle::clip property implementation.
by Alexandre Julliard 15 Jul '11

15 Jul '11

Module: wine Branch: master Commit: b7934f0ad197dc00d2e0c541f17ec9b5949f6b65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7934f0ad197dc00d2e0c541f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 15 15:38:08 2011 +0200 mshtml: Added IHTMLStyle::clip property implementation. --- dlls/mshtml/htmlstyle.c | 46 +++++++++++++++++++++++++++++++++++++++++----- dlls/mshtml/htmlstyle.h | 10 ++++++---- 2 files changed, 47 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index b9a18c7..cd1f6b5 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -91,6 +91,8 @@ static const WCHAR attrBorderWidth[] = {'b','o','r','d','e','r','-','w','i','d','t','h',0}; static const WCHAR attrBottom[] = {'b','o','t','t','o','m',0}; +static const WCHAR attrClip[] = + {'c','l','i','p',0}; static const WCHAR attrColor[] = {'c','o','l','o','r',0}; static const WCHAR attrCursor[] = @@ -198,6 +200,7 @@ static const struct{ {attrBorderTopWidth, DISPID_IHTMLSTYLE_BORDERTOPWIDTH}, {attrBorderWidth, DISPID_IHTMLSTYLE_BORDERWIDTH}, {attrBottom, DISPID_IHTMLSTYLE2_BOTTOM}, + {attrClip, DISPID_IHTMLSTYLE_CLIP}, {attrColor, DISPID_IHTMLSTYLE_COLOR}, {attrCursor, DISPID_IHTMLSTYLE_CURSOR}, {attrDisplay, DISPID_IHTMLSTYLE_DISPLAY}, @@ -410,6 +413,7 @@ static HRESULT get_nsstyle_attr_nsval(nsIDOMCSSStyleDeclaration *nsstyle, stylei static HRESULT nsstyle_to_bstr(const WCHAR *val, DWORD flags, BSTR *p) { BSTR ret; + DWORD len; if(!*val) { *p = NULL; @@ -420,6 +424,34 @@ static HRESULT nsstyle_to_bstr(const WCHAR *val, DWORD flags, BSTR *p) if(!ret) return E_OUTOFMEMORY; + len = SysStringLen(ret); + + if(flags & ATTR_REMOVE_COMMA) { + DWORD new_len = len; + WCHAR *ptr, *ptr2; + + for(ptr = ret; (ptr = strchrW(ptr, ',')); ptr++) + new_len--; + + if(new_len != len) { + BSTR new_ret; + + new_ret = SysAllocStringLen(NULL, new_len); + if(!new_ret) { + SysFreeString(ret); + return E_OUTOFMEMORY; + } + + for(ptr2 = new_ret, ptr = ret; *ptr; ptr++) { + if(*ptr != ',') + *ptr2++ = *ptr; + } + + SysFreeString(ret); + ret = new_ret; + } + } + *p = ret; return S_OK; } @@ -488,7 +520,7 @@ HRESULT get_nsstyle_attr_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, nsAString_Finish(&str_value); TRACE("%s -> %s\n", debugstr_w(style_tbl[sid].name), debugstr_variant(p)); - return hres; + return S_OK; } static inline HRESULT get_style_attr(HTMLStyle *This, styleid_t sid, BSTR *p) @@ -2549,15 +2581,19 @@ static HRESULT WINAPI HTMLStyle_get_cursor(IHTMLStyle *iface, BSTR *p) static HRESULT WINAPI HTMLStyle_put_clip(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + return set_style_attr(This, STYLEID_CLIP, v, 0); } static HRESULT WINAPI HTMLStyle_get_clip(IHTMLStyle *iface, BSTR *p) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_nsstyle_attr(This->nsstyle, STYLEID_CLIP, p, ATTR_REMOVE_COMMA); } static void set_opacity(HTMLStyle *This, const WCHAR *val) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index f4f36a1..154c391 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -59,6 +59,7 @@ typedef enum { STYLEID_BORDER_TOP_WIDTH, STYLEID_BORDER_WIDTH, STYLEID_BOTTOM, + STYLEID_CLIP, STYLEID_COLOR, STYLEID_CURSOR, STYLEID_DISPLAY, @@ -107,7 +108,8 @@ HRESULT set_nsstyle_attr(nsIDOMCSSStyleDeclaration*,styleid_t,LPCWSTR,DWORD) DEC HRESULT set_nsstyle_attr_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, VARIANT *value, DWORD flags) DECLSPEC_HIDDEN; HRESULT get_nsstyle_attr_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, VARIANT *p, DWORD flags) DECLSPEC_HIDDEN; -#define ATTR_FIX_PX 1 -#define ATTR_FIX_URL 2 -#define ATTR_STR_TO_INT 4 -#define ATTR_HEX_INT 8 +#define ATTR_FIX_PX 0x0001 +#define ATTR_FIX_URL 0x0002 +#define ATTR_STR_TO_INT 0x0004 +#define ATTR_HEX_INT 0x0008 +#define ATTR_REMOVE_COMMA 0x0010

1 0

Jacek Caban : mshtml: Pass flags to get_nsstyle_attr.
by Alexandre Julliard 15 Jul '11

15 Jul '11

Module: wine Branch: master Commit: e0631980467d5ed639d64c90e21faef564d1e924 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0631980467d5ed639d64c90e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 15 15:37:56 2011 +0200 mshtml: Pass flags to get_nsstyle_attr. --- dlls/mshtml/htmlcurstyle.c | 42 +++++++++++++++++++++--------------------- dlls/mshtml/htmlstyle.c | 6 +++--- dlls/mshtml/htmlstyle.h | 2 +- dlls/mshtml/htmlstyle2.c | 2 +- dlls/mshtml/htmlstyle3.c | 2 +- 5 files changed, 27 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e0631980467d5ed639d64…

1 0

Jacek Caban : mshtml: Factor out getting style value string from Gecko value.
by Alexandre Julliard 15 Jul '11

15 Jul '11

Module: wine Branch: master Commit: 9257ab8a5c1596a7b13a836bf445814b56abb617 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9257ab8a5c1596a7b13a836bf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 15 15:37:40 2011 +0200 mshtml: Factor out getting style value string from Gecko value. --- dlls/mshtml/htmlstyle.c | 37 ++++++++++++++++++++++++++----------- 1 files changed, 26 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index e34f001..ff12bdd 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -407,18 +407,35 @@ static HRESULT get_nsstyle_attr_nsval(nsIDOMCSSStyleDeclaration *nsstyle, stylei return NS_OK; } +static HRESULT nsstyle_to_bstr(const WCHAR *val, DWORD flags, BSTR *p) +{ + BSTR ret; + + if(!*val) { + *p = NULL; + return S_OK; + } + + ret = SysAllocString(val); + if(!ret) + return E_OUTOFMEMORY; + + *p = ret; + return S_OK; +} + HRESULT get_nsstyle_attr(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, BSTR *p) { nsAString str_value; const PRUnichar *value; + HRESULT hres; nsAString_Init(&str_value, NULL); get_nsstyle_attr_nsval(nsstyle, sid, &str_value); nsAString_GetData(&str_value, &value); - *p = *value ? SysAllocString(value) : NULL; - + hres = nsstyle_to_bstr(value, 0, p); nsAString_Finish(&str_value); TRACE("%s -> %s\n", debugstr_w(style_tbl[sid].name), debugstr_w(*p)); @@ -430,6 +447,7 @@ HRESULT get_nsstyle_attr_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, nsAString str_value; const PRUnichar *value; BOOL set = FALSE; + HRESULT hres = S_OK; nsAString_Init(&str_value, NULL); @@ -458,22 +476,19 @@ HRESULT get_nsstyle_attr_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, } if(!set) { - BSTR str = NULL; + BSTR str; - if(*value) { - str = SysAllocString(value); - if(!str) - return E_OUTOFMEMORY; + hres = nsstyle_to_bstr(value, flags, &str); + if(SUCCEEDED(hres)) { + V_VT(p) = VT_BSTR; + V_BSTR(p) = str; } - - V_VT(p) = VT_BSTR; - V_BSTR(p) = str; } nsAString_Finish(&str_value); TRACE("%s -> %s\n", debugstr_w(style_tbl[sid].name), debugstr_variant(p)); - return S_OK; + return hres; } static inline HRESULT get_style_attr(HTMLStyle *This, styleid_t sid, BSTR *p)

1 0

Huw Davies : gdi32: Move the query info code to a separate function.
by Alexandre Julliard 15 Jul '11

15 Jul '11

Module: wine Branch: master Commit: ff17abc695c66dc4f6b20fd9a9df2470ec7f0978 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff17abc695c66dc4f6b20fd9a… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 15 14:19:10 2011 +0100 gdi32: Move the query info code to a separate function. --- dlls/gdi32/dib.c | 100 ++++++++++++++++++++++++++++-------------------------- 1 files changed, 52 insertions(+), 48 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index cebe474..ed68a90 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -444,6 +444,57 @@ static const DWORD bit_fields_888[3] = {0xff0000, 0x00ff00, 0x0000ff}; static const DWORD bit_fields_565[3] = {0xf800, 0x07e0, 0x001f}; static const DWORD bit_fields_555[3] = {0x7c00, 0x03e0, 0x001f}; +static int fill_query_info( BITMAPINFO *info, BITMAPOBJ *bmp ) +{ + BITMAPINFOHEADER header; + + header.biSize = info->bmiHeader.biSize; /* Ensure we don't overwrite the original size when we copy back */ + header.biWidth = bmp->bitmap.bmWidth; + header.biHeight = bmp->bitmap.bmHeight; + header.biPlanes = 1; + + if (bmp->dib) + { + header.biBitCount = bmp->dib->dsBm.bmBitsPixel; + switch (bmp->dib->dsBm.bmBitsPixel) + { + case 16: + case 32: + header.biCompression = BI_BITFIELDS; + break; + default: + header.biCompression = BI_RGB; + break; + } + } + else + { + header.biCompression = (bmp->bitmap.bmBitsPixel > 8) ? BI_BITFIELDS : BI_RGB; + header.biBitCount = bmp->bitmap.bmBitsPixel; + } + + header.biSizeImage = DIB_GetDIBImageBytes( bmp->bitmap.bmWidth, + bmp->bitmap.bmHeight, + bmp->bitmap.bmBitsPixel ); + header.biXPelsPerMeter = 0; + header.biYPelsPerMeter = 0; + header.biClrUsed = 0; + header.biClrImportant = 0; + + if ( info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER) ) + { + BITMAPCOREHEADER *coreheader = (BITMAPCOREHEADER *)info; + + coreheader->bcWidth = header.biWidth; + coreheader->bcHeight = header.biHeight; + coreheader->bcPlanes = header.biPlanes; + coreheader->bcBitCount = header.biBitCount; + } + else + info->bmiHeader = header; + + return abs(bmp->bitmap.bmHeight); +} /************************************************************************ * copy_color_info @@ -519,7 +570,6 @@ INT WINAPI GetDIBits( BITMAPOBJ * bmp; int i; int bitmap_type; - BOOL core_header; LONG width; LONG height; WORD planes, bpp; @@ -535,7 +585,6 @@ INT WINAPI GetDIBits( ERR("Invalid bitmap format\n"); return 0; } - core_header = (bitmap_type == 0); if (!(dc = get_dc_ptr( hdc ))) { SetLastError( ERROR_INVALID_PARAMETER ); @@ -551,55 +600,10 @@ INT WINAPI GetDIBits( if (bpp == 0) /* query bitmap info only */ { - if (core_header) - { - BITMAPCOREHEADER* coreheader = (BITMAPCOREHEADER*) info; - coreheader->bcWidth = bmp->bitmap.bmWidth; - coreheader->bcHeight = bmp->bitmap.bmHeight; - coreheader->bcPlanes = 1; - coreheader->bcBitCount = bmp->bitmap.bmBitsPixel; - } - else - { - info->bmiHeader.biWidth = bmp->bitmap.bmWidth; - info->bmiHeader.biHeight = bmp->bitmap.bmHeight; - info->bmiHeader.biPlanes = 1; - info->bmiHeader.biSizeImage = - DIB_GetDIBImageBytes( bmp->bitmap.bmWidth, - bmp->bitmap.bmHeight, - bmp->bitmap.bmBitsPixel ); - if (bmp->dib) - { - info->bmiHeader.biBitCount = bmp->dib->dsBm.bmBitsPixel; - switch (bmp->dib->dsBm.bmBitsPixel) - { - case 16: - case 32: - info->bmiHeader.biCompression = BI_BITFIELDS; - break; - default: - info->bmiHeader.biCompression = BI_RGB; - break; - } - } - else - { - info->bmiHeader.biCompression = (bmp->bitmap.bmBitsPixel > 8) ? BI_BITFIELDS : BI_RGB; - info->bmiHeader.biBitCount = bmp->bitmap.bmBitsPixel; - } - info->bmiHeader.biXPelsPerMeter = 0; - info->bmiHeader.biYPelsPerMeter = 0; - info->bmiHeader.biClrUsed = 0; - info->bmiHeader.biClrImportant = 0; - - /* Windows 2000 doesn't touch the additional struct members if - it's a BITMAPV4HEADER or a BITMAPV5HEADER */ - } - lines = abs(bmp->bitmap.bmHeight); + lines = fill_query_info( info, bmp ); goto done; } - /* Since info may be a BITMAPCOREINFO or any of the larger BITMAPINFO structures, we'll use our own copy and transfer the colour info back at the end */

1 0

Huw Davies : gdi32: Zero-pad the end of the scanlines.
by Alexandre Julliard 15 Jul '11

15 Jul '11

Module: wine Branch: master Commit: 9b56cec9c5cbf31b3dda770c09a4e3363906f2c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b56cec9c5cbf31b3dda770c0… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 15 14:19:09 2011 +0100 gdi32: Zero-pad the end of the scanlines. --- dlls/gdi32/dibdrv/primitives.c | 164 ++++++++++++++++++++++++++++++++++++++-- 1 files changed, 156 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9b56cec9c5cbf31b3dda7…

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
84
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2011