January 2009 - Wine-commits

Aric Stewart : shdocvw: Stub implementation of IEParseDisplayNameWithBCW.
by Alexandre Julliard 23 Jan '09

23 Jan '09

Module: wine Branch: master Commit: 3aebdbb65de704bea259a9ac0323e35a8435057c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3aebdbb65de704bea259a9ac0… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jan 22 14:59:08 2009 -0600 shdocvw: Stub implementation of IEParseDisplayNameWithBCW. --- dlls/shdocvw/shdocvw.spec | 2 +- dlls/shdocvw/shdocvw_main.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/shdocvw.spec b/dlls/shdocvw/shdocvw.spec index f47ecb4..2bfcc8f 100644 --- a/dlls/shdocvw/shdocvw.spec +++ b/dlls/shdocvw/shdocvw.spec @@ -89,7 +89,7 @@ 215 stub -noname GetSearchAssistantUrlA 216 stub -noname GetDefaultInternetSearchUrlW 217 stub -noname GetDefaultInternetSearchUrlA -218 stub -noname IEParseDisplayNameWithBCW +218 stdcall -noname IEParseDisplayNameWithBCW(long wstr ptr ptr) 219 stub -noname IEILIsEqual 220 stub @ 221 stub -noname IECreateFromPathCPWithBCA diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index a065aa5..110b713 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -396,3 +396,13 @@ DWORD WINAPI ParseURLFromOutsideSourceA(LPCSTR url, LPSTR out, LPDWORD plen, LPD TRACE("=> %d\n", res); return res; } + +/****************************************************************** + * IEParseDisplayNameWithBCW (SHDOCVW.218) + */ +HRESULT WINAPI IEParseDisplayNameWithBCW(DWORD codepage, LPCWSTR lpszDisplayName, LPBC pbc, LPITEMIDLIST *ppidl) +{ + /* Guessing at parameter 3 based on IShellFolder's ParseDisplayName */ + FIXME("stub: 0x%x %s %p %p\n",codepage,debugstr_w(lpszDisplayName),pbc,ppidl); + return E_FAIL; +}

1 0

Detlef Riekenberg : comdlg32: Remove dead code (GetModuleHandleA can't fail ).
by Alexandre Julliard 23 Jan '09

23 Jan '09

Module: wine Branch: master Commit: cbaa2e5bd7ac3bf201b1f17882928847821b4a2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbaa2e5bd7ac3bf201b1f1788… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Jan 22 22:16:07 2009 +0100 comdlg32: Remove dead code (GetModuleHandleA can't fail). --- dlls/comdlg32/cdlg32.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/comdlg32/cdlg32.c b/dlls/comdlg32/cdlg32.c index afa3c61..321554f 100644 --- a/dlls/comdlg32/cdlg32.c +++ b/dlls/comdlg32/cdlg32.c @@ -83,12 +83,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD Reason, LPVOID Reserved) SHELL32_hInstance = GetModuleHandleA("SHELL32.DLL"); - if (!SHELL32_hInstance) - { - ERR("loading of shell32 failed\n"); - return FALSE; - } - /* ITEMIDLIST */ GPA(COMDLG32_PIDL_ILIsEqual, SHELL32_hInstance, (LPCSTR)21L); GPA(COMDLG32_PIDL_ILCombine, SHELL32_hInstance, (LPCSTR)25L);

1 0

Nikolay Sivov : kernel32: Added DeleteTimerQueue.
by Alexandre Julliard 23 Jan '09

23 Jan '09

Module: wine Branch: master Commit: 2ddcb295b6e9dd25f298c34e48284970798ae884 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ddcb295b6e9dd25f298c34e4… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Jan 22 20:55:35 2009 +0300 kernel32: Added DeleteTimerQueue. --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/sync.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 13c7cd4..9c70d56 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -281,7 +281,7 @@ @ stdcall DeleteFiber(ptr) @ stdcall DeleteFileA(str) @ stdcall DeleteFileW(wstr) -# @ stub DeleteTimerQueue +@ stdcall DeleteTimerQueue(long) @ stdcall DeleteTimerQueueEx (long long) @ stdcall DeleteTimerQueueTimer(long long long) # @ stub DeleteVolumeMountPointA diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index d65bd12..be96633 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1330,6 +1330,14 @@ BOOL WINAPI DeleteTimerQueueEx(HANDLE TimerQueue, HANDLE CompletionEvent) } /*********************************************************************** + * DeleteTimerQueue (KERNEL32.@) + */ +BOOL WINAPI DeleteTimerQueue(HANDLE TimerQueue) +{ + return DeleteTimerQueueEx(TimerQueue, NULL); +} + +/*********************************************************************** * CreateTimerQueueTimer (KERNEL32.@) * * Creates a timer-queue timer. This timer expires at the specified due

1 0

Anders Jonsson : winhlp32: Update Swedish translation.
by Alexandre Julliard 23 Jan '09

23 Jan '09

Module: wine Branch: master Commit: 4e733f98e3c9b90c4aecc14cc831ee9ff5a71d18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e733f98e3c9b90c4aecc14cc… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Fri Jan 23 10:16:50 2009 +0100 winhlp32: Update Swedish translation. --- programs/winhlp32/Sv.rc | 48 +++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 44 insertions(+), 4 deletions(-) diff --git a/programs/winhlp32/Sv.rc b/programs/winhlp32/Sv.rc index 3bd6c93..d389328 100644 --- a/programs/winhlp32/Sv.rc +++ b/programs/winhlp32/Sv.rc @@ -5,6 +5,7 @@ * Swedish language by Karl Backstr�m <karl_b(a)geocities.com> * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> * Copyright 2007, 2008 Daniel Nylander <po(a)danielnylander.se> + * Copyright 2009 Anders Jonsson * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -51,9 +52,9 @@ MAIN_MENU MENU LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL MENUITEM "Historik", MNID_OPTS_HISTORY POPUP "Typsnitt" BEGIN - MENUITEM "Liten", MNID_OPTS_FONTS_SMALL - MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL - MENUITEM "Stor", MNID_OPTS_FONTS_LARGE + MENUITEM "Litet", MNID_OPTS_FONTS_SMALL + MENUITEM "Normalt", MNID_OPTS_FONTS_NORMAL + MENUITEM "Stort", MNID_OPTS_FONTS_LARGE END MENUITEM "Anv�nd systemf�rger", MNID_OPTS_SYSTEM_COLORS } @@ -68,10 +69,26 @@ MAIN_MENU MENU LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL } } +IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Index" +{ + LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER +} + +IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "S�k" +{ + LTEXT "Inte implementerat �nnu", -1, 10, 10, 180, 150 +} + /* Strings */ STRINGTABLE DISCARDABLE LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL { -STID_WINE_HELP, "WINE Hj�lp" +STID_WINE_HELP, "Wine Hj�lp" STID_WHERROR, "FEL" STID_WARNING, "VARNING" STID_INFO, "Information" @@ -86,3 +103,26 @@ STID_FILE_NOT_FOUND_s "Kan inte hitta '%s'. Vill du s STID_NO_RICHEDIT "Kan inte hitta en implementation av richedit... Avslutar" STID_PSH_INDEX, "Hj�lprubriker: " } + +CONTEXT_MENU MENU LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL +BEGIN + POPUP "" + BEGIN + MENUITEM "Kommentar...", MNID_CTXT_ANNOTATE + MENUITEM "Kopiera", MNID_CTXT_COPY + MENUITEM "Skriv ut...", MNID_CTXT_PRINT + POPUP "Typsnitt" + BEGIN + MENUITEM "Litet", MNID_CTXT_FONTS_SMALL + MENUITEM "Normalt", MNID_CTXT_FONTS_NORMAL + MENUITEM "Stort", MNID_CTXT_FONTS_LARGE + END + POPUP "Hj�lp alltid synlig" + BEGIN + MENUITEM "Standard", MNID_CTXT_HELP_DEFAULT + MENUITEM "Synlig", MNID_CTXT_HELP_VISIBLE + MENUITEM "Ej synlig", MNID_CTXT_HELP_NONVISIBLE + END + MENUITEM "Anv�nd systemf�rger", MNID_CTXT_SYSTEM_COLORS + END +END

1 0

Gerald Pfeifer : comctl32: Simplify ten functions by removing unused parameters.
by Alexandre Julliard 23 Jan '09

23 Jan '09

Module: wine Branch: master Commit: bcfc2027fb33456958d864b845a24be93f212791 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcfc2027fb33456958d864b84… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Jan 22 09:09:39 2009 +0100 comctl32: Simplify ten functions by removing unused parameters. --- dlls/comctl32/toolbar.c | 46 +++++++++++++++++++++++----------------------- 1 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index edf15df..fb2745f 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -3310,7 +3310,7 @@ TOOLBAR_GetBitmap (HWND hwnd, WPARAM wParam) static inline LRESULT -TOOLBAR_GetBitmapFlags (HWND hwnd) +TOOLBAR_GetBitmapFlags () { return (GetDeviceCaps (0, LOGPIXELSX) >= 120) ? TBBF_LARGE : 0; } @@ -3876,7 +3876,7 @@ TOOLBAR_IsButtonHighlighted (HWND hwnd, WPARAM wParam) static LRESULT -TOOLBAR_IsButtonIndeterminate (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_IsButtonIndeterminate (HWND hwnd, WPARAM wParam) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); INT nIndex; @@ -4089,7 +4089,7 @@ TOOLBAR_PressButton (HWND hwnd, WPARAM wParam, LPARAM lParam) /* FIXME: there might still be some confusion her between number of buttons * and number of bitmaps */ static LRESULT -TOOLBAR_ReplaceBitmap (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_ReplaceBitmap (HWND hwnd, LPARAM lParam) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); LPTBREPLACEBITMAP lpReplace = (LPTBREPLACEBITMAP) lParam; @@ -4168,7 +4168,7 @@ TOOLBAR_ReplaceBitmap (HWND hwnd, WPARAM wParam, LPARAM lParam) /* helper for TOOLBAR_SaveRestoreW */ static BOOL -TOOLBAR_Save(const TOOLBAR_INFO *infoPtr, const TBSAVEPARAMSW *lpSave) +TOOLBAR_Save(const TBSAVEPARAMSW *lpSave) { FIXME("save to %s %s\n", debugstr_w(lpSave->pszSubKey), debugstr_w(lpSave->pszValueName)); @@ -4308,7 +4308,7 @@ TOOLBAR_SaveRestoreW (HWND hwnd, WPARAM wParam, const TBSAVEPARAMSW *lpSave) if (lpSave == NULL) return 0; if (wParam) - return TOOLBAR_Save(infoPtr, lpSave); + return TOOLBAR_Save(lpSave); else return TOOLBAR_Restore(infoPtr, lpSave); } @@ -4562,7 +4562,7 @@ TOOLBAR_SetButtonSize (HWND hwnd, LPARAM lParam) static LRESULT -TOOLBAR_SetButtonWidth (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_SetButtonWidth (HWND hwnd, LPARAM lParam) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); @@ -4825,7 +4825,7 @@ TOOLBAR_SetImageList (HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT -TOOLBAR_SetIndent (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_SetIndent (HWND hwnd, WPARAM wParam) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); @@ -4846,7 +4846,7 @@ TOOLBAR_SetIndent (HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT -TOOLBAR_SetInsertMark (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_SetInsertMark (HWND hwnd, LPARAM lParam) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); TBINSERTMARK *lptbim = (TBINSERTMARK*)lParam; @@ -4875,7 +4875,7 @@ TOOLBAR_SetInsertMark (HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT -TOOLBAR_SetInsertMarkColor (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_SetInsertMarkColor (HWND hwnd, LPARAM lParam) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); @@ -5117,7 +5117,7 @@ TOOLBAR_SetToolTips (HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT -TOOLBAR_SetUnicodeFormat (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_SetUnicodeFormat (HWND hwnd, WPARAM wParam) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); BOOL bTemp; @@ -5171,7 +5171,7 @@ TOOLBAR_SetVersion (HWND hwnd, INT iVersion) infoPtr->iVersion = iVersion; if (infoPtr->iVersion >= 5) - TOOLBAR_SetUnicodeFormat(hwnd, TRUE, 0); + TOOLBAR_SetUnicodeFormat(hwnd, TRUE); return iOldVersion; } @@ -5270,7 +5270,7 @@ TOOLBAR_SetHotItem2 (HWND hwnd, WPARAM wParam, LPARAM lParam) /* Sets the toolbar global iListGap parameter which controls the amount of * spacing between the image and the text of buttons for TBSTYLE_LIST * toolbars. */ -static LRESULT TOOLBAR_SetListGap(HWND hwnd, WPARAM wParam, LPARAM lParam) +static LRESULT TOOLBAR_SetListGap(HWND hwnd, WPARAM wParam) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(hwnd); @@ -5355,7 +5355,7 @@ static LRESULT TOOLBAR_Unkwn464(HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT -TOOLBAR_Create (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_Create (HWND hwnd, LPARAM lParam) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); DWORD dwStyle = GetWindowLongW (hwnd, GWL_STYLE); @@ -6701,7 +6701,7 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TOOLBAR_GetBitmap (hwnd, wParam); case TB_GETBITMAPFLAGS: - return TOOLBAR_GetBitmapFlags (hwnd); + return TOOLBAR_GetBitmapFlags (); case TB_GETBUTTON: return TOOLBAR_GetButton (hwnd, wParam, lParam); @@ -6810,7 +6810,7 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TOOLBAR_IsButtonHighlighted (hwnd, wParam); case TB_ISBUTTONINDETERMINATE: - return TOOLBAR_IsButtonIndeterminate (hwnd, wParam, lParam); + return TOOLBAR_IsButtonIndeterminate (hwnd, wParam); case TB_ISBUTTONPRESSED: return TOOLBAR_IsButtonPressed (hwnd, wParam); @@ -6832,7 +6832,7 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TOOLBAR_PressButton (hwnd, wParam, lParam); case TB_REPLACEBITMAP: - return TOOLBAR_ReplaceBitmap (hwnd, wParam, lParam); + return TOOLBAR_ReplaceBitmap (hwnd, lParam); case TB_SAVERESTOREA: return TOOLBAR_SaveRestoreA (hwnd, wParam, (LPTBSAVEPARAMSA)lParam); @@ -6856,7 +6856,7 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TOOLBAR_SetButtonSize (hwnd, lParam); case TB_SETBUTTONWIDTH: - return TOOLBAR_SetButtonWidth (hwnd, wParam, lParam); + return TOOLBAR_SetButtonWidth (hwnd, lParam); case TB_SETCMDID: return TOOLBAR_SetCmdId (hwnd, wParam, lParam); @@ -6880,13 +6880,13 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TOOLBAR_SetImageList (hwnd, wParam, lParam); case TB_SETINDENT: - return TOOLBAR_SetIndent (hwnd, wParam, lParam); + return TOOLBAR_SetIndent (hwnd, wParam); case TB_SETINSERTMARK: - return TOOLBAR_SetInsertMark (hwnd, wParam, lParam); + return TOOLBAR_SetInsertMark (hwnd, lParam); case TB_SETINSERTMARKCOLOR: - return TOOLBAR_SetInsertMarkColor (hwnd, wParam, lParam); + return TOOLBAR_SetInsertMarkColor (hwnd, lParam); case TB_SETMAXTEXTROWS: return TOOLBAR_SetMaxTextRows (hwnd, wParam); @@ -6910,7 +6910,7 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TOOLBAR_SetToolTips (hwnd, wParam, lParam); case TB_SETUNICODEFORMAT: - return TOOLBAR_SetUnicodeFormat (hwnd, wParam, lParam); + return TOOLBAR_SetUnicodeFormat (hwnd, wParam); case TB_UNKWN45D: return TOOLBAR_Unkwn45D(hwnd, wParam, lParam); @@ -6919,7 +6919,7 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TOOLBAR_SetHotItem2 (hwnd, wParam, lParam); case TB_SETLISTGAP: - return TOOLBAR_SetListGap(hwnd, wParam, lParam); + return TOOLBAR_SetListGap(hwnd, wParam); case TB_GETIMAGELISTCOUNT: return TOOLBAR_GetImageListCount(hwnd, wParam, lParam); @@ -6950,7 +6950,7 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) /* case WM_CHAR: */ case WM_CREATE: - return TOOLBAR_Create (hwnd, wParam, lParam); + return TOOLBAR_Create (hwnd, lParam); case WM_DESTROY: return TOOLBAR_Destroy (hwnd, wParam, lParam);

1 0

Christoph Korn : German deb.template: Fix dimensions of screenshots.
by Jeremy Newman 22 Jan '09

22 Jan '09

Module: website Branch: master Commit: 41789eaf9e4ff50717138d09cc0b4a7ca824b440 URL: http://source.winehq.org/git/website.git/?a=commit;h=41789eaf9e4ff50717138d… Author: Christoph Korn <c_korn(a)gmx.de> Date: Thu Jan 22 16:45:50 2009 +0100 German deb.template: Fix dimensions of screenshots. This fixes the height and width properties of the screenshots. Best regards Christoph Korn >From 3e8edf259cdfa4fd3c065c0f69e565d4e57d7d9d Mon Sep 17 00:00:00 2001 From: Christoph Korn <c_korn(a)gmx.de> Date: Thu, 22 Jan 2009 16:42:15 +0100 Subject: German deb.template: Fix dimensions of screenshots. --- templates/de/download/deb.template | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/de/download/deb.template b/templates/de/download/deb.template index f59e568..5b0bbcd 100644 --- a/templates/de/download/deb.template +++ b/templates/de/download/deb.template @@ -27,7 +27,7 @@ wahrscheinlich nicht benutzen. System->Systemverwaltung->Software-Paketquellen. Wähle dann den Software von Drittanbietern-Reiter und klicke auf Hinzufügen. -<img src="{$root}/images/distro/de_ubuntu-softwaresources1.png" width="531" height="509" alt="System->Systemverwaltung->Software-Paketquellen" border="0"> +<img src="{$root}/images/distro/de_ubuntu-softwaresources1.png" width="686" height="516" alt="System->Systemverwaltung->Software-Paketquellen" border="0"> Dann, copy-paste eine der unteren Zeilen in Abhängigkeit welche Version du benutzt. @@ -48,7 +48,7 @@ und speichere Scott Ritchie's Schlüssel</a> auf deinen Desktop. Ö Schlüsseldatei, die du gerade gespeichert hast (Scott Ritchie.gpg). Es ist sicher, diese Datei nach diesem Schritt zu löschen. -<img src="{$root}/images/distro/de_ubuntu-softwaresources2.png" width="531" height="509" alt="System->Systemverwaltung->Software-Paketquellen" border="0"> +<img src="{$root}/images/distro/de_ubuntu-softwaresources2.png" width="686" height="514" alt="System->Systemverwaltung->Software-Paketquellen" border="0"> Klick auf Schließen zum Beenden, anschließend lade die Paketinformationen neu, wenn Du dazu aufgefordert wirst. Wenn Du Wine installiert hast, wird die Aktualisierungsverwaltung

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLDocument3 getElementsByTagName.
by Alexandre Julliard 22 Jan '09

22 Jan '09

Module: wine Branch: master Commit: a44ff54d814d4c54bebcf88144b6bedad8521602 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a44ff54d814d4c54bebcf8814… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jan 20 21:22:24 2009 +1100 mshtml: Implement IHTMLDocument3 getElementsByTagName. --- dlls/mshtml/htmldoc3.c | 28 ++++++++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 19 +++++++++++++++++++ 2 files changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc3.c b/dlls/mshtml/htmldoc3.c index 533dedd..5cf06ca 100644 --- a/dlls/mshtml/htmldoc3.c +++ b/dlls/mshtml/htmldoc3.c @@ -458,8 +458,32 @@ static HRESULT WINAPI HTMLDocument3_getElementsByTagName(IHTMLDocument3 *iface, IHTMLElementCollection **pelColl) { HTMLDocument *This = HTMLDOC3_THIS(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(v), pelColl); - return E_NOTIMPL; + nsIDOMNodeList *nslist; + nsAString id_str, ns_str; + nsresult nsres; + static const WCHAR str[] = {'*',0}; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(v), pelColl); + + if(!This->nsdoc) { + WARN("NULL nsdoc\n"); + return E_UNEXPECTED; + } + + nsAString_Init(&id_str, v); + nsAString_Init(&ns_str, str); + nsres = nsIDOMHTMLDocument_GetElementsByTagNameNS(This->nsdoc, &ns_str, &id_str, &nslist); + nsAString_Finish(&id_str); + nsAString_Finish(&ns_str); + if(FAILED(nsres)) { + ERR("GetElementByName failed: %08x\n", nsres); + return E_FAIL; + } + + *pelColl = (IHTMLElementCollection*)create_collection_from_nodelist(This, (IUnknown*)HTMLDOC3(This), nslist); + nsIDOMNodeList_Release(nslist); + + return S_OK; } #undef HTMLDOC3_THIS diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index e0a5f69..88eddc5 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3418,6 +3418,8 @@ static void test_elems(IHTMLDocument2 *doc) long type; HRESULT hres; IHTMLElementCollection *collection; + IHTMLDocument3 *doc3; + BSTR str; static const WCHAR imgidW[] = {'i','m','g','i','d',0}; static const WCHAR inW[] = {'i','n',0}; @@ -3804,6 +3806,23 @@ static void test_elems(IHTMLDocument2 *doc) } } IDispatch_Release(disp); + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3); + ok(hres == S_OK, "Could not get IHTMLDocument3 iface: %08x\n", hres); + + str = a2bstr("img"); + hres = IHTMLDocument3_getElementsByTagName(doc3, str, &col); + SysFreeString(str); + ok(hres == S_OK, "getElementByTag(%s) failed: %08x\n", dbgstr_w(ifrW), hres); + if(hres == S_OK) + { + static const elem_type_t img_types[] = { ET_IMG }; + + test_elem_collection((IUnknown*)col, img_types, sizeof(img_types)/sizeof(img_types[0])); + IHTMLElementCollection_Release(col); + } + + IHTMLDocument3_Release(doc3); } static void test_create_elems(IHTMLDocument2 *doc)

1 0

Alistair Leslie-Hughes : msxml3: Implement IXMLDOMDocument2 IPersistStream_Save.
by Alexandre Julliard 22 Jan '09

22 Jan '09

Module: wine Branch: master Commit: d77acecbff1d27584a3988bad7c2e0224109d30b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d77acecbff1d27584a3988bad… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jan 22 20:21:45 2009 +1100 msxml3: Implement IXMLDOMDocument2 IPersistStream_Save. --- dlls/msxml3/domdoc.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index a758d9f..49f18cc 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -357,8 +357,26 @@ static HRESULT WINAPI xmldoc_IPersistStream_Load( static HRESULT WINAPI xmldoc_IPersistStream_Save( IPersistStream *iface, LPSTREAM pStm, BOOL fClearDirty) { - FIXME("(%p, %p, %d): stub!\n", iface, pStm, fClearDirty); - return E_NOTIMPL; + domdoc *This = impl_from_IPersistStream(iface); + HRESULT hr; + BSTR xmlString; + + TRACE("(%p, %p, %d)\n", iface, pStm, fClearDirty); + + hr = IXMLDOMNode_get_xml( This->node, &xmlString ); + if(hr == S_OK) + { + DWORD count; + DWORD len = strlenW(xmlString) * sizeof(WCHAR); + + hr = IStream_Write( pStm, xmlString, len, &count ); + + SysFreeString(xmlString); + } + + TRACE("ret 0x%08x\n", hr); + + return hr; } static HRESULT WINAPI xmldoc_IPersistStream_GetSizeMax(

1 0

Austin English : updspapi: Add missing functions and forward to setupapi.
by Alexandre Julliard 22 Jan '09

22 Jan '09

Module: wine Branch: master Commit: b0e000ca885d36b225a5ac109b341a57e09dc487 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0e000ca885d36b225a5ac109… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jan 22 00:34:19 2009 -0600 updspapi: Add missing functions and forward to setupapi. --- dlls/updspapi/updspapi.spec | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/updspapi/updspapi.spec b/dlls/updspapi/updspapi.spec index ca4ef7c..dc6b25f 100644 --- a/dlls/updspapi/updspapi.spec +++ b/dlls/updspapi/updspapi.spec @@ -67,4 +67,12 @@ @ stub UpdSpSetDynamicStringExA @ stub UpdSpSetDynamicStringExW @ stub UpdSpSetDynamicStringW +@ stdcall UpdSpStringTableAddString(ptr wstr long) setupapi.StringTableAddString +@ stdcall UpdSpStringTableAddStringEx(ptr wstr long ptr long) setupapi.StringTableAddStringEx +@ stdcall UpdSpStringTableDestroy(ptr) setupapi.StringTableDestroy +@ stub UpdSpStringTableEnum +@ stdcall UpdSpStringTableInitialize() setupapi.StringTableInitialize +@ stdcall UpdSpStringTableInitializeEx(long long) setupapi.StringTableInitializeEx +@ stdcall UpdSpStringTableLookUpString(ptr wstr long) setupapi.StringTableLookUpString +@ stdcall UpdSpStringTableLookUpStringEx(ptr wstr long ptr long) setupapi.StringTableLookUpStringEx @ stdcall UpdSpTermDefaultQueueCallback(ptr) setupapi.SetupTermDefaultQueueCallback

1 0

Alistair Leslie-Hughes : msxml3: Register missing SAXXMLReader Components.
by Alexandre Julliard 22 Jan '09

22 Jan '09

Module: wine Branch: master Commit: ceed55a46acfe4cfdb407c849b3ad74dbae56651 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ceed55a46acfe4cfdb407c849… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jan 21 16:19:26 2009 +1100 msxml3: Register missing SAXXMLReader Components. --- dlls/msxml3/regsvr.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/regsvr.c b/dlls/msxml3/regsvr.c index a6ed0ee..9ca8afe 100644 --- a/dlls/msxml3/regsvr.c +++ b/dlls/msxml3/regsvr.c @@ -564,6 +564,14 @@ static struct regsvr_coclass const coclass_list[] = { "Msxml2.SAXXMLReader", "3.0" }, + { &CLSID_SAXXMLReader30, + "SAX XML Reader 3.0", + NULL, + "msxml3.dll", + "Both", + "Msxml2.SAXXMLReader", + "3.0" + }, { NULL } /* list terminator */ }; @@ -653,6 +661,16 @@ static struct progid const progid_list[] = { &CLSID_XMLSchemaCache30, NULL }, + { "Msxml2.SAXXMLReader", + "SAX XML Reader", + &CLSID_SAXXMLReader, + "Msxml2.SAXXMLReader.3.0" + }, + { "Msxml2.SAXXMLReader.3.0", + "SAX XML Reader 3.0", + &CLSID_SAXXMLReader30, + NULL + }, { NULL } /* list terminator */ };

1 0