October 2007 - Wine-Commits

Francois Gouget : Better match the PSDK types and update win32. api to fix the winapi_check warnings.
by Alexandre Julliard Oct. 15, 2007

Oct. 15, 2007

Module: wine Branch: master Commit: d16a634c380bdc968c158a1bc192a604564a5a80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d16a634c380bdc968c158a1bc… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Oct 14 14:36:21 2007 +0200 Better match the PSDK types and update win32.api to fix the winapi_check warnings. --- dlls/advapi32/security.c | 4 ++-- dlls/shell32/shellord.c | 2 +- tools/winapi/win32.api | 21 +++++++++++++++++++++ 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 2e8a124..f95acf7 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -3948,7 +3948,7 @@ static BOOL DumpSacl(PSECURITY_DESCRIPTOR SecurityDescriptor, WCHAR **pwptr, ULO /****************************************************************************** * ConvertSecurityDescriptorToStringSecurityDescriptorA [ADVAPI32.@] */ -BOOL WINAPI ConvertSecurityDescriptorToStringSecurityDescriptorW(PSECURITY_DESCRIPTOR SecurityDescriptor, DWORD SDRevision, SECURITY_INFORMATION RequestedInformation, LPWSTR *OutputString, ULONG *OutputLen) +BOOL WINAPI ConvertSecurityDescriptorToStringSecurityDescriptorW(PSECURITY_DESCRIPTOR SecurityDescriptor, DWORD SDRevision, SECURITY_INFORMATION RequestedInformation, LPWSTR *OutputString, PULONG OutputLen) { ULONG len; WCHAR *wptr, *wstr; @@ -3999,7 +3999,7 @@ BOOL WINAPI ConvertSecurityDescriptorToStringSecurityDescriptorW(PSECURITY_DESCR /****************************************************************************** * ConvertSecurityDescriptorToStringSecurityDescriptorA [ADVAPI32.@] */ -BOOL WINAPI ConvertSecurityDescriptorToStringSecurityDescriptorA(PSECURITY_DESCRIPTOR SecurityDescriptor, DWORD SDRevision, SECURITY_INFORMATION Information, LPSTR *OutputString, ULONG *OutputLen) +BOOL WINAPI ConvertSecurityDescriptorToStringSecurityDescriptorA(PSECURITY_DESCRIPTOR SecurityDescriptor, DWORD SDRevision, SECURITY_INFORMATION Information, LPSTR *OutputString, PULONG OutputLen) { LPWSTR wstr; ULONG len; diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index e3b77cf..57d6b82 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -1594,7 +1594,7 @@ HPSXA WINAPI SHCreatePropSheetExtArray(HKEY hKey, LPCWSTR pszSubKey, UINT max_if /************************************************************************* * SHCreatePropSheetExtArrayEx [SHELL32.194] */ -HPSXA WINAPI SHCreatePropSheetExtArrayEx(HKEY hKey, LPCWSTR pszSubKey, UINT max_iface, IDataObject *pDataObj) +HPSXA WINAPI SHCreatePropSheetExtArrayEx(HKEY hKey, LPCWSTR pszSubKey, UINT max_iface, LPDATAOBJECT pDataObj) { static const WCHAR szPropSheetSubKey[] = {'s','h','e','l','l','e','x','\\','P','r','o','p','e','r','t','y','S','h','e','e','t','H','a','n','d','l','e','r','s',0}; WCHAR szHandler[64]; diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index a591d7c..6864f2e 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -1348,6 +1348,12 @@ REFIID %long BOOL +DWORD +EFaultRepRetVal + +%ptr + +LPEXCEPTION_POINTERS %str @@ -1739,6 +1745,7 @@ void DWORD HRESULT HWND +ULONG %ptr @@ -2201,9 +2208,15 @@ WCHAR * %%localspl.dll +%long + +BOOL +DWORD + %ptr LPMONITOREX +LPPRINTPROVIDOR %wstr @@ -3975,8 +3988,10 @@ void BOOLEAN DWORD +HANDLE LONG PDH_HCOUNTER +PDH_HLOG PDH_HQUERY PDH_STATUS @@ -4921,6 +4936,7 @@ HANDLE LPBYTE LPVOID +LPVOID * %wstr @@ -5889,6 +5905,10 @@ void ** BOOL +%ptr + +WINHTTP_CURRENT_USER_IE_PROXY_CONFIG * + %%wininet.dll %double @@ -6448,6 +6468,7 @@ LPWSTR BOOL DWORD HANDLE +HWND WTS_INFO_CLASS %ptr

1 0

Francois Gouget : wtsapi32: Add a couple of related prototypes.
by Alexandre Julliard Oct. 15, 2007

Oct. 15, 2007

Module: wine Branch: master Commit: f2b3843b5ee6ec1a254b4481edc0f960b20c372e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2b3843b5ee6ec1a254b4481e… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Oct 14 14:36:13 2007 +0200 wtsapi32: Add a couple of related prototypes. --- include/wtsapi32.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/wtsapi32.h b/include/wtsapi32.h index 55309bc..e875111 100644 --- a/include/wtsapi32.h +++ b/include/wtsapi32.h @@ -152,8 +152,10 @@ BOOL WINAPI WTSQueryUserConfigW(LPWSTR,LPWSTR,WTS_CONFIG_CLASS,LPWSTR*,DWORD*); #define WTSQueryUserConfig WINELIB_NAME_AW(WTSQueryUserConfig) BOOL WINAPI WTSQueryUserToken(ULONG, PHANDLE); BOOL WINAPI WTSRegisterSessionNotification(HWND, DWORD); +BOOL WINAPI WTSRegisterSessionNotificationEx(HANDLE, HWND, DWORD); BOOL WINAPI WTSTerminateProcess(HANDLE, DWORD, DWORD); BOOL WINAPI WTSUnRegisterSessionNotification(HWND); +BOOL WINAPI WTSUnRegisterSessionNotificationEx(HANDLE, HWND); BOOL WINAPI WTSWaitSystemEvent(HANDLE, DWORD, DWORD*); #ifdef __cplusplus

1 0

Francois Gouget : user32: Fix the HRAWINPUT definition and the GetRawInputData() prototype. Update win32.api to fix the winapi_check warnings.
by Alexandre Julliard Oct. 15, 2007

Oct. 15, 2007

Module: wine Branch: master Commit: 1a75b5d49c7879bf5678e4d900da000fb1f92072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a75b5d49c7879bf5678e4d90… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Oct 14 14:36:08 2007 +0200 user32: Fix the HRAWINPUT definition and the GetRawInputData() prototype. Update win32.api to fix the winapi_check warnings. --- dlls/user32/input.c | 2 +- include/winuser.h | 4 ++-- tools/winapi/win32.api | 6 ++++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 3e16dc3..b385ee4 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -368,7 +368,7 @@ BOOL WINAPI RegisterRawInputDevices(PRAWINPUTDEVICE pRawInputDevices, UINT uiNum /****************************************************************** * GetRawInputData (USER32.@) */ -INT WINAPI GetRawInputData(HRAWINPUT hRawInput, UINT uiCommand, LPVOID pData, PUINT pcbSize, UINT cbSizeHeader) +UINT WINAPI GetRawInputData(HRAWINPUT hRawInput, UINT uiCommand, LPVOID pData, PUINT pcbSize, UINT cbSizeHeader) { FIXME("(hRawInput=%p, uiCommand=%d, pData=%p, pcbSize=%p, cbSizeHeader=%d) stub!\n", hRawInput, uiCommand, pData, pcbSize, cbSizeHeader); diff --git a/include/winuser.h b/include/winuser.h index ef17994..974cef8 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -443,7 +443,7 @@ typedef struct tagINPUT } DUMMYUNIONNAME; } INPUT, *PINPUT, *LPINPUT; -typedef HANDLE HRAWINPUT; +DECLARE_HANDLE(HRAWINPUT); typedef struct tagRAWINPUTDEVICELIST { @@ -4670,7 +4670,7 @@ SHORT WINAPI GetKeyState(INT); HWND WINAPI GetLastActivePopup(HWND); BOOL WINAPI GetLastInputInfo(PLASTINPUTINFO); UINT WINAPI GetRawInputBuffer(PRAWINPUT,PUINT,UINT); -INT WINAPI GetRawInputData(HRAWINPUT,UINT,LPVOID,PUINT,UINT); +UINT WINAPI GetRawInputData(HRAWINPUT,UINT,LPVOID,PUINT,UINT); UINT WINAPI GetRawInputDeviceInfoA(HANDLE,UINT,LPVOID,PUINT); UINT WINAPI GetRawInputDeviceInfoW(HANDLE,UINT,LPVOID,PUINT); #define GetRawInputDeviceInfo WINELIB_NAME_AW(GetRawInputDeviceInfo) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index d64e006..a591d7c 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -5117,6 +5117,7 @@ HMENU HMODULE HMODULE16 HMONITOR +HRAWINPUT HRESULT HRGN HSZ @@ -5217,6 +5218,10 @@ PICONINFO PLASTINPUTINFO PMENUBARINFO POINT * +PRAWINPUT +PRAWINPUT * +PRAWINPUTDEVICE +PRAWINPUTDEVICELIST PROPENUMPROCA PROPENUMPROCEXA PROPENUMPROCEXW @@ -5225,6 +5230,7 @@ PSECURITY_DESCRIPTOR PSECURITY_INFORMATION PSECURITY_QUALITY_OF_SERVICE PTITLEBARINFO +PUINT PUINT_PTR PVOID PWINDOWINFO

1 0

Francois Gouget : msdmo: Fix the DMOGetName() prototype.
by Alexandre Julliard Oct. 15, 2007

Oct. 15, 2007

Module: wine Branch: master Commit: d223716b7bcde8839c741d83865b95c990a8abcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d223716b7bcde8839c741d838… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Oct 14 14:36:00 2007 +0200 msdmo: Fix the DMOGetName() prototype. --- dlls/msdmo/dmoreg.c | 4 ++-- include/dmoreg.h | 2 +- tools/winapi/win32.api | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index c207a3e..25bb759 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -291,7 +291,7 @@ lend: * * Get DMP Name from the registry */ -HRESULT WINAPI DMOGetName(REFCLSID clsidDMO, WCHAR* szName) +HRESULT WINAPI DMOGetName(REFCLSID clsidDMO, WCHAR szName[80]) { WCHAR szguid[64]; HRESULT hres; @@ -311,7 +311,7 @@ HRESULT WINAPI DMOGetName(REFCLSID clsidDMO, WCHAR* szName) if (ERROR_SUCCESS != hres) goto lend; - count = 80 * sizeof(WCHAR); /* 80 by API definition */ + count = sizeof(szName); hres = RegQueryValueExW(hkey, NULL, NULL, NULL, (LPBYTE) szName, &count); diff --git a/include/dmoreg.h b/include/dmoreg.h index c352790..66966f9 100644 --- a/include/dmoreg.h +++ b/include/dmoreg.h @@ -44,7 +44,7 @@ HRESULT WINAPI DMOEnum(REFGUID,DWORD,DWORD,const DMO_PARTIAL_MEDIATYPE*,DWORD, const DMO_PARTIAL_MEDIATYPE*,IEnumDMO**); HRESULT WINAPI DMOGetTypes(REFCLSID,ULONG,ULONG*,DMO_PARTIAL_MEDIATYPE*, ULONG,ULONG*,DMO_PARTIAL_MEDIATYPE*); -HRESULT WINAPI DMOGetName(REFCLSID,WCHAR*); +HRESULT WINAPI DMOGetName(REFCLSID,WCHAR[80]); DEFINE_GUID(DMOCATEGORY_AUDIO_DECODER, 0x57f2db8b,0xe6bb,0x4513,0x9d,0x43,0xdc,0xd2,0xa6,0x59,0x31,0x25); diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index bd6bcfd..d64e006 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -2664,7 +2664,7 @@ ULONG * %wstr LPCWSTR -WCHAR * +WCHAR[80] %%msg711.acm

1 0

Francois Gouget : ole32: Fix the CoCreateGuid() ordinal in the documentation.
by Alexandre Julliard Oct. 15, 2007

Oct. 15, 2007

Module: wine Branch: master Commit: f76bea09d4fe186c734aed0351067aabf08a832c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f76bea09d4fe186c734aed035… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Oct 14 14:35:44 2007 +0200 ole32: Fix the CoCreateGuid() ordinal in the documentation. --- dlls/ole32/compobj.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 1904313..95dff3b 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1197,7 +1197,7 @@ HRESULT WINAPI CoDisconnectObject( LPUNKNOWN lpUnk, DWORD reserved ) /****************************************************************************** * CoCreateGuid [OLE32.@] - * CoCreateGuid [COMPOBJ.17] + * CoCreateGuid [COMPOBJ.73] * * Simply forwards to UuidCreate in RPCRT4. *

1 0

Francois Gouget : msdmo: Fix a winapi_check documentation warning and improve the documentation a bit .
by Alexandre Julliard Oct. 15, 2007

Oct. 15, 2007

Module: wine Branch: master Commit: 5e336f45d25f2b15043a5c8e1ca0e59d97aa6b6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e336f45d25f2b15043a5c8e1… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Oct 14 14:35:51 2007 +0200 msdmo: Fix a winapi_check documentation warning and improve the documentation a bit. --- dlls/msdmo/dmoreg.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index f3b969e..c207a3e 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -157,7 +157,7 @@ static HRESULT write_types(HKEY hkey, LPCWSTR name, const DMO_PARTIAL_MEDIATYPE* } /*************************************************************** - * DMORegister + * DMORegister (MSDMO.@) * * Register a DirectX Media Object. */ @@ -245,7 +245,7 @@ lend: /*************************************************************** - * DMOUnregister + * DMOUnregister (MSDMO.@) * * Unregister a DirectX Media Object. */ @@ -287,7 +287,7 @@ lend: /*************************************************************** - * DMOGetName + * DMOGetName (MSDMO.@) * * Get DMP Name from the registry */ @@ -668,7 +668,7 @@ static HRESULT WINAPI IEnumDMO_fnClone(IEnumDMO * iface, IEnumDMO **ppEnum) /*************************************************************** - * DMOEnum + * DMOEnum (MSDMO.@) * * Enumerate DirectX Media Objects in the registry. */ @@ -778,7 +778,9 @@ HRESULT read_types(HKEY root, LPCWSTR key, ULONG *supplied, ULONG requested, DMO return ret; } - +/*************************************************************** + * DMOGetTypes (MSDMO.@) + */ HRESULT WINAPI DMOGetTypes(REFCLSID clsidDMO, ULONG ulInputTypesRequested, ULONG* pulInputTypesSupplied,

1 0

Francois Gouget : msvcrt: Fix the calling convention of _wsearchenv() and _wspawnv*().
by Alexandre Julliard Oct. 15, 2007

Oct. 15, 2007

Module: wine Branch: master Commit: 015844a63c10e290faca26a0aabb185e30bcd9b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=015844a63c10e290faca26a0a… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Oct 14 14:35:36 2007 +0200 msvcrt: Fix the calling convention of _wsearchenv() and _wspawnv*(). --- dlls/msvcrt/msvcrt.spec | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 5711946..6e7504a 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -552,17 +552,17 @@ @ cdecl _wrename(wstr wstr) @ cdecl _write(long ptr long) MSVCRT__write @ cdecl _wrmdir(wstr) -@ stdcall _wsearchenv(wstr wstr ptr) +@ cdecl _wsearchenv(wstr wstr ptr) @ cdecl _wsetlocale(long wstr) MSVCRT__wsetlocale @ varargs _wsopen (wstr long long) MSVCRT__wsopen @ stub _wspawnl #(long wstr wstr) varargs @ stub _wspawnle #(long wstr wstr) varargs @ stub _wspawnlp #(long wstr wstr) varargs @ stub _wspawnlpe #(long wstr wstr) varargs -@ stdcall _wspawnv(long wstr ptr) -@ stdcall _wspawnve(long wstr ptr ptr) -@ stdcall _wspawnvp(long wstr ptr) -@ stdcall _wspawnvpe(long wstr ptr ptr) +@ cdecl _wspawnv(long wstr ptr) +@ cdecl _wspawnve(long wstr ptr ptr) +@ cdecl _wspawnvp(long wstr ptr) +@ cdecl _wspawnvpe(long wstr ptr ptr) @ cdecl _wsplitpath(wstr wstr wstr wstr wstr) @ cdecl _wstat(wstr ptr) MSVCRT__wstat @ cdecl _wstati64(wstr ptr) MSVCRT__wstati64

1 0

Francois Gouget : mshtml: Check for HAVE_UNISTD_H before including unistd.h .
by Alexandre Julliard Oct. 15, 2007

Oct. 15, 2007

Module: wine Branch: master Commit: f4bb8209f2555566889a5cc10585fe910554d45c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4bb8209f2555566889a5cc10… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Oct 14 14:35:14 2007 +0200 mshtml: Check for HAVE_UNISTD_H before including unistd.h. --- dlls/mshtml/install.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/install.c b/dlls/mshtml/install.c index 364884f..3890ac2 100644 --- a/dlls/mshtml/install.c +++ b/dlls/mshtml/install.c @@ -20,7 +20,9 @@ #include <stdarg.h> #include <fcntl.h> -#include <unistd.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif #define COBJMACROS #define NONAMELESSUNION

1 0

Francois Gouget : oleaut32/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Oct. 15, 2007

Oct. 15, 2007

Module: wine Branch: master Commit: 1766918ddac9a436ae2d60eef85ab1e5bec779ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=1766918ddac9a436ae2d60eef… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Oct 14 14:34:58 2007 +0200 oleaut32/tests: Fix compilation on systems that don't support nameless unions. --- dlls/oleaut32/tests/typelib.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index a52029c..e022b82 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1193,8 +1193,8 @@ static const interface_info info[] = { }; #define check_type(elem, info) { \ - expect_int((elem)->tdesc.vt, (info)->vt); \ - expect_hex((elem)->paramdesc.wParamFlags, (info)->wParamFlags); \ + expect_int((elem)->tdesc.vt, (info)->vt); \ + expect_hex(U(*(elem)).paramdesc.wParamFlags, (info)->wParamFlags); \ } static void test_dump_typelib(const char *name)

1 0

Francois Gouget : wined3d: Fix the d3dfmt_p8_init_palette() prototype.
by Alexandre Julliard Oct. 15, 2007

Oct. 15, 2007

Module: wine Branch: master Commit: 7785c93b028224e9d0531cd97761921d0fd8c7f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7785c93b028224e9d0531cd97… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Oct 14 14:34:47 2007 +0200 wined3d: Fix the d3dfmt_p8_init_palette() prototype. --- dlls/wined3d/surface.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ade950e..8c14288 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -34,7 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); #define GLINFO_LOCATION This->resource.wineD3DDevice->adapter->gl_info HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height, UINT outpitch, CONVERT_TYPES convert, IWineD3DSurfaceImpl *surf); -static void d3dfmt_p8_init_palette(IWineD3DSurfaceImpl *This, BYTE (*table)[4], BOOL colorkey); +static void d3dfmt_p8_init_palette(IWineD3DSurfaceImpl *This, BYTE table[256][4], BOOL colorkey); static void surface_download_data(IWineD3DSurfaceImpl *This) { if (!(This->resource.allocatedMemory || This->Flags & SFLAG_PBO)) This->resource.allocatedMemory = HeapAlloc(GetProcessHeap(), 0, This->resource.size + 4); @@ -1909,7 +1909,7 @@ HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UIN return WINED3D_OK; } -static void d3dfmt_p8_init_palette(IWineD3DSurfaceImpl *This, BYTE (*table)[4], BOOL colorkey) { +static void d3dfmt_p8_init_palette(IWineD3DSurfaceImpl *This, BYTE table[256][4], BOOL colorkey) { IWineD3DPaletteImpl* pal = This->palette; IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; BOOL index_in_alpha = FALSE;

1 0