sync shlwapi to wine 1.1.28

svn path=/trunk/; revision=42862
2026-08-31 04:13:37 +00:00 · 2009-08-22 17:36:24 +00:00
parent fa3224d6d5
commit 9596ede35f
27 changed files with 130 additions and 22 deletions
@@ -134,7 +134,8 @@ static BOOL SHLWAPI_ParamAToW(LPCSTR lpszParam, LPWSTR lpszBuff, DWORD dwLen,
 *  Failure: An HRESULT error code indicating the error.
 *
 * NOTES
- *  refiid must be equal to IID_IQueryAssociations, or this function will fail.
+ *  clsid  must be equal to CLSID_QueryAssociations and
+ *  refiid must be equal to IID_IQueryAssociations, IID_IUnknown or this function will fail
 */
 HRESULT WINAPI AssocCreate(CLSID clsid, REFIID refiid, void **lpInterface)
 {
@@ -149,8 +150,8 @@ HRESULT WINAPI AssocCreate(CLSID clsid, REFIID refiid, void **lpInterface)

  *(DWORD*)lpInterface = 0;

-  if (!IsEqualGUID(&clsid, &IID_IQueryAssociations))
-    return E_NOTIMPL;
+  if (!IsEqualGUID(&clsid,  &CLSID_QueryAssociations))
+    return CLASS_E_CLASSNOTAVAILABLE;

  lpAssoc = IQueryAssociations_Constructor();

@@ -159,6 +160,10 @@ HRESULT WINAPI AssocCreate(CLSID clsid, REFIID refiid, void **lpInterface)

  hRet = IQueryAssociations_QueryInterface(lpAssoc, refiid, lpInterface);
  IQueryAssociations_Release(lpAssoc);
+
+  if(hRet == E_NOINTERFACE)
+    return CLASS_E_CLASSNOTAVAILABLE;
+
  return hRet;
 }

@@ -20,6 +20,9 @@
 #ifndef WINE_SHLWAPI_RESOURCE_H
 #define WINE_SHLWAPI_RESOURCE_H

+#include <windef.h>
+#include <winuser.h>
+
 #define IDS_BYTES_FORMAT 64
 #define IDS_TIME_INTERVAL_HOURS 65
 #define IDS_TIME_INTERVAL_MINUTES 66
@@ -36,6 +36,7 @@
 #include "shlwapi_It.rc"
 #include "shlwapi_Ja.rc"
 #include "shlwapi_Ko.rc"
+#include "shlwapi_Lt.rc"
 #include "shlwapi_Nl.rc"
 #include "shlwapi_No.rc"
 #include "shlwapi_Pl.rc"
@@ -18,6 +18,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resource.h"
+
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT

 IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60
@@ -18,6 +18,10 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resource.h"
+
+#pragma code_page(65001)
+
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL

 IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60
@@ -37,7 +41,8 @@ FONT 8, "MS Shell Dlg"
 STRINGTABLE DISCARDABLE
 {
    IDS_BYTES_FORMAT    "%ld Bytes"
-    IDS_TIME_INTERVAL_HOURS    " hr"
-    IDS_TIME_INTERVAL_MINUTES  " min"
-    IDS_TIME_INTERVAL_SECONDS  " sec"
+    IDS_TIME_INTERVAL_HOURS    " Std"
+    IDS_TIME_INTERVAL_MINUTES  " Min"
+    IDS_TIME_INTERVAL_SECONDS  " Sek"
 }
+#pragma code_page(default)
@@ -18,6 +18,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resource.h"
+
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT

 IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60
@@ -18,6 +18,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resource.h"
+
 LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT

 IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60
@@ -18,6 +18,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resource.h"
+
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL

 IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60
@@ -18,6 +18,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resource.h"
+
 LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT

 IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60
@@ -18,11 +18,16 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resource.h"
+
+/* UTF-8 */
+#pragma code_page(65001)
+
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL

 IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60
 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Erreur!"
+CAPTION "Erreur !"
 FONT 8, "MS Shell Dlg"
 {
 LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20
@@ -41,3 +46,4 @@ STRINGTABLE DISCARDABLE
    IDS_TIME_INTERVAL_MINUTES  " min"
    IDS_TIME_INTERVAL_SECONDS  " sec"
 }
+#pragma code_page(default)
@@ -18,6 +18,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resource.h"
+
 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT

 IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60
@@ -18,6 +18,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resource.h"
+
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL

 IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60
@@ -18,6 +18,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resource.h"
+
 /* UTF-8 */
 #pragma code_page(65001)

@@ -44,5 +46,4 @@ STRINGTABLE DISCARDABLE
    IDS_TIME_INTERVAL_MINUTES  " min"
    IDS_TIME_INTERVAL_SECONDS  " sec"
 }
-
 #pragma code_page(default)
@@ -18,6 +18,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resource.h"
+
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT

 IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60
@@ -0,0 +1,48 @@
+/*
+ * Lithuanian resources for shlwapi
+ *
+ * Copyright 2009 Aurimas Fišeras <[email protected]>
+ *
+ * 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 "resource.h"
+
+/* UTF-8 */
+#pragma code_page(65001)
+
+LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL
+
+IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60
+STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Klaida!"
+FONT 8, "MS Shell Dlg"
+{
+ LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20
+ LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8
+ CHECKBOX "Daugiau ne&rodyti šio pranešimo", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Gerai" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Atsisakyti" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Taip" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Ne" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+}
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_BYTES_FORMAT    "%ld baitai"
+    IDS_TIME_INTERVAL_HOURS    " val"
+    IDS_TIME_INTERVAL_MINUTES  " min"
+    IDS_TIME_INTERVAL_SECONDS  " sek"
+}
@@ -18,6 +18,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resource.h"
+
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL

 IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60
@@ -18,6 +18,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resource.h"
+
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL

 IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60
@@ -41,3 +43,4 @@ STRINGTABLE DISCARDABLE
    IDS_TIME_INTERVAL_MINUTES  " min"
    IDS_TIME_INTERVAL_SECONDS  " sec"
 }
+#pragma code_page(default)
@@ -19,6 +19,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resource.h"
+
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT

 IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60
@@ -19,6 +19,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resource.h"
+
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN

 IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60
@@ -17,6 +17,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resource.h"
+
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL

 #pragma code_page(65001)
@@ -42,5 +44,3 @@ STRINGTABLE DISCARDABLE
    IDS_TIME_INTERVAL_MINUTES  " min"
    IDS_TIME_INTERVAL_SECONDS  " sec"
 }
-
-#pragma code_page(default)
@@ -18,26 +18,31 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resource.h"
+
+/* UTF-8 */
+#pragma code_page(65001)
+
 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 "Îøèáêà!"
+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
+ 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
+ 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 áàéò"
-    IDS_TIME_INTERVAL_HOURS    " ÷àñ"
-    IDS_TIME_INTERVAL_MINUTES  " ìèí"
-    IDS_TIME_INTERVAL_SECONDS  " ñåê"
+    IDS_BYTES_FORMAT    "%ld байт"
+    IDS_TIME_INTERVAL_HOURS    " час"
+    IDS_TIME_INTERVAL_MINUTES  " мин"
+    IDS_TIME_INTERVAL_SECONDS  " сек"
 }
@@ -18,6 +18,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resource.h"
+
 #pragma code_page(65001)

 LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
@@ -43,5 +45,4 @@ STRINGTABLE DISCARDABLE
    IDS_TIME_INTERVAL_MINUTES  " min"
    IDS_TIME_INTERVAL_SECONDS  " sek"
 }
-
 #pragma code_page(default)
@@ -18,6 +18,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resource.h"
+
 LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT

 IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60
@@ -18,6 +18,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resource.h"
+
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL

 IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60
@@ -18,6 +18,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resource.h"
+
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT

 IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60
@@ -18,6 +18,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resource.h"
+
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT

 IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60
@@ -18,6 +18,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resource.h"
+
 /* Chinese text is encoded in UTF-8 */
 #pragma code_page(65001)

@@ -68,5 +70,3 @@ STRINGTABLE DISCARDABLE
    IDS_TIME_INTERVAL_MINUTES  " 分"
    IDS_TIME_INTERVAL_SECONDS  " 秒"
 }
-
-#pragma code_page(default)