[sedwards] 13203: started syncing setupapi.dll with Winehq. Once I get things in sync I will import to the vendor branch and do a proper merge.

started syncing setupapi.dll with Winehq. Once I get things in sync I
will import to the vendor branch and do a proper merge.
Modified: trunk/reactos/lib/setupapi/De.rc
Modified: trunk/reactos/lib/setupapi/En.rc
Modified: trunk/reactos/lib/setupapi/Es.rc
Modified: trunk/reactos/lib/setupapi/Fr.rc
Modified: trunk/reactos/lib/setupapi/It.rc
Modified: trunk/reactos/lib/setupapi/Nl.rc
Modified: trunk/reactos/lib/setupapi/Pt.rc
Modified: trunk/reactos/lib/setupapi/Ru.rc
Modified: trunk/reactos/lib/setupapi/devinst16.c
Modified: trunk/reactos/lib/setupapi/setupapi.rc
  _____  

Modified: trunk/reactos/lib/setupapi/De.rc
--- trunk/reactos/lib/setupapi/De.rc	2005-01-22 01:30:05 UTC (rev
13202)
+++ trunk/reactos/lib/setupapi/De.rc	2005-01-22 01:35:07 UTC (rev
13203)
@@ -1,7 +1,7 @@

 /*
  * German resources for SETUPAPI
  *
- * Copyright 2004 Michael Wirth
+ * Copyright 2004 Henning Gerhardt
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -18,15 +18,15 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
USA
  */
 
-LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
+LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT
 
 COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105
 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION
-CAPTION "Kopiere Dateien..."
-FONT 8, "MS Sans Serif"
+CAPTION "Dateien kopieren..."
+FONT 8, "MS Shell Dlg"
 BEGIN
 	PUSHBUTTON "Abbrechen", IDCANCEL, 79, 84, 50, 14, WS_CHILD |
WS_VISIBLE | WS_TABSTOP
-	LTEXT "Quelltext:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE |
WS_GROUP
+	LTEXT "Quelle:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE |
WS_GROUP
 	LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE |
WS_GROUP
 	LTEXT "Ziel:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE |
WS_GROUP
 	LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE |
WS_GROUP
  _____  

Modified: trunk/reactos/lib/setupapi/En.rc
--- trunk/reactos/lib/setupapi/En.rc	2005-01-22 01:30:05 UTC (rev
13202)
+++ trunk/reactos/lib/setupapi/En.rc	2005-01-22 01:35:07 UTC (rev
13203)
@@ -23,7 +23,7 @@

 COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105
 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION
 CAPTION "Copying Files..."
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 BEGIN
 	PUSHBUTTON "Cancel", IDCANCEL, 79, 84, 50, 14, WS_CHILD |
WS_VISIBLE | WS_TABSTOP
 	LTEXT "Source:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE |
WS_GROUP
  _____  

Modified: trunk/reactos/lib/setupapi/Es.rc
--- trunk/reactos/lib/setupapi/Es.rc	2005-01-22 01:30:05 UTC (rev
13202)
+++ trunk/reactos/lib/setupapi/Es.rc	2005-01-22 01:35:07 UTC (rev
13203)
@@ -23,7 +23,7 @@

 COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105
 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION
 CAPTION "Copiando archivos..."
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 BEGIN
 	PUSHBUTTON "Cancelar", IDCANCEL, 79, 84, 50, 14, WS_CHILD |
WS_VISIBLE | WS_TABSTOP
 	LTEXT "Origen:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE |
WS_GROUP
  _____  

Modified: trunk/reactos/lib/setupapi/Fr.rc
--- trunk/reactos/lib/setupapi/Fr.rc	2005-01-22 01:30:05 UTC (rev
13202)
+++ trunk/reactos/lib/setupapi/Fr.rc	2005-01-22 01:35:07 UTC (rev
13203)
@@ -24,7 +24,7 @@

 COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105
 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION
 CAPTION "Copie de fichiers..."
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 BEGIN
 	PUSHBUTTON "Annuler", IDCANCEL, 79, 84, 50, 14, WS_CHILD |
WS_VISIBLE | WS_TABSTOP
 	LTEXT "Source:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE |
WS_GROUP
  _____  

Modified: trunk/reactos/lib/setupapi/It.rc
--- trunk/reactos/lib/setupapi/It.rc	2005-01-22 01:30:05 UTC (rev
13202)
+++ trunk/reactos/lib/setupapi/It.rc	2005-01-22 01:35:07 UTC (rev
13203)
@@ -2,7 +2,7 @@

  * Italian resources for SETUPAPI
  *
  * Copyright 2001 Andreas Mohr
- * Copyright 2003 Ivan Leo Murray-Smith
+ * Copyright 2003 Ivan Leo Puoti
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -24,7 +24,7 @@
 COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105
 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION
 CAPTION "Copia dei file in corso..."
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 BEGIN
 	PUSHBUTTON "Anulla", IDCANCEL, 79, 84, 50, 14, WS_CHILD |
WS_VISIBLE | WS_TABSTOP
 	LTEXT "Origine:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE |
WS_GROUP
  _____  

Modified: trunk/reactos/lib/setupapi/Nl.rc
--- trunk/reactos/lib/setupapi/Nl.rc	2005-01-22 01:30:05 UTC (rev
13202)
+++ trunk/reactos/lib/setupapi/Nl.rc	2005-01-22 01:35:07 UTC (rev
13203)
@@ -23,7 +23,7 @@

 COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105
 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION
 CAPTION "Bestanden worden gekopiëerd..."
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 BEGIN
 	PUSHBUTTON "Annuleren", IDCANCEL, 79, 84, 50, 14, WS_CHILD |
WS_VISIBLE | WS_TABSTOP
 	LTEXT "Bron:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE |
WS_GROUP
  _____  

Modified: trunk/reactos/lib/setupapi/Pt.rc
--- trunk/reactos/lib/setupapi/Pt.rc	2005-01-22 01:30:05 UTC (rev
13202)
+++ trunk/reactos/lib/setupapi/Pt.rc	2005-01-22 01:35:07 UTC (rev
13203)
@@ -23,7 +23,7 @@

 COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105
 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION
 CAPTION "Copiando arquivos..."
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 BEGIN
 	PUSHBUTTON "Cancelar", IDCANCEL, 79, 84, 50, 14, WS_CHILD |
WS_VISIBLE | WS_TABSTOP
 	LTEXT "Origem:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE |
WS_GROUP
  _____  

Modified: trunk/reactos/lib/setupapi/Ru.rc
--- trunk/reactos/lib/setupapi/Ru.rc	2005-01-22 01:30:05 UTC (rev
13202)
+++ trunk/reactos/lib/setupapi/Ru.rc	2005-01-22 01:35:07 UTC (rev
13203)
@@ -23,7 +23,7 @@

 COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105
 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION
 CAPTION "Êîïèðîâàíèå ôàéëîâ..."
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 BEGIN
 	PUSHBUTTON "Îòìåíà", IDCANCEL, 79, 84, 50, 14, WS_CHILD |
WS_VISIBLE | WS_TABSTOP
 	LTEXT "Îòêóäà:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE |
WS_GROUP
  _____  

Modified: trunk/reactos/lib/setupapi/devinst16.c
--- trunk/reactos/lib/setupapi/devinst16.c	2005-01-22 01:30:05 UTC
(rev 13202)
+++ trunk/reactos/lib/setupapi/devinst16.c	2005-01-22 01:35:07 UTC
(rev 13203)
@@ -68,7 +68,7 @@

 
/***********************************************************************
  *		DiCallClassInstaller (SETUPX.308)
  */
-RETERR16 WINAPI DiCallClassInstaller16(/*DI_FUNCTIONS*/WORD diFctn,
LPDEVICE_INFO16 lpdi)
+RETERR16 WINAPI DiCallClassInstaller16(DI_FUNCTION16 diFctn,
LPDEVICE_INFO16 lpdi)
 {
     FIXME("(%x, %p): stub\n", diFctn, lpdi);
     return FALSE;
  _____  

Modified: trunk/reactos/lib/setupapi/setupapi.rc
--- trunk/reactos/lib/setupapi/setupapi.rc	2005-01-22 01:30:05 UTC
(rev 13202)
+++ trunk/reactos/lib/setupapi/setupapi.rc	2005-01-22 01:35:07 UTC
(rev 13203)
@@ -24,11 +24,13 @@

 #include "winnls.h"
 #include "setupapi_private.h"
 
+#include "Cs.rc"
+#include "De.rc"
 #include "En.rc"
-#include "De.rc"
 #include "Es.rc"
 #include "Fr.rc"
 #include "It.rc"
+#include "Ja.rc"
 #include "Nl.rc"
 #include "Pt.rc"
 #include "Ru.rc"