Ros-diffs January 2009

ros-diffs@reactos.org

30 participants
755 discussions

[hyperion] 38872: Warning killing commit modified include/psdk/basetsd.h modified include/psdk/windef.h modified include/psdk/winnt.h Introduce new define __ROS_LONG64__ ("assume 64-bit long"), to use int instead of long in typedefs of 32-bit integers __ROS_LONG64__ automatically defined if __WINESRC__ is defined. No, __WINESRC__ alone is not enough modified base/applications/winhlp32/winhlp32.rbuild modified base/applications/wordpad/wordpad.rbuild Compile with __ROS_LONG64__ define to silence

by hyperion＠svn.reactos.org

Author: hyperion Date: Sun Jan 18 00:25:43 2009 New Revision: 38872 URL: http://svn.reactos.org/svn/reactos?rev=38872&view=rev Log: Warning killing commit modified include/psdk/basetsd.h modified include/psdk/windef.h modified include/psdk/winnt.h Introduce new define __ROS_LONG64__ ("assume 64-bit long"), to use int instead of long in typedefs of 32-bit integers __ROS_LONG64__ automatically defined if __WINESRC__ is defined. No, __WINESRC__ alone is not enough modified base/applications/winhlp32/winhlp32.rbuild modified base/applications/wordpad/wordpad.rbuild Compile with __ROS_LONG64__ define to silence int/long warnings modified include/psdk/winsock.h modified include/psdk/winsock2.h __ROS_LONG64__ does Winsock too Use LONG and u_long instead of long and unsigned long, to take advantage of __ROS_LONG64__ modified include/reactos/wine/test.h Use explicit casts in printf calls so the header compiles without warnings regardless of whether __ROS_LONG64__ is defined Use _strdup instead of strdup modified include/psdk/sspi.h modified include/psdk/wininet.h Use LONG and ULONG instead of long and unsigned long, to take advantage of __ROS_LONG64__ modified include/psdk/htmlhelp.h modified include/psdk/lmaccess.h modified include/psdk/prsht.h modified include/psdk/vfw.h modified include/psdk/winuser.h By sheer coincidence, several wrong prototypes were uncovered by the __ROS_LONG64__ feature. They all happen to be 64-bit portability issues, too modified base/system/msiexec/msiexec.rbuild msiexec is a Wine system component: compile with __WINESRC__ modified dll/win32/setupapi/setupapi.rbuild setupapi is _not_ a Wine system component: compile _without_ __WINESRC__ modified lib/3rdparty/libwine/debug.c Use LONG instead of long modified dll/win32/advapi32/service/sctrl.c modified include/psdk/winsvc.h Fix prototypes of StartServiceCtrlDispatcherA and StartServiceCtrlDispatcherW modified include/psdk/winbase.h Corrected the prototypes of GetProcessAffinityMask and ReadProcessMemory. Now Win64-compliant The argument to the _InterlockedCompareExchange is volatile long *, not volatile LONG *: cast explicitly (it's perfectly safe) modified include/psdk/wingdi.h Fix prototype of ENHMFENUMPROC Modified: trunk/reactos/base/applications/winhlp32/winhlp32.rbuild trunk/reactos/base/applications/wordpad/wordpad.rbuild trunk/reactos/base/system/msiexec/msiexec.rbuild trunk/reactos/dll/win32/advapi32/service/sctrl.c trunk/reactos/dll/win32/setupapi/setupapi.rbuild trunk/reactos/include/psdk/basetsd.h trunk/reactos/include/psdk/htmlhelp.h trunk/reactos/include/psdk/lmaccess.h trunk/reactos/include/psdk/prsht.h trunk/reactos/include/psdk/sspi.h trunk/reactos/include/psdk/vfw.h trunk/reactos/include/psdk/winbase.h trunk/reactos/include/psdk/windef.h trunk/reactos/include/psdk/wingdi.h trunk/reactos/include/psdk/wininet.h trunk/reactos/include/psdk/winnt.h trunk/reactos/include/psdk/winsock.h trunk/reactos/include/psdk/winsock2.h trunk/reactos/include/psdk/winsvc.h trunk/reactos/include/psdk/winuser.h trunk/reactos/include/reactos/wine/test.h trunk/reactos/lib/3rdparty/libwine/debug.c Modified: trunk/reactos/base/applications/winhlp32/winhlp32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/winhlp32.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/winhlp32.rbuild [iso-8859-1] Sun Jan 18 00:25:43 2009 @@ -3,6 +3,7 @@ <module name="winhlp32" type="win32gui" installbase="system32" installname="winhlp32.exe" unicode="no" allowwarnings="true"> <include base="winhlp32">.</include> <include base="ReactOS">include/reactos/wine</include> + <define name="__ROS_LONG64__" /> <library>wine</library> <library>comdlg32</library> <library>comctl32</library> Modified: trunk/reactos/base/applications/wordpad/wordpad.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/wordpad.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/wordpad.rbuild [iso-8859-1] Sun Jan 18 00:25:43 2009 @@ -2,6 +2,7 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="wordpad" type="win32gui" installbase="system32" installname="wordpad.exe" allowwarnings="true"> <include base="wordpad">.</include> + <define name="__ROS_LONG64__" /> <library>comdlg32</library> <library>shell32</library> <library>user32</library> Modified: trunk/reactos/base/system/msiexec/msiexec.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/msiexec/msiexe… ============================================================================== --- trunk/reactos/base/system/msiexec/msiexec.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/system/msiexec/msiexec.rbuild [iso-8859-1] Sun Jan 18 00:25:43 2009 @@ -3,6 +3,7 @@ <module name="msiexec" type="win32gui" installbase="system32" installname="msiexec.exe" allowwarnings="true"> <include base="msiexec">.</include> <include base="ReactOS">include/wine</include> + <define name="__WINESRC__" /> <library>uuid</library> <library>wine</library> <library>ntdll</library> Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] Sun Jan 18 00:25:43 2009 @@ -652,7 +652,7 @@ * @implemented */ BOOL WINAPI -StartServiceCtrlDispatcherA(LPSERVICE_TABLE_ENTRYA lpServiceStartTable) +StartServiceCtrlDispatcherA(const SERVICE_TABLE_ENTRYA * lpServiceStartTable) { ULONG i; HANDLE hPipe; @@ -742,7 +742,7 @@ * @implemented */ BOOL WINAPI -StartServiceCtrlDispatcherW(LPSERVICE_TABLE_ENTRYW lpServiceStartTable) +StartServiceCtrlDispatcherW(const SERVICE_TABLE_ENTRYW * lpServiceStartTable) { ULONG i; HANDLE hPipe; Modified: trunk/reactos/dll/win32/setupapi/setupapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.rbuild [iso-8859-1] Sun Jan 18 00:25:43 2009 @@ -5,7 +5,6 @@ <include base="setupapi">.</include> <include base="ReactOS">include/reactos/wine</include> <include base="pnp_client">.</include> - <define name="__WINESRC__" /> <define name="_SETUPAPI_" /> <library>pnp_client</library> <library>uuid</library> Modified: trunk/reactos/include/psdk/basetsd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/basetsd.h?rev… ============================================================================== --- trunk/reactos/include/psdk/basetsd.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/basetsd.h [iso-8859-1] Sun Jan 18 00:25:43 2009 @@ -1,5 +1,11 @@ #ifndef _BASETSD_H #define _BASETSD_H + +#if !defined(__ROS_LONG64__) +#ifdef __WINESRC__ +#define __ROS_LONG64__ +#endif +#endif #ifdef __GNUC__ #ifndef __int64 @@ -93,8 +99,13 @@ { return( (void*)(ULONG_PTR)ul ); } #endif /* !__midl */ #else /* !_WIN64 */ +#if !defined(__ROS_LONG64__) typedef int INT_PTR, *PINT_PTR; typedef unsigned int UINT_PTR, *PUINT_PTR; +#else +typedef long INT_PTR, *PINT_PTR; +typedef unsigned long UINT_PTR, *PUINT_PTR; +#endif #ifndef LONG_PTR_DEFINED #define LONG_PTR_DEFINED Modified: trunk/reactos/include/psdk/htmlhelp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/htmlhelp.h?re… ============================================================================== --- trunk/reactos/include/psdk/htmlhelp.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/htmlhelp.h [iso-8859-1] Sun Jan 18 00:25:43 2009 @@ -420,8 +420,8 @@ DECL_WINELIB_TYPE_AW(HH_NTRACK) -HWND WINAPI HtmlHelpA(HWND,LPCSTR,UINT,DWORD); -HWND WINAPI HtmlHelpW(HWND,LPCWSTR,UINT,DWORD); +HWND WINAPI HtmlHelpA(HWND,LPCSTR,UINT,DWORD_PTR); +HWND WINAPI HtmlHelpW(HWND,LPCWSTR,UINT,DWORD_PTR); #define HtmlHelp WINELIB_NAME_AW(HtmlHelp) #define ATOM_HTMLHELP_API_ANSI (LPTSTR)14 Modified: trunk/reactos/include/psdk/lmaccess.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/lmaccess.h?re… ============================================================================== --- trunk/reactos/include/psdk/lmaccess.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/lmaccess.h [iso-8859-1] Sun Jan 18 00:25:43 2009 @@ -585,13 +585,13 @@ NET_API_STATUS WINAPI NetGroupSetUsers(LPCWSTR,LPCWSTR,DWORD,PBYTE,DWORD); NET_API_STATUS WINAPI NetLocalGroupAdd(LPCWSTR,DWORD,PBYTE,PDWORD); NET_API_STATUS WINAPI NetLocalGroupAddMember(LPCWSTR,LPCWSTR,PSID); -NET_API_STATUS WINAPI NetLocalGroupEnum(LPCWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD); +NET_API_STATUS WINAPI NetLocalGroupEnum(LPCWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD_PTR); NET_API_STATUS WINAPI NetLocalGroupGetInfo(LPCWSTR,LPCWSTR,DWORD,PBYTE*); NET_API_STATUS WINAPI NetLocalGroupSetInfo(LPCWSTR,LPCWSTR,DWORD,PBYTE,PDWORD); NET_API_STATUS WINAPI NetLocalGroupDel(LPCWSTR,LPCWSTR); NET_API_STATUS WINAPI NetLocalGroupDelMember(LPCWSTR,LPCWSTR,PSID); NET_API_STATUS WINAPI NetLocalGroupGetMembers(LPCWSTR,LPCWSTR,DWORD,PBYTE*,DWORD, -PDWORD,PDWORD,PDWORD); +PDWORD,PDWORD,PDWORD_PTR); NET_API_STATUS WINAPI NetLocalGroupSetMembers(LPCWSTR,LPCWSTR,DWORD,PBYTE,DWORD); NET_API_STATUS WINAPI NetLocalGroupAddMembers(LPCWSTR,LPCWSTR,DWORD,PBYTE,DWORD); NET_API_STATUS WINAPI NetLocalGroupDelMembers(LPCWSTR,LPCWSTR,DWORD,PBYTE,DWORD); Modified: trunk/reactos/include/psdk/prsht.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/prsht.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/prsht.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/prsht.h [iso-8859-1] Sun Jan 18 00:25:43 2009 @@ -289,8 +289,8 @@ HPROPSHEETPAGE WINAPI CreatePropertySheetPageA(LPCPROPSHEETPAGEA); HPROPSHEETPAGE WINAPI CreatePropertySheetPageW(LPCPROPSHEETPAGEW); BOOL WINAPI DestroyPropertySheetPage(HPROPSHEETPAGE); -int WINAPI PropertySheetA(LPCPROPSHEETHEADERA); -int WINAPI PropertySheetW(LPCPROPSHEETHEADERW); +INT_PTR WINAPI PropertySheetA(LPCPROPSHEETHEADERA); +INT_PTR WINAPI PropertySheetW(LPCPROPSHEETHEADERW); #define PropSheet_AddPage(d,p) SendMessage(d,PSM_ADDPAGE,0,(LPARAM)p) #define PropSheet_Apply(d) SendMessage(d,PSM_APPLY,0,0) #define PropSheet_CancelToClose(d) SendMessage(d,PSM_CANCELTOCLOSE,0,0) Modified: trunk/reactos/include/psdk/sspi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sspi.h?rev=38… ============================================================================== --- trunk/reactos/include/psdk/sspi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/sspi.h [iso-8859-1] Sun Jan 18 00:25:43 2009 @@ -72,27 +72,27 @@ typedef struct _SECURITY_INTEGER { - unsigned long LowPart; - long HighPart; + ULONG LowPart; + LONG HighPart; } SECURITY_INTEGER, *PSECURITY_INTEGER; typedef SECURITY_INTEGER TimeStamp, *PTimeStamp; typedef struct _SecPkgInfoA { - unsigned long fCapabilities; + ULONG fCapabilities; unsigned short wVersion; unsigned short wRPCID; - unsigned long cbMaxToken; + ULONG cbMaxToken; SEC_CHAR *Name; SEC_CHAR *Comment; } SecPkgInfoA, *PSecPkgInfoA; typedef struct _SecPkgInfoW { - unsigned long fCapabilities; + ULONG fCapabilities; unsigned short wVersion; unsigned short wRPCID; - unsigned long cbMaxToken; + ULONG cbMaxToken; SEC_WCHAR *Name; SEC_WCHAR *Comment; } SecPkgInfoW, *PSecPkgInfoW; @@ -123,8 +123,8 @@ typedef struct _SecBuffer { - unsigned long cbBuffer; - unsigned long BufferType; + ULONG cbBuffer; + ULONG BufferType; void *pvBuffer; } SecBuffer, *PSecBuffer; @@ -152,8 +152,8 @@ typedef struct _SecBufferDesc { - unsigned long ulVersion; - unsigned long cBuffers; + ULONG ulVersion; + ULONG cBuffers; PSecBuffer pBuffers; } SecBufferDesc, *PSecBufferDesc; @@ -161,7 +161,7 @@ #define SECBUFFER_VERSION 0 typedef void (SEC_ENTRY *SEC_GET_KEY_FN)(void *Arg, void *Principal, - unsigned long KeyVer, void **Key, SECURITY_STATUS *Status); + ULONG KeyVer, void **Key, SECURITY_STATUS *Status); SECURITY_STATUS SEC_ENTRY EnumerateSecurityPackagesA(PULONG pcPackages, PSecPkgInfoA *ppPackageInfo); @@ -176,15 +176,15 @@ #define ENUMERATE_SECURITY_PACKAGES_FN WINELIB_NAME_AW(ENUMERATE_SECURITY_PACKAGES_FN_) SECURITY_STATUS SEC_ENTRY QueryCredentialsAttributesA( - PCredHandle phCredential, unsigned long ulAttribute, void *pBuffer); + PCredHandle phCredential, ULONG ulAttribute, void *pBuffer); SECURITY_STATUS SEC_ENTRY QueryCredentialsAttributesW( - PCredHandle phCredential, unsigned long ulAttribute, void *pBuffer); + PCredHandle phCredential, ULONG ulAttribute, void *pBuffer); #define QueryCredentialsAttributes WINELIB_NAME_AW(QueryCredentialsAttributes) typedef SECURITY_STATUS (SEC_ENTRY *QUERY_CREDENTIALS_ATTRIBUTES_FN_A) - (PCredHandle, unsigned long, PVOID); + (PCredHandle, ULONG, PVOID); typedef SECURITY_STATUS (SEC_ENTRY *QUERY_CREDENTIALS_ATTRIBUTES_FN_W) - (PCredHandle, unsigned long, PVOID); + (PCredHandle, ULONG, PVOID); #define QUERY_CREDENTIALS_ATTRIBUTES_FN WINELIB_NAME_AW(QUERY_CREDENTIALS_ATTRIBUTES_FN_) /* values for QueryCredentialsAttributes ulAttribute */ @@ -241,26 +241,26 @@ SECURITY_STATUS SEC_ENTRY InitializeSecurityContextA( PCredHandle phCredential, PCtxtHandle phContext, - SEC_CHAR *pszTargetName, unsigned long fContextReq, - unsigned long Reserved1, unsigned long TargetDataRep, PSecBufferDesc pInput, - unsigned long Reserved2, PCtxtHandle phNewContext, PSecBufferDesc pOutput, - unsigned long *pfContextAttr, PTimeStamp ptsExpiry); + SEC_CHAR *pszTargetName, ULONG fContextReq, + ULONG Reserved1, ULONG TargetDataRep, PSecBufferDesc pInput, + ULONG Reserved2, PCtxtHandle phNewContext, PSecBufferDesc pOutput, + ULONG *pfContextAttr, PTimeStamp ptsExpiry); SECURITY_STATUS SEC_ENTRY InitializeSecurityContextW( PCredHandle phCredential, PCtxtHandle phContext, - SEC_WCHAR *pszTargetName, unsigned long fContextReq, - unsigned long Reserved1, unsigned long TargetDataRep, PSecBufferDesc pInput, - unsigned long Reserved2, PCtxtHandle phNewContext, PSecBufferDesc pOutput, - unsigned long *pfContextAttr, PTimeStamp ptsExpiry); + SEC_WCHAR *pszTargetName, ULONG fContextReq, + ULONG Reserved1, ULONG TargetDataRep, PSecBufferDesc pInput, + ULONG Reserved2, PCtxtHandle phNewContext, PSecBufferDesc pOutput, + ULONG *pfContextAttr, PTimeStamp ptsExpiry); #define InitializeSecurityContext WINELIB_NAME_AW(InitializeSecurityContext) typedef SECURITY_STATUS (SEC_ENTRY *INITIALIZE_SECURITY_CONTEXT_FN_A) - (PCredHandle, PCtxtHandle, SEC_CHAR *, unsigned long, unsigned long, - unsigned long, PSecBufferDesc, unsigned long, PCtxtHandle, PSecBufferDesc, - unsigned long *, PTimeStamp); + (PCredHandle, PCtxtHandle, SEC_CHAR *, ULONG, ULONG, + ULONG, PSecBufferDesc, ULONG, PCtxtHandle, PSecBufferDesc, + ULONG *, PTimeStamp); typedef SECURITY_STATUS (SEC_ENTRY *INITIALIZE_SECURITY_CONTEXT_FN_W) - (PCredHandle, PCtxtHandle, SEC_WCHAR *, unsigned long, unsigned long, - unsigned long, PSecBufferDesc, unsigned long, PCtxtHandle, PSecBufferDesc, - unsigned long *, PTimeStamp); + (PCredHandle, PCtxtHandle, SEC_WCHAR *, ULONG, ULONG, + ULONG, PSecBufferDesc, ULONG, PCtxtHandle, PSecBufferDesc, + ULONG *, PTimeStamp); #define INITIALIZE_SECURITY_CONTEXT_FN WINELIB_NAME_AW(INITIALIZE_SECURITY_CONTEXT_FN_) /* flags for InitializeSecurityContext fContextReq and pfContextAttr */ @@ -312,13 +312,13 @@ SECURITY_STATUS SEC_ENTRY AcceptSecurityContext( PCredHandle phCredential, PCtxtHandle phContext, PSecBufferDesc pInput, - unsigned long fContextReq, unsigned long TargetDataRep, + ULONG fContextReq, ULONG TargetDataRep, PCtxtHandle phNewContext, PSecBufferDesc pOutput, - unsigned long *pfContextAttr, PTimeStamp ptsExpiry); + ULONG *pfContextAttr, PTimeStamp ptsExpiry); typedef SECURITY_STATUS (SEC_ENTRY *ACCEPT_SECURITY_CONTEXT_FN)(PCredHandle, - PCtxtHandle, PSecBufferDesc, unsigned long, unsigned long, PCtxtHandle, - PSecBufferDesc, unsigned long *, PTimeStamp); + PCtxtHandle, PSecBufferDesc, ULONG, ULONG, PCtxtHandle, + PSecBufferDesc, ULONG *, PTimeStamp); /* flags for AcceptSecurityContext fContextReq and pfContextAttr */ #define ASC_REQ_DELEGATE 0x00000001 @@ -389,15 +389,15 @@ PSecBufferDesc); SECURITY_STATUS SEC_ENTRY QueryContextAttributesA(PCtxtHandle phContext, - unsigned long ulAttribute, void *pBuffer); + ULONG ulAttribute, void *pBuffer); SECURITY_STATUS SEC_ENTRY QueryContextAttributesW(PCtxtHandle phContext, - unsigned long ulAttribute, void *pBuffer); + ULONG ulAttribute, void *pBuffer); #define QueryContextAttributes WINELIB_NAME_AW(QueryContextAttributes) typedef SECURITY_STATUS (SEC_ENTRY *QUERY_CONTEXT_ATTRIBUTES_FN_A)(PCtxtHandle, - unsigned long, void *); + ULONG, void *); typedef SECURITY_STATUS (SEC_ENTRY *QUERY_CONTEXT_ATTRIBUTES_FN_W)(PCtxtHandle, - unsigned long, void *); + ULONG, void *); #define QUERY_CONTEXT_ATTRIBUTES_FN WINELIB_NAME_AW(QUERY_CONTEXT_ATTRIBUTES_FN_) /* values for QueryContextAttributes/SetContextAttributes ulAttribute */ @@ -427,19 +427,19 @@ typedef struct _SecPkgContext_Sizes { - unsigned long cbMaxToken; - unsigned long cbMaxSignature; - unsigned long cbBlockSize; - unsigned long cbSecurityTrailer; + ULONG cbMaxToken; + ULONG cbMaxSignature; + ULONG cbBlockSize; + ULONG cbSecurityTrailer; } SecPkgContext_Sizes, *PSecPkgContext_Sizes; typedef struct _SecPkgContext_StreamSizes { - unsigned long cbHeader; - unsigned long cbTrailer; - unsigned long cbMaximumMessage; - unsigned long cbBuffers; - unsigned long cbBlockSize; + ULONG cbHeader; + ULONG cbTrailer; + ULONG cbMaximumMessage; + ULONG cbBuffers; + ULONG cbBlockSize; } SecPkgContext_StreamSizes, *PSecPkgContext_StreamSizes; typedef struct _SecPkgContext_NamesA @@ -463,7 +463,7 @@ typedef struct _SecPkgContext_DceInfo { - unsigned long AuthzSvc; + ULONG AuthzSvc; void *pPac; } SecPkgContext_DceInfo, *PSecPkgContext_DceInfo; @@ -471,18 +471,18 @@ { SEC_CHAR *sSignatureAlgorithmName; SEC_CHAR *sEncryptAlgorithmName; - unsigned long KeySize; - unsigned long SignatureAlgorithm; - unsigned long EncryptAlgorithm; + ULONG KeySize; + ULONG SignatureAlgorithm; + ULONG EncryptAlgorithm; } SecPkgContext_KeyInfoA, *PSecPkgContext_KeyInfoA; typedef struct _SecPkgContext_KeyInfoW { SEC_WCHAR *sSignatureAlgorithmName; SEC_WCHAR *sEncryptAlgorithmName; - unsigned long KeySize; - unsigned long SignatureAlgorithm; - unsigned long EncryptAlgorithm; + ULONG KeySize; + ULONG SignatureAlgorithm; + ULONG EncryptAlgorithm; } SecPkgContext_KeyInfoW, *PSecPkgContext_KeyInfoW; #define SecPkgContext_KeyInfo WINELIB_NAME_AW(SecPkgContext_KeyInfo) @@ -504,15 +504,15 @@ typedef struct _SecPkgContext_ProtoInfoA { SEC_CHAR *sProtocolName; - unsigned long majorVersion; - unsigned long minorVersion; + ULONG majorVersion; + ULONG minorVersion; } SecPkgContext_ProtoInfoA, *PSecPkgContext_ProtoInfoA; typedef struct _SecPkgContext_ProtoInfoW { SEC_WCHAR *sProtocolName; - unsigned long majorVersion; - unsigned long minorVersion; + ULONG majorVersion; + ULONG minorVersion; } SecPkgContext_ProtoInfoW, *PSecPkgContext_ProtoInfoW; #define SecPkgContext_ProtoInfo WINELIB_NAME_AW(SecPkgContext_ProtoInfo) @@ -525,7 +525,7 @@ typedef struct _SecPkgContext_SessionKey { - unsigned long SessionKeyLength; + ULONG SessionKeyLength; unsigned char *SessionKey; } SecPkgContext_SessionKey, *PSecPkgContext_SessionKey; @@ -544,24 +544,24 @@ typedef struct _SecPkgContext_Flags { - unsigned long Flags; + ULONG Flags; } SecPkgContext_Flags, *PSecPkgContext_Flags; typedef struct _SecPkgContext_UserFlags { - unsigned long UserFlags; + ULONG UserFlags; } SecPkgContext_UserFlags, *PSecPkgContext_UserFlags; typedef struct _SecPkgContext_NegotiationInfoA { PSecPkgInfoA PackageInfo; - unsigned long NegotiationState; + ULONG NegotiationState; } SecPkgContext_NegotiationInfoA, *PSecPkgContext_NegotiationInfoA; typedef struct _SecPkgContext_NegotiationInfoW { PSecPkgInfoW PackageInfo; - unsigned long NegotiationState; + ULONG NegotiationState; } SecPkgContext_NegotiationInfoW, *PSecPkgContext_NegotiationInfoW; #define SecPkgContext_NegotiationInfo WINELIB_NAME_AW(SecPkgContext_NegotiationInfo) @@ -591,13 +591,13 @@ typedef struct _SecPkgContext_CredentialNameA { - unsigned long CredentialType; + ULONG CredentialType; SEC_CHAR *sCredentialName; } SecPkgContext_CredentialNameA, *PSecPkgContext_CredentialNameA; typedef struct _SecPkgContext_CredentialNameW { - unsigned long CredentialType; + ULONG CredentialType; SEC_WCHAR *sCredentialName; } SecPkgContext_CredentialNameW, *PSecPkgContext_CredentialNameW; @@ -611,19 +611,19 @@ typedef struct _SecPkgContext_TargetInformation { - unsigned long MarshalledTargetInfoLength; + ULONG MarshalledTargetInfoLength; unsigned char *MarshalledTargetInfo; } SecPkgContext_TargetInformation, *PSecPkgContext_TargetInformation; typedef struct _SecPkgContext_AuthzID { - unsigned long AuthzIDLength; + ULONG AuthzIDLength; char *AuthzID; } SecPkgContext_AuthzID, *PSecPkgContext_AuthzID; typedef struct _SecPkgContext_Target { - unsigned long TargetLength; + ULONG TargetLength; char *Target; } SecPkgContext_Target, *PSecPkgContext_Target; @@ -683,20 +683,20 @@ #define IMPORT_SECURITY_CONTEXT_FN WINELIB_NAME_AW(IMPORT_SECURITY_CONTEXT_FN_) SECURITY_STATUS SEC_ENTRY AddCredentialsA(PCredHandle hCredentials, - SEC_CHAR *pszPrincipal, SEC_CHAR *pszPackage, unsigned long fCredentialUse, + SEC_CHAR *pszPrincipal, SEC_CHAR *pszPackage, ULONG fCredentialUse, void *pAuthData, SEC_GET_KEY_FN pGetKeyFn, void *pvGetKeyArgument, PTimeStamp ptsExpiry); SECURITY_STATUS SEC_ENTRY AddCredentialsW(PCredHandle hCredentials, - SEC_WCHAR *pszPrincipal, SEC_WCHAR *pszPackage, unsigned long fCredentialUse, + SEC_WCHAR *pszPrincipal, SEC_WCHAR *pszPackage, ULONG fCredentialUse, void *pAuthData, SEC_GET_KEY_FN pGetKeyFn, void *pvGetKeyArgument, PTimeStamp ptsExpiry); #define AddCredentials WINELIB_NAME_AW(AddCredentials) typedef SECURITY_STATUS (SEC_ENTRY *ADD_CREDENTIALS_FN_A)(PCredHandle, - SEC_CHAR *, SEC_CHAR *, unsigned long, void *, SEC_GET_KEY_FN, void *, + SEC_CHAR *, SEC_CHAR *, ULONG, void *, SEC_GET_KEY_FN, void *, PTimeStamp); typedef SECURITY_STATUS (SEC_ENTRY *ADD_CREDENTIALS_FN_W)(PCredHandle, - SEC_WCHAR *, SEC_WCHAR *, unsigned long, void *, SEC_GET_KEY_FN, void *, + SEC_WCHAR *, SEC_WCHAR *, ULONG, void *, SEC_GET_KEY_FN, void *, PTimeStamp); SECURITY_STATUS SEC_ENTRY QuerySecurityContextToken(PCtxtHandle phContext, @@ -719,15 +719,15 @@ PSecBufferDesc, ULONG, PULONG); SECURITY_STATUS SEC_ENTRY SetContextAttributesA(PCtxtHandle phContext, - unsigned long ulAttribute, void *pBuffer, unsigned long cbBuffer); + ULONG ulAttribute, void *pBuffer, ULONG cbBuffer); SECURITY_STATUS SEC_ENTRY SetContextAttributesW(PCtxtHandle phContext, - unsigned long ulAttribute, void *pBuffer, unsigned long cbBuffer); + ULONG ulAttribute, void *pBuffer, ULONG cbBuffer); #define SetContextAttributes WINELIB_NAME_AW(SetContextAttributes) typedef SECURITY_STATUS (SEC_ENTRY *SET_CONTEXT_ATTRIBUTES_FN_A)(PCtxtHandle, - unsigned long, void *, unsigned long); + ULONG, void *, ULONG); typedef SECURITY_STATUS (SEC_ENTRY *SET_CONTEXT_ATTRIBUTES_FN_W)(PCtxtHandle, - unsigned long, void *, unsigned long); + ULONG, void *, ULONG); #define SECURITY_ENTRYPOINT_ANSIA "InitSecurityInterfaceA" #define SECURITY_ENTRYPOINT_ANSIW "InitSecurityInterfaceW" @@ -735,7 +735,7 @@ typedef struct _SECURITY_FUNCTION_TABLE_A { - unsigned long dwVersion; + ULONG dwVersion; ENUMERATE_SECURITY_PACKAGES_FN_A EnumerateSecurityPackagesA; QUERY_CREDENTIALS_ATTRIBUTES_FN_A QueryCredentialsAttributesA; ACQUIRE_CREDENTIALS_HANDLE_FN_A AcquireCredentialsHandleA; @@ -770,7 +770,7 @@ * discovery discussion. */ typedef struct _SECURITY_FUNCTION_TABLE_W { - unsigned long dwVersion; + ULONG dwVersion; ENUMERATE_SECURITY_PACKAGES_FN_W EnumerateSecurityPackagesW; QUERY_CREDENTIALS_ATTRIBUTES_FN_W QueryCredentialsAttributesW; ACQUIRE_CREDENTIALS_HANDLE_FN_W AcquireCredentialsHandleW; Modified: trunk/reactos/include/psdk/vfw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/vfw.h?rev=388… ============================================================================== --- trunk/reactos/include/psdk/vfw.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/vfw.h [iso-8859-1] Sun Jan 18 00:25:43 2009 @@ -833,7 +833,7 @@ LONG VFWAPI TermVFW(VOID); DWORD VFWAPIV ICCompress(HIC,DWORD,LPBITMAPINFOHEADER,LPVOID,LPBITMAPINFOHEADER,LPVOID,LPDWORD,LPDWORD,LONG,DWORD,DWORD,LPBITMAPINFOHEADER,LPVOID); DWORD VFWAPIV ICDecompress(HIC,DWORD,LPBITMAPINFOHEADER,LPVOID,LPBITMAPINFOHEADER,LPVOID); -LRESULT VFWAPI ICSendMessage(HIC,UINT,DWORD,DWORD); +LRESULT VFWAPI ICSendMessage(HIC,UINT,DWORD_PTR,DWORD_PTR); HANDLE VFWAPI ICImageCompress(HIC,UINT,LPBITMAPINFO,LPVOID,LPBITMAPINFO,LONG,LONG*); HANDLE VFWAPI ICImageDecompress(HIC,UINT,LPBITMAPINFO,LPVOID,LPBITMAPINFO); BOOL VFWAPI ICInfo(DWORD,DWORD,ICINFO*); Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winbase.h [iso-8859-1] Sun Jan 18 00:25:43 2009 @@ -1530,7 +1530,7 @@ BOOL WINAPI GetPrivateProfileStructA(LPCSTR,LPCSTR,LPVOID,UINT,LPCSTR); BOOL WINAPI GetPrivateProfileStructW(LPCWSTR,LPCWSTR,LPVOID,UINT,LPCWSTR); FARPROC WINAPI GetProcAddress(HINSTANCE,LPCSTR); -BOOL WINAPI GetProcessAffinityMask(HANDLE,PDWORD,PDWORD); +BOOL WINAPI GetProcessAffinityMask(HANDLE,PDWORD_PTR,PDWORD_PTR); #if (_WIN32_WINNT >= 0x0502) BOOL WINAPI GetProcessHandleCount(HANDLE,PDWORD); #endif @@ -1779,7 +1779,7 @@ j = *Target; do { i = j; - j = _InterlockedCompareExchange((PLONG)Target, + j = _InterlockedCompareExchange((volatile long *)Target, i & Set, i); @@ -1802,7 +1802,7 @@ j = *Target; do { i = j; - j = _InterlockedCompareExchange((PLONG)Target, + j = _InterlockedCompareExchange((volatile long *)Target, i | Set, i); @@ -1967,7 +1967,7 @@ BOOL WINAPI ReadFile(HANDLE,PVOID,DWORD,PDWORD,LPOVERLAPPED); BOOL WINAPI ReadFileEx(HANDLE,PVOID,DWORD,LPOVERLAPPED,LPOVERLAPPED_COMPLETION_ROUTINE); BOOL WINAPI ReadFileScatter(HANDLE,FILE_SEGMENT_ELEMENT*,DWORD,LPDWORD,LPOVERLAPPED); -BOOL WINAPI ReadProcessMemory(HANDLE,PCVOID,PVOID,DWORD,PDWORD); +BOOL WINAPI ReadProcessMemory(HANDLE,PCVOID,PVOID,SIZE_T,PSIZE_T); #if (_WIN32_WINNT >= 0x0600) VOID WINAPI RecoveryFinished(BOOL); HRESULT WINAPI RecoveryInProgress(OUT PBOOL); Modified: trunk/reactos/include/psdk/windef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windef.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/windef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/windef.h [iso-8859-1] Sun Jan 18 00:25:43 2009 @@ -1,5 +1,11 @@ #ifndef _WINDEF_H #define _WINDEF_H + +#if !defined(__ROS_LONG64__) +#ifdef __WINESRC__ +#define __ROS_LONG64__ +#endif +#endif #ifdef __cplusplus extern "C" { @@ -258,7 +264,11 @@ #ifndef DWORD_DEFINED #define DWORD_DEFINED +#ifndef __ROS_LONG64__ typedef unsigned long DWORD; +#else + typedef unsigned int DWORD; +#endif #endif//DWORD_DEFINED typedef int WINBOOL,*PWINBOOL,*LPWINBOOL; @@ -278,7 +288,11 @@ typedef BYTE *PBYTE,*LPBYTE; typedef int *PINT,*LPINT; typedef WORD *PWORD,*LPWORD; +#ifndef __ROS_LONG64__ typedef long *LPLONG; +#else +typedef int *LPLONG; +#endif typedef DWORD *PDWORD,*LPDWORD; typedef CONST void *PCVOID,*LPCVOID; @@ -291,7 +305,11 @@ // #ifndef BASETYPES #define BASETYPES +#ifndef __ROS_LONG64__ typedef unsigned long ULONG, *PULONG; +#else +typedef unsigned int ULONG, *PULONG; +#endif typedef unsigned short USHORT, *PUSHORT; typedef unsigned char UCHAR, *PUCHAR; typedef char *PSZ; Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wingdi.h [iso-8859-1] Sun Jan 18 00:25:43 2009 @@ -2700,7 +2700,7 @@ typedef BOOL (CALLBACK *ABORTPROC)(HDC,int); typedef int (CALLBACK *MFENUMPROC)(HDC,HANDLETABLE*,METARECORD*,int,LPARAM); -typedef int (CALLBACK *ENHMFENUMPROC)(HDC,HANDLETABLE*,ENHMETARECORD*,int,LPARAM); +typedef int (CALLBACK *ENHMFENUMPROC)(HDC,HANDLETABLE*,const ENHMETARECORD*,int,LPARAM); typedef int (CALLBACK *OLDFONTENUMPROCA)(ENUMLOGFONTEXA*,NEWTEXTMETRICEXA*,DWORD,LPARAM); typedef int (CALLBACK *OLDFONTENUMPROCW)(ENUMLOGFONTEXW*,NEWTEXTMETRICEXW*,DWORD,LPARAM); typedef OLDFONTENUMPROCA FONTENUMPROCA; Modified: trunk/reactos/include/psdk/wininet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wininet.h?rev… ============================================================================== --- trunk/reactos/include/psdk/wininet.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wininet.h [iso-8859-1] Sun Jan 18 00:25:43 2009 @@ -1281,8 +1281,8 @@ BOOLAPI InternetClearAllPerSiteCookieDecisions(VOID); -BOOLAPI InternetEnumPerSiteCookieDecisionA(LPSTR,unsigned long *,unsigned long *,unsigned long); -BOOLAPI InternetEnumPerSiteCookieDecisionW(LPWSTR,unsigned long *,unsigned long *,unsigned long); +BOOLAPI InternetEnumPerSiteCookieDecisionA(LPSTR,ULONG *,ULONG *,ULONG); +BOOLAPI InternetEnumPerSiteCookieDecisionW(LPWSTR,ULONG *,ULONG *,ULONG); #define InternetEnumPerSiteCookieDecision WINELIB_NAME_AW(InternetEnumPerSiteCookieDecision) #define INTERNET_COOKIE_IS_SECURE 0x00000001 @@ -1304,8 +1304,8 @@ DWORD WINAPI InternetSetCookieExW(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,DWORD_PTR); #define InternetSetCookieEx WINELIB_NAME_AW(InternetSetCookieEx) -BOOLAPI InternetGetPerSiteCookieDecisionA(LPCSTR,unsigned long *); -BOOLAPI InternetGetPerSiteCookieDecisionW(LPCWSTR,unsigned long *); +BOOLAPI InternetGetPerSiteCookieDecisionA(LPCSTR,ULONG *); +BOOLAPI InternetGetPerSiteCookieDecisionW(LPCWSTR,ULONG *); #define InternetGetPerSiteCookieDecision WINELIB_NAME_AW(InternetGetPerSiteCookieDecision) BOOLAPI InternetSetPerSiteCookieDecisionA(LPCSTR,DWORD); Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sun Jan 18 00:25:43 2009 @@ -1,5 +1,11 @@ #ifndef _WINNT_H #define _WINNT_H + +#if !defined(__ROS_LONG64__) +#ifdef __WINESRC__ +#define __ROS_LONG64__ +#endif +#endif #ifdef __GNUC__ #include <msvctarget.h> @@ -97,7 +103,11 @@ #endif typedef char CHAR; typedef short SHORT; +#ifndef __ROS_LONG64__ typedef long LONG; +#else +typedef int LONG; +#endif typedef char CCHAR, *PCCHAR; typedef void *PVOID; @@ -1995,7 +2005,7 @@ } ACL,*PACL; typedef enum _ACL_INFORMATION_CLASS { - AclRevisionInformation = 1, + AclRevisionInformation = 1, AclSizeInformation } ACL_INFORMATION_CLASS; typedef struct _ACL_REVISION_INFORMATION { @@ -3206,7 +3216,7 @@ ); NTSYSAPI -WORD +WORD NTAPI RtlQueryDepthSList ( IN PSLIST_HEADER ListHead @@ -4555,14 +4565,14 @@ CacheUnified, CacheInstruction, CacheData, - CacheTrace + CacheTrace } PROCESSOR_CACHE_TYPE; typedef enum _LOGICAL_PROCESSOR_RELATIONSHIP { RelationProcessorCore, RelationNumaNode, RelationCache, - RelationProcessorPackage + RelationProcessorPackage } LOGICAL_PROCESSOR_RELATIONSHIP; #define CACHE_FULLY_ASSOCIATIVE 0xFF @@ -4805,7 +4815,7 @@ /* TODO: Other architectures than X86 */ #if defined(_M_IX86) -#define PF_TEMPORAL_LEVEL_1 +#define PF_TEMPORAL_LEVEL_1 #define PF_NON_TEMPORAL_LEVEL_ALL #define PreFetchCacheLine(l, a) #elif defined (_M_AMD64) Modified: trunk/reactos/include/psdk/winsock.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winsock.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winsock.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winsock.h [iso-8859-1] Sun Jan 18 00:25:43 2009 @@ -10,6 +10,12 @@ #ifndef _WINSOCK_H #define _WINSOCK_H + +#if !defined(__ROS_LONG64__) +#ifdef __WINESRC__ +#define __ROS_LONG64__ +#endif +#endif #define _GNU_H_WINDOWS32_SOCKETS #include <windows.h> @@ -23,7 +29,11 @@ typedef unsigned char u_char; typedef unsigned short u_short; typedef unsigned int u_int; +#ifndef __ROS_LONG64__ typedef unsigned long u_long; +#else +typedef unsigned int u_long; +#endif #define _BSDTYPES_DEFINED #endif /* !defined _BSDTYPES_DEFINED */ typedef u_int SOCKET; @@ -83,8 +93,8 @@ #ifndef _TIMEVAL_DEFINED /* also in sys/time.h */ #define _TIMEVAL_DEFINED struct timeval { - long tv_sec; - long tv_usec; + LONG tv_sec; + LONG tv_usec; }; #define timerisset(tvp) ((tvp)->tv_sec || (tvp)->tv_usec) #define timercmp(tvp, uvp, cmp) \ @@ -114,8 +124,8 @@ #if !(defined (__INSIDE_CYGWIN__) || defined (__INSIDE_MSYS__)) #define _IO(x,y) (IOC_VOID|((x)<<8)|(y)) -#define _IOR(x,y,t) (IOC_OUT|(((long)sizeof(t)&IOCPARM_MASK)<<16)|((x)<<8)|(y)) -#define _IOW(x,y,t) (IOC_IN|(((long)sizeof(t)&IOCPARM_MASK)<<16)|((x)<<8)|(y)) +#define _IOR(x,y,t) (IOC_OUT|(((LONG)sizeof(t)&IOCPARM_MASK)<<16)|((x)<<8)|(y)) +#define _IOW(x,y,t) (IOC_IN|(((LONG)sizeof(t)&IOCPARM_MASK)<<16)|((x)<<8)|(y)) #define FIONBIO _IOW('f', 126, u_long) #endif /* ! (__INSIDE_CYGWIN__ || __INSIDE_MSYS__) */ @@ -199,17 +209,17 @@ #define s_impno S_un.S_un_b.s_b4 #define s_lh S_un.S_un_b.s_b3 }; -#define IN_CLASSA(i) ((long)(i)&0x80000000) +#define IN_CLASSA(i) ((LONG)(i)&0x80000000) #define IN_CLASSA_NET 0xff000000 #define IN_CLASSA_NSHIFT 24 #define IN_CLASSA_HOST 0x00ffffff #define IN_CLASSA_MAX 128 -#define IN_CLASSB(i) (((long)(i)&0xc0000000)==0x80000000) +#define IN_CLASSB(i) (((LONG)(i)&0xc0000000)==0x80000000) #define IN_CLASSB_NET 0xffff0000 #define IN_CLASSB_NSHIFT 16 #define IN_CLASSB_HOST 0x0000ffff #define IN_CLASSB_MAX 65536 -#define IN_CLASSC(i) (((long)(i)&0xe0000000)==0xc0000000) +#define IN_CLASSC(i) (((LONG)(i)&0xe0000000)==0xc0000000) #define IN_CLASSC_NET 0xffffff00 #define IN_CLASSC_NSHIFT 8 #define IN_CLASSC_HOST 0xff @@ -431,11 +441,11 @@ int PASCAL bind(SOCKET,const struct sockaddr*,int); int PASCAL closesocket(SOCKET); int PASCAL connect(SOCKET,const struct sockaddr*,int); -int PASCAL ioctlsocket(SOCKET,long,u_long *); +int PASCAL ioctlsocket(SOCKET,LONG,u_long *); int PASCAL getpeername(SOCKET,struct sockaddr*,int*); int PASCAL getsockname(SOCKET,struct sockaddr*,int*); int PASCAL getsockopt(SOCKET,int,int,char*,int*); -unsigned long PASCAL inet_addr(const char*); +u_long PASCAL inet_addr(const char*); DECLARE_STDCALL_P(char *) inet_ntoa(struct in_addr); int PASCAL listen(SOCKET,int); int PASCAL recv(SOCKET,char*,int,int); @@ -466,7 +476,7 @@ HANDLE PASCAL WSAAsyncGetHostByName(HWND,u_int,const char*,char*,int); HANDLE PASCAL WSAAsyncGetHostByAddr(HWND,u_int,const char*,int,int,char*,int); int PASCAL WSACancelAsyncRequest(HANDLE); -int PASCAL WSAAsyncSelect(SOCKET,HWND,u_int,long); +int PASCAL WSAAsyncSelect(SOCKET,HWND,u_int,LONG); #if !(defined (__INSIDE_CYGWIN__) || defined (__INSIDE_MSYS__)) u_long PASCAL htonl(u_long); u_long PASCAL ntohl(u_long); Modified: trunk/reactos/include/psdk/winsock2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winsock2.h?re… ============================================================================== --- trunk/reactos/include/psdk/winsock2.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winsock2.h [iso-8859-1] Sun Jan 18 00:25:43 2009 @@ -15,6 +15,12 @@ #define _WINSOCK_H /* to prevent later inclusion of winsock.h */ #define _GNU_H_WINDOWS32_SOCKETS + +#if !defined(__ROS_LONG64__) +#ifdef __WINESRC__ +#define __ROS_LONG64__ +#endif +#endif #include <windows.h> @@ -27,7 +33,11 @@ typedef unsigned char u_char; typedef unsigned short u_short; typedef unsigned int u_int; +#ifndef __ROS_LONG64__ typedef unsigned long u_long; +#else +typedef unsigned int u_long; +#endif #define _BSDTYPES_DEFINED #endif /* ! def _BSDTYPES_DEFINED */ typedef u_int SOCKET; @@ -98,8 +108,8 @@ #define _TIMEVAL_DEFINED #define _STRUCT_TIMEVAL struct timeval { - long tv_sec; - long tv_usec; + LONG tv_sec; + LONG tv_usec; }; #define timerisset(tvp) ((tvp)->tv_sec || (tvp)->tv_usec) #define timercmp(tvp, uvp, cmp) \ @@ -129,8 +139,8 @@ #if ! (defined (__INSIDE_CYGWIN__) || defined (__INSIDE_MSYS__)) #define _IO(x,y) (IOC_VOID|((x)<<8)|(y)) -#define _IOR(x,y,t) (IOC_OUT|(((long)sizeof(t)&IOCPARM_MASK)<<16)|((x)<<8)|(y)) -#define _IOW(x,y,t) (IOC_IN|(((long)sizeof(t)&IOCPARM_MASK)<<16)|((x)<<8)|(y)) +#define _IOR(x,y,t) (IOC_OUT|(((LONG)sizeof(t)&IOCPARM_MASK)<<16)|((x)<<8)|(y)) +#define _IOW(x,y,t) (IOC_IN|(((LONG)sizeof(t)&IOCPARM_MASK)<<16)|((x)<<8)|(y)) #define FIONBIO _IOW('f', 126, u_long) #endif /* ! (__INSIDE_CYGWIN__ || __INSIDE_MSYS__) */ @@ -226,17 +236,17 @@ #define s_lh S_un.S_un_b.s_b3 } IN_ADDR, *PIN_ADDR; #endif -#define IN_CLASSA(i) ((long)(i)&0x80000000) +#define IN_CLASSA(i) ((LONG)(i)&0x80000000) #define IN_CLASSA_NET 0xff000000 #define IN_CLASSA_NSHIFT 24 #define IN_CLASSA_HOST 0x00ffffff #define IN_CLASSA_MAX 128 -#define IN_CLASSB(i) (((long)(i)&0xc0000000)==0x80000000) +#define IN_CLASSB(i) (((LONG)(i)&0xc0000000)==0x80000000) #define IN_CLASSB_NET 0xffff0000 #define IN_CLASSB_NSHIFT 16 #define IN_CLASSB_HOST 0x0000ffff #define IN_CLASSB_MAX 65536 -#define IN_CLASSC(i) (((long)(i)&0xe0000000)==0xc0000000) +#define IN_CLASSC(i) (((LONG)(i)&0xe0000000)==0xc0000000) #define IN_CLASSC_NET 0xffffff00 #define IN_CLASSC_NSHIFT 8 #define IN_CLASSC_HOST 0xff @@ -518,11 +528,11 @@ int PASCAL bind(SOCKET,const struct sockaddr*,int); int PASCAL closesocket(SOCKET); int PASCAL connect(SOCKET,const struct sockaddr*,int); -int PASCAL ioctlsocket(SOCKET,long,u_long *); +int PASCAL ioctlsocket(SOCKET,LONG,u_long *); int PASCAL getpeername(SOCKET,struct sockaddr*,int*); int PASCAL getsockname(SOCKET,struct sockaddr*,int*); int PASCAL getsockopt(SOCKET,int,int,char*,int*); -unsigned long PASCAL inet_addr(const char*); +u_long PASCAL inet_addr(const char*); DECLARE_STDCALL_P(char *) inet_ntoa(struct in_addr); int PASCAL listen(SOCKET,int); int PASCAL recv(SOCKET,char*,int,int); @@ -558,7 +568,7 @@ HANDLE PASCAL WSAAsyncGetHostByName(HWND,u_int,const char*,char*,int); HANDLE PASCAL WSAAsyncGetHostByAddr(HWND,u_int,const char*,int,int,char*,int); int PASCAL WSACancelAsyncRequest(HANDLE); -int PASCAL WSAAsyncSelect(SOCKET,HWND,u_int,long); +int PASCAL WSAAsyncSelect(SOCKET,HWND,u_int,LONG); #if ! (defined (__INSIDE_CYGWIN__) || defined (__INSIDE_MSYS__)) u_long PASCAL htonl(u_long); u_long PASCAL ntohl(u_long); @@ -609,7 +619,7 @@ /* winsock2 additions */ #define ADDR_ANY INADDR_ANY -#define IN_CLASSD(i) (((long)(i) & 0xf0000000) == 0xe0000000) +#define IN_CLASSD(i) (((LONG)(i) & 0xf0000000) == 0xe0000000) #define IN_CLASSD_NET 0xf0000000 #define IN_CLASSD_NSHIFT 28 #define IN_CLASSD_HOST 0x0fffffff @@ -655,7 +665,7 @@ #define WSA_INFINITE (INFINITE) typedef struct _WSABUF { - unsigned long len; + u_long len; char *buf; } WSABUF, *LPWSABUF; @@ -687,7 +697,7 @@ #define SG_UNCONSTRAINED_GROUP 0x01 #define SG_CONSTRAINED_GROUP 0x02 typedef struct _WSANETWORKEVENTS { - long lNetworkEvents; + LONG lNetworkEvents; int iErrorCode[FD_MAX_EVENTS]; } WSANETWORKEVENTS, *LPWSANETWORKEVENTS; @@ -1060,14 +1070,14 @@ int WINAPI WSAEnumNetworkEvents(SOCKET, WSAEVENT, LPWSANETWORKEVENTS); int WINAPI WSAEnumProtocolsA(LPINT, LPWSAPROTOCOL_INFOA, LPDWORD); int WINAPI WSAEnumProtocolsW(LPINT, LPWSAPROTOCOL_INFOW, LPDWORD); -int WINAPI WSAEventSelect(SOCKET, WSAEVENT, long); +int WINAPI WSAEventSelect(SOCKET, WSAEVENT, LONG); BOOL WINAPI WSAGetOverlappedResult(SOCKET, LPWSAOVERLAPPED, LPDWORD, BOOL, LPDWORD); BOOL WINAPI WSAGetQOSByName(SOCKET, LPWSABUF, LPQOS); INT WINAPI WSAGetServiceClassInfoA(LPGUID, LPGUID, LPDWORD, LPWSASERVICECLASSINFOA); INT WINAPI WSAGetServiceClassInfoW(LPGUID, LPGUID, LPDWORD, LPWSASERVICECLASSINFOW); INT WINAPI WSAGetServiceClassNameByClassIdA(LPGUID, LPSTR, LPDWORD); INT WINAPI WSAGetServiceClassNameByClassIdW(LPGUID, LPWSTR, LPDWORD); -int WINAPI WSAHtonl(SOCKET, unsigned long, unsigned long *); +int WINAPI WSAHtonl(SOCKET, u_long, u_long *); int WINAPI WSAHtons(SOCKET, unsigned short, unsigned short *); INT WINAPI WSAInstallServiceClassA(LPWSASERVICECLASSINFOA); INT WINAPI WSAInstallServiceClassW(LPWSASERVICECLASSINFOW); @@ -1079,7 +1089,7 @@ INT WINAPI WSALookupServiceNextW(HANDLE, DWORD, LPDWORD, LPWSAQUERYSETW); INT WINAPI WSALookupServiceEnd(HANDLE); int WINAPI WSANSPIoctl(HANDLE,DWORD,LPVOID,DWORD,LPVOID,DWORD,LPDWORD,LPWSACOMPLETION); /* XP or .NET Server */ -int WINAPI WSANtohl(SOCKET, unsigned long, unsigned long *); +int WINAPI WSANtohl(SOCKET, u_long, u_long *); int WINAPI WSANtohs(SOCKET, unsigned short, unsigned short *); int WINAPI WSARecv(SOCKET, LPWSABUF, DWORD, LPDWORD, LPDWORD, LPWSAOVERLAPPED, LPWSAOVERLAPPED_COMPLETION_ROUTINE); int WINAPI WSARecvDisconnect(SOCKET, LPWSABUF); @@ -1110,14 +1120,14 @@ typedef int (WINAPI *LPFN_WSAENUMNETWORKEVENTS)(SOCKET, WSAEVENT, LPWSANETWORKEVENTS); typedef int (WINAPI *LPFN_WSAENUMPROTOCOLSA)(LPINT, LPWSAPROTOCOL_INFOA, LPDWORD); typedef int (WINAPI *LPFN_WSAENUMPROTOCOLSW)(LPINT, LPWSAPROTOCOL_INFOW, LPDWORD); -typedef int (WINAPI *LPFN_WSAEVENTSELECT)(SOCKET, WSAEVENT, long); +typedef int (WINAPI *LPFN_WSAEVENTSELECT)(SOCKET, WSAEVENT, LONG); typedef BOOL (WINAPI *LPFN_WSAGETOVERLAPPEDRESULT)(SOCKET, LPWSAOVERLAPPED, LPDWORD, BOOL, LPDWORD); typedef BOOL (WINAPI *LPFN_WSAGETQOSBYNAME)(SOCKET, LPWSABUF, LPQOS); typedef INT (WINAPI *LPFN_WSAGETSERVICECLASSINFOA)(LPGUID, LPGUID, LPDWORD, LPWSASERVICECLASSINFOA); typedef INT (WINAPI *LPFN_WSAGETSERVICECLASSINFOW)(LPGUID, LPGUID, LPDWORD, LPWSASERVICECLASSINFOW); typedef INT (WINAPI *LPFN_WSAGETSERVICECLASSNAMEBYCLASSIDA)(LPGUID, LPSTR, LPDWORD); typedef INT (WINAPI *LPFN_WSAGETSERVICECLASSNAMEBYCLASSIDW)(LPGUID, LPWSTR, LPDWORD); -typedef int (WINAPI *LPFN_WSAHTONL)(SOCKET, unsigned long, unsigned long *); +typedef int (WINAPI *LPFN_WSAHTONL)(SOCKET, u_long, u_long *); typedef int (WINAPI *LPFN_WSAHTONS)(SOCKET, unsigned short, unsigned short *); typedef INT (WINAPI *LPFN_WSAINSTALLSERVICECLASSA)(LPWSASERVICECLASSINFOA); typedef INT (WINAPI *LPFN_WSAINSTALLSERVICECLASSW)(LPWSASERVICECLASSINFOW); @@ -1129,7 +1139,7 @@ typedef INT (WINAPI *LPFN_WSALOOKUPSERVICENEXTW)(HANDLE, DWORD, LPDWORD, LPWSAQUERYSETW); typedef INT (WINAPI *LPFN_WSALOOKUPSERVICEEND)(HANDLE); typedef int (WINAPI *LPFN_WSANSPIoctl)(HANDLE, DWORD,LPVOID,DWORD,LPVOID,DWORD,LPDWORD,LPWSACOMPLETION); -typedef int (WINAPI *LPFN_WSANTOHL)(SOCKET, unsigned long, unsigned long *); +typedef int (WINAPI *LPFN_WSANTOHL)(SOCKET, u_long, u_long *); typedef int (WINAPI *LPFN_WSANTOHS)(SOCKET, unsigned short, unsigned short *); typedef int (WINAPI *LPFN_WSARECV)(SOCKET, LPWSABUF, DWORD, LPDWORD, LPDWORD, LPWSAOVERLAPPED, LPWSAOVERLAPPED_COMPLETION_ROUTINE); typedef int (WINAPI *LPFN_WSARECVDISCONNECT)(SOCKET, LPWSABUF); Modified: trunk/reactos/include/psdk/winsvc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winsvc.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winsvc.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winsvc.h [iso-8859-1] Sun Jan 18 00:25:43 2009 @@ -230,8 +230,8 @@ BOOL WINAPI SetServiceObjectSecurity(SC_HANDLE,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR); BOOL WINAPI SetServiceStatus(SERVICE_STATUS_HANDLE,LPSERVICE_STATUS); BOOL WINAPI StartServiceA(SC_HANDLE,DWORD,LPCSTR*); -BOOL WINAPI StartServiceCtrlDispatcherA(LPSERVICE_TABLE_ENTRYA); -BOOL WINAPI StartServiceCtrlDispatcherW(LPSERVICE_TABLE_ENTRYW); +BOOL WINAPI StartServiceCtrlDispatcherA(const SERVICE_TABLE_ENTRYA*); +BOOL WINAPI StartServiceCtrlDispatcherW(const SERVICE_TABLE_ENTRYW*); BOOL WINAPI StartServiceW(SC_HANDLE,DWORD,LPCWSTR*); BOOL WINAPI UnlockServiceDatabase(SC_LOCK); Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Sun Jan 18 00:25:43 2009 @@ -2724,7 +2724,7 @@ #ifndef RC_INVOKED typedef INT_PTR(CALLBACK *DLGPROC)(HWND,UINT,WPARAM,LPARAM); -typedef VOID(CALLBACK *TIMERPROC)(HWND,UINT,UINT,DWORD); +typedef VOID(CALLBACK *TIMERPROC)(HWND,UINT,UINT_PTR,DWORD); typedef BOOL(CALLBACK *GRAYSTRINGPROC)(HDC,LPARAM,int); typedef LRESULT(CALLBACK *HOOKPROC)(int,WPARAM,LPARAM); typedef BOOL(CALLBACK *PROPENUMPROCA)(HWND,LPCSTR,HANDLE); @@ -4155,8 +4155,8 @@ LRESULT WINAPI SendMessageA(HWND,UINT,WPARAM,LPARAM); BOOL WINAPI SendMessageCallbackA(HWND,UINT,WPARAM,LPARAM,SENDASYNCPROC,DWORD); BOOL WINAPI SendMessageCallbackW(HWND,UINT,WPARAM,LPARAM,SENDASYNCPROC,DWORD); -LRESULT WINAPI SendMessageTimeoutA(HWND,UINT,WPARAM,LPARAM,UINT,UINT,PDWORD); -LRESULT WINAPI SendMessageTimeoutW(HWND,UINT,WPARAM,LPARAM,UINT,UINT,PDWORD); +LRESULT WINAPI SendMessageTimeoutA(HWND,UINT,WPARAM,LPARAM,UINT,UINT,PDWORD_PTR); +LRESULT WINAPI SendMessageTimeoutW(HWND,UINT,WPARAM,LPARAM,UINT,UINT,PDWORD_PTR); LRESULT WINAPI SendMessageW(HWND,UINT,WPARAM,LPARAM); BOOL WINAPI SendNotifyMessageA(HWND,UINT,WPARAM,LPARAM); BOOL WINAPI SendNotifyMessageW(HWND,UINT,WPARAM,LPARAM); Modified: trunk/reactos/include/reactos/wine/test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/test.… ============================================================================== --- trunk/reactos/include/reactos/wine/test.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/test.h [iso-8859-1] Sun Jan 18 00:25:43 2009 @@ -391,13 +391,13 @@ { if (exit_code > 255) { - fprintf( stdout, "%s: exception 0x%08x in child process\n", current_test->name, exit_code ); + fprintf( stdout, "%s: exception 0x%08x in child process\n", current_test->name, (unsigned int)exit_code ); InterlockedIncrement( &failures ); } else { fprintf( stdout, "%s: %u failures in child process\n", - current_test->name, exit_code ); + current_test->name, (unsigned int)exit_code ); while (exit_code-- > 0) InterlockedIncrement(&failures); } @@ -453,10 +453,10 @@ if (winetest_debug) { fprintf( stdout, "%s: %d tests executed (%d marked as todo, %d %s), %d skipped.\n", - test->name, successes + failures + todo_successes + todo_failures, - todo_successes, failures + todo_failures, + test->name, (int)(successes + failures + todo_successes + todo_failures), + (int)todo_successes, (int)(failures + todo_failures), (failures + todo_failures != 1) ? "failures" : "failure", - skipped ); + (int)skipped ); } status = (failures + todo_failures < 255) ? failures + todo_failures : 255; return status; @@ -482,7 +482,7 @@ winetest_argc = argc; winetest_argv = argv; - if ((p = getenv( "WINETEST_PLATFORM" ))) winetest_platform = strdup(p); + if ((p = getenv( "WINETEST_PLATFORM" ))) winetest_platform = _strdup(p); if ((p = getenv( "WINETEST_DEBUG" ))) winetest_debug = atoi(p); if ((p = getenv( "WINETEST_INTERACTIVE" ))) winetest_interactive = atoi(p); if ((p = getenv( "WINETEST_REPORT_SUCCESS"))) report_success = atoi(p); Modified: trunk/reactos/lib/3rdparty/libwine/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libwine/debug… ============================================================================== --- trunk/reactos/lib/3rdparty/libwine/debug.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libwine/debug.c [iso-8859-1] Sun Jan 18 00:25:43 2009 @@ -258,7 +258,7 @@ static char *get_temp_buffer( size_t size ) { static char *list[32]; - static long pos; + static LONG pos; char *ret; int idx;

15 years, 8 months

[cgutman] 38871: - Call IRPFinish directly instead of through DispDataRequestComplete in DispCancelListenRequest

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Jan 17 23:51:13 2009 New Revision: 38871 URL: http://svn.reactos.org/svn/reactos?rev=38871&view=rev Log: - Call IRPFinish directly instead of through DispDataRequestComplete in DispCancelListenRequest Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/dispatch.c Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Sat Jan 17 23:51:13 2009 @@ -256,7 +256,8 @@ IoReleaseCancelSpinLock(Irp->CancelIrql); - DispDataRequestComplete(Irp, STATUS_CANCELLED, 0); + Irp->IoStatus.Information = 0; + IRPFinish(Irp, STATUS_CANCELLED); TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); }

15 years, 8 months

[cgutman] 38870: - Change SatisfyAccept and SatisfyPreAccept to return an NTSTATUS value - Don't modify an IRP that is already complete (again)

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Jan 17 23:10:46 2009 New Revision: 38870 URL: http://svn.reactos.org/svn/reactos?rev=38870&view=rev Log: - Change SatisfyAccept and SatisfyPreAccept to return an NTSTATUS value - Don't modify an IRP that is already complete (again) Modified: branches/aicom-network-fixes/drivers/network/afd/afd/listen.c branches/aicom-network-fixes/drivers/network/afd/afd/select.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/listen.c [iso-8859-1] Sat Jan 17 23:10:46 2009 @@ -12,17 +12,15 @@ #include "tdiconn.h" #include "debug.h" -static VOID SatisfyAccept( PAFD_DEVICE_EXTENSION DeviceExt, +static NTSTATUS SatisfyAccept( PAFD_DEVICE_EXTENSION DeviceExt, PIRP Irp, PFILE_OBJECT NewFileObject, PAFD_TDI_OBJECT_QELT Qelt ) { PAFD_FCB FCB = NewFileObject->FsContext; NTSTATUS Status; - if( !SocketAcquireStateLock( FCB ) ) { - LostSocket( Irp ); - return; - } + if( !SocketAcquireStateLock( FCB ) ) + return LostSocket( Irp ); /* Transfer the connection to the new socket, launch the opening read */ AFD_DbgPrint(MID_TRACE,("Completing a real accept (FCB %x)\n", FCB)); @@ -50,9 +48,11 @@ IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); SocketStateUnlock( FCB ); -} - -static VOID SatisfyPreAccept( PIRP Irp, PAFD_TDI_OBJECT_QELT Qelt ) { + + return Status; +} + +static NTSTATUS SatisfyPreAccept( PIRP Irp, PAFD_TDI_OBJECT_QELT Qelt ) { PAFD_RECEIVED_ACCEPT_DATA ListenReceive = (PAFD_RECEIVED_ACCEPT_DATA)Irp->AssociatedIrp.SystemBuffer; PTA_IP_ADDRESS IPAddr; @@ -74,6 +74,7 @@ Irp->IoStatus.Status = STATUS_NO_MEMORY; Irp->IoStatus.Information = 0; IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); + return STATUS_NO_MEMORY; } AFD_DbgPrint(MID_TRACE,("IPAddr->TAAddressCount %d\n", @@ -92,6 +93,7 @@ Irp->IoStatus.Information = ((PCHAR)&IPAddr[1]) - ((PCHAR)ListenReceive); Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); + return STATUS_SUCCESS; } static NTSTATUS NTAPI ListenComplete @@ -244,6 +246,7 @@ PIO_STACK_LOCATION IrpSp ) { PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; + NTSTATUS Status; AFD_DbgPrint(MID_TRACE,("Called\n")); @@ -253,7 +256,7 @@ PLIST_ENTRY PendingConn = FCB->PendingConnections.Flink; /* We have a pending connection ... complete this irp right away */ - SatisfyPreAccept + Status = SatisfyPreAccept ( Irp, CONTAINING_RECORD ( PendingConn, AFD_TDI_OBJECT_QELT, ListEntry ) ); @@ -264,7 +267,7 @@ PollReeval( FCB->DeviceExt, FCB->FileObject ); SocketStateUnlock( FCB ); - return Irp->IoStatus.Status; + return Status; } else { AFD_DbgPrint(MID_TRACE,("Holding\n")); @@ -341,7 +344,7 @@ ASSERT(NewFileObject->FsContext != FCB); /* We have a pending connection ... complete this irp right away */ - SatisfyAccept( DeviceExt, Irp, NewFileObject, PendingConnObj ); + Status = SatisfyAccept( DeviceExt, Irp, NewFileObject, PendingConnObj ); ObDereferenceObject( NewFileObject ); @@ -355,7 +358,7 @@ } SocketStateUnlock( FCB ); - return Irp->IoStatus.Status; + return Status; } } Modified: branches/aicom-network-fixes/drivers/network/afd/afd/select.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/select.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/select.c [iso-8859-1] Sat Jan 17 23:10:46 2009 @@ -181,7 +181,7 @@ Irp->IoStatus.Status = STATUS_NO_MEMORY; Irp->IoStatus.Information = 0; IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); - return Irp->IoStatus.Status; + return STATUS_NO_MEMORY; } if( Exclusive ) { @@ -262,8 +262,6 @@ KeReleaseSpinLock( &DeviceExt->Lock, OldIrql ); AFD_DbgPrint(MID_TRACE,("Returning %x\n", Status)); - - Irp->IoStatus.Status = Status; return Status; }

15 years, 8 months

[cgutman] 38869: - More memtrack fixes

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Jan 17 22:39:45 2009 New Revision: 38869 URL: http://svn.reactos.org/svn/reactos?rev=38869&view=rev Log: - More memtrack fixes Modified: branches/aicom-network-fixes/lib/drivers/ip/network/memtrack.c Modified: branches/aicom-network-fixes/lib/drivers/ip/network/memtrack.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/network/memtrack.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/network/memtrack.c [iso-8859-1] Sat Jan 17 22:39:45 2009 @@ -82,14 +82,14 @@ if( ThingInList->Thing == Thing ) { RemoveEntryList(Entry); - TrackDumpFL( FileName, LineNo ); - - //DbgPrint("TRACK: SPECIFIED ALREADY ALLOCATED ITEM %x\n", Thing); + TI_DbgPrint(MAX_TRACE,("TRACK: SPECIFIED ALREADY ALLOCATED ITEM %x\n", Thing)); ShowTrackedThing( "Double Alloc (Item in list)", ThingInList, FALSE ); ShowTrackedThing( "Double Alloc (Item not in list)", TrackedThing, FALSE ); ExFreeToNPagedLookasideList( &AllocatedObjectsLookasideList, ThingInList ); + + break; } Entry = Entry->Flink; } @@ -97,8 +97,6 @@ InsertHeadList( &AllocatedObjectsList, &TrackedThing->Entry ); TcpipReleaseSpinLock( &AllocatedObjectsLock, OldIrql ); - - /*TrackDumpFL( FileName, LineNo );*/ } BOOL ShowTag( DWORD Tag ) {

15 years, 8 months

[jimtabor] 38868: - Add more thread info types and remove a set mask clear bit.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Jan 17 22:36:43 2009 New Revision: 38868 URL: http://svn.reactos.org/svn/reactos?rev=38868&view=rev Log: - Add more thread info types and remove a set mask clear bit. Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Sat Jan 17 22:36:43 2009 @@ -37,11 +37,14 @@ struct _DESKTOP* Desktop; PDESKTOPINFO pDeskInfo; PCLIENTINFO pClientInfo; + FLONG TIF_flags; + HANDLE hDesktop; + UINT cPaintsReady; + UINT cTimersReady; LIST_ENTRY PtiLink; LIST_ENTRY WindowListHead; LIST_ENTRY W32CallbackListHead; - HANDLE hDesktop; BOOLEAN IsExiting; SINGLE_LIST_ENTRY ReferencesList; ULONG Hooks; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Sat Jan 17 22:36:43 2009 @@ -120,7 +120,6 @@ MessageQueue = Win32Thread->MessageQueue; // HACK!!!!!!! Newbies that wrote this should hold your head down in shame! (jt) MessageQueue->WakeMask = ~0; - MessageQueue->WakeMask &= ~QS_TIMER; return TRUE; } @@ -1436,7 +1435,6 @@ MessageQueue->PaintCount = 0; // HACK!!!!!!! Newbies that wrote this should hold your head down in shame! (jt) MessageQueue->WakeMask = ~0; - MessageQueue->WakeMask &= ~QS_TIMER; MessageQueue->NewMessagesHandle = NULL; Status = ZwCreateEvent(&MessageQueue->NewMessagesHandle, EVENT_ALL_ACCESS,

15 years, 8 months

[cgutman] 38867: - Fix some IRP tracking bugs - Don't change the status of a previously completed IRP (found by memtrack)

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Jan 17 22:34:00 2009 New Revision: 38867 URL: http://svn.reactos.org/svn/reactos?rev=38867&view=rev Log: - Fix some IRP tracking bugs - Don't change the status of a previously completed IRP (found by memtrack) Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/dispatch.c branches/aicom-network-fixes/drivers/network/tcpip/tcpip/main.c Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Sat Jan 17 22:34:00 2009 @@ -106,7 +106,7 @@ Irp->IoStatus.Information)); TI_DbgPrint(DEBUG_IRP, ("Completing IRP at (0x%X).\n", Irp)); - IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); + IRPFinish(Irp, Status); TI_DbgPrint(DEBUG_IRP, ("Done Completing IRP\n")); } @@ -212,7 +212,7 @@ } IoReleaseCancelSpinLock(Irp->CancelIrql); - IoCompleteRequest(Irp, IO_NO_INCREMENT); + IRPFinish(Irp, STATUS_CANCELLED); TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); } Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/tcpip/main.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/tcpip/main.c [iso-8859-1] Sat Jan 17 22:34:00 2009 @@ -473,10 +473,6 @@ if( Complete ) IRPFinish( Irp, Status ); - else { - Irp->IoStatus.Status = Status; - UntrackFL(__FILE__, __LINE__, Irp, IRP_TAG); - } return Status; }

15 years, 8 months

[tkreuzer] 38866: Forgot this file

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Jan 17 20:38:35 2009 New Revision: 38866 URL: http://svn.reactos.org/svn/reactos?rev=38866&view=rev Log: Forgot this file Modified: trunk/reactos/dll/win32/user32/include/user32p.h Modified: trunk/reactos/dll/win32/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] Sat Jan 17 20:38:35 2009 @@ -249,5 +249,10 @@ #endif #endif +/* Hack away wine hack */ +#define __TRY if(1) +#define __EXCEPT_PAGE_FAULT else +#define __ENDTRY + #endif /* EOF */

15 years, 8 months

[tkreuzer] 38865: user32: sync listbox.c to wine 1.1.13

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Jan 17 20:28:12 2009 New Revision: 38865 URL: http://svn.reactos.org/svn/reactos?rev=38865&view=rev Log: user32: sync listbox.c to wine 1.1.13 Modified: trunk/reactos/dll/win32/user32/controls/listbox.c Modified: trunk/reactos/dll/win32/user32/controls/listbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/listbox.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/listbox.c [iso-8859-1] Sat Jan 17 20:28:12 2009 @@ -37,7 +37,6 @@ #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(listbox); -WINE_DECLARE_DEBUG_CHANNEL(combo); /* Start of hack section -------------------------------- */ @@ -147,9 +146,10 @@ /********************************************************************* * listbox class descriptor */ +static const WCHAR listboxW[] = {'L','i','s','t','B','o','x',0}; const struct builtin_class_descr LISTBOX_builtin_class = { - L"ListBox", /* name */ + listboxW, /* name */ CS_DBLCLKS /*| CS_PARENTDC*/, /* style */ ListBoxWndProcA, /* procA */ ListBoxWndProcW, /* procW */ @@ -162,9 +162,10 @@ /********************************************************************* * combolbox class descriptor */ +static const WCHAR combolboxW[] = {'C','o','m','b','o','L','B','o','x',0}; const struct builtin_class_descr COMBOLBOX_builtin_class = { - L"ComboLBox", /* name */ + combolboxW, /* name */ CS_DBLCLKS | CS_SAVEBITS, /* style */ ListBoxWndProcA, /* procA */ ListBoxWndProcW, /* procW */ @@ -175,31 +176,11 @@ #ifndef __REACTOS__ /* check whether app is a Win 3.1 app */ -inline static BOOL is_old_app( HWND hwnd ) -{ - return (GetExpWinVer16( GetWindowLongA(hwnd,GWL_HINSTANCE) ) & 0xFF00 ) == 0x0300; -} -#endif - - -/*********************************************************************** - * LISTBOX_Dump - */ -void LISTBOX_Dump( HWND hwnd ) -{ - INT i; - LB_ITEMDATA *item; - LB_DESCR *descr = (LB_DESCR *)GetWindowLongA( hwnd, 0 ); - - TRACE( "Listbox:\n" ); - TRACE( "hwnd=%p descr=%08x items=%d top=%d\n", - hwnd, (UINT)descr, descr->nb_items, descr->top_item ); - for (i = 0, item = descr->items; i < descr->nb_items; i++, item++) - { - TRACE( "%4d: %-40s %d %08lx %3d\n", - i, debugstr_w(item->str), item->selected, item->data, item->height ); - } -} +static inline BOOL is_old_app( LB_DESCR *descr ) +{ + return (GetExpWinVer16( GetWindowLongPtrW(descr->self, GWLP_HINSTANCE) ) & 0xFF00 ) == 0x0300; +} +#endif /*********************************************************************** @@ -429,7 +410,7 @@ if ((descr->height > descr->item_height) && remaining) { #ifndef __REACTOS__ - if (is_old_app(hwnd)) + if (is_old_app(descr)) { /* give a margin for error to 16 bits programs - if we need less than the height of the nonclient area, round to the *next* number of items */ @@ -569,8 +550,8 @@ * * Paint an item. */ -static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, - const RECT *rect, INT index, UINT action, BOOL ignoreFocus ) +static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, + INT index, UINT action, BOOL ignoreFocus ) { LB_ITEMDATA *item = NULL; if (index < descr->nb_items) item = &descr->items[index]; @@ -589,7 +570,7 @@ DrawFocusRect( hdc, rect ); } else - FIXME("called with an out of bounds index %d(%d) in owner draw, Not good.\n",index,descr->nb_items); + ERR("called with an out of bounds index %d(%d) in owner draw, Not good.\n",index,descr->nb_items); return; } @@ -616,9 +597,9 @@ if (!IsWindowEnabled(descr->self)) dis.itemState |= ODS_DISABLED; dis.itemData = item->data; dis.rcItem = *rect; - TRACE("[%p]: drawitem %d (%s) action=%02x state=%02x rect=%ld,%ld-%ld,%ld\n", + TRACE("[%p]: drawitem %d (%s) action=%02x state=%02x rect=%s\n", descr->self, index, item ? debugstr_w(item->str) : "", action, - dis.itemState, rect->left, rect->top, rect->right, rect->bottom ); + dis.itemState, wine_dbgstr_rect(rect) ); SendMessageW(descr->owner, WM_DRAWITEM, dis.CtlID, (LPARAM)&dis); } else @@ -637,9 +618,9 @@ oldText = SetTextColor( hdc, GetSysColor(COLOR_HIGHLIGHTTEXT)); } - TRACE("[%p]: painting %d (%s) action=%02x rect=%ld,%ld-%ld,%ld\n", + TRACE("[%p]: painting %d (%s) action=%02x rect=%s\n", descr->self, index, item ? debugstr_w(item->str) : "", action, - rect->left, rect->top, rect->right, rect->bottom ); + wine_dbgstr_rect(rect) ); if (!item) ExtTextOutW( hdc, rect->left + 1, rect->top, ETO_OPAQUE | ETO_CLIPPED, rect, NULL, 0, NULL ); @@ -724,7 +705,7 @@ if (!IsWindowEnabled(descr->self)) SetTextColor( hdc, GetSysColor( COLOR_GRAYTEXT ) ); SetWindowOrgEx( hdc, descr->horz_pos, 0, NULL ); - LISTBOX_PaintItem( descr, hdc, &rect, index, action, FALSE ); + LISTBOX_PaintItem( descr, hdc, &rect, index, action, TRUE ); if (oldFont) SelectObject( hdc, oldFont ); if (oldBrush) SelectObject( hdc, oldBrush ); ReleaseDC( descr->self, hdc ); @@ -815,7 +796,7 @@ INT i; LPINT16 p = (LPINT16)tabs; - TRACE("[%p]: settabstops ", hwnd ); + TRACE("[%p]: settabstops ", descr->self ); for (i = 0; i < descr->nb_tabs; i++) { descr->tabs[i] = *p++<<1; /* FIXME */ TRACE("%hd ", descr->tabs[i]); @@ -840,6 +821,8 @@ */ static LRESULT LISTBOX_GetText( LB_DESCR *descr, INT index, LPWSTR buffer, BOOL unicode ) { + DWORD len; + if ((index < 0) || (index >= descr->nb_items)) { SetLastError(ERROR_INVALID_INDEX); @@ -849,7 +832,7 @@ { if (!buffer) { - DWORD len = strlenW(descr->items[index].str); + len = strlenW(descr->items[index].str); if( unicode ) return len; return WideCharToMultiByte( CP_ACP, 0, descr->items[index].str, len, @@ -858,23 +841,35 @@ TRACE("index %d (0x%04x) %s\n", index, index, debugstr_w(descr->items[index].str)); - if(unicode) - { - strcpyW( buffer, descr->items[index].str ); - return strlenW(buffer); - } - else - { - return WideCharToMultiByte(CP_ACP, 0, descr->items[index].str, -1, (LPSTR)buffer, 0x7FFFFFFF, NULL, NULL) - 1; - } + __TRY /* hide a Delphi bug that passes a read-only buffer */ + { + if(unicode) + { + strcpyW( buffer, descr->items[index].str ); + len = strlenW(buffer); + } + else + { + len = WideCharToMultiByte(CP_ACP, 0, descr->items[index].str, -1, + (LPSTR)buffer, 0x7FFFFFFF, NULL, NULL) - 1; + } + } + __EXCEPT_PAGE_FAULT + { + WARN( "got an invalid buffer (Delphi bug?)\n" ); + SetLastError( ERROR_INVALID_PARAMETER ); + return LB_ERR; + } + __ENDTRY } else { if (buffer) *((LPDWORD)buffer)=*(LPDWORD)(&descr->items[index].data); - return sizeof(DWORD); - } -} - -static __inline INT LISTBOX_lstrcmpiW( LCID lcid, LPCWSTR str1, LPCWSTR str2 ) + len = sizeof(DWORD); + } + return len; +} + +static inline INT LISTBOX_lstrcmpiW( LCID lcid, LPCWSTR str1, LPCWSTR str2 ) { INT ret = CompareStringW( lcid, NORM_IGNORECASE, str1, -1, str2, -1 ); if (ret == CSTR_LESS_THAN) @@ -1509,7 +1504,7 @@ if (descr->style & LBS_MULTIPLESEL) { if (index == -1) /* Select all items */ - return LISTBOX_SelectItemRange( descr, 0, -1, on ); + return LISTBOX_SelectItemRange( descr, 0, descr->nb_items, on ); else /* Only one item */ return LISTBOX_SelectItemRange( descr, index, index, on ); } @@ -1669,8 +1664,8 @@ { if (index <= descr->selected_item) { - descr->selected_item++; - descr->focus_item = oldfocus; /* focus not changed */ + descr->selected_item++; + descr->focus_item = oldfocus; /* focus not changed */ } } return LB_OKAY; @@ -1680,8 +1675,7 @@ /*********************************************************************** * LISTBOX_InsertString */ -static LRESULT LISTBOX_InsertString( LB_DESCR *descr, INT index, - LPCWSTR str ) +static LRESULT LISTBOX_InsertString( LB_DESCR *descr, INT index, LPCWSTR str ) { LPWSTR new_str = NULL; ULONG_PTR data = 0; @@ -1815,7 +1809,7 @@ { INT i; - for (i = 0; i < descr->nb_items; i++) LISTBOX_DeleteItem( descr, i ); + for(i = descr->nb_items - 1; i>=0; i--) LISTBOX_DeleteItem( descr, i); HeapFree( GetProcessHeap(), 0, descr->items ); descr->nb_items = 0; descr->top_item = 0; @@ -1873,7 +1867,7 @@ /* scan directory */ if ((handle = FindFirstFileW(filespec, &entry)) == INVALID_HANDLE_VALUE) { - int le = GetLastError(); + int le = GetLastError(); if ((le != ERROR_NO_MORE_FILES) && (le != ERROR_FILE_NOT_FOUND)) return LB_ERR; } else @@ -1913,17 +1907,11 @@ pos = LISTBOX_FindFileStrPos( descr, buffer ); if ((ret = LISTBOX_InsertString( descr, pos, buffer )) < 0) break; - - if (ret <= maxinsert) - maxinsert++; - else - maxinsert = ret; - + if (ret <= maxinsert) maxinsert++; else maxinsert = ret; } while (FindNextFileW( handle, &entry )); FindClose( handle ); } } - if (ret >= 0) { ret = maxinsert; @@ -2500,7 +2488,7 @@ LISTBOX_SetSelection( descr, caret, TRUE, FALSE); if (descr->style & LBS_NOTIFY) { - if( descr->lphc ) + if (descr->lphc && IsWindowVisible( descr->self )) { /* make sure that combo parent doesn't hide us */ descr->lphc->wState |= CBF_NOROLLUP; @@ -2594,7 +2582,7 @@ descr->lphc = lphc; #ifndef __REACTOS__ - if (is_old_app(hwnd) && ( descr->style & ( WS_VSCROLL | WS_HSCROLL ) ) ) + if (is_old_app(descr) && ( descr->style & ( WS_VSCROLL | WS_HSCROLL ) ) ) { /* Win95 document "List Box Differences" from MSDN: If a list box in a version 3.x application has either the @@ -2607,7 +2595,7 @@ if( lphc ) { - TRACE_(combo)("[%p]: resetting owner %p -> %p\n", hwnd, descr->owner, lphc->self ); + TRACE("[%p]: resetting owner %p -> %p\n", descr->self, descr->owner, lphc->self ); descr->owner = lphc->self; } @@ -2663,8 +2651,8 @@ /*********************************************************************** * ListBoxWndProc_common */ -static LRESULT WINAPI ListBoxWndProc_common( HWND hwnd, UINT msg, - WPARAM wParam, LPARAM lParam, BOOL unicode ) +static LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, + WPARAM wParam, LPARAM lParam, BOOL unicode ) { LB_DESCR *descr = (LB_DESCR *)GetWindowLongPtrW( hwnd, 0 ); LPHEADCOMBO lphc = 0; @@ -2679,7 +2667,7 @@ CREATESTRUCTW *lpcs = (CREATESTRUCTW *)lParam; if (lpcs->style & LBS_COMBOBOX) lphc = (LPHEADCOMBO)lpcs->lpCreateParams; if (!LISTBOX_Create( hwnd, lphc )) return -1; - TRACE("creating wnd=%p descr=%lx\n", hwnd, GetWindowLongPtrW( hwnd, 0 ) ); + TRACE("creating hwnd %p descr %p\n", hwnd, (void *)GetWindowLongPtrW( hwnd, 0 ) ); return 0; } /* Ignore all other messages before we get a WM_CREATE */ @@ -2689,7 +2677,7 @@ if (descr->style & LBS_COMBOBOX) lphc = descr->lphc; TRACE("[%p]: msg %s wp %08lx lp %08lx\n", - hwnd, SPY_GetMsgName(msg, hwnd), wParam, lParam ); + descr->self, SPY_GetMsgName(msg, descr->self), wParam, lParam ); switch(msg) { @@ -2721,6 +2709,8 @@ INT countW = MultiByteToWideChar(CP_ACP, 0, textA, -1, NULL, 0); if((textW = HeapAlloc(GetProcessHeap(), 0, countW * sizeof(WCHAR)))) MultiByteToWideChar(CP_ACP, 0, textA, -1, textW, countW); + else + return LB_ERRSPACE; } /* in the unicode the version, the string is really overwritten during the converting case */ @@ -2755,6 +2745,8 @@ INT countW = MultiByteToWideChar(CP_ACP, 0, textA, -1, NULL, 0); if((textW = HeapAlloc(GetProcessHeap(), 0, countW * sizeof(WCHAR)))) MultiByteToWideChar(CP_ACP, 0, textA, -1, textW, countW); + else + return LB_ERRSPACE; } /* in the unicode the version, the string is really overwritten during the converting case */ @@ -2785,6 +2777,8 @@ INT countW = MultiByteToWideChar(CP_ACP, 0, textA, -1, NULL, 0); if((textW = HeapAlloc(GetProcessHeap(), 0, countW * sizeof(WCHAR)))) MultiByteToWideChar(CP_ACP, 0, textA, -1, textW, countW); + else + return LB_ERRSPACE; } wParam = LISTBOX_FindFileStrPos( descr, textW ); ret = LISTBOX_InsertString( descr, wParam, textW ); @@ -2963,8 +2957,12 @@ case LB_GETITEMRECT16: { RECT rect; + RECT16 *r16 = MapSL(lParam); ret = LISTBOX_GetItemRect( descr, (INT16)wParam, &rect ); - CONV_RECT32TO16( &rect, MapSL(lParam) ); + r16->left = rect.left; + r16->top = rect.top; + r16->right = rect.right; + r16->bottom = rect.bottom; } return ret; #endif @@ -3083,8 +3081,8 @@ if (IS_MULTISELECT(descr)) return LB_ERR; LISTBOX_SetCaretIndex( descr, wParam, FALSE ); ret = LISTBOX_SetSelection( descr, wParam, TRUE, FALSE ); - if (ret != LB_ERR) ret = descr->selected_item; - return ret; + if (ret != LB_ERR) ret = descr->selected_item; + return ret; #ifndef __REACTOS__ case LB_GETSELCOUNT16: @@ -3236,7 +3234,7 @@ return LISTBOX_Destroy( descr ); case WM_ENABLE: - InvalidateRect( hwnd, NULL, TRUE ); + InvalidateRect( descr->self, NULL, TRUE ); return 0; case WM_SETREDRAW: @@ -3252,7 +3250,7 @@ PAINTSTRUCT ps; HDC hdc = ( wParam ) ? ((HDC)wParam) : BeginPaint( descr->self, &ps ); ret = LISTBOX_Paint( descr, hdc ); - if( !wParam ) EndPaint( hwnd, &ps ); + if( !wParam ) EndPaint( descr->self, &ps ); } return ret; case WM_SIZE: @@ -3262,7 +3260,7 @@ return (LRESULT)descr->font; case WM_SETFONT: LISTBOX_SetFont( descr, (HFONT)wParam ); - if (lParam) InvalidateRect( hwnd, 0, TRUE ); + if (lParam) InvalidateRect( descr->self, 0, TRUE ); return 0; case WM_SETFOCUS: descr->in_focus = TRUE; @@ -3283,7 +3281,7 @@ return LISTBOX_HandleVScroll( descr, LOWORD(wParam), HIWORD(wParam) ); case WM_MOUSEWHEEL: if (wParam & (MK_SHIFT | MK_CONTROL)) - return DefWindowProcW( hwnd, msg, wParam, lParam ); + return DefWindowProcW( descr->self, msg, wParam, lParam ); return LISTBOX_HandleMouseWheel( descr, (SHORT)HIWORD(wParam) ); case WM_LBUTTONDOWN: if (lphc) @@ -3342,7 +3340,7 @@ mousePos.x = (INT16)LOWORD(lParam); mousePos.y = (INT16)HIWORD(lParam); - GetClientRect(hwnd, &clientRect); + GetClientRect(descr->self, &clientRect); /* * When the user clicks outside the combobox and the focus @@ -3431,7 +3429,6 @@ if ((msg >= WM_USER) && (msg < 0xc000)) WARN("[%p]: unknown msg %04x wp %08lx lp %08lx\n", hwnd, msg, wParam, lParam ); - break; } return unicode ? DefWindowProcW( hwnd, msg, wParam, lParam ) : @@ -3440,9 +3437,6 @@ /*********************************************************************** * ListBoxWndProcA - * - * This is just a wrapper for the real wndproc, it only does window locking - * and unlocking. */ static LRESULT WINAPI ListBoxWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) { @@ -3456,4 +3450,3 @@ { return ListBoxWndProc_common( hwnd, msg, wParam, lParam, TRUE ); } -

15 years, 8 months

[cgutman] 38864: - Fix an NCE state check

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Jan 17 19:36:06 2009 New Revision: 38864 URL: http://svn.reactos.org/svn/reactos?rev=38864&view=rev Log: - Fix an NCE state check Modified: branches/aicom-network-fixes/lib/drivers/ip/network/neighbor.c Modified: branches/aicom-network-fixes/lib/drivers/ip/network/neighbor.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/network/neighbor.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/network/neighbor.c [iso-8859-1] Sat Jan 17 19:36:06 2009 @@ -237,7 +237,7 @@ { TI_DbgPrint(DEBUG_NCACHE, ("Called. NCE (0x%X).\n", NCE)); - if (NCE->State == NUD_INCOMPLETE) + if (NCE->State & NUD_INCOMPLETE) { /* This is the first solicitation of this neighbor. Broadcast a request for the neighbor */

15 years, 8 months

[tkreuzer] 38863: user32: sync DIALOG_DlgDirSelect to wine 1.1.13: Fixes crash of user32 winetest listbox

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Jan 17 19:17:47 2009 New Revision: 38863 URL: http://svn.reactos.org/svn/reactos?rev=38863&view=rev Log: user32: sync DIALOG_DlgDirSelect to wine 1.1.13: Fixes crash of user32 winetest listbox Modified: trunk/reactos/dll/win32/user32/windows/dialog.c Modified: trunk/reactos/dll/win32/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] Sat Jan 17 19:17:47 2009 @@ -1354,12 +1354,13 @@ BOOL ret; HWND listbox = GetDlgItem( hwnd, id ); - TRACE("%p '%s' %d\n", hwnd, str, id ); + TRACE("%p %s %d\n", hwnd, unicode ? debugstr_w(str) : debugstr_a((LPSTR)str), id ); if (!listbox) return FALSE; item = SendMessageW(listbox, combo ? CB_GETCURSEL : LB_GETCURSEL, 0, 0 ); if (item == LB_ERR) return FALSE; - size = SendMessageW(listbox, combo ? CB_GETLBTEXTLEN : LB_GETTEXTLEN, 0, 0 ); + + size = SendMessageW(listbox, combo ? CB_GETLBTEXTLEN : LB_GETTEXTLEN, item, 0 ); if (size == LB_ERR) return FALSE; if (!(buffer = HeapAlloc( GetProcessHeap(), 0, (size+2) * sizeof(WCHAR) ))) return FALSE; @@ -1396,11 +1397,9 @@ if (len > 0 && !WideCharToMultiByte( CP_ACP, 0, ptr, -1, (LPSTR)str, len, 0, 0 )) ((LPSTR)str)[len-1] = 0; } - else - lstrcpynW( str, ptr, len ); - + else lstrcpynW( str, ptr, len ); HeapFree( GetProcessHeap(), 0, buffer ); - TRACE("Returning %d '%s'\n", ret, str ); + TRACE("Returning %d %s\n", ret, unicode ? debugstr_w(str) : debugstr_a((LPSTR)str) ); return ret; }

15 years, 8 months

← Newer
1
...
36
37
38
39
40
41
42
...
76
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2009