Francois Gouget : quartz: Better match the PSDK types and fix the winapi_check warnings.

Alexandre Julliard julliard at wine.codeweavers.com
Mon Sep 10 10:17:49 CDT 2007


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

Author: Francois Gouget <fgouget at free.fr>
Date:   Sat Sep  1 02:45:48 2007 +0200

quartz: Better match the PSDK types and fix the winapi_check warnings.

---

 dlls/quartz/main.c     |    4 ++--
 tools/winapi/win32.api |    9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c
index 230e5be..1e73979 100644
--- a/dlls/quartz/main.c
+++ b/dlls/quartz/main.c
@@ -273,7 +273,7 @@ LONG WINAPI DBToAmpFactor(LONG db)
 /***********************************************************************
  *              AMGetErrorTextA (QUARTZ.@)
  */
-DWORD WINAPI AMGetErrorTextA(HRESULT hr, char *buffer, DWORD maxlen)
+DWORD WINAPI AMGetErrorTextA(HRESULT hr, LPSTR buffer, DWORD maxlen)
 {
     int len;
     static const char format[] = "Error: 0x%x";
@@ -291,7 +291,7 @@ DWORD WINAPI AMGetErrorTextA(HRESULT hr, char *buffer, DWORD maxlen)
 /***********************************************************************
  *              AMGetErrorTextW (QUARTZ.@)
  */
-DWORD WINAPI AMGetErrorTextW(HRESULT hr, WCHAR *buffer, DWORD maxlen)
+DWORD WINAPI AMGetErrorTextW(HRESULT hr, LPWSTR buffer, DWORD maxlen)
 {
     int len;
     static const WCHAR format[] = {'E','r','r','o','r',':',' ','0','x','%','l','x',0};
diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api
index 21bee48..d772561 100644
--- a/tools/winapi/win32.api
+++ b/tools/winapi/win32.api
@@ -4087,6 +4087,7 @@ REFIID
 
 %long
 
+DWORD
 HRESULT
 LONG
 
@@ -4096,6 +4097,14 @@ LPVOID *
 REFCLSID
 REFIID
 
+%str
+
+LPSTR
+
+%wstr
+
+LPWSTR
+
 %%query.dll
 
 %long




More information about the wine-cvs mailing list