Author: winesync Date: Fri Apr 4 09:35:37 2008 New Revision: 32857
URL: http://svn.reactos.org/svn/reactos?rev=32857&view=rev Log: Autosyncing with Wine HEAD
Added: trunk/reactos/dll/win32/shlwapi/shlwapi_Ro.rc (with props) Modified: trunk/reactos/dll/win32/shlwapi/ordinal.c trunk/reactos/dll/win32/shlwapi/path.c trunk/reactos/dll/win32/shlwapi/shlwapi.rbuild trunk/reactos/dll/win32/shlwapi/shlwapi.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Ru.rc trunk/reactos/dll/win32/shlwapi/shlwapi_ros.diff trunk/reactos/dll/win32/shlwapi/url.c
Modified: trunk/reactos/dll/win32/shlwapi/ordinal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/ordinal.c... ============================================================================== --- trunk/reactos/dll/win32/shlwapi/ordinal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/ordinal.c [iso-8859-1] Fri Apr 4 09:35:37 2008 @@ -1284,9 +1284,6 @@ */ HRESULT WINAPI IUnknown_GetWindow(IUnknown *lpUnknown, HWND *lphWnd) { - /* FIXME: Wine has no header for this object */ - static const GUID IID_IInternetSecurityMgrSite = { 0x79eac9ed, - 0xbaf9, 0x11ce, { 0x8c, 0x82, 0x00, 0xaa, 0x00, 0x4b, 0xa9, 0x0b }}; IUnknown *lpOle; HRESULT hRet = E_FAIL;
Modified: trunk/reactos/dll/win32/shlwapi/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/path.c?re... ============================================================================== --- trunk/reactos/dll/win32/shlwapi/path.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/path.c [iso-8859-1] Fri Apr 4 09:35:37 2008 @@ -2344,7 +2344,12 @@ { WCHAR szPath[MAX_PATH]; WCHAR szBuff[MAX_PATH]; - MultiByteToWideChar(CP_ACP,0,lpszPath,-1,szPath,MAX_PATH); + int ret = MultiByteToWideChar(CP_ACP,0,lpszPath,-1,szPath,MAX_PATH); + + if (!ret) { + WARN("Failed to convert string to widechar (too long?), LE %d.\n", GetLastError()); + return FALSE; + } bRet = PathCanonicalizeW(szBuff, szPath); WideCharToMultiByte(CP_ACP,0,szBuff,-1,lpszBuf,MAX_PATH,0,0); }
Modified: trunk/reactos/dll/win32/shlwapi/shlwapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi.r... ============================================================================== --- trunk/reactos/dll/win32/shlwapi/shlwapi.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/shlwapi.rbuild [iso-8859-1] Fri Apr 4 09:35:37 2008 @@ -8,23 +8,6 @@ <define name="__WINESRC__" /> <define name="WINVER">0x600</define> <define name="_WIN32_WINNT">0x600</define> - <library>wine</library> - <library>user32</library> - <library>gdi32</library> - <library>advapi32</library> - <library>kernel32</library> - <library>ntdll</library> - <library>oleaut32</library> - <library>ole32</library> - <library>comctl32</library> - <library>comdlg32</library> - <library>mpr</library> - <library>mlang</library> - <library>urlmon</library> - <library>shell32</library> - <library>winmm</library> - <library>version</library> - <library>uuid</library> <file>assoc.c</file> <file>clist.c</file> <file>istream.c</file> @@ -41,5 +24,22 @@ <file>wsprintf.c</file> <file>shlwapi.rc</file> <file>shlwapi.spec</file> + <library>wine</library> + <library>user32</library> + <library>gdi32</library> + <library>advapi32</library> + <library>kernel32</library> + <library>oleaut32</library> + <library>ole32</library> + <library>comctl32</library> + <library>comdlg32</library> + <library>mpr</library> + <library>mlang</library> + <library>urlmon</library> + <library>shell32</library> + <library>winmm</library> + <library>version</library> + <library>uuid</library> + <library>ntdll</library> </module> </group>
Modified: trunk/reactos/dll/win32/shlwapi/shlwapi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi.r... ============================================================================== --- trunk/reactos/dll/win32/shlwapi/shlwapi.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/shlwapi.rc [iso-8859-1] Fri Apr 4 09:35:37 2008 @@ -39,6 +39,7 @@ #include "shlwapi_No.rc" #include "shlwapi_Pl.rc" #include "shlwapi_Pt.rc" +#include "shlwapi_Ro.rc" #include "shlwapi_Ru.rc" #include "shlwapi_Sv.rc" #include "shlwapi_Tr.rc"
Added: trunk/reactos/dll/win32/shlwapi/shlwapi_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_R... ============================================================================== --- trunk/reactos/dll/win32/shlwapi/shlwapi_Ro.rc (added) +++ trunk/reactos/dll/win32/shlwapi/shlwapi_Ro.rc [iso-8859-1] Fri Apr 4 09:35:37 2008 @@ -1,0 +1,46 @@ +/* + * Copyright 2004 Jon Griffiths + * Copyright 2008 Michael Stefaniuc + * + * 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 + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Eroare!" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 + LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 + CHECKBOX "Nu &afiÈa din nou acest mesaj", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&RenunÈÄ" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Da" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Nu" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE DISCARDABLE +{ + IDS_BYTES_FORMAT "%ld octeÈi" + IDS_TIME_INTERVAL_HOURS " ore" + IDS_TIME_INTERVAL_MINUTES " min" + IDS_TIME_INTERVAL_SECONDS " sec" +} + +#pragma code_page(default)
Propchange: trunk/reactos/dll/win32/shlwapi/shlwapi_Ro.rc ------------------------------------------------------------------------------ svn:eol-style = native
Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_R... ============================================================================== --- trunk/reactos/dll/win32/shlwapi/shlwapi_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/shlwapi_Ru.rc [iso-8859-1] Fri Apr 4 09:35:37 2008 @@ -1,7 +1,7 @@ /* * Russian resources for shlwapi * - * Copyright 2005 Mikhail Y. Zvyozdochkin + * Copyright 2008 Vitaliy Margolen * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -15,7 +15,7 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT @@ -27,17 +27,17 @@ { LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 - CHECKBOX "&Áîëüøå íå ïîêàçûâàòü ýòî ñîîáùåíèå", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Áîëüøå íå &ïîêàçûâàòü ýòî ñîîáùåíèå", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Îòìåíà" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"Î&òìåíèòü" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON L"&Äà" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON L"&Íåò" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP }
STRINGTABLE DISCARDABLE { - IDS_BYTES_FORMAT "%ld bytes" - IDS_TIME_INTERVAL_HOURS " hr" - IDS_TIME_INTERVAL_MINUTES " min" - IDS_TIME_INTERVAL_SECONDS " sec" + IDS_BYTES_FORMAT "%ld áàéò" + IDS_TIME_INTERVAL_HOURS " ÷àñ" + IDS_TIME_INTERVAL_MINUTES " ìèí" + IDS_TIME_INTERVAL_SECONDS " ñåê" }
Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_r... ============================================================================== --- trunk/reactos/dll/win32/shlwapi/shlwapi_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/shlwapi_ros.diff [iso-8859-1] Fri Apr 4 09:35:37 2008 @@ -2,67 +2,11 @@ =================================================================== --- shlwapi.rc (revision 25691) +++ shlwapi.rc (revision 25692) -@@ -39,5 +39,7 @@ - #include "shlwapi_No.rc" - #include "shlwapi_Pl.rc" - #include "shlwapi_Pt.rc" -+#include "shlwapi_Ru.rc" +@@ -43,3 +43,4 @@ + #include "shlwapi_Ru.rc" #include "shlwapi_Sv.rc" #include "shlwapi_Tr.rc" +#include "shlwapi_Uk.rc" -Index: shlwapi_Ru.rc -=================================================================== ---- shlwapi_Ru.rc (revision 25692) -+++ shlwapi_Ru.rc (working copy) -@@ -0,0 +1,43 @@ -+/* -+ * Russian resources for shlwapi -+ * -+ * Copyright 2005 Mikhail Y. Zvyozdochkin -+ * -+ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ */ -+ -+LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT -+ -+IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60 -+STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -+CAPTION "Îøèáêà!" -+FONT 8, "MS Shell Dlg" -+{ -+ LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 -+ LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 -+ CHECKBOX "&Áîëüøå íå ïîêàçûâàòü ýòî ñîîáùåíèå", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP -+ PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP -+ PUSHBUTTON L"&Îòìåíà" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP -+ PUSHBUTTON L"&Äà" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP -+ PUSHBUTTON L"&Íåò" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP -+} -+ -+STRINGTABLE DISCARDABLE -+{ -+ IDS_BYTES_FORMAT "%ld bytes" -+ IDS_TIME_INTERVAL_HOURS " hr" -+ IDS_TIME_INTERVAL_MINUTES " min" -+ IDS_TIME_INTERVAL_SECONDS " sec" -+} - -Property shlwapi_Ru.rc -___________________________________________________________________ -Name: svn:eol-style - + native Index: shlwapi_Uk.rc =================================================================== --- shlwapi_Uk.rc (revision 25692)
Modified: trunk/reactos/dll/win32/shlwapi/url.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/url.c?rev... ============================================================================== --- trunk/reactos/dll/win32/shlwapi/url.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/url.c [iso-8859-1] Fri Apr 4 09:35:37 2008 @@ -752,7 +752,6 @@ break; } while(FALSE); /* a litte trick to allow easy exit from nested if's */
- ret = S_OK; switch (process_case) {
@@ -780,9 +779,6 @@ memcpy(preliminary, base.pszProtocol, (base.cchProtocol + 1)*sizeof(WCHAR)); work = preliminary + base.cchProtocol + 1; strcpyW(work, relative.pszSuffix); - if (!(dwFlags & URL_PLUGGABLE_PROTOCOL) && - URL_JustLocation(relative.pszSuffix)) - strcatW(work, single_slash); break;
case 4: /* @@ -1584,14 +1580,18 @@ { HKEY newkey; DWORD data_len, dwType; - WCHAR reg_path[MAX_PATH]; WCHAR value[MAX_PATH], data[MAX_PATH];
+ static const WCHAR prefix_keyW[] = + {'S','o','f','t','w','a','r','e', + '\','M','i','c','r','o','s','o','f','t', + '\','W','i','n','d','o','w','s', + '\','C','u','r','r','e','n','t','V','e','r','s','i','o','n', + '\','U','R','L', + '\','D','e','f','a','u','l','t','P','r','e','f','i','x',0}; + /* get and prepend default */ - MultiByteToWideChar(0, 0, - "Software\Microsoft\Windows\CurrentVersion\URL\DefaultPrefix", - -1, reg_path, MAX_PATH); - RegOpenKeyExW(HKEY_LOCAL_MACHINE, reg_path, 0, 1, &newkey); + RegOpenKeyExW(HKEY_LOCAL_MACHINE, prefix_keyW, 0, 1, &newkey); data_len = MAX_PATH; value[0] = '@'; value[1] = '\0'; @@ -2013,7 +2013,7 @@ * pszIn [I] Url to parse * pszOut [O] Destination for part of pszIn requested * pcchOut [I] Size of pszOut - * [O] length of pszOut string EXLUDING '\0' if S_OK, otherwise + * [O] length of pszOut string EXCLUDING '\0' if S_OK, otherwise * needed size of pszOut INCLUDING '\0'. * dwPart [I] URL_PART_ enum from "shlwapi.h" * dwFlags [I] URL_ flags from "shlwapi.h" @@ -2155,6 +2155,8 @@ PARSEDURLA base; DWORD res1;
+ TRACE("%s\n", debugstr_a(lpstrPath)); + if (!lpstrPath || !*lpstrPath) return FALSE;
/* get protocol */ @@ -2172,6 +2174,8 @@ { PARSEDURLW base; DWORD res1; + + TRACE("%s\n", debugstr_w(lpstrPath));
if (!lpstrPath || !*lpstrPath) return FALSE;