winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
March
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
October 2012
----- 2025 -----
March 2025
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
960 discussions
Start a n
N
ew thread
Hans Leidekker : credui: Don' t show a dialog if existing credentials can be found.
by Alexandre Julliard
18 Oct '12
18 Oct '12
Module: wine Branch: master Commit: 9d95d33118dceca36252745302485d7268934c33 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=9d95d33118dceca3625274530…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 18 14:16:52 2012 +0200 credui: Don't show a dialog if existing credentials can be found. --- dlls/credui/credui_main.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index b470928..6e8d452 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -548,6 +548,38 @@ static INT_PTR CALLBACK CredDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, } } +static BOOL find_existing_credential(const WCHAR *target, WCHAR *username, ULONG len_username, + WCHAR *password, ULONG len_password) +{ + DWORD count, i; + CREDENTIALW **credentials; + + if (!CredEnumerateW(target, 0, &count, &credentials)) return FALSE; + for (i = 0; i < count; i++) + { + if (credentials[i]->Type != CRED_TYPE_DOMAIN_PASSWORD) + { + FIXME("no support for type %u credentials\n", credentials[i]->Type); + continue; + } + if ((!*username || !strcmpW(username, credentials[i]->UserName)) && + strlenW(credentials[i]->UserName) < len_username && + credentials[i]->CredentialBlobSize / sizeof(WCHAR) < len_password) + { + TRACE("found existing credential for %s\n", debugstr_w(credentials[i]->UserName)); + + strcpyW(username, credentials[i]->UserName); + memcpy(password, credentials[i]->CredentialBlob, credentials[i]->CredentialBlobSize); + password[credentials[i]->CredentialBlobSize / sizeof(WCHAR)] = 0; + + CredFree(credentials); + return TRUE; + } + } + CredFree(credentials); + return FALSE; +} + /****************************************************************************** * CredUIPromptForCredentialsW [CREDUI.@] */ @@ -578,6 +610,11 @@ DWORD WINAPI CredUIPromptForCredentialsW(PCREDUI_INFOW pUIInfo, if ((dwFlags & CREDUI_FLAGS_SHOW_SAVE_CHECK_BOX) && !pfSave) return ERROR_INVALID_PARAMETER; + if (!(dwFlags & CREDUI_FLAGS_ALWAYS_SHOW_UI) && + !(dwFlags & CREDUI_FLAGS_INCORRECT_PASSWORD) && + find_existing_credential(pszTargetName, pszUsername, ulUsernameMaxChars, pszPassword, ulPasswordMaxChars)) + return ERROR_SUCCESS; + params.pszTargetName = pszTargetName; if (pUIInfo) {
1
0
0
0
Hans Leidekker : credui: Don' t save credentials if CREDUI_FLAGS_DO_NOT_PERSIST is specified.
by Alexandre Julliard
18 Oct '12
18 Oct '12
Module: wine Branch: master Commit: d6f8687630b3702e91aee5dadc5fd6b1842ba879 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d6f8687630b3702e91aee5dad…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 18 14:16:21 2012 +0200 credui: Don't save credentials if CREDUI_FLAGS_DO_NOT_PERSIST is specified. --- dlls/credui/credui_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index e3e964f..b470928 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -655,7 +655,7 @@ DWORD WINAPI CredUIPromptForCredentialsW(PCREDUI_INFOW pUIInfo, LeaveCriticalSection(&csPendingCredentials); } - else + else if (!(dwFlags & CREDUI_FLAGS_DO_NOT_PERSIST)) result = save_credentials(pszTargetName, pszUsername, pszPassword, (dwFlags & CREDUI_FLAGS_GENERIC_CREDENTIALS) != 0); }
1
0
0
0
Hans Leidekker : credui: Show the save password checkbox if both CREDUI_FLAGS_DO_NOT_PERSIST and CREDUI_FLAGS_SHOW_SAVE_CHECK_BOX are specified .
by Alexandre Julliard
18 Oct '12
18 Oct '12
Module: wine Branch: master Commit: ab179341e2c1f1f833adc16b91ed7e3e24502209 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ab179341e2c1f1f833adc16b9…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 18 14:16:05 2012 +0200 credui: Show the save password checkbox if both CREDUI_FLAGS_DO_NOT_PERSIST and CREDUI_FLAGS_SHOW_SAVE_CHECK_BOX are specified. --- dlls/credui/credui_main.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index 5a8c05c..e3e964f 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -410,7 +410,9 @@ static BOOL CredDialogInit(HWND hwndDlg, struct cred_dialog_params *params) SetWindowTextW(hwndDlg, title); } - if (params->dwFlags & (CREDUI_FLAGS_DO_NOT_PERSIST|CREDUI_FLAGS_PERSIST)) + if (params->dwFlags & CREDUI_FLAGS_PERSIST || + (params->dwFlags & CREDUI_FLAGS_DO_NOT_PERSIST && + !(params->dwFlags & CREDUI_FLAGS_SHOW_SAVE_CHECK_BOX))) ShowWindow(GetDlgItem(hwndDlg, IDC_SAVE), SW_HIDE); else if (params->fSave) CheckDlgButton(hwndDlg, IDC_SAVE, BST_CHECKED);
1
0
0
0
Huw Davies : gdi32: Make get_glyph_bitmap return a dib_info structure in order to avoid code duplication .
by Alexandre Julliard
18 Oct '12
18 Oct '12
Module: wine Branch: master Commit: 64e2ad5709312c886e5cbff8740fce195f01561d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=64e2ad5709312c886e5cbff87…
Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 18 12:55:05 2012 +0100 gdi32: Make get_glyph_bitmap return a dib_info structure in order to avoid code duplication. --- dlls/gdi32/dibdrv/graphics.c | 74 +++++++++++++++++------------------------- 1 files changed, 30 insertions(+), 44 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 846b08e..a811a75 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -441,24 +441,13 @@ static inline void get_text_bkgnd_masks( dibdrv_physdev *pdev, rop_mask *mask ) } static void draw_glyph( dibdrv_physdev *pdev, const POINT *origin, const GLYPHMETRICS *metrics, - const struct gdi_image_bits *image, DWORD text_color, + const dib_info *glyph_dib, DWORD text_color, const struct intensity_range *ranges, const struct clipped_rects *clipped_rects, RECT *bounds ) { int i; RECT rect, clipped_rect; POINT src_origin; - dib_info glyph_dib; - - glyph_dib.bit_count = 8; - glyph_dib.width = metrics->gmBlackBoxX; - glyph_dib.height = metrics->gmBlackBoxY; - glyph_dib.rect.left = 0; - glyph_dib.rect.top = 0; - glyph_dib.rect.right = metrics->gmBlackBoxX; - glyph_dib.rect.bottom = metrics->gmBlackBoxY; - glyph_dib.stride = get_dib_stride( metrics->gmBlackBoxX, 8 ); - glyph_dib.bits = *image; rect.left = origin->x + metrics->gmptGlyphOrigin.x; rect.top = origin->y - metrics->gmptGlyphOrigin.y; @@ -473,7 +462,7 @@ static void draw_glyph( dibdrv_physdev *pdev, const POINT *origin, const GLYPHME src_origin.x = clipped_rect.left - rect.left; src_origin.y = clipped_rect.top - rect.top; - pdev->dib.funcs->draw_glyph( &pdev->dib, &clipped_rect, &glyph_dib, &src_origin, + pdev->dib.funcs->draw_glyph( &pdev->dib, &clipped_rect, glyph_dib, &src_origin, text_color, ranges ); } } @@ -491,7 +480,7 @@ static const int padding[4] = {0, 3, 2, 1}; * using only values 0 or 16. */ static DWORD get_glyph_bitmap( HDC hdc, UINT index, UINT aa_flags, GLYPHMETRICS *metrics, - struct gdi_image_bits *image ) + dib_info *glyph_dib ) { UINT ggo_flags = aa_flags | GGO_GLYPH_INDEX; static const MAT2 identity = { {0,1}, {0,0}, {0,0}, {0,1} }; @@ -499,12 +488,12 @@ static DWORD get_glyph_bitmap( HDC hdc, UINT index, UINT aa_flags, GLYPHMETRICS int i, x, y; DWORD ret, size; BYTE *buf, *dst, *src; - int pad, stride; + int pad; - image->ptr = NULL; - image->is_copy = FALSE; - image->free = free_heap_bits; - image->param = NULL; + glyph_dib->bits.ptr = NULL; + glyph_dib->bits.is_copy = FALSE; + glyph_dib->bits.free = free_heap_bits; + glyph_dib->bits.param = NULL; indices[0] = index; @@ -519,9 +508,17 @@ static DWORD get_glyph_bitmap( HDC hdc, UINT index, UINT aa_flags, GLYPHMETRICS if (!ret) return ERROR_SUCCESS; /* empty glyph */ /* We'll convert non-antialiased 1-bpp bitmaps to 8-bpp, so these sizes relate to 8-bpp */ + glyph_dib->bit_count = 8; + glyph_dib->width = metrics->gmBlackBoxX; + glyph_dib->height = metrics->gmBlackBoxY; + glyph_dib->rect.left = 0; + glyph_dib->rect.top = 0; + glyph_dib->rect.right = metrics->gmBlackBoxX; + glyph_dib->rect.bottom = metrics->gmBlackBoxY; + glyph_dib->stride = get_dib_stride( metrics->gmBlackBoxX, glyph_dib->bit_count ); + pad = padding[ metrics->gmBlackBoxX % 4 ]; - stride = get_dib_stride( metrics->gmBlackBoxX, 8 ); - size = metrics->gmBlackBoxY * stride; + size = metrics->gmBlackBoxY * glyph_dib->stride; buf = HeapAlloc( GetProcessHeap(), 0, size ); if (!buf) return ERROR_OUTOFMEMORY; @@ -538,7 +535,7 @@ static DWORD get_glyph_bitmap( HDC hdc, UINT index, UINT aa_flags, GLYPHMETRICS for (y = metrics->gmBlackBoxY - 1; y >= 0; y--) { src = buf + y * get_dib_stride( metrics->gmBlackBoxX, 1 ); - dst = buf + y * stride; + dst = buf + y * glyph_dib->stride; if (pad) memset( dst + metrics->gmBlackBoxX, 0, pad ); @@ -548,11 +545,11 @@ static DWORD get_glyph_bitmap( HDC hdc, UINT index, UINT aa_flags, GLYPHMETRICS } else if (pad) { - for (y = 0, dst = buf; y < metrics->gmBlackBoxY; y++, dst += stride) + for (y = 0, dst = buf; y < metrics->gmBlackBoxY; y++, dst += glyph_dib->stride) memset( dst + metrics->gmBlackBoxX, 0, pad ); } - image->ptr = buf; + glyph_dib->bits.ptr = buf; return ERROR_SUCCESS; } @@ -592,26 +589,15 @@ BOOL render_aa_text_bitmapinfo( HDC hdc, BITMAPINFO *info, struct gdi_image_bits for (i = 0; i < count; i++) { GLYPHMETRICS metrics; - struct gdi_image_bits image; + dib_info glyph_dib; - err = get_glyph_bitmap( hdc, (UINT)str[i], aa_flags, &metrics, &image ); + err = get_glyph_bitmap( hdc, (UINT)str[i], aa_flags, &metrics, &glyph_dib ); if (err) continue; - if (image.ptr) + if (glyph_dib.bits.ptr) { RECT rect, clipped_rect; POINT src_origin; - dib_info glyph_dib; - - glyph_dib.bit_count = 8; - glyph_dib.width = metrics.gmBlackBoxX; - glyph_dib.height = metrics.gmBlackBoxY; - glyph_dib.rect.left = 0; - glyph_dib.rect.top = 0; - glyph_dib.rect.right = metrics.gmBlackBoxX; - glyph_dib.rect.bottom = metrics.gmBlackBoxY; - glyph_dib.stride = get_dib_stride( metrics.gmBlackBoxX, 8 ); - glyph_dib.bits = image; rect.left = x + metrics.gmptGlyphOrigin.x; rect.top = y - metrics.gmptGlyphOrigin.y; @@ -627,7 +613,7 @@ BOOL render_aa_text_bitmapinfo( HDC hdc, BITMAPINFO *info, struct gdi_image_bits fg_pixel, glyph_intensities ); } } - if (image.free) image.free( &image ); + free_dib_info( &glyph_dib ); if (dx) { @@ -698,15 +684,15 @@ BOOL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, for (i = 0; i < count; i++) { GLYPHMETRICS metrics; - struct gdi_image_bits image; + dib_info glyph_dib; - err = get_glyph_bitmap( dev->hdc, (UINT)str[i], aa_flags, &metrics, &image ); + err = get_glyph_bitmap( dev->hdc, (UINT)str[i], aa_flags, &metrics, &glyph_dib ); if (err) continue; - if (image.ptr) - draw_glyph( pdev, &origin, &metrics, &image, text_color, ranges, &clipped_rects, &bounds ); + if (glyph_dib.bits.ptr) + draw_glyph( pdev, &origin, &metrics, &glyph_dib, text_color, ranges, &clipped_rects, &bounds ); - if (image.free) image.free( &image ); + free_dib_info( &glyph_dib ); if (dx) {
1
0
0
0
Jacek Caban : mshtml: Added HTML comments in VBScript code tests.
by Alexandre Julliard
18 Oct '12
18 Oct '12
Module: wine Branch: master Commit: b5691b5e6335f3733a79e796001c791b0f9f2383 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b5691b5e6335f3733a79e7960…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 18 11:49:53 2012 +0200 mshtml: Added HTML comments in VBScript code tests. --- dlls/mshtml/tests/vbtest.html | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/vbtest.html b/dlls/mshtml/tests/vbtest.html index 44212e7..c965f42 100644 --- a/dlls/mshtml/tests/vbtest.html +++ b/dlls/mshtml/tests/vbtest.html @@ -1,6 +1,7 @@ <html> <head> <script type="text/vbscript"> +<!-- Dim counter counter = 1 @@ -8,6 +9,7 @@ counter = 1 Sub ok(b,m) Call external.ok(b,m) End Sub +--> </script> <script> ' Verifies that we're in VBScript although there is no type specified
1
0
0
0
Jacek Caban : vbscript: Added HTML comments tests.
by Alexandre Julliard
18 Oct '12
18 Oct '12
Module: wine Branch: master Commit: 214fab85689389d10ace7b8132254f8d05a8eda0 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=214fab85689389d10ace7b813…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 18 11:49:35 2012 +0200 vbscript: Added HTML comments tests. --- dlls/vbscript/tests/run.c | 40 ++++++++++++++++++++++++++++++++++------ 1 files changed, 34 insertions(+), 6 deletions(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 24a3c8d..4c22cb0 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -1419,7 +1419,7 @@ static void close_script(IActiveScript *script) ok(!ref, "ref=%u\n", ref); } -static HRESULT parse_script(DWORD flags, BSTR script_str) +static HRESULT parse_script(DWORD flags, BSTR script_str, const WCHAR *delim) { IActiveScriptParse *parser; IActiveScript *engine; @@ -1446,7 +1446,7 @@ static HRESULT parse_script(DWORD flags, BSTR script_str) test_counter = 0; - hres = IActiveScriptParse_ParseScriptText(parser, script_str, NULL, NULL, NULL, 0, 0, 0, NULL, NULL); + hres = IActiveScriptParse_ParseScriptText(parser, script_str, NULL, NULL, delim, 0, 0, 0, NULL, NULL); IActiveScript_Close(engine); @@ -1464,7 +1464,7 @@ static void parse_script_af(DWORD flags, const char *src) HRESULT hres; tmp = a2bstr(src); - hres = parse_script(flags, tmp); + hres = parse_script(flags, tmp, NULL); SysFreeString(tmp); ok(hres == S_OK, "parse_script failed: %08x\n", hres); } @@ -1475,7 +1475,7 @@ static HRESULT parse_script_ar(const char *src) HRESULT hres; tmp = a2bstr(src); - hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, tmp); + hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, tmp, NULL); SysFreeString(tmp); return hres; } @@ -1485,6 +1485,20 @@ static void parse_script_a(const char *src) parse_script_af(SCRIPTITEM_GLOBALMEMBERS, src); } +#define parse_htmlscript_a(a) _parse_htmlscript_a(__LINE__,a) +static void _parse_htmlscript_a(unsigned line, const char *src) +{ + BSTR tmp; + HRESULT hres; + + static const WCHAR script_delimW[] = {'<','/','S','C','R','I','P','T','>',0}; + + tmp = a2bstr(src); + hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, tmp, script_delimW); + SysFreeString(tmp); + ok_(__FILE__,line)(hres == S_OK, "parse_script failed: %08x\n", hres); +} + static IDispatchEx *parse_procedure(IActiveScriptParseProcedure2 *parse_proc, const char *src) { IDispatchEx *dispex; @@ -1742,7 +1756,7 @@ static void run_from_file(const char *filename) return; strict_dispid_check = FALSE; - hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, script_str); + hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, script_str, NULL); SysFreeString(script_str); ok(hres == S_OK, "parse_script failed: %08x\n", hres); } @@ -1770,7 +1784,7 @@ static void run_from_res(const char *name) SET_EXPECT(global_success_d); SET_EXPECT(global_success_i); - hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, str); + hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, str, NULL); CHECK_CALLED(global_success_d); CHECK_CALLED(global_success_i); @@ -1859,6 +1873,20 @@ static void run_tests(void) CHECK_CALLED(global_propargput1_d); CHECK_CALLED(global_propargput1_i); + parse_htmlscript_a("<!--"); + parse_htmlscript_a(" -->"); + parse_htmlscript_a("<!--\ndim x\nx=1\n-->\n"); + parse_htmlscript_a("<!--\ndim x\n-->\n<!--\nx=1\n-->\n"); + + hres = parse_script_ar("<!--"); + ok(FAILED(hres), "script didn't fail\n"); + + SET_EXPECT(global_success_d); + SET_EXPECT(global_success_i); + parse_htmlscript_a("<!--\n<!-- ignore this <> <>\n--> <>\nCall reportSuccess()\n-->\n"); + CHECK_CALLED(global_success_d); + CHECK_CALLED(global_success_i); + next_cnt = 0; SET_EXPECT(collectionobj_newenum_i); SET_EXPECT(Next);
1
0
0
0
Jacek Caban : vbscript: Added support for HTML comments.
by Alexandre Julliard
18 Oct '12
18 Oct '12
Module: wine Branch: master Commit: 290f5631993ddd77df7be1b836f0948d6929d39f URL:
http://source.winehq.org/git/wine.git/?a=commit;h=290f5631993ddd77df7be1b83…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 18 11:49:17 2012 +0200 vbscript: Added support for HTML comments. --- dlls/vbscript/compile.c | 4 ++-- dlls/vbscript/lex.c | 26 +++++++++++++++++++------- dlls/vbscript/parse.h | 3 ++- dlls/vbscript/parser.y | 5 ++++- dlls/vbscript/vbscript.c | 4 ++-- dlls/vbscript/vbscript.h | 2 +- 6 files changed, 30 insertions(+), 14 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 327d97b..58afdf4 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1644,7 +1644,7 @@ static void release_compiler(compile_ctx_t *ctx) release_vbscode(ctx->code); } -HRESULT compile_script(script_ctx_t *script, const WCHAR *src, vbscode_t **ret) +HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *delimiter, vbscode_t **ret) { function_t *new_func; function_decl_t *func_decl; @@ -1653,7 +1653,7 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, vbscode_t **ret) vbscode_t *code; HRESULT hres; - hres = parse_script(&ctx.parser, src); + hres = parse_script(&ctx.parser, src, delimiter); if(FAILED(hres)) return hres; diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index 8e971e2..65d2334 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -320,6 +320,16 @@ static void skip_spaces(parser_ctx_t *ctx) ctx->ptr++; } +static int comment_line(parser_ctx_t *ctx) +{ + ctx->ptr = strchrW(ctx->ptr, '\n'); + if(ctx->ptr) + ctx->ptr++; + else + ctx->ptr = ctx->end; + return tNL; +} + static int parse_next_token(void *lval, parser_ctx_t *ctx) { WCHAR c; @@ -347,18 +357,12 @@ static int parse_next_token(void *lval, parser_ctx_t *ctx) ctx->ptr++; return tNL; case '\'': - ctx->ptr = strchrW(ctx->ptr, '\n'); - if(ctx->ptr) - ctx->ptr++; - else - ctx->ptr = ctx->end; - return tNL; + return comment_line(ctx); case ':': case ')': case ',': case '=': case '+': - case '-': case '*': case '/': case '^': @@ -366,6 +370,11 @@ static int parse_next_token(void *lval, parser_ctx_t *ctx) case '.': case '_': return *ctx->ptr++; + case '-': + if(ctx->is_html && ctx->ptr[1] == '-' && ctx->ptr[2] == '>') + return comment_line(ctx); + ctx->ptr++; + return '-'; case '(': /* NOTE: * We resolve empty brackets in lexer instead of parser to avoid complex conflicts @@ -392,6 +401,9 @@ static int parse_next_token(void *lval, parser_ctx_t *ctx) case '=': ctx->ptr++; return tLTEQ; + case '!': + if(ctx->is_html && ctx->ptr[1] == '-' && ctx->ptr[2] == '-') + return comment_line(ctx); } return '<'; case '>': diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index df8f9b5..74e0a8a 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -253,6 +253,7 @@ typedef struct { BOOL option_explicit; BOOL parse_complete; + BOOL is_html; HRESULT hres; int last_token; @@ -265,7 +266,7 @@ typedef struct { vbsheap_t heap; } parser_ctx_t; -HRESULT parse_script(parser_ctx_t*,const WCHAR*) DECLSPEC_HIDDEN; +HRESULT parse_script(parser_ctx_t*,const WCHAR*,const WCHAR*) DECLSPEC_HIDDEN; void parser_release(parser_ctx_t*) DECLSPEC_HIDDEN; int parser_lex(void*,parser_ctx_t*) DECLSPEC_HIDDEN; void *parser_alloc(parser_ctx_t*,size_t) DECLSPEC_HIDDEN; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 3f86b04..8a2a9e3 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -919,8 +919,10 @@ void *parser_alloc(parser_ctx_t *ctx, size_t size) return ret; } -HRESULT parse_script(parser_ctx_t *ctx, const WCHAR *code) +HRESULT parse_script(parser_ctx_t *ctx, const WCHAR *code, const WCHAR *delimiter) { + const WCHAR html_delimiterW[] = {'<','/','s','c','r','i','p','t','>',0}; + ctx->code = ctx->ptr = code; ctx->end = ctx->code + strlenW(ctx->code); @@ -934,6 +936,7 @@ HRESULT parse_script(parser_ctx_t *ctx, const WCHAR *code) ctx->stats = ctx->stats_tail = NULL; ctx->class_decls = NULL; ctx->option_explicit = FALSE; + ctx->is_html = delimiter && !strcmpiW(delimiter, html_delimiterW); parser_parse(ctx); diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 05132a6..1195f85 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -612,7 +612,7 @@ static HRESULT WINAPI VBScriptParse_ParseScriptText(IActiveScriptParse *iface, if(This->thread_id != GetCurrentThreadId() || This->state == SCRIPTSTATE_CLOSED) return E_UNEXPECTED; - hres = compile_script(This->ctx, pstrCode, &code); + hres = compile_script(This->ctx, pstrCode, pstrDelimiter, &code); if(FAILED(hres)) return hres; @@ -672,7 +672,7 @@ static HRESULT WINAPI VBScriptParseProcedure_ParseProcedureText(IActiveScriptPar if(This->thread_id != GetCurrentThreadId() || This->state == SCRIPTSTATE_CLOSED) return E_UNEXPECTED; - hres = compile_script(This->ctx, pstrCode, &code); + hres = compile_script(This->ctx, pstrCode, pstrDelimiter, &code); if(FAILED(hres)) return hres; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 41982da..2ce93b6 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -326,7 +326,7 @@ struct _vbscode_t { }; void release_vbscode(vbscode_t*) DECLSPEC_HIDDEN; -HRESULT compile_script(script_ctx_t*,const WCHAR*,vbscode_t**) DECLSPEC_HIDDEN; +HRESULT compile_script(script_ctx_t*,const WCHAR*,const WCHAR*,vbscode_t**) DECLSPEC_HIDDEN; HRESULT exec_script(script_ctx_t*,function_t*,IDispatch*,DISPPARAMS*,VARIANT*) DECLSPEC_HIDDEN; void release_dynamic_vars(dynamic_var_t*) DECLSPEC_HIDDEN;
1
0
0
0
Francois Gouget : shell32: Standardize on the ShellExecuteEx() terminology.
by Alexandre Julliard
18 Oct '12
18 Oct '12
Module: wine Branch: master Commit: 68c1bf507d4c114c79660e010f0fb2a1f43ecdf1 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=68c1bf507d4c114c79660e010…
Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 17 23:25:56 2012 +0200 shell32: Standardize on the ShellExecuteEx() terminology. --- dlls/shell32/shlexec.c | 108 +++++++++++++++++++++--------------------- dlls/shell32/tests/shlexec.c | 16 +++--- 2 files changed, 62 insertions(+), 62 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=68c1bf507d4c114c79660…
1
0
0
0
Francois Gouget : wined3d: Add a trailing '\n' to a Wine trace.
by Alexandre Julliard
18 Oct '12
18 Oct '12
Module: wine Branch: master Commit: 23470870a1fac9a07eaf5bc9355b896c7200f3e8 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=23470870a1fac9a07eaf5bc93…
Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Oct 17 23:24:43 2012 +0200 wined3d: Add a trailing '\n' to a Wine trace. --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7213d05..b18a99f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2186,7 +2186,7 @@ static enum wined3d_pci_device select_card_handler(const struct gl_vendor_select TRACE("Applying card selector \"%s\".\n", table[i].description); return table[i].select_card(gl_info, gl_renderer); } - FIXME("Couldn't find a suitable card selector for GL vendor %04x (using GL_RENDERER %s)", + FIXME("Couldn't find a suitable card selector for GL vendor %04x (using GL_RENDERER %s)\n", gl_vendor, debugstr_a(gl_renderer)); return PCI_DEVICE_NONE;
1
0
0
0
Francois Gouget : msvcp100: Make MSVCP_basic_string_char_append_len_ch() static.
by Alexandre Julliard
18 Oct '12
18 Oct '12
Module: wine Branch: master Commit: 8e6934fae78d2254bec52e2103c78d8e8083dba2 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=8e6934fae78d2254bec52e210…
Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Oct 17 23:24:37 2012 +0200 msvcp100: Make MSVCP_basic_string_char_append_len_ch() static. --- dlls/msvcp100/string.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp100/string.c b/dlls/msvcp100/string.c index ae597fb..7faf95f 100644 --- a/dlls/msvcp100/string.c +++ b/dlls/msvcp100/string.c @@ -399,7 +399,7 @@ MSVCP_size_t MSVCP_basic_string_char_length(const basic_string_char *this) /* ?append@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@ID@Z */ /* ?append@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@_KD@Z */ -basic_string_char* MSVCP_basic_string_char_append_len_ch(basic_string_char *this, MSVCP_size_t count, char ch) +static basic_string_char* MSVCP_basic_string_char_append_len_ch(basic_string_char *this, MSVCP_size_t count, char ch) { TRACE("%p %lu %c\n", this, count, ch);
1
0
0
0
← Newer
1
...
36
37
38
39
40
41
42
...
96
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
Results per page:
10
25
50
100
200