Paul Vriens : dlls: Fix some specfiles with respect to 'str' and 'wstr' usage.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 75c5484174462a521856b01c17abb18e2684bc99
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=75c5484174462a521856b01c17...

Author: Paul Vriens 
Date:   Thu Sep  9 11:30:40 2010 +0200

dlls: Fix some specfiles with respect to 'str' and 'wstr' usage.

---

dlls/advapi32/advapi32.spec         |    4 ++--
 dlls/msi/msi.spec                   |    4 ++--
 dlls/odbccp32/odbccp32.spec         |    4 ++--
 dlls/rasapi32/rasapi32.spec         |    2 +-
 dlls/setupapi/setupapi.spec         |    2 +-
 dlls/shell32/shell32.spec           |    2 +-
 dlls/winspool.drv/winspool.drv.spec |    2 +-
 dlls/wldap32/wldap32.spec           |    4 ++--
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec
index ac69d3c..11a335b 100644
--- a/dlls/advapi32/advapi32.spec
+++ b/dlls/advapi32/advapi32.spec
@@ -95,7 +95,7 @@
 # @ stub CreatePrivateObjectSecurityWithMultipleInheritance
 @ stdcall CreateProcessAsUserA(long str str ptr ptr long long ptr str ptr ptr)
 # @ stub CreateProcessAsUserSecure
-@ stdcall CreateProcessAsUserW(long str str ptr ptr long long ptr str ptr ptr)
+@ stdcall CreateProcessAsUserW(long wstr wstr ptr ptr long long ptr wstr ptr ptr)
 @ stdcall CreateProcessWithLogonW(wstr wstr wstr long wstr wstr long ptr wstr ptr ptr)
 @ stdcall CreateRestrictedToken(long long long ptr long ptr long ptr ptr)
 @ stdcall CreateServiceA(long str str long long long long str str ptr str str str)
@@ -314,7 +314,7 @@
 @ stdcall InitiateSystemShutdownA(str str long long long)
 @ stdcall InitiateSystemShutdownExA(str str long long long long)
 @ stdcall InitiateSystemShutdownExW(wstr wstr long long long long)
-@ stdcall InitiateSystemShutdownW(str str long long long)
+@ stdcall InitiateSystemShutdownW(wstr wstr long long long)
 @ stub InstallApplication
 @ stub IsProcessRestricted
 @ stdcall IsTextUnicode(ptr long ptr)
diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec
index f0e3238..fd047f8 100644
--- a/dlls/msi/msi.spec
+++ b/dlls/msi/msi.spec
@@ -174,7 +174,7 @@
 178 stdcall MsiGetPatchInfoA(str str ptr ptr)
 179 stdcall MsiGetPatchInfoW(wstr wstr ptr ptr)
 180 stdcall MsiEnumPatchesA(str long ptr ptr ptr)
-181 stdcall MsiEnumPatchesW(str long ptr ptr ptr)
+181 stdcall MsiEnumPatchesW(wstr long ptr ptr ptr)
 182 stdcall -private DllGetVersion(ptr)
 183 stub MsiGetProductCodeFromPackageCodeA
 184 stub MsiGetProductCodeFromPackageCodeW
@@ -214,7 +214,7 @@
 218 stdcall MsiGetFileHashA(str long ptr)
 219 stdcall MsiGetFileHashW(wstr long ptr)
 220 stub MsiEnumComponentCostsA
-221 stdcall MsiEnumComponentCostsW(long str long long ptr ptr ptr ptr)
+221 stdcall MsiEnumComponentCostsW(long wstr long long ptr ptr ptr ptr)
 222 stdcall MsiCreateAndVerifyInstallerDirectory(long)
 223 stdcall MsiGetFileSignatureInformationA(str long ptr ptr ptr)
 224 stdcall MsiGetFileSignatureInformationW(wstr long ptr ptr ptr)
diff --git a/dlls/odbccp32/odbccp32.spec b/dlls/odbccp32/odbccp32.spec
index e01da6a..3d85d75 100644
--- a/dlls/odbccp32/odbccp32.spec
+++ b/dlls/odbccp32/odbccp32.spec
@@ -1,6 +1,6 @@
 @ stdcall ODBCCPlApplet( long long ptr ptr)
-@ stdcall SQLConfigDataSource(ptr long wstr wstr)
-@ stdcall SQLConfigDataSourceW(ptr long str str)
+@ stdcall SQLConfigDataSource(ptr long str str)
+@ stdcall SQLConfigDataSourceW(ptr long wstr wstr)
 @ stdcall SQLConfigDriver(ptr long str str ptr long ptr)
 @ stdcall SQLConfigDriverW(ptr long wstr wstr ptr long ptr)
 @ stdcall SQLCreateDataSource(ptr str)
diff --git a/dlls/rasapi32/rasapi32.spec b/dlls/rasapi32/rasapi32.spec
index 6aacbbf..08c750e 100644
--- a/dlls/rasapi32/rasapi32.spec
+++ b/dlls/rasapi32/rasapi32.spec
@@ -21,7 +21,7 @@
 @ stdcall RasEnumDevicesA(ptr ptr ptr)
 @ stdcall RasEnumDevicesW(ptr ptr ptr)
 @ stdcall RasEnumEntriesA(str str ptr ptr ptr)
-@ stdcall RasEnumEntriesW(str str ptr ptr ptr)
+@ stdcall RasEnumEntriesW(wstr wstr ptr ptr ptr)
 @ stub RasEnumEntriesWow
 @ stdcall RasGetAutodialAddressA(str ptr ptr ptr ptr)
 @ stdcall RasGetAutodialAddressW(wstr ptr ptr ptr ptr)
diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec
index 9db4b6e..f91d0d8 100644
--- a/dlls/setupapi/setupapi.spec
+++ b/dlls/setupapi/setupapi.spec
@@ -290,7 +290,7 @@
 @ stdcall SetupDiCreateDeviceInfoA(long str ptr str long long ptr)
 @ stdcall SetupDiCreateDeviceInfoList(ptr ptr)
 @ stdcall SetupDiCreateDeviceInfoListExA(ptr long str ptr)
-@ stdcall SetupDiCreateDeviceInfoListExW(ptr long str ptr)
+@ stdcall SetupDiCreateDeviceInfoListExW(ptr long wstr ptr)
 @ stdcall SetupDiCreateDeviceInfoW(long wstr ptr wstr long long ptr)
 @ stdcall SetupDiCreateDeviceInterfaceA(ptr ptr ptr str long ptr)
 @ stdcall SetupDiCreateDeviceInterfaceW(ptr ptr ptr wstr long ptr)
diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec
index 719fc9a..961e1af 100644
--- a/dlls/shell32/shell32.spec
+++ b/dlls/shell32/shell32.spec
@@ -443,7 +443,7 @@
 @ stdcall StrNCpyW(wstr wstr long) shlwapi.StrCpyNW
 @ stdcall StrRChrA(str str long) shlwapi.StrRChrA
 @ stdcall StrRChrIA(str str long) shlwapi.StrRChrIA
-@ stdcall StrRChrIW(str str long) shlwapi.StrRChrIW
+@ stdcall StrRChrIW(wstr wstr long) shlwapi.StrRChrIW
 @ stdcall StrRChrW(wstr wstr long) shlwapi.StrRChrW
 @ stub StrRStrA
 @ stdcall StrRStrIA(str str str) shlwapi.StrRStrIA
diff --git a/dlls/winspool.drv/winspool.drv.spec b/dlls/winspool.drv/winspool.drv.spec
index ce29a72..9151b11 100644
--- a/dlls/winspool.drv/winspool.drv.spec
+++ b/dlls/winspool.drv/winspool.drv.spec
@@ -143,7 +143,7 @@
 @ stdcall GetPrinterDriverA(long str long ptr long ptr)
 @ stdcall GetPrinterDriverDirectoryA(str str long ptr long ptr)
 @ stdcall GetPrinterDriverDirectoryW(wstr wstr long ptr long ptr)
-@ stdcall GetPrinterDriverW(long str long ptr long ptr)
+@ stdcall GetPrinterDriverW(long wstr long ptr long ptr)
 @ stdcall GetPrinterW(long long ptr long ptr)
 @ stdcall OpenPrinterA(str ptr ptr)
 @ stdcall OpenPrinterW(wstr ptr ptr)
diff --git a/dlls/wldap32/wldap32.spec b/dlls/wldap32/wldap32.spec
index 048defe..8a8e29f 100644
--- a/dlls/wldap32/wldap32.spec
+++ b/dlls/wldap32/wldap32.spec
@@ -52,7 +52,7 @@
  62 cdecl ldap_add_extW(ptr wstr ptr ptr ptr ptr)
  63 cdecl ldap_add_ext_s(ptr str ptr ptr ptr) ldap_add_ext_sA
  64 cdecl ldap_add_ext_sA(ptr str ptr ptr ptr)
- 65 cdecl ldap_add_ext_sW(ptr str ptr ptr ptr)
+ 65 cdecl ldap_add_ext_sW(ptr wstr ptr ptr ptr)
  66 cdecl ldap_add_sA(ptr str ptr)
  67 cdecl ldap_modrdn2(ptr str ptr long) ldap_modrdn2A
  68 cdecl ldap_modrdn2_s(ptr str ptr long) ldap_modrdn2_sA
@@ -206,7 +206,7 @@
 216 cdecl ldap_simple_bind_sW(ptr wstr wstr)
 217 cdecl ldap_sslinit(str long long) ldap_sslinitA
 218 cdecl ldap_sslinitA(str long long)
-219 cdecl ldap_sslinitW(str long long)
+219 cdecl ldap_sslinitW(wstr long long)
 220 cdecl ldap_ufn2dn(str ptr) ldap_ufn2dnA
 221 cdecl ldap_ufn2dnA(str ptr)
 222 cdecl ldap_ufn2dnW(wstr ptr)