June 2010 - Wine-commits - list.winehq.org

Jacek Caban : shdocvw: Try to guess scheme for IHTMLPrivateWindow navigation too.
by Alexandre Julliard 28 Jun '10

28 Jun '10

Module: wine Branch: master Commit: d230fad0a8bd0101452ec8cb56629dfc1f41962c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d230fad0a8bd0101452ec8cb5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 28 12:52:03 2010 +0200 shdocvw: Try to guess scheme for IHTMLPrivateWindow navigation too. --- dlls/shdocvw/navigate.c | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 99980c7..6d6cbb6 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -760,7 +760,23 @@ HRESULT navigate_url(DocHost *This, LPCWSTR url, const VARIANT *Flags, This->ready_state = READYSTATE_LOADING; if(This->doc_navigate) { - hres = async_doc_navigate(This, url, headers, post_data, post_data_len, TRUE); + WCHAR new_url[INTERNET_MAX_URL_LENGTH]; + + if(PathIsURLW(url)) { + new_url[0] = 0; + }else { + DWORD size; + + size = sizeof(new_url)/sizeof(WCHAR); + hres = UrlApplySchemeW(url, new_url, &size, URL_APPLY_GUESSSCHEME); + if(FAILED(hres)) { + WARN("UrlApplyScheme failed: %08x\n", hres); + new_url[0] = 0; + } + } + + hres = async_doc_navigate(This, *new_url ? new_url : url, headers, post_data, + post_data_len, TRUE); }else { task_navigate_bsc_t *task;

1 0

Jacek Caban : shdocvw: Pass correct buffer size to UrlApplySchemeW.
by Alexandre Julliard 28 Jun '10

28 Jun '10

Module: wine Branch: master Commit: 4c2bb6ca706f215495d3fe6c1846abc553c85238 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c2bb6ca706f215495d3fe6c1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 28 12:52:23 2010 +0200 shdocvw: Pass correct buffer size to UrlApplySchemeW. --- dlls/shdocvw/navigate.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 6d6cbb6..3310cba 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -486,7 +486,7 @@ static HRESULT create_moniker(LPCWSTR url, IMoniker **mon) return hres; } }else { - size = sizeof(new_url); + size = sizeof(new_url)/sizeof(WCHAR); hres = UrlApplySchemeW(url, new_url, &size, URL_APPLY_GUESSSCHEME); TRACE("got %s\n", debugstr_w(new_url)); if(FAILED(hres)) {

1 0

Jacek Caban : shdocvw: Return S_OK in IWebBrowser2::Stop.
by Alexandre Julliard 28 Jun '10

28 Jun '10

Module: wine Branch: master Commit: cfdaa3cd531d5e2a294a3eb7a5cde0358b7cc4fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfdaa3cd531d5e2a294a3eb7a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 28 12:52:43 2010 +0200 shdocvw: Return S_OK in IWebBrowser2::Stop. --- dlls/shdocvw/webbrowser.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 20d39bb..4799686 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -301,7 +301,7 @@ static HRESULT WINAPI WebBrowser_Stop(IWebBrowser2 *iface) { WebBrowser *This = WEBBROWSER_THIS(iface); FIXME("(%p)\n", This); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI WebBrowser_get_Application(IWebBrowser2 *iface, IDispatch **ppDisp)

1 0

Igor Paliychuk : oleacc: Added Ukrainian translation.
by Alexandre Julliard 28 Jun '10

28 Jun '10

Module: wine Branch: master Commit: fd56bf6d0fff3404b8555d3f7d6685407a58a77f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd56bf6d0fff3404b8555d3f7… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Sun Jun 27 19:52:27 2010 +0300 oleacc: Added Ukrainian translation. --- dlls/oleacc/Makefile.in | 3 +- dlls/oleacc/oleacc_Uk.rc | 97 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 99 insertions(+), 1 deletions(-) diff --git a/dlls/oleacc/Makefile.in b/dlls/oleacc/Makefile.in index 2f1a67d..bf28dff 100644 --- a/dlls/oleacc/Makefile.in +++ b/dlls/oleacc/Makefile.in @@ -21,6 +21,7 @@ RC_SRCS = \ oleacc_Pl.rc \ oleacc_Pt.rc \ oleacc_Ro.rc \ - oleacc_Si.rc + oleacc_Si.rc \ + oleacc_Uk.rc @MAKE_DLL_RULES@ diff --git a/dlls/oleacc/oleacc_Uk.rc b/dlls/oleacc/oleacc_Uk.rc new file mode 100644 index 0000000..5822cf3 --- /dev/null +++ b/dlls/oleacc/oleacc_Uk.rc @@ -0,0 +1,97 @@ +/* + * Ukrainian resources for oleacc + * + * Copyright 2008 Nikolay Sivov + * + * Copyright 2010 Igor Paliychuk + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "oleacc.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + 0 "unknown object" /* undocumented */ + ROLE_SYSTEM_TITLEBAR "смуга назви" + ROLE_SYSTEM_MENUBAR "смуга меню" + ROLE_SYSTEM_SCROLLBAR "смуга прокручування" + ROLE_SYSTEM_GRIP "ручка" + ROLE_SYSTEM_SOUND "звук" + ROLE_SYSTEM_CURSOR "курсор" + ROLE_SYSTEM_CARET "знак вставки" + ROLE_SYSTEM_ALERT "тривога" + ROLE_SYSTEM_WINDOW "вікно" + ROLE_SYSTEM_CLIENT "клієнт" + ROLE_SYSTEM_MENUPOPUP "контекстне меню" + ROLE_SYSTEM_MENUITEM "елемент меню" + ROLE_SYSTEM_TOOLTIP "підказка" + ROLE_SYSTEM_APPLICATION "додаток" + ROLE_SYSTEM_DOCUMENT "документ" + ROLE_SYSTEM_PANE "сектор" + ROLE_SYSTEM_CHART "графік" + ROLE_SYSTEM_DIALOG "діалог" + ROLE_SYSTEM_BORDER "межа" + ROLE_SYSTEM_GROUPING "групування" + ROLE_SYSTEM_SEPARATOR "розділювач" + ROLE_SYSTEM_TOOLBAR "панель інструментів" + ROLE_SYSTEM_STATUSBAR "рядок стану" + ROLE_SYSTEM_TABLE "таблиця" + ROLE_SYSTEM_COLUMNHEADER "заголовок стовпчика" + ROLE_SYSTEM_ROWHEADER "заголовок рядка" + ROLE_SYSTEM_COLUMN "стовпчик" + ROLE_SYSTEM_ROW "рядок" + ROLE_SYSTEM_CELL "комірка" + ROLE_SYSTEM_LINK "посилання" + ROLE_SYSTEM_HELPBALLOON "помічна повітряна куля" + ROLE_SYSTEM_CHARACTER "знак" + ROLE_SYSTEM_LIST "список" + ROLE_SYSTEM_LISTITEM "елемент списку" + ROLE_SYSTEM_OUTLINE "план" + ROLE_SYSTEM_OUTLINEITEM "елемент плану" + ROLE_SYSTEM_PAGETAB "закладка сторінки" + ROLE_SYSTEM_PROPERTYPAGE "сторінка властивостей" + ROLE_SYSTEM_INDICATOR "показник" + ROLE_SYSTEM_GRAPHIC "графіка" + ROLE_SYSTEM_STATICTEXT "статичний текст" + ROLE_SYSTEM_TEXT "текст" + ROLE_SYSTEM_PUSHBUTTON "кнопка" + ROLE_SYSTEM_CHECKBUTTON "кнопка-позначка" + ROLE_SYSTEM_RADIOBUTTON "перемикач" + ROLE_SYSTEM_COMBOBOX "комбіноване поле" + ROLE_SYSTEM_DROPLIST "випадаючий" + ROLE_SYSTEM_PROGRESSBAR "смужка прогресу" + ROLE_SYSTEM_DIAL "вибір" + ROLE_SYSTEM_HOTKEYFIELD "поле гарячих клавіш" + ROLE_SYSTEM_SLIDER "повзунок" + ROLE_SYSTEM_SPINBUTTON "поле скролінгу" + ROLE_SYSTEM_DIAGRAM "діаграма" + ROLE_SYSTEM_ANIMATION "анімація" + ROLE_SYSTEM_EQUATION "рівняння" + ROLE_SYSTEM_BUTTONDROPDOWN "випадаюча кнопка" + ROLE_SYSTEM_BUTTONMENU "кнопка меню" + ROLE_SYSTEM_BUTTONDROPDOWNGRID "випадаюча кнопка сітки" + ROLE_SYSTEM_WHITESPACE "білий простір" + ROLE_SYSTEM_PAGETABLIST "список закладок сторінки" + ROLE_SYSTEM_CLOCK "годинник" + ROLE_SYSTEM_SPLITBUTTON "кнопка поділу" + ROLE_SYSTEM_IPADDRESS "IP адреса" + ROLE_SYSTEM_OUTLINEBUTTON "кпопка плану" +}

1 0

Alexandre Julliard : winemenubuilder: Load only low bit count icons if we are going to save to XPM format.
by Alexandre Julliard 28 Jun '10

28 Jun '10

Module: wine Branch: master Commit: 67bdd633b2b85cf24b67d9b2dc2581964a85f7d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67bdd633b2b85cf24b67d9b2d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 28 16:39:12 2010 +0200 winemenubuilder: Load only low bit count icons if we are going to save to XPM format. --- programs/winemenubuilder/winemenubuilder.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index c027dad..620d705 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -684,8 +684,13 @@ static BOOL extract_icon32(LPCWSTR szFileName, int nIndex, char *szXPMFileName) { if ((pIconDir = LockResource(hResData))) { + lpName = MAKEINTRESOURCEW(pIconDir->idEntries[0].nID); /* default to first entry */ for (i = 0; i < pIconDir->idCount; i++) { +#ifndef SONAME_LIBPNG + if (pIconDir->idEntries[i].wBitCount != 4 && pIconDir->idEntries[i].wBitCount != 8) + continue; +#endif if (pIconDir->idEntries[i].wBitCount >= nMaxBits) { if ((pIconDir->idEntries[i].bHeight * pIconDir->idEntries[i].bWidth) >= nMax) @@ -694,7 +699,7 @@ static BOOL extract_icon32(LPCWSTR szFileName, int nIndex, char *szXPMFileName) nMax = pIconDir->idEntries[i].bHeight * pIconDir->idEntries[i].bWidth; nMaxBits = pIconDir->idEntries[i].wBitCount; } - } + } } }

1 0

Alexandre Julliard : winemenubuilder: Use the new wine glass icon from user32 as default icon.
by Alexandre Julliard 28 Jun '10

28 Jun '10

Module: wine Branch: master Commit: db68b1e60228a562f6df723adf682bd216457c0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=db68b1e60228a562f6df723ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 28 16:39:39 2010 +0200 winemenubuilder: Use the new wine glass icon from user32 as default icon. --- programs/winemenubuilder/wine.xpm | 210 ---------------------------- programs/winemenubuilder/winemenubuilder.c | 34 +---- 2 files changed, 5 insertions(+), 239 deletions(-) diff --git a/programs/winemenubuilder/wine.xpm b/programs/winemenubuilder/wine.xpm deleted file mode 100644 index 85e34f8..0000000 --- a/programs/winemenubuilder/wine.xpm +++ /dev/null @@ -1,210 +0,0 @@ -/* XPM */ -static const char * wine_xpm[] = { -"48 48 159 2", -" c None", -". c #010101", -"+ c #030303", -"@ c #000000", -"# c #040404", -"$ c #0D0D0D", -"% c #222222", -"& c #090909", -"* c #050505", -"= c #101010", -"- c #0B0B0B", -"; c #131313", -"> c #1C1C1C", -", c #232323", -"' c #161616", -") c #020202", -"! c #2F2F2F", -"~ c #212121", -"{ c #060606", -"] c #292929", -"^ c #0A0A0A", -"/ c #111111", -"( c #252525", -"_ c #0E0E0E", -": c #262626", -"< c #0C0005", -"[ c #100308", -"} c #2D2D2D", -"| c #2A2A2A", -"1 c #360013", -"2 c #59001C", -"3 c #120006", -"4 c #080808", -"5 c #141414", -"6 c #090707", -"7 c #0A0003", -"8 c #0E0003", -"9 c #0B0205", -"0 c #191919", -"a c #6A0022", -"b c #AC0033", -"c c #730024", -"d c #4F0019", -"e c #470016", -"f c #4B0019", -"g c #5D001E", -"h c #690022", -"i c #6E0023", -"j c #660021", -"k c #410012", -"l c #1B080D", -"m c #171717", -"n c #160007", -"o c #8E002E", -"p c #B60038", -"q c #AE0038", -"r c #A90035", -"s c #A60033", -"t c #A60035", -"u c #AF0038", -"v c #B10038", -"w c #B00038", -"x c #A10031", -"y c #6D0020", -"z c #1A0007", -"A c #121212", -"B c #3D0014", -"C c #A70033", -"D c #AE0039", -"E c #B30038", -"F c #B20038", -"G c #B70038", -"H c #98002E", -"I c #2E000F", -"J c #52021A", -"K c #7C0026", -"L c #AC0035", -"M c #AD0038", -"N c #B50038", -"O c #830029", -"P c #1A0008", -"Q c #490017", -"R c #A00033", -"S c #B20039", -"T c #53001B", -"U c #3C0014", -"V c #A20032", -"W c #AD0039", -"X c #B40038", -"Y c #8F002D", -"Z c #1E0008", -"` c #171616", -" . c #51001A", -".. c #A80035", -"+. c #B20037", -"@. c #700025", -"#. c #0A0104", -"$. c #090204", -"%. c #B00039", -"&. c #A40033", -"*. c #32000F", -"=. c #110005", -"-. c #730026", -";. c #AF0039", -">. c #810029", -",. c #0A0002", -"'. c #1D0009", -"). c #820029", -"!. c #410014", -"~. c #21000A", -"{. c #87002A", -"]. c #88002C", -"^. c #8B002A", -"/. c #3C0015", -"(. c #20000A", -"_. c #86002A", -":. c #B50037", -"<. c #710022", -"[. c #080002", -"}. c #130006", -"|. c #790026", -"1. c #7A0128", -"2. c #140007", -"3. c #0D0608", -"4. c #650021", -"5. c #90002E", -"6. c #290310", -"7. c #181818", -"8. c #390013", -"9. c #9A0032", -"0. c #B40039", -"a. c #B10037", -"b. c #91002D", -"c. c #3E0014", -"d. c #0C0407", -"e. c #0A0004", -"f. c #4A001A", -"g. c #92002D", -"h. c #A50034", -"i. c #94002E", -"j. c #6C0122", -"k. c #2E0210", -"l. c #0B0406", -"m. c #070707", -"n. c #090003", -"o. c #26000C", -"p. c #370414", -"q. c #28000C", -"r. c #060303", -"s. c #191818", -"t. c #1F1F1F", -"u. c #0F0F0F", -"v. c #1D1D1D", -"w. c #3E3E3E", -"x. c #2B2B2B", -"y. c #1A1A1A", -"z. c #323232", -"A. c #2E2E2E", -"B. c #1E1E1E", -" . + @ @ # ", -" $ % & . * ", -" & . = & - ", -" @ ; - # ", -" > @ , # ", -" . ' ) ", -" ! # ~ * ", -" { @ # @ ", -" . > . * ", -" ] ^ / ( _ : ", -" $ < [ } + + ", -" | ' 1 2 3 4 5 / 6 7 8 9 $ & 0 ", -" ^ * a b c d e f g h i j k l m & ' ", -" @ n o p q r s t u q v w x y z @ ", -" A B C u D E F v q F u u G H I @ ", -" J K L E D F M v u M E q N O P ", -" Q R E q S u v M F u E q r T + ", -" { U V v F W w v v w F M X Y Z ", -" ` ...F u D F u w v w M +.(a).#. ", -" $.a w w v %.v u u w v w &.*.. ", -" =.-.w w v ;.u v u w M G >.,.@ ", -" '.).w v u W v q v u v E !.@ ", -" ~.{.E u F D F u w v X ].7 # ", -" ~.^.F F q S u v M F X /.@ ", -" (._.X u E W u v v :.<.[.@ ", -" }.|.w F q D F v v 1.2.4 ", -" 3.4.w w F %.F X 5.6.. 7. ", -" ^ 8.9.G v 0.a.b.c.d.. ", -" e.f.g.h.i.j.k.l.m. ", -" - n.o.p.q.3 4 ^ ", -" r.@ @ . @ @ ", -" s.@ @ @ ", -" > @ ) ", -" t.. u. ", -" > + ", -" > v. ", -" 5 ' ", -" # ", -" v. ", -" @ ( ", -" w.x.] _ @ ( ", -" @ @ @ @ & / - @ @ @ ( ", -" { & @ @ @ @ @ @ & ( ", -" = / m.@ @ @ @ = 5 ) ", -" y.@ @ @ @ @ @ @ - ", -" z.^ @ @ @ @ m.# ", -" A _ . @ . & ", -" A.B.; "}; diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 620d705..8ee8387 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -95,7 +95,6 @@ #include "wine/debug.h" #include "wine/library.h" #include "wine/list.h" -#include "wine.xpm" #ifdef HAVE_PNG_H #undef FAR @@ -865,27 +864,11 @@ end: return ret; } -static BOOL create_default_icon( const char *filename, const char* comment ) +static BOOL create_default_icon( char *filename ) { - FILE *fXPM; - unsigned int i; - - if (!(fXPM = fopen(filename, "w"))) return FALSE; - if (fprintf(fXPM, "/* XPM */\n/* %s */\nstatic char * icon[] = {", comment) <= 0) - goto error; - for (i = 0; i < sizeof(wine_xpm)/sizeof(wine_xpm[0]); i++) { - if (fprintf( fXPM, "\n\"%s\",", wine_xpm[i]) <= 0) - goto error; - } - if (fprintf( fXPM, "};\n" ) <=0) - goto error; - fclose( fXPM ); - return TRUE; - error: - fclose( fXPM ); - unlink( filename ); - return FALSE; + static const WCHAR user32W[] = {'u','s','e','r','3','2',0}; + return extract_icon32( user32W, -(INT_PTR)IDI_WINLOGO, filename ); } static unsigned short crc16(const char* string) @@ -1084,15 +1067,8 @@ static char *extract_icon( LPCWSTR path, int index, const char *destFilename, BO goto end; if (ExtractFromFileType( path, xpm_path )) goto end; - if (!bWait) - { - if (destFilename) - sprintf(xpm_path,"%s/%s.xpm",iconsdir,destFilename); - else - sprintf(xpm_path,"%s/%04x_%s.xpm",iconsdir,crc,ico_name); - if (create_default_icon( xpm_path, ico_path )) - goto end; - } + if (!bWait && create_default_icon( xpm_path )) + goto end; HeapFree( GetProcessHeap(), 0, xpm_path ); xpm_path=NULL;

1 0

Eric Pouech : dbghelp: Parse correctly DW_LNE_set_discriminator.
by Alexandre Julliard 28 Jun '10

28 Jun '10

Module: wine Branch: master Commit: 5afe16621b786a11c6d28e54e2fa526240ba100a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5afe16621b786a11c6d28e54e… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Jun 27 22:57:33 2010 +0200 dbghelp: Parse correctly DW_LNE_set_discriminator. --- dlls/dbghelp/dwarf.c | 4 ++++ dlls/dbghelp/dwarf.h | 2 ++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 413ae44..dda1725 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2075,6 +2075,10 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, dwarf2_leb128_as_unsigned(&traverse); dwarf2_leb128_as_unsigned(&traverse); break; + case DW_LNE_set_discriminator: + WARN("not handled %s\n", traverse.data); + dwarf2_leb128_as_unsigned(&traverse); + break; default: FIXME("Unsupported extended opcode %x\n", extopcode); break; diff --git a/dlls/dbghelp/dwarf.h b/dlls/dbghelp/dwarf.h index 4ecb816..9864ecc 100644 --- a/dlls/dbghelp/dwarf.h +++ b/dlls/dbghelp/dwarf.h @@ -421,6 +421,8 @@ enum dwarf_calling_convention #define DW_LNE_end_sequence 0x01 #define DW_LNE_set_address 0x02 #define DW_LNE_define_file 0x03 +/* Dwarf4 new values */ +#define DW_LNE_set_discriminator 0x04 #define DW_CIE_ID ~(0x0)

1 0

Nikolay Sivov : msxml3: Create additional node for xml declaration.
by Alexandre Julliard 28 Jun '10

28 Jun '10

Module: wine Branch: master Commit: d461d7d2136fcb8fa591784742c31237ad5b10d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d461d7d2136fcb8fa59178474… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 28 12:17:56 2010 +0400 msxml3: Create additional node for xml declaration. --- dlls/msxml3/domdoc.c | 71 ++++++++++++++++++++++++++++++++++++++++--- dlls/msxml3/msxml_private.h | 2 + dlls/msxml3/node.c | 5 +++ dlls/msxml3/tests/domdoc.c | 49 ++++++++++++++++++++++-------- 4 files changed, 109 insertions(+), 18 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 54e4728..cec59e8 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -141,18 +141,75 @@ static xmldoc_priv * create_priv(void) return priv; } +/* links a "<?xml" node as a first child */ +void xmldoc_link_xmldecl(xmlDocPtr doc, xmlNodePtr node) +{ + assert(doc != NULL); + if (doc->standalone != -1) xmlAddPrevSibling( doc->children, node ); +} + +/* unlinks a first "<?xml" child if it was created */ +xmlNodePtr xmldoc_unlink_xmldecl(xmlDocPtr doc) +{ + xmlNodePtr node; + + assert(doc != NULL); + + if (doc->standalone != -1) + { + node = doc->children; + xmlUnlinkNode( node ); + } + else + node = NULL; + + return node; +} + static xmlDocPtr doparse( char *ptr, int len, const char *encoding ) { + xmlDocPtr doc; + #ifdef HAVE_XMLREADMEMORY /* * use xmlReadMemory if possible so we can suppress * writing errors to stderr */ - return xmlReadMemory( ptr, len, NULL, encoding, - XML_PARSE_NOERROR | XML_PARSE_NOWARNING | XML_PARSE_NOBLANKS ); + doc = xmlReadMemory( ptr, len, NULL, encoding, + XML_PARSE_NOERROR | XML_PARSE_NOWARNING | XML_PARSE_NOBLANKS ); #else - return xmlParseMemory( ptr, len ); + doc = xmlParseMemory( ptr, len ); #endif + + /* create first child as a <?xml...?> */ + if (doc && doc->standalone != -1) + { + xmlNodePtr node; + char buff[30]; + xmlChar *xmlbuff = (xmlChar*)buff; + + node = xmlNewDocPI( doc, (xmlChar*)"xml", NULL ); + + /* version attribute can't be omitted */ + sprintf(buff, "version=\"%s\"", doc->version ? (char*)doc->version : "1.0"); + xmlNodeAddContent( node, xmlbuff ); + + if (doc->encoding) + { + sprintf(buff, " encoding=\"%s\"", doc->encoding); + xmlNodeAddContent( node, xmlbuff ); + } + + if (doc->standalone != -2) + { + sprintf(buff, " standalone=\"%s\"", doc->standalone == 0 ? "no" : "yes"); + xmlNodeAddContent( node, xmlbuff ); + } + + xmldoc_link_xmldecl( doc, node ); + } + + return doc; } LONG xmldoc_add_ref(xmlDocPtr doc) @@ -345,7 +402,7 @@ static HRESULT WINAPI xmldoc_IPersistStream_Load( len = GlobalSize(hglobal); ptr = GlobalLock(hglobal); if (len != 0) - xmldoc = parse_xml(ptr, len); + xmldoc = doparse(ptr, len, NULL); GlobalUnlock(hglobal); if (!xmldoc) @@ -1524,7 +1581,7 @@ static HRESULT WINAPI domdoc_load( { *isSuccessful = VARIANT_TRUE; - TRACE("Using ID_IStream to load Document\n"); + TRACE("Using IStream to load Document\n"); return S_OK; } else @@ -1733,6 +1790,7 @@ static HRESULT WINAPI domdoc_save( domdoc *This = impl_from_IXMLDOMDocument2( iface ); HANDLE handle; xmlSaveCtxtPtr ctx; + xmlNodePtr xmldecl; HRESULT ret = S_OK; TRACE("(%p)->(var(vt %d, %s))\n", This, V_VT(&destination), @@ -1788,7 +1846,10 @@ static HRESULT WINAPI domdoc_save( return S_FALSE; } + xmldecl = xmldoc_unlink_xmldecl(get_doc(This)); if (xmlSaveDoc(ctx, get_doc(This)) == -1) ret = S_FALSE; + xmldoc_link_xmldecl(get_doc(This), xmldecl); + /* will close file through close callback */ xmlSaveClose(ctx); diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 1df3e8b..e0279f1 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -134,6 +134,8 @@ extern LONG xmldoc_add_ref( xmlDocPtr doc ); extern LONG xmldoc_release( xmlDocPtr doc ); extern HRESULT xmldoc_add_orphan( xmlDocPtr doc, xmlNodePtr node ); extern HRESULT xmldoc_remove_orphan( xmlDocPtr doc, xmlNodePtr node ); +extern void xmldoc_link_xmldecl(xmlDocPtr doc, xmlNodePtr node); +extern xmlNodePtr xmldoc_unlink_xmldecl(xmlDocPtr doc); extern HRESULT XMLElement_create( IUnknown *pUnkOuter, xmlNodePtr node, LPVOID *ppObj, BOOL own ); diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 135844f..bbdcb5d 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1382,6 +1382,7 @@ static HRESULT WINAPI xmlnode_get_xml( { xmlnode *This = impl_from_IXMLDOMNode( iface ); xmlBufferPtr pXmlBuf; + xmlNodePtr xmldecl; int nSize; TRACE("(%p %d)->(%p)\n", This, This->node->type, xmlString); @@ -1391,6 +1392,8 @@ static HRESULT WINAPI xmlnode_get_xml( *xmlString = NULL; + xmldecl = xmldoc_unlink_xmldecl( This->node->doc ); + pXmlBuf = xmlBufferCreate(); if(pXmlBuf) { @@ -1424,6 +1427,8 @@ static HRESULT WINAPI xmlnode_get_xml( xmlBufferFree(pXmlBuf); } + xmldoc_link_xmldecl( This->node->doc, xmldecl ); + /* Always returns a string. */ if(*xmlString == NULL) *xmlString = SysAllocStringLen( NULL, 0 ); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 9c1440c..cde4c81 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -470,20 +470,8 @@ static void node_to_string(IXMLDOMNode *node, char *buf) } else { - int pos = get_node_position(node); - DOMNodeType parent_type = NODE_INVALID; r = IXMLDOMNode_get_parentNode(node, &new_node); - - /* currently wine doesn't create a node for the <?xml ... ?>. To be able to test query - * results we "fix" it */ - if (r == S_OK) - ole_check(IXMLDOMNode_get_nodeType(new_node, &parent_type)); - if ((parent_type == NODE_DOCUMENT) && type != NODE_PROCESSING_INSTRUCTION && pos==1) - { - todo_wine ok(FALSE, "The first child of the document node in MSXML is the <?xml ... ?> processing instruction\n"); - pos++; - } - wsprintf(buf, "%d", pos); + wsprintf(buf, "%d", get_node_position(node)); buf += strlen(buf); } @@ -2477,6 +2465,40 @@ static void test_get_childNodes(void) IXMLDOMDocument_Release( doc ); } +static void test_get_firstChild(void) +{ + static WCHAR xmlW[] = {'x','m','l',0}; + IXMLDOMDocument *doc; + IXMLDOMNode *node; + VARIANT_BOOL b; + HRESULT r; + BSTR str; + + r = CoCreateInstance( &CLSID_DOMDocument, NULL, + CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (void**)&doc ); + ok( r == S_OK, "failed with 0x%08x\n", r ); + if( r != S_OK ) + return; + + str = SysAllocString( szComplete4 ); + r = IXMLDOMDocument_loadXML( doc, str, &b ); + ok( r == S_OK, "loadXML failed\n"); + ok( b == VARIANT_TRUE, "failed to load XML string\n"); + SysFreeString( str ); + + r = IXMLDOMDocument_get_firstChild( doc, &node ); + ok( r == S_OK, "ret %08x\n", r); + + r = IXMLDOMNode_get_nodeName( node, &str ); + ok( r == S_OK, "ret %08x\n", r); + + ok(memcmp(str, xmlW, sizeof(xmlW)) == 0, "expected \"xml\" node name\n"); + + SysFreeString(str); + IXMLDOMNode_Release( node ); + IXMLDOMDocument_Release( doc ); +} + static void test_removeChild(void) { HRESULT r; @@ -5581,6 +5603,7 @@ START_TEST(domdoc) test_getElementsByTagName(); test_get_text(); test_get_childNodes(); + test_get_firstChild(); test_removeChild(); test_replaceChild(); test_removeNamedItem();

1 0

Andrew Eikum : shell32: Fix a comment typo.
by Alexandre Julliard 28 Jun '10

28 Jun '10

Module: wine Branch: master Commit: 5c81b5484a36985f8662df80d2256b5beaea97fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c81b5484a36985f8662df80d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jun 25 15:20:04 2010 -0500 shell32: Fix a comment typo. --- dlls/shell32/shfldr_fs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 626f17f..305902c 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -1068,7 +1068,7 @@ static ULONG WINAPI ISFHelper_fnRelease (ISFHelper * iface) } /**************************************************************************** - * ISFHelper_fnAddFolder + * ISFHelper_fnGetUniqueName * * creates a unique folder name */

1 0

Hwang YunSong : cmd: Update Korean resource.
by Alexandre Julliard 28 Jun '10

28 Jun '10

Module: wine Branch: master Commit: ffc5f0d45ffb9d0cad2f4a3227d27128e114ef38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffc5f0d45ffb9d0cad2f4a322… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Jun 28 10:20:06 2010 +0900 cmd: Update Korean resource. --- programs/cmd/Ko.rc | 350 +++++++++++++++++++++++++++------------------------- 1 files changed, 179 insertions(+), 171 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ffc5f0d45ffb9d0cad2f4…

1 0