[Wine-patches] [eterhack] shell32: Synchronize with upstream.

[Alexander Morozov]

----------- следующая часть -----------
From e6c00eff95d97cfd2c443d90a66c582ddda70aa5 Mon Sep 17 00:00:00 2001
From: Alexander Morozov <amorozov на etersoft.ru>
Date: Tue, 25 Jan 2011 17:46:52 +0300
Subject: [eterhack 2/3] shell32: Synchronize with upstream.

---
 .gitignore                   |    2 +-
 dlls/shell32/Makefile.in     |    2 +-
 dlls/shell32/shell32_tlb.idl |   19 +++++++++++++++++++
 dlls/shell32/shell32_v1.idl  |   19 -------------------
 dlls/shell32/shelldispatch.c |    4 ++--
 dlls/shell32/shres.rc        |    4 ++--
 6 files changed, 25 insertions(+), 25 deletions(-)
 create mode 100644 dlls/shell32/shell32_tlb.idl
 delete mode 100644 dlls/shell32/shell32_v1.idl

diff --git a/.gitignore b/.gitignore
index b3bcd29..ef8d3cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -143,7 +143,7 @@ dlls/rpcrt4/tests/server_c.c
 dlls/rpcrt4/tests/server_s.c
 dlls/shdocvw/shdocvw_v1.tlb
 dlls/shell32/AUTHORS
-dlls/shell32/shell32_v1.tlb
+dlls/shell32/shell32_tlb.tlb
 dlls/stdole2.tlb/std_ole_v2.tlb
 dlls/stdole32.tlb/std_ole_v1.tlb
 dlls/sti/sti_wia.h
diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in
index 8946490..3440726 100644
--- a/dlls/shell32/Makefile.in
+++ b/dlls/shell32/Makefile.in
@@ -88,7 +88,7 @@ RC_SRCS = \
 	shres.rc \
 	version.rc
 
-IDL_TLB_SRCS = shell32_v1.idl
+IDL_TLB_SRCS = shell32_tlb.idl
 
 SVG_SRCS = \
 	cdrom.svg \
diff --git a/dlls/shell32/shell32_tlb.idl b/dlls/shell32/shell32_tlb.idl
new file mode 100644
index 0000000..2b6c719
--- /dev/null
+++ b/dlls/shell32/shell32_tlb.idl
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2010 Alexander Morozov for Etersoft
+ *
+ * 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 "shldisp.idl"
diff --git a/dlls/shell32/shell32_v1.idl b/dlls/shell32/shell32_v1.idl
deleted file mode 100644
index 2b6c719..0000000
--- a/dlls/shell32/shell32_v1.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright 2010 Alexander Morozov for Etersoft
- *
- * 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 "shldisp.idl"
diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c
index 3497c3d..8ed5727 100644
--- a/dlls/shell32/shelldispatch.c
+++ b/dlls/shell32/shelldispatch.c
@@ -1041,7 +1041,7 @@ HRESULT WINAPI IShellDispatch_Constructor(IUnknown *pUnkOuter, REFIID riid,
         return ret;
     }
 
-    ret = ShellDispatch_QueryInterface((IShellDispatch*)This, riid, ppv);
-    ShellDispatch_Release((IShellDispatch*)This);
+    ret = ShellDispatch_QueryInterface(&This->IShellDispatch_iface, riid, ppv);
+    ShellDispatch_Release(&This->IShellDispatch_iface);
     return ret;
 }
diff --git a/dlls/shell32/shres.rc b/dlls/shell32/shres.rc
index e0ba7a6..78b7fa9 100644
--- a/dlls/shell32/shres.rc
+++ b/dlls/shell32/shres.rc
@@ -22,8 +22,8 @@
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
-/* @makedep: shell32_v1.tlb */
-1 TYPELIB shell32_v1.tlb
+/* @makedep: shell32_tlb.tlb */
+1 TYPELIB shell32_tlb.tlb
 
 shv_accel ACCELERATORS
 BEGIN
-- 
1.7.3.4