From 6c0bd6bc60ba7afbe04521662b3dbbfb425bbec5 Mon Sep 17 00:00:00 2001 From: The Wine Synchronizer Date: Fri, 21 Jul 2006 13:05:13 +0000 Subject: [PATCH] Autosyncing with Wine HEAD svn path=/trunk/; revision=23209 --- reactos/dll/win32/oledlg/Makefile.in | 17 ----------------- reactos/dll/win32/oledlg/insobjdlg.c | 2 +- reactos/dll/win32/oledlg/oledlg_Cs.rc | 2 +- reactos/dll/win32/oledlg/oledlg_De.rc | 2 +- reactos/dll/win32/oledlg/oledlg_En.rc | 2 +- reactos/dll/win32/oledlg/oledlg_Es.rc | 2 +- reactos/dll/win32/oledlg/oledlg_Fr.rc | 2 +- reactos/dll/win32/oledlg/oledlg_Hu.rc | 2 +- reactos/dll/win32/oledlg/oledlg_It.rc | 2 +- reactos/dll/win32/oledlg/oledlg_Ja.rc | 2 +- reactos/dll/win32/oledlg/oledlg_Ko.rc | 2 +- reactos/dll/win32/oledlg/oledlg_Nl.rc | 2 +- reactos/dll/win32/oledlg/oledlg_No.rc | 2 +- reactos/dll/win32/oledlg/oledlg_Pt.rc | 2 +- reactos/dll/win32/oledlg/oledlg_Tr.rc | 2 +- reactos/dll/win32/oledlg/oledlg_main.c | 6 +++--- reactos/dll/win32/oledlg/resource.h | 2 +- 17 files changed, 18 insertions(+), 35 deletions(-) delete mode 100644 reactos/dll/win32/oledlg/Makefile.in diff --git a/reactos/dll/win32/oledlg/Makefile.in b/reactos/dll/win32/oledlg/Makefile.in deleted file mode 100644 index 8452ccdc050..00000000000 --- a/reactos/dll/win32/oledlg/Makefile.in +++ /dev/null @@ -1,17 +0,0 @@ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -MODULE = oledlg.dll -IMPORTLIB = liboledlg.$(IMPLIBEXT) -IMPORTS = ole32 comdlg32 user32 advapi32 kernel32 ntdll - -C_SRCS = \ - insobjdlg.c \ - oledlg_main.c - -RC_SRCS = rsrc.rc - -@MAKE_DLL_RULES@ - -### Dependencies: diff --git a/reactos/dll/win32/oledlg/insobjdlg.c b/reactos/dll/win32/oledlg/insobjdlg.c index 04de4e6f5b5..e13917ca634 100644 --- a/reactos/dll/win32/oledlg/insobjdlg.c +++ b/reactos/dll/win32/oledlg/insobjdlg.c @@ -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 */ #include diff --git a/reactos/dll/win32/oledlg/oledlg_Cs.rc b/reactos/dll/win32/oledlg/oledlg_Cs.rc index 2102779fcb0..4271a762129 100644 --- a/reactos/dll/win32/oledlg/oledlg_Cs.rc +++ b/reactos/dll/win32/oledlg/oledlg_Cs.rc @@ -16,7 +16,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_CZECH, SUBLANG_DEFAULT diff --git a/reactos/dll/win32/oledlg/oledlg_De.rc b/reactos/dll/win32/oledlg/oledlg_De.rc index ceeba84d90d..501b2129bd6 100644 --- a/reactos/dll/win32/oledlg/oledlg_De.rc +++ b/reactos/dll/win32/oledlg/oledlg_De.rc @@ -13,7 +13,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_GERMAN, SUBLANG_DEFAULT diff --git a/reactos/dll/win32/oledlg/oledlg_En.rc b/reactos/dll/win32/oledlg/oledlg_En.rc index 84f364a7169..9d746f677b7 100644 --- a/reactos/dll/win32/oledlg/oledlg_En.rc +++ b/reactos/dll/win32/oledlg/oledlg_En.rc @@ -13,7 +13,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_ENGLISH, SUBLANG_DEFAULT diff --git a/reactos/dll/win32/oledlg/oledlg_Es.rc b/reactos/dll/win32/oledlg/oledlg_Es.rc index b0dfc025760..d143feb0d6b 100644 --- a/reactos/dll/win32/oledlg/oledlg_Es.rc +++ b/reactos/dll/win32/oledlg/oledlg_Es.rc @@ -13,7 +13,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_SPANISH, SUBLANG_NEUTRAL diff --git a/reactos/dll/win32/oledlg/oledlg_Fr.rc b/reactos/dll/win32/oledlg/oledlg_Fr.rc index 7df569d58c8..8cf7f1067ad 100644 --- a/reactos/dll/win32/oledlg/oledlg_Fr.rc +++ b/reactos/dll/win32/oledlg/oledlg_Fr.rc @@ -16,7 +16,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 */ diff --git a/reactos/dll/win32/oledlg/oledlg_Hu.rc b/reactos/dll/win32/oledlg/oledlg_Hu.rc index 1d2b8540a14..58cc0882f2a 100644 --- a/reactos/dll/win32/oledlg/oledlg_Hu.rc +++ b/reactos/dll/win32/oledlg/oledlg_Hu.rc @@ -13,7 +13,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_HUNGARIAN, SUBLANG_DEFAULT diff --git a/reactos/dll/win32/oledlg/oledlg_It.rc b/reactos/dll/win32/oledlg/oledlg_It.rc index 0bf3f05274a..3fa660267ee 100644 --- a/reactos/dll/win32/oledlg/oledlg_It.rc +++ b/reactos/dll/win32/oledlg/oledlg_It.rc @@ -14,7 +14,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_ITALIAN, SUBLANG_DEFAULT diff --git a/reactos/dll/win32/oledlg/oledlg_Ja.rc b/reactos/dll/win32/oledlg/oledlg_Ja.rc index beef292d501..a412f7d86b2 100644 --- a/reactos/dll/win32/oledlg/oledlg_Ja.rc +++ b/reactos/dll/win32/oledlg/oledlg_Ja.rc @@ -13,7 +13,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_JAPANESE, SUBLANG_DEFAULT diff --git a/reactos/dll/win32/oledlg/oledlg_Ko.rc b/reactos/dll/win32/oledlg/oledlg_Ko.rc index b8eb0878ba5..29827ccefa0 100644 --- a/reactos/dll/win32/oledlg/oledlg_Ko.rc +++ b/reactos/dll/win32/oledlg/oledlg_Ko.rc @@ -13,7 +13,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_KOREAN, SUBLANG_DEFAULT diff --git a/reactos/dll/win32/oledlg/oledlg_Nl.rc b/reactos/dll/win32/oledlg/oledlg_Nl.rc index f32b4495f2a..afd737630c6 100644 --- a/reactos/dll/win32/oledlg/oledlg_Nl.rc +++ b/reactos/dll/win32/oledlg/oledlg_Nl.rc @@ -14,7 +14,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_DUTCH, SUBLANG_DEFAULT diff --git a/reactos/dll/win32/oledlg/oledlg_No.rc b/reactos/dll/win32/oledlg/oledlg_No.rc index b4094edc3ed..fe7bf570559 100644 --- a/reactos/dll/win32/oledlg/oledlg_No.rc +++ b/reactos/dll/win32/oledlg/oledlg_No.rc @@ -13,7 +13,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_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL diff --git a/reactos/dll/win32/oledlg/oledlg_Pt.rc b/reactos/dll/win32/oledlg/oledlg_Pt.rc index b456e95edf2..40c7539212b 100644 --- a/reactos/dll/win32/oledlg/oledlg_Pt.rc +++ b/reactos/dll/win32/oledlg/oledlg_Pt.rc @@ -13,7 +13,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_PORTUGUESE, SUBLANG_DEFAULT diff --git a/reactos/dll/win32/oledlg/oledlg_Tr.rc b/reactos/dll/win32/oledlg/oledlg_Tr.rc index 3f0d4b4175a..8a96fe43220 100644 --- a/reactos/dll/win32/oledlg/oledlg_Tr.rc +++ b/reactos/dll/win32/oledlg/oledlg_Tr.rc @@ -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_TURKISH, SUBLANG_DEFAULT diff --git a/reactos/dll/win32/oledlg/oledlg_main.c b/reactos/dll/win32/oledlg/oledlg_main.c index 1157459d396..c7daf5f83d4 100644 --- a/reactos/dll/win32/oledlg/oledlg_main.c +++ b/reactos/dll/win32/oledlg/oledlg_main.c @@ -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 */ #define COM_NO_WINDOWS_H @@ -245,7 +245,7 @@ BOOL WINAPI OleUIUpdateLinksW( /*********************************************************************** * OleUIPromptUserA (OLEDLG.10) */ -INT __cdecl OleUIPromptUserA( +INT WINAPIV OleUIPromptUserA( INT nTemplate, HWND hwndParent, ...) { FIXME("(%d, %p, ...): stub\n", nTemplate, hwndParent); @@ -256,7 +256,7 @@ INT __cdecl OleUIPromptUserA( /*********************************************************************** * OleUIPromptUserW (OLEDLG.13) */ -INT __cdecl OleUIPromptUserW( +INT WINAPIV OleUIPromptUserW( INT nTemplate, HWND hwndParent, ...) { FIXME("(%d, %p, ...): stub\n", nTemplate, hwndParent); diff --git a/reactos/dll/win32/oledlg/resource.h b/reactos/dll/win32/oledlg/resource.h index a14f18534e3..b0f59325b10 100644 --- a/reactos/dll/win32/oledlg/resource.h +++ b/reactos/dll/win32/oledlg/resource.h @@ -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 */ #define IDS_RESULTOBJDESC 101