Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 59969: [PSDK] * Annotate usp10.h.
by akhaldi＠svn.reactos.org 02 Sep '13

02 Sep '13

Author: akhaldi Date: Mon Sep 2 22:49:45 2013 New Revision: 59969 URL: http://svn.reactos.org/svn/reactos?rev=59969&view=rev Log: [PSDK] * Annotate usp10.h. Modified: trunk/reactos/include/psdk/usp10.h Modified: trunk/reactos/include/psdk/usp10.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/usp10.h?rev=5… ============================================================================== --- trunk/reactos/include/psdk/usp10.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/usp10.h [iso-8859-1] Mon Sep 2 22:49:45 2013 @@ -230,65 +230,310 @@ /* Function Declarations */ -HRESULT WINAPI ScriptApplyDigitSubstitution(const SCRIPT_DIGITSUBSTITUTE* psds, - SCRIPT_CONTROL* psc, SCRIPT_STATE* pss); -HRESULT WINAPI ScriptApplyLogicalWidth(const int *piDx, int cChars, int cGlyphs, const WORD *pwLogClust, - const SCRIPT_VISATTR *psva, const int *piAdvance, - const SCRIPT_ANALYSIS *psa, ABC *pABC, int *piJustify); -HRESULT WINAPI ScriptRecordDigitSubstitution(LCID Locale, SCRIPT_DIGITSUBSTITUTE *psds); -HRESULT WINAPI ScriptItemize(const WCHAR *pwcInChars, int cInChars, int cMaxItems, - const SCRIPT_CONTROL *psControl, const SCRIPT_STATE *psState, - SCRIPT_ITEM *pItems, int *pcItems); -HRESULT WINAPI ScriptGetCMap(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcInChars, int cChars, - DWORD dwFlags, WORD *pwOutGlyphs); -HRESULT WINAPI ScriptGetFontProperties(HDC hdc, SCRIPT_CACHE *psc, SCRIPT_FONTPROPERTIES *sfp); -HRESULT WINAPI ScriptGetGlyphABCWidth(HDC hdc, SCRIPT_CACHE *psc, WORD wGlyph, ABC *pABC); -HRESULT WINAPI ScriptGetLogicalWidths(const SCRIPT_ANALYSIS *psa, int cChars, int cGlyphs, - const int *piGlyphWidth, const WORD *pwLogClust, - const SCRIPT_VISATTR *psva, int *piDx); -HRESULT WINAPI ScriptGetProperties(const SCRIPT_PROPERTIES ***ppSp, int *piNumScripts); -HRESULT WINAPI ScriptStringAnalyse(HDC hdc, - const void *pString, - int cString, - int cGlyphs, - int iCharset, - DWORD dwFlags, - int iReqWidth, - SCRIPT_CONTROL *psControl, - SCRIPT_STATE *psState, - const int *piDx, - SCRIPT_TABDEF *pTabdef, - const BYTE *pbInClass, - SCRIPT_STRING_ANALYSIS *pssa); -HRESULT WINAPI ScriptStringValidate(SCRIPT_STRING_ANALYSIS ssa); -HRESULT WINAPI ScriptStringFree(SCRIPT_STRING_ANALYSIS *pssa); -HRESULT WINAPI ScriptFreeCache(SCRIPT_CACHE *psc); -HRESULT WINAPI ScriptIsComplex(const WCHAR* pwcInChars, int cInChars, DWORD dwFlags); -HRESULT WINAPI ScriptJustify(const SCRIPT_VISATTR *psva, const int *piAdvance, int cGlyphs, - int iDx, int iMinKashida, int *piJustify); -HRESULT WINAPI ScriptLayout(int cRuns, const BYTE *pbLevel, int *piVisualToLogical, int *piLogicalToVisual); -HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, int cChars, int cMaxGlyphs, - SCRIPT_ANALYSIS *psa, WORD *pwOutGlyphs, WORD *pwLogClust, SCRIPT_VISATTR *psva, int *pcGlyphs); -HRESULT WINAPI ScriptPlace(HDC hdc, SCRIPT_CACHE *psc, const WORD *pwGlyphs, int cGlyphs, const SCRIPT_VISATTR *psva, - SCRIPT_ANALYSIS *psa, int *piAdvance, GOFFSET *pGoffset, ABC *pABC ); -HRESULT WINAPI ScriptBreak(const WCHAR *pwcChars, int cChars, const SCRIPT_ANALYSIS *psa, SCRIPT_LOGATTR *psla); -HRESULT WINAPI ScriptCacheGetHeight(HDC hdc, SCRIPT_CACHE *psc, LONG *tmHeight); -HRESULT WINAPI ScriptCPtoX(int iCP, BOOL fTrailing, int cChars, int cGlyphs, const WORD *pwLogClust, const SCRIPT_VISATTR *psva, - const int *piAdvance, const SCRIPT_ANALYSIS *psa, int *piX); -HRESULT WINAPI ScriptXtoCP(int iX, int cChars, int cGlyphs, const WORD *pwLogClust, const SCRIPT_VISATTR *psva, - const int *piAdvance, const SCRIPT_ANALYSIS *psa, int *piCP, int *piTrailing); -HRESULT WINAPI ScriptStringCPtoX(SCRIPT_STRING_ANALYSIS ssa, int icp, BOOL fTrailing, int *pX); -HRESULT WINAPI ScriptStringXtoCP(SCRIPT_STRING_ANALYSIS ssa, int iX, int *piCh , int *piTrailing); -HRESULT WINAPI ScriptStringGetLogicalWidths(SCRIPT_STRING_ANALYSIS ssa, int *piDx); -HRESULT WINAPI ScriptStringGetOrder(SCRIPT_STRING_ANALYSIS ssa, UINT *puOrder); -HRESULT WINAPI ScriptStringOut(SCRIPT_STRING_ANALYSIS ssa, int iX, int iY, UINT uOptions, const RECT *prc, - int iMinSel, int iMaxSel, BOOL fDisabled); -HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UINT fuOptions, const RECT *lprc, - const SCRIPT_ANALYSIS *psa, const WCHAR *pwcReserved, int iReserved, const WORD *pwGlyphs, - int cGlyphs, const int *piAdvance, const int *piJustify, const GOFFSET *pGoffset); -const int* WINAPI ScriptString_pcOutChars(SCRIPT_STRING_ANALYSIS ssa); -const SCRIPT_LOGATTR* WINAPI ScriptString_pLogAttr(SCRIPT_STRING_ANALYSIS ssa); -const SIZE* WINAPI ScriptString_pSize(SCRIPT_STRING_ANALYSIS ssa); +_Check_return_ +HRESULT +WINAPI +ScriptApplyDigitSubstitution( + _In_reads_(1) const SCRIPT_DIGITSUBSTITUTE* psds, + _Out_writes_(1) SCRIPT_CONTROL* psc, + _Out_writes_(1) SCRIPT_STATE* pss); + +_Check_return_ +HRESULT +WINAPI +ScriptApplyLogicalWidth( + _In_reads_(cChars) const int *piDx, + _In_ int cChars, + _In_ int cGlyphs, + _In_reads_(cChars) const WORD *pwLogClust, + _In_reads_(cGlyphs) const SCRIPT_VISATTR *psva, + _In_reads_(cGlyphs) const int *piAdvance, + _In_reads_(1) const SCRIPT_ANALYSIS *psa, + _Inout_updates_opt_(1) ABC *pABC, + _Out_writes_all_(cGlyphs) int *piJustify); + +_Check_return_ +HRESULT +WINAPI +ScriptRecordDigitSubstitution( + _In_ LCID Locale, + _Out_writes_(1) SCRIPT_DIGITSUBSTITUTE *psds); + +_Check_return_ +HRESULT +WINAPI +ScriptItemize( + _In_reads_(cInChars) const WCHAR *pwcInChars, + _In_ int cInChars, + _In_ int cMaxItems, + _In_reads_opt_(1) const SCRIPT_CONTROL *psControl, + _In_reads_opt_(1) const SCRIPT_STATE *psState, + _Out_writes_to_(cMaxItems, *pcItems) SCRIPT_ITEM *pItems, + _Out_writes_(1) int *pcItems); + +_Check_return_ +HRESULT +WINAPI +ScriptGetCMap( + _In_ HDC hdc, + _Inout_updates_(1) SCRIPT_CACHE *psc, + _In_reads_(cChars) const WCHAR *pwcInChars, + _In_ int cChars, + _In_ DWORD dwFlags, + _Out_writes_(cChars) WORD *pwOutGlyphs); + +_Check_return_ +HRESULT +WINAPI +ScriptGetFontProperties( + _In_ HDC hdc, + _Inout_updates_(1) SCRIPT_CACHE *psc, + _Out_writes_(1) SCRIPT_FONTPROPERTIES *sfp); + +_Check_return_ +HRESULT +WINAPI +ScriptGetGlyphABCWidth( + _In_ HDC hdc, + _Inout_updates_(1) SCRIPT_CACHE *psc, + _In_ WORD wGlyph, + _Out_writes_(1) ABC *pABC); + +_Check_return_ +HRESULT +WINAPI +ScriptGetLogicalWidths( + _In_reads_(1) const SCRIPT_ANALYSIS *psa, + _In_ int cChars, + _In_ int cGlyphs, + _In_reads_(cGlyphs) const int *piGlyphWidth, + _In_reads_(cChars) const WORD *pwLogClust, + _In_reads_(cGlyphs) const SCRIPT_VISATTR *psva, + _In_reads_(cChars) int *piDx); + +_Check_return_ +HRESULT +WINAPI +ScriptGetProperties( + _Outptr_result_buffer_(*piNumScripts) const SCRIPT_PROPERTIES ***ppSp, + _Out_ int *piNumScripts); + +_Check_return_ +HRESULT +WINAPI +ScriptStringAnalyse( + _In_ HDC hdc, + _In_ const void *pString, + _In_ int cString, + _In_ int cGlyphs, + _In_ int iCharset, + _In_ DWORD dwFlags, + _In_ int iReqWidth, + _In_reads_opt_(1) SCRIPT_CONTROL *psControl, + _In_reads_opt_(1) SCRIPT_STATE *psState, + _In_reads_opt_(cString) const int *piDx, + _In_reads_opt_(1) SCRIPT_TABDEF *pTabdef, + _In_ const BYTE *pbInClass, + _Outptr_result_buffer_(1) SCRIPT_STRING_ANALYSIS *pssa); + +_Check_return_ +HRESULT +WINAPI +ScriptStringValidate( + _In_reads_(1) SCRIPT_STRING_ANALYSIS ssa); + +_Check_return_ +HRESULT +WINAPI +ScriptStringFree( + _Inout_updates_(1) SCRIPT_STRING_ANALYSIS *pssa); + +_Check_return_ +HRESULT +WINAPI +ScriptFreeCache( + _Inout_updates_(1) _At_(*psc, _Post_null_) SCRIPT_CACHE *psc); + +_Check_return_ +HRESULT +WINAPI +ScriptIsComplex( + _In_reads_(cInChars) const WCHAR *pwcInChars, + _In_ int cInChars, + _In_ DWORD dwFlags); + +_Check_return_ +HRESULT +WINAPI +ScriptJustify( + _In_reads_(cGlyphs) const SCRIPT_VISATTR *psva, + _In_reads_(cGlyphs) const int *piAdvance, + _In_ int cGlyphs, + _In_ int iDx, + _In_ int iMinKashida, + _Out_writes_all_(cGlyphs) int *piJustify); + +_Check_return_ +HRESULT +WINAPI +ScriptLayout( + int cRuns, + _In_reads_(cRuns) const BYTE *pbLevel, + _Out_writes_all_opt_(cRuns) int *piVisualToLogical, + _Out_writes_all_opt_(cRuns) int *piLogicalToVisual); + +_Check_return_ +HRESULT +WINAPI +ScriptShape( + _In_ HDC hdc, + _Inout_updates_(1) SCRIPT_CACHE *psc, + _In_reads_(cChars) const WCHAR *pwcChars, + _In_ int cChars, + _In_ int cMaxGlyphs, + _Inout_updates_(1) SCRIPT_ANALYSIS *psa, + _Out_writes_to_(cMaxGlyphs, *pcGlyphs) WORD *pwOutGlyphs, + _Out_writes_all_(cChars) WORD *pwLogClust, + _Out_writes_to_(cMaxGlyphs, *pcGlyphs) SCRIPT_VISATTR *psva, + _Out_writes_(1) int *pcGlyphs); + +_Check_return_ +HRESULT +WINAPI +ScriptPlace( + _In_ HDC hdc, + _Inout_updates_(1) SCRIPT_CACHE *psc, + _In_reads_(cGlyphs) const WORD *pwGlyphs, + _In_ int cGlyphs, + _In_reads_(cGlyphs) const SCRIPT_VISATTR *psva, + _Inout_updates_(1) SCRIPT_ANALYSIS *psa, + _Out_writes_all_(cGlyphs) int *piAdvance, + _Out_writes_all_opt_(cGlyphs) GOFFSET *pGoffset, + _Out_writes_(1) ABC *pABC); + +_Check_return_ +HRESULT +WINAPI +ScriptBreak( + _In_reads_(cChars) const WCHAR *pwcChars, + _In_ int cChars, + _In_reads_(1) const SCRIPT_ANALYSIS *psa, + _Out_writes_all_(cChars) SCRIPT_LOGATTR *psla); + +_Check_return_ +HRESULT +WINAPI +ScriptCacheGetHeight( + _In_ HDC hdc, + _Inout_updates_(1) SCRIPT_CACHE *psc, + _Out_writes_(1) LONG *tmHeight); + +_Check_return_ +HRESULT +WINAPI +ScriptCPtoX( + _In_ int iCP, + _In_ BOOL fTrailing, + _In_ int cChars, + _In_ int cGlyphs, + _In_reads_(cChars) const WORD *pwLogClust, + _In_reads_(cGlyphs) const SCRIPT_VISATTR *psva, + _In_reads_(cGlyphs) const int *piAdvance, + _In_reads_(1) const SCRIPT_ANALYSIS *psa, + _Out_ int *piX); + +_Check_return_ +HRESULT +WINAPI +ScriptXtoCP( + _In_ int iX, + _In_ int cChars, + _In_ int cGlyphs, + _In_reads_(cChars) const WORD *pwLogClust, + _In_reads_(cGlyphs) const SCRIPT_VISATTR *psva, + _In_reads_(cGlyphs) const int *piAdvance, + _In_reads_(1) const SCRIPT_ANALYSIS *psa, + _Out_writes_(1) int *piCP, + _Out_writes_(1) int *piTrailing); + +_Check_return_ +HRESULT +WINAPI +ScriptStringCPtoX( + _In_reads_(1) SCRIPT_STRING_ANALYSIS ssa, + _In_ int icp, + _In_ BOOL fTrailing, + _Out_writes_(1) int *pX); + +_Check_return_ +HRESULT +WINAPI +ScriptStringXtoCP( + _In_reads_(1) SCRIPT_STRING_ANALYSIS ssa, + _In_ int iX, + _Out_writes_(1) int *piCh, + _Out_writes_(1) int *piTrailing); + +_Check_return_ +HRESULT +WINAPI +ScriptStringGetLogicalWidths( + _In_reads_(1) SCRIPT_STRING_ANALYSIS ssa, + _Out_ int *piDx); + +_Check_return_ +HRESULT +WINAPI +ScriptStringGetOrder( + _In_reads_(1) SCRIPT_STRING_ANALYSIS ssa, + _Out_ UINT *puOrder); + +_Check_return_ +HRESULT +WINAPI +ScriptStringOut( + _In_reads_(1) SCRIPT_STRING_ANALYSIS ssa, + _In_ int iX, + _In_ int iY, + _In_ UINT uOptions, + _In_reads_opt_(1) const RECT *prc, + _In_ int iMinSel, + _In_ int iMaxSel, + _In_ BOOL fDisabled); + +_Check_return_ +HRESULT +WINAPI +ScriptTextOut( + _In_ const HDC hdc, + _Inout_updates_(1) SCRIPT_CACHE *psc, + _In_ int x, + _In_ int y, + _In_ UINT fuOptions, + _In_reads_opt_(1) const RECT *lprc, + _In_reads_(1) const SCRIPT_ANALYSIS *psa, + _Reserved_ const WCHAR *pwcReserved, + _Reserved_ int iReserved, + _In_reads_(cGlyphs) const WORD *pwGlyphs, + _In_ int cGlyphs, + _In_reads_(cGlyphs) const int *piAdvance, + _In_reads_opt_(cGlyphs) const int *piJustify, + _In_reads_(cGlyphs) const GOFFSET *pGoffset); + +const int* +WINAPI +ScriptString_pcOutChars( + _In_reads_(1) SCRIPT_STRING_ANALYSIS ssa); + +const SCRIPT_LOGATTR* +WINAPI +ScriptString_pLogAttr( + _In_reads_(1) SCRIPT_STRING_ANALYSIS ssa); + +const SIZE* +WINAPI +ScriptString_pSize( + _In_reads_(1) SCRIPT_STRING_ANALYSIS ssa); #ifdef __cplusplus } /* extern "C" */

1 0

[akhaldi] 59968: [SMLIB] * Fix some print specifiers.
by akhaldi＠svn.reactos.org 02 Sep '13

02 Sep '13

Author: akhaldi Date: Mon Sep 2 22:43:37 2013 New Revision: 59968 URL: http://svn.reactos.org/svn/reactos?rev=59968&view=rev Log: [SMLIB] * Fix some print specifiers. Modified: trunk/reactos/lib/smlib/execpgm.c trunk/reactos/lib/smlib/lookupss.c Modified: trunk/reactos/lib/smlib/execpgm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/smlib/execpgm.c?rev=59… ============================================================================== --- trunk/reactos/lib/smlib/execpgm.c [iso-8859-1] (original) +++ trunk/reactos/lib/smlib/execpgm.c [iso-8859-1] Mon Sep 2 22:43:37 2013 @@ -36,7 +36,7 @@ SM_PORT_MESSAGE SmReqMsg; - DPRINT("SMLIB: %s(%08lx,'%S') called\n", + DPRINT("SMLIB: %s(%p,'%S') called\n", __FUNCTION__, hSmApiPort, Pgm->Buffer); /* Check Pgm's length */ @@ -63,7 +63,7 @@ " u2.s2.Type = %d\n" " u1.s1.DataLength = %d\n" " u1.s1.TotalLength = %d\n" - " sizeof(PORT_MESSAGE)==%d\n", + " sizeof(PORT_MESSAGE)==%u\n", __FUNCTION__, SmReqMsg.Header.u2.s2.Type, SmReqMsg.Header.u1.s1.DataLength, Modified: trunk/reactos/lib/smlib/lookupss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/smlib/lookupss.c?rev=5… ============================================================================== --- trunk/reactos/lib/smlib/lookupss.c [iso-8859-1] (original) +++ trunk/reactos/lib/smlib/lookupss.c [iso-8859-1] Mon Sep 2 22:43:37 2013 @@ -84,9 +84,9 @@ & ResultLength); if(NT_SUCCESS(Status)) { - DPRINT("nkvpi.TitleIndex = %ld\n", kvpi->TitleIndex); - DPRINT("kvpi.Type = %ld\n", kvpi->Type); - DPRINT("kvpi.DataLength = %ld\n", kvpi->DataLength); + DPRINT("nkvpi.TitleIndex = %lu\n", kvpi->TitleIndex); + DPRINT("kvpi.Type = %lu\n", kvpi->Type); + DPRINT("kvpi.DataLength = %lu\n", kvpi->DataLength); if((NULL != Data) && (NULL != DataLength) && (NULL != DataType)) {

1 0

[hbelusca] 59967: [NTOS:LPC]: Rename a flag I've introduced sooner, and remove an unneeded variable + code formatting.
by hbelusca＠svn.reactos.org 02 Sep '13

02 Sep '13

Author: hbelusca Date: Mon Sep 2 22:19:41 2013 New Revision: 59967 URL: http://svn.reactos.org/svn/reactos?rev=59967&view=rev Log: [NTOS:LPC]: Rename a flag I've introduced sooner, and remove an unneeded variable + code formatting. Modified: trunk/reactos/ntoskrnl/include/internal/lpc.h trunk/reactos/ntoskrnl/lpc/close.c trunk/reactos/ntoskrnl/lpc/reply.c trunk/reactos/ntoskrnl/lpc/send.c Modified: trunk/reactos/ntoskrnl/include/internal/lpc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/lpc.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/lpc.h [iso-8859-1] Mon Sep 2 22:19:41 2013 @@ -60,7 +60,7 @@ // // LPC Locking Flags // -#define LPCP_LOCK_OWNED 1 +#define LPCP_LOCK_HELD 1 #define LPCP_LOCK_RELEASE 2 // Modified: trunk/reactos/ntoskrnl/lpc/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/close.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/close.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/lpc/close.c [iso-8859-1] Mon Sep 2 22:19:41 2013 @@ -55,7 +55,7 @@ PLPCP_CONNECTION_MESSAGE ConnectMessage; PLPCP_PORT_OBJECT ClientPort = NULL; PETHREAD Thread = NULL; - BOOLEAN LockHeld = (LockFlags & LPCP_LOCK_OWNED); + BOOLEAN LockHeld = (LockFlags & LPCP_LOCK_HELD); BOOLEAN ReleaseLock = (LockFlags & LPCP_LOCK_RELEASE); PAGED_CODE(); @@ -186,7 +186,7 @@ Thread->LpcReplyMessage = NULL; /* And remove the message from the port zone */ - LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED); + LpcpFreeToPortZone(Message, LPCP_LOCK_HELD); NextEntry = Port->LpcReplyChainHead.Flink; } @@ -213,7 +213,7 @@ InitializeListHead(&Message->Entry); /* Remove it from the port zone */ - LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED); + LpcpFreeToPortZone(Message, LPCP_LOCK_HELD); } /* Release the lock */ @@ -407,7 +407,7 @@ /* Free queued messages */ RemoveEntryList(&Message->Entry); InitializeListHead(&Message->Entry); - LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED); + LpcpFreeToPortZone(Message, LPCP_LOCK_HELD); /* Restart at the head */ NextEntry = ListHead->Flink; @@ -420,7 +420,7 @@ /* Remove it */ RemoveEntryList(&Message->Entry); InitializeListHead(&Message->Entry); - LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED); + LpcpFreeToPortZone(Message, LPCP_LOCK_HELD); /* Restart at the head */ NextEntry = ListHead->Flink; Modified: trunk/reactos/ntoskrnl/lpc/reply.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/reply.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/reply.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/lpc/reply.c [iso-8859-1] Mon Sep 2 22:19:41 2013 @@ -48,7 +48,7 @@ /* Unlink and free it */ RemoveEntryList(&Message->Entry); InitializeListHead(&Message->Entry); - LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED); + LpcpFreeToPortZone(Message, LPCP_LOCK_HELD); break; } @@ -63,7 +63,7 @@ IN PLPCP_MESSAGE Message, IN ULONG LockFlags) { - BOOLEAN LockHeld = (LockFlags & LPCP_LOCK_OWNED); + BOOLEAN LockHeld = (LockFlags & LPCP_LOCK_HELD); PAGED_CODE(); @@ -238,7 +238,7 @@ Request) != LPC_REQUEST))) { /* It isn't, fail */ - LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); + LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE); if (ConnectionPort) ObDereferenceObject(ConnectionPort); ObDereferenceObject(WakeupThread); ObDereferenceObject(Port); @@ -257,7 +257,7 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { /* Fail */ - LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); + LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE); ObDereferenceObject(WakeupThread); ObDereferenceObject(Port); _SEH2_YIELD(return _SEH2_GetExceptionCode()); @@ -482,7 +482,7 @@ Request) != LPC_REQUEST))) { /* It isn't, fail */ - LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); + LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE); if (ConnectionPort) ObDereferenceObject(ConnectionPort); ObDereferenceObject(WakeupThread); ObDereferenceObject(Port); @@ -639,7 +639,7 @@ if (Message->Request.u2.s2.DataInfoOffset) { /* It does, save it, and don't free the message below */ - LpcpSaveDataInfoMessage(Port, Message, LPCP_LOCK_OWNED); + LpcpSaveDataInfoMessage(Port, Message, LPCP_LOCK_HELD); Message = NULL; } } @@ -661,7 +661,7 @@ if (Message) { /* Free it and release the lock */ - LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); + LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE); } else { Modified: trunk/reactos/ntoskrnl/lpc/send.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/send.c?rev=59… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/send.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/lpc/send.c [iso-8859-1] Mon Sep 2 22:19:41 2013 @@ -104,7 +104,7 @@ if (!ConnectionPort) { /* Fail */ - LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); + LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE); return STATUS_PORT_DISCONNECTED; } } @@ -115,7 +115,7 @@ if (!ConnectionPort) { /* Fail */ - LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); + LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE); return STATUS_PORT_DISCONNECTED; } } @@ -134,7 +134,7 @@ if (QueuePort) { /* Generate the Message ID and set it */ - Message->Request.MessageId = LpcpNextMessageId++; + Message->Request.MessageId = LpcpNextMessageId++; if (!LpcpNextMessageId) LpcpNextMessageId = 1; Message->Request.CallbackId = 0; @@ -144,7 +144,7 @@ /* Insert the message in our chain */ InsertTailList(&QueuePort->MsgQueue.ReceiveHead, &Message->Entry); - /* Release the lock and release the semaphore */ + /* Release the lock and the semaphore */ KeEnterCriticalRegion(); KeReleaseGuardedMutex(&LpcpLock); LpcpCompleteWait(QueuePort->MsgQueue.Semaphore); @@ -156,15 +156,16 @@ KeSetEvent(&QueuePort->WaitEvent, IO_NO_INCREMENT, FALSE); } + KeLeaveCriticalRegion(); + /* We're done */ - KeLeaveCriticalRegion(); if (ConnectionPort) ObDereferenceObject(ConnectionPort); LPCTRACE(LPC_SEND_DEBUG, "Port: %p. Message: %p\n", QueuePort, Message); return STATUS_SUCCESS; } /* If we got here, then free the message and fail */ - LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); + LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE); if (ConnectionPort) ObDereferenceObject(ConnectionPort); return STATUS_PORT_DISCONNECTED; } @@ -284,7 +285,7 @@ if (!QueuePort) { /* We have no connected port, fail */ - LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); + LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE); return STATUS_PORT_DISCONNECTED; } @@ -300,7 +301,7 @@ if (!ConnectionPort) { /* Fail */ - LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); + LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE); return STATUS_PORT_DISCONNECTED; } } @@ -312,7 +313,7 @@ if (!ConnectionPort) { /* Fail */ - LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); + LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE); return STATUS_PORT_DISCONNECTED; } } @@ -331,7 +332,7 @@ Message->SenderPort = Port; /* Generate the Message ID and set it */ - Message->Request.MessageId = LpcpNextMessageId++; + Message->Request.MessageId = LpcpNextMessageId++; if (!LpcpNextMessageId) LpcpNextMessageId = 1; Message->Request.CallbackId = 0; @@ -413,7 +414,7 @@ } /* Free the message */ - LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); + LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE); } else { @@ -452,7 +453,6 @@ PLPCP_MESSAGE Message; KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); PETHREAD Thread = PsGetCurrentThread(); - PKSEMAPHORE Semaphore; PAGED_CODE(); @@ -536,7 +536,7 @@ if (!QueuePort) { /* We have no connected port, fail */ - LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); + LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE); ObDereferenceObject(Port); return STATUS_PORT_DISCONNECTED; } @@ -550,7 +550,7 @@ if (!ConnectionPort) { /* Fail */ - LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); + LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE); ObDereferenceObject(Port); return STATUS_PORT_DISCONNECTED; } @@ -563,7 +563,7 @@ if (!ConnectionPort) { /* Fail */ - LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); + LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE); ObDereferenceObject(Port); return STATUS_PORT_DISCONNECTED; } @@ -585,7 +585,7 @@ Message->SenderPort = Port; /* Generate the Message ID and set it */ - Message->Request.MessageId = LpcpNextMessageId++; + Message->Request.MessageId = LpcpNextMessageId++; if (!LpcpNextMessageId) LpcpNextMessageId = 1; Message->Request.CallbackId = 0; @@ -595,13 +595,10 @@ /* Insert the message in our chain */ InsertTailList(&QueuePort->MsgQueue.ReceiveHead, &Message->Entry); - /* Release the lock and get the semaphore we'll use later */ + /* Release the lock and the semaphore */ KeEnterCriticalRegion(); KeReleaseGuardedMutex(&LpcpLock); - - /* Now release the semaphore */ - Semaphore = QueuePort->MsgQueue.Semaphore; - LpcpCompleteWait(Semaphore); + LpcpCompleteWait(QueuePort->MsgQueue.Semaphore); /* If this is a waitable port, wake it up */ if (QueuePort->Flags & LPCP_WAITABLE_PORT) @@ -629,7 +626,7 @@ Status); /* The wait failed, free the message */ - if (Message) LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); + if (Message) LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE); ObDereferenceObject(Port); if (ConnectionPort) ObDereferenceObject(ConnectionPort); @@ -762,7 +759,7 @@ if (!QueuePort) { /* We have no connected port, fail */ - LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); + LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE); ObDereferenceObject(Port); return STATUS_PORT_DISCONNECTED; } @@ -779,7 +776,7 @@ if (!ConnectionPort) { /* Fail */ - LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); + LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE); ObDereferenceObject(Port); return STATUS_PORT_DISCONNECTED; } @@ -792,7 +789,7 @@ if (!ConnectionPort) { /* Fail */ - LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); + LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE); ObDereferenceObject(Port); return STATUS_PORT_DISCONNECTED; } @@ -812,7 +809,7 @@ Message->SenderPort = Port; /* Generate the Message ID and set it */ - Message->Request.MessageId = LpcpNextMessageId++; + Message->Request.MessageId = LpcpNextMessageId++; if (!LpcpNextMessageId) LpcpNextMessageId = 1; Message->Request.CallbackId = 0;

1 0

[ekohl] 59966: [NETAPI32] Revert r59958 because the old code was correct.
by ekohl＠svn.reactos.org 02 Sep '13

02 Sep '13

Author: ekohl Date: Mon Sep 2 21:10:46 2013 New Revision: 59966 URL: http://svn.reactos.org/svn/reactos?rev=59966&view=rev Log: [NETAPI32] Revert r59958 because the old code was correct. Modified: trunk/reactos/dll/win32/netapi32/local_group.c Modified: trunk/reactos/dll/win32/netapi32/local_group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/local_g… ============================================================================== --- trunk/reactos/dll/win32/netapi32/local_group.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/local_group.c [iso-8859-1] Mon Sep 2 21:10:46 2013 @@ -447,7 +447,7 @@ TRACE("Created alias \"%wZ\" (RID: %lu)\n", &AliasName, RelativeId); /* Set the admin comment */ - if (aliascomment != NULL) + if (level == 1) { RtlInitUnicodeString(&AdminComment.AdminComment, aliascomment);

1 0

[hbelusca] 59965: [NTOS:LPC]: Code formatting, with hardocded_flags--;
by hbelusca＠svn.reactos.org 02 Sep '13

02 Sep '13

Author: hbelusca Date: Mon Sep 2 21:09:56 2013 New Revision: 59965 URL: http://svn.reactos.org/svn/reactos?rev=59965&view=rev Log: [NTOS:LPC]: Code formatting, with hardocded_flags--; Modified: trunk/reactos/ntoskrnl/include/internal/lpc.h trunk/reactos/ntoskrnl/lpc/close.c trunk/reactos/ntoskrnl/lpc/reply.c trunk/reactos/ntoskrnl/lpc/send.c Modified: trunk/reactos/ntoskrnl/include/internal/lpc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/lpc.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/lpc.h [iso-8859-1] Mon Sep 2 21:09:56 2013 @@ -58,6 +58,12 @@ LPCP_THREAD_FLAG_NO_IMPERSONATION) // +// LPC Locking Flags +// +#define LPCP_LOCK_OWNED 1 +#define LPCP_LOCK_RELEASE 2 + +// // Internal Port Management // VOID @@ -86,7 +92,7 @@ NTAPI LpcpFreeToPortZone( IN PLPCP_MESSAGE Message, - IN ULONG Flags + IN ULONG LockFlags ); VOID @@ -104,7 +110,7 @@ LpcpSaveDataInfoMessage( IN PLPCP_PORT_OBJECT Port, IN PLPCP_MESSAGE Message, - IN ULONG LockHeld + IN ULONG LockFlags ); // Modified: trunk/reactos/ntoskrnl/lpc/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/close.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/close.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/lpc/close.c [iso-8859-1] Mon Sep 2 21:09:56 2013 @@ -50,14 +50,17 @@ VOID NTAPI LpcpFreeToPortZone(IN PLPCP_MESSAGE Message, - IN ULONG Flags) + IN ULONG LockFlags) { PLPCP_CONNECTION_MESSAGE ConnectMessage; PLPCP_PORT_OBJECT ClientPort = NULL; PETHREAD Thread = NULL; - BOOLEAN LockHeld = Flags & 1, ReleaseLock = Flags & 2; + BOOLEAN LockHeld = (LockFlags & LPCP_LOCK_OWNED); + BOOLEAN ReleaseLock = (LockFlags & LPCP_LOCK_RELEASE); + PAGED_CODE(); - LPCTRACE(LPC_CLOSE_DEBUG, "Message: %p. Flags: %lx\n", Message, Flags); + + LPCTRACE(LPC_CLOSE_DEBUG, "Message: %p. LockFlags: %lx\n", Message, LockFlags); /* Acquire the lock if not already */ if (!LockHeld) KeAcquireGuardedMutex(&LpcpLock); @@ -183,7 +186,7 @@ Thread->LpcReplyMessage = NULL; /* And remove the message from the port zone */ - LpcpFreeToPortZone(Message, 1); + LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED); NextEntry = Port->LpcReplyChainHead.Flink; } @@ -210,7 +213,7 @@ InitializeListHead(&Message->Entry); /* Remove it from the port zone */ - LpcpFreeToPortZone(Message, 1); + LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED); } /* Release the lock */ @@ -404,7 +407,7 @@ /* Free queued messages */ RemoveEntryList(&Message->Entry); InitializeListHead(&Message->Entry); - LpcpFreeToPortZone(Message, 1); + LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED); /* Restart at the head */ NextEntry = ListHead->Flink; @@ -417,7 +420,7 @@ /* Remove it */ RemoveEntryList(&Message->Entry); InitializeListHead(&Message->Entry); - LpcpFreeToPortZone(Message, 1); + LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED); /* Restart at the head */ NextEntry = ListHead->Flink; Modified: trunk/reactos/ntoskrnl/lpc/reply.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/reply.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/reply.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/lpc/reply.c [iso-8859-1] Mon Sep 2 21:09:56 2013 @@ -48,7 +48,7 @@ /* Unlink and free it */ RemoveEntryList(&Message->Entry); InitializeListHead(&Message->Entry); - LpcpFreeToPortZone(Message, 1); + LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED); break; } @@ -61,8 +61,10 @@ NTAPI LpcpSaveDataInfoMessage(IN PLPCP_PORT_OBJECT Port, IN PLPCP_MESSAGE Message, - IN ULONG LockHeld) -{ + IN ULONG LockFlags) +{ + BOOLEAN LockHeld = (LockFlags & LPCP_LOCK_OWNED); + PAGED_CODE(); /* Acquire the lock */ @@ -236,7 +238,7 @@ Request) != LPC_REQUEST))) { /* It isn't, fail */ - LpcpFreeToPortZone(Message, 3); + LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); if (ConnectionPort) ObDereferenceObject(ConnectionPort); ObDereferenceObject(WakeupThread); ObDereferenceObject(Port); @@ -255,7 +257,7 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { /* Fail */ - LpcpFreeToPortZone(Message, 3); + LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); ObDereferenceObject(WakeupThread); ObDereferenceObject(Port); _SEH2_YIELD(return _SEH2_GetExceptionCode()); @@ -480,7 +482,7 @@ Request) != LPC_REQUEST))) { /* It isn't, fail */ - LpcpFreeToPortZone(Message, 3); + LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); if (ConnectionPort) ObDereferenceObject(ConnectionPort); ObDereferenceObject(WakeupThread); ObDereferenceObject(Port); @@ -637,7 +639,7 @@ if (Message->Request.u2.s2.DataInfoOffset) { /* It does, save it, and don't free the message below */ - LpcpSaveDataInfoMessage(Port, Message, 1); + LpcpSaveDataInfoMessage(Port, Message, LPCP_LOCK_OWNED); Message = NULL; } } @@ -659,7 +661,7 @@ if (Message) { /* Free it and release the lock */ - LpcpFreeToPortZone(Message, 3); + LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); } else { Modified: trunk/reactos/ntoskrnl/lpc/send.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/send.c?rev=59… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/send.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/lpc/send.c [iso-8859-1] Mon Sep 2 21:09:56 2013 @@ -26,7 +26,10 @@ ULONG MessageType; PLPCP_MESSAGE Message; KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); + PETHREAD Thread = PsGetCurrentThread(); + PAGED_CODE(); + LPCTRACE(LPC_SEND_DEBUG, "Port: %p. Message: %p\n", Port, LpcMessage); /* Check if this is a non-datagram message */ @@ -59,7 +62,7 @@ /* Can't have data information on this type of call */ if (LpcMessage->u2.s2.DataInfoOffset) return STATUS_INVALID_PARAMETER; - /* Validate message sizes */ + /* Validate the message length */ if (((ULONG)LpcMessage->u1.s1.TotalLength > Port->MaxMessageLength) || ((ULONG)LpcMessage->u1.s1.TotalLength <= (ULONG)LpcMessage->u1.s1.DataLength)) { @@ -80,7 +83,7 @@ LpcMessage, LpcMessage + 1, MessageType, - &PsGetCurrentThread()->Cid); + &Thread->Cid); /* Acquire the LPC lock */ KeAcquireGuardedMutex(&LpcpLock); @@ -101,7 +104,7 @@ if (!ConnectionPort) { /* Fail */ - LpcpFreeToPortZone(Message, 3); + LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); return STATUS_PORT_DISCONNECTED; } } @@ -112,7 +115,7 @@ if (!ConnectionPort) { /* Fail */ - LpcpFreeToPortZone(Message, 3); + LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); return STATUS_PORT_DISCONNECTED; } } @@ -136,7 +139,7 @@ Message->Request.CallbackId = 0; /* No Message ID for the thread */ - PsGetCurrentThread()->LpcReplyMessageId = 0; + Thread->LpcReplyMessageId = 0; /* Insert the message in our chain */ InsertTailList(&QueuePort->MsgQueue.ReceiveHead, &Message->Entry); @@ -161,7 +164,7 @@ } /* If we got here, then free the message and fail */ - LpcpFreeToPortZone(Message, 3); + LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); if (ConnectionPort) ObDereferenceObject(ConnectionPort); return STATUS_PORT_DISCONNECTED; } @@ -281,7 +284,7 @@ if (!QueuePort) { /* We have no connected port, fail */ - LpcpFreeToPortZone(Message, 3); + LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); return STATUS_PORT_DISCONNECTED; } @@ -297,7 +300,7 @@ if (!ConnectionPort) { /* Fail */ - LpcpFreeToPortZone(Message, 3); + LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); return STATUS_PORT_DISCONNECTED; } } @@ -309,7 +312,7 @@ if (!ConnectionPort) { /* Fail */ - LpcpFreeToPortZone(Message, 3); + LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); return STATUS_PORT_DISCONNECTED; } } @@ -409,9 +412,8 @@ Message->RepliedToThread = NULL; } - /* Free the message */ - LpcpFreeToPortZone(Message, 3); + LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); } else { @@ -444,15 +446,16 @@ NtRequestPort(IN HANDLE PortHandle, IN PPORT_MESSAGE LpcRequest) { + NTSTATUS Status; PLPCP_PORT_OBJECT Port, QueuePort, ConnectionPort = NULL; + ULONG MessageType; + PLPCP_MESSAGE Message; KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); - NTSTATUS Status; - PLPCP_MESSAGE Message; PETHREAD Thread = PsGetCurrentThread(); - PKSEMAPHORE Semaphore; - ULONG MessageType; + PAGED_CODE(); + LPCTRACE(LPC_SEND_DEBUG, "Handle: %p. Message: %p. Type: %lx\n", PortHandle, @@ -505,10 +508,10 @@ { /* Copy it */ LpcpMoveMessage(&Message->Request, - LpcRequest, - LpcRequest + 1, - MessageType, - &Thread->Cid); + LpcRequest, + LpcRequest + 1, + MessageType, + &Thread->Cid); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -533,7 +536,7 @@ if (!QueuePort) { /* We have no connected port, fail */ - LpcpFreeToPortZone(Message, 3); + LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); ObDereferenceObject(Port); return STATUS_PORT_DISCONNECTED; } @@ -547,7 +550,7 @@ if (!ConnectionPort) { /* Fail */ - LpcpFreeToPortZone(Message, 3); + LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); ObDereferenceObject(Port); return STATUS_PORT_DISCONNECTED; } @@ -560,7 +563,7 @@ if (!ConnectionPort) { /* Fail */ - LpcpFreeToPortZone(Message, 3); + LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); ObDereferenceObject(Port); return STATUS_PORT_DISCONNECTED; } @@ -587,7 +590,7 @@ Message->Request.CallbackId = 0; /* No Message ID for the thread */ - PsGetCurrentThread()->LpcReplyMessageId = 0; + Thread->LpcReplyMessageId = 0; /* Insert the message in our chain */ InsertTailList(&QueuePort->MsgQueue.ReceiveHead, &Message->Entry); @@ -626,7 +629,7 @@ Status); /* The wait failed, free the message */ - if (Message) LpcpFreeToPortZone(Message, 3); + if (Message) LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); ObDereferenceObject(Port); if (ConnectionPort) ObDereferenceObject(ConnectionPort); @@ -759,7 +762,7 @@ if (!QueuePort) { /* We have no connected port, fail */ - LpcpFreeToPortZone(Message, 3); + LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); ObDereferenceObject(Port); return STATUS_PORT_DISCONNECTED; } @@ -776,7 +779,7 @@ if (!ConnectionPort) { /* Fail */ - LpcpFreeToPortZone(Message, 3); + LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); ObDereferenceObject(Port); return STATUS_PORT_DISCONNECTED; } @@ -789,7 +792,7 @@ if (!ConnectionPort) { /* Fail */ - LpcpFreeToPortZone(Message, 3); + LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); ObDereferenceObject(Port); return STATUS_PORT_DISCONNECTED; }

1 0

[ekohl] 59964: [SAMSRV] - Use the new function SampSetObjectAttributeString to write strings to the registry. Handle empty strings properly. - Fix SampGetObjectAttributeString to handle empty strin...
by ekohl＠svn.reactos.org 02 Sep '13

02 Sep '13

Author: ekohl Date: Mon Sep 2 20:36:42 2013 New Revision: 59964 URL: http://svn.reactos.org/svn/reactos?rev=59964&view=rev Log: [SAMSRV] - Use the new function SampSetObjectAttributeString to write strings to the registry. Handle empty strings properly. - Fix SampGetObjectAttributeString to handle empty strings properly as well. Modified: trunk/reactos/dll/win32/samsrv/database.c trunk/reactos/dll/win32/samsrv/samrpc.c trunk/reactos/dll/win32/samsrv/samsrv.h Modified: trunk/reactos/dll/win32/samsrv/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/database.… ============================================================================== --- trunk/reactos/dll/win32/samsrv/database.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/database.c [iso-8859-1] Mon Sep 2 20:36:42 2013 @@ -533,7 +533,7 @@ NTSTATUS SampGetObjectAttributeString(PSAM_DB_OBJECT DbObject, LPWSTR AttributeName, - RPC_UNICODE_STRING *String) + PRPC_UNICODE_STRING String) { ULONG Length = 0; NTSTATUS Status; @@ -549,6 +549,16 @@ goto done; } + if (Length == 0) + { + String->Length = 0; + String->MaximumLength = 0; + String->Buffer = NULL; + + Status = STATUS_SUCCESS; + goto done; + } + String->Length = (USHORT)(Length - sizeof(WCHAR)); String->MaximumLength = (USHORT)Length; String->Buffer = midl_user_allocate(Length); @@ -583,5 +593,28 @@ return Status; } + +NTSTATUS +SampSetObjectAttributeString(PSAM_DB_OBJECT DbObject, + LPWSTR AttributeName, + PRPC_UNICODE_STRING String) +{ + PWCHAR Buffer = NULL; + USHORT Length = 0; + + if ((String != NULL) && (String->Buffer != NULL)) + { + Buffer = String->Buffer; + Length = String->Length + sizeof(WCHAR); + } + + return SampSetObjectAttribute(DbObject, + AttributeName, + REG_SZ, + Buffer, + Length); +} + + /* EOF */ Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Mon Sep 2 20:36:42 2013 @@ -1714,27 +1714,21 @@ break; case DomainOemInformation: - Status = SampSetObjectAttribute(DomainObject, - L"OemInformation", - REG_SZ, - DomainInformation->Oem.OemInformation.Buffer, - DomainInformation->Oem.OemInformation.Length + sizeof(WCHAR)); + Status = SampSetObjectAttributeString(DomainObject, + L"OemInformation", + &DomainInformation->Oem.OemInformation); break; case DomainNameInformation: - Status = SampSetObjectAttribute(DomainObject, - L"Name", - REG_SZ, - DomainInformation->Name.DomainName.Buffer, - DomainInformation->Name.DomainName.Length + sizeof(WCHAR)); + Status = SampSetObjectAttributeString(DomainObject, + L"Name", + &DomainInformation->Name.DomainName); break; case DomainReplicationInformation: - Status = SampSetObjectAttribute(DomainObject, - L"ReplicaSourceNodeName", - REG_SZ, - DomainInformation->Replication.ReplicaSourceNodeName.Buffer, - DomainInformation->Replication.ReplicaSourceNodeName.Length + sizeof(WCHAR)); + Status = SampSetObjectAttributeString(DomainObject, + L"ReplicaSourceNodeName", + &DomainInformation->Replication.ReplicaSourceNodeName); break; case DomainServerRoleInformation: @@ -1772,7 +1766,6 @@ OUT SAMPR_HANDLE *GroupHandle, OUT unsigned long *RelativeId) { - UNICODE_STRING EmptyString = RTL_CONSTANT_STRING(L""); SAM_DOMAIN_FIXED_DATA FixedDomainData; SAM_GROUP_FIXED_DATA FixedGroupData; PSAM_DB_OBJECT DomainObject; @@ -1840,10 +1833,10 @@ /* Store the fixed domain attributes */ Status = SampSetObjectAttribute(DomainObject, - L"F", - REG_BINARY, - &FixedDomainData, - ulSize); + L"F", + REG_BINARY, + &FixedDomainData, + ulSize); if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); @@ -1898,11 +1891,9 @@ } /* Set the Name attribute */ - Status = SampSetObjectAttribute(GroupObject, - L"Name", - REG_SZ, - (LPVOID)Name->Buffer, - Name->MaximumLength); + Status = SampSetObjectAttributeString(GroupObject, + L"Name", + Name); if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); @@ -1910,11 +1901,9 @@ } /* Set the AdminComment attribute */ - Status = SampSetObjectAttribute(GroupObject, - L"AdminComment", - REG_SZ, - EmptyString.Buffer, - EmptyString.MaximumLength); + Status = SampSetObjectAttributeString(GroupObject, + L"AdminComment", + NULL); if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); @@ -2150,7 +2139,6 @@ OUT SAMPR_HANDLE *UserHandle, OUT unsigned long *RelativeId) { - UNICODE_STRING EmptyString = RTL_CONSTANT_STRING(L""); SAM_DOMAIN_FIXED_DATA FixedDomainData; SAM_USER_FIXED_DATA FixedUserData; PSAM_DB_OBJECT DomainObject; @@ -2302,11 +2290,9 @@ } /* Set the Name attribute */ - Status = SampSetObjectAttribute(UserObject, - L"Name", - REG_SZ, - (LPVOID)Name->Buffer, - Name->MaximumLength); + Status = SampSetObjectAttributeString(UserObject, + L"Name", + Name); if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); @@ -2314,11 +2300,9 @@ } /* Set the FullName attribute */ - Status = SampSetObjectAttribute(UserObject, - L"FullName", - REG_SZ, - EmptyString.Buffer, - EmptyString.MaximumLength); + Status = SampSetObjectAttributeString(UserObject, + L"FullName", + NULL); if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); @@ -2326,11 +2310,9 @@ } /* Set the HomeDirectory attribute */ - Status = SampSetObjectAttribute(UserObject, - L"HomeDirectory", - REG_SZ, - EmptyString.Buffer, - EmptyString.MaximumLength); + Status = SampSetObjectAttributeString(UserObject, + L"HomeDirectory", + NULL); if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); @@ -2338,11 +2320,9 @@ } /* Set the HomeDirectoryDrive attribute */ - Status = SampSetObjectAttribute(UserObject, - L"HomeDirectoryDrive", - REG_SZ, - EmptyString.Buffer, - EmptyString.MaximumLength); + Status = SampSetObjectAttributeString(UserObject, + L"HomeDirectoryDrive", + NULL); if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); @@ -2350,11 +2330,9 @@ } /* Set the ScriptPath attribute */ - Status = SampSetObjectAttribute(UserObject, - L"ScriptPath", - REG_SZ, - EmptyString.Buffer, - EmptyString.MaximumLength); + Status = SampSetObjectAttributeString(UserObject, + L"ScriptPath", + NULL); if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); @@ -2362,11 +2340,9 @@ } /* Set the ProfilePath attribute */ - Status = SampSetObjectAttribute(UserObject, - L"ProfilePath", - REG_SZ, - EmptyString.Buffer, - EmptyString.MaximumLength); + Status = SampSetObjectAttributeString(UserObject, + L"ProfilePath", + NULL); if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); @@ -2374,11 +2350,9 @@ } /* Set the AdminComment attribute */ - Status = SampSetObjectAttribute(UserObject, - L"AdminComment", - REG_SZ, - EmptyString.Buffer, - EmptyString.MaximumLength); + Status = SampSetObjectAttributeString(UserObject, + L"AdminComment", + NULL); if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); @@ -2386,11 +2360,9 @@ } /* Set the UserComment attribute */ - Status = SampSetObjectAttribute(UserObject, - L"UserComment", - REG_SZ, - EmptyString.Buffer, - EmptyString.MaximumLength); + Status = SampSetObjectAttributeString(UserObject, + L"UserComment", + NULL); if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); @@ -2398,11 +2370,9 @@ } /* Set the WorkStations attribute */ - Status = SampSetObjectAttribute(UserObject, - L"WorkStations", - REG_SZ, - EmptyString.Buffer, - EmptyString.MaximumLength); + Status = SampSetObjectAttributeString(UserObject, + L"WorkStations", + NULL); if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); @@ -2410,11 +2380,9 @@ } /* Set the Parameters attribute */ - Status = SampSetObjectAttribute(UserObject, - L"Parameters", - REG_SZ, - EmptyString.Buffer, - EmptyString.MaximumLength); + Status = SampSetObjectAttributeString(UserObject, + L"Parameters", + NULL); if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); @@ -2736,7 +2704,6 @@ SAM_DOMAIN_FIXED_DATA FixedDomainData; PSAM_DB_OBJECT DomainObject; PSAM_DB_OBJECT AliasObject; - UNICODE_STRING EmptyString = RTL_CONSTANT_STRING(L""); ULONG ulSize; ULONG ulRid; WCHAR szRid[9]; @@ -2841,11 +2808,9 @@ } /* Set the Name attribute */ - Status = SampSetObjectAttribute(AliasObject, - L"Name", - REG_SZ, - (LPVOID)AccountName->Buffer, - AccountName->MaximumLength); + Status = SampSetObjectAttributeString(AliasObject, + L"Name", + AccountName); if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); @@ -2853,11 +2818,9 @@ } /* Set the Description attribute */ - Status = SampSetObjectAttribute(AliasObject, - L"Description", - REG_SZ, - EmptyString.Buffer, - EmptyString.MaximumLength); + Status = SampSetObjectAttributeString(AliasObject, + L"Description", + NULL); if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); @@ -4141,11 +4104,9 @@ goto done; } - Status = SampSetObjectAttribute(GroupObject, - L"Name", - REG_SZ, - NewGroupName.Buffer, - NewGroupName.Length + sizeof(WCHAR)); + Status = SampSetObjectAttributeString(GroupObject, + L"Name", + (PRPC_UNICODE_STRING)&NewGroupName); if (!NT_SUCCESS(Status)) { TRACE("SampSetObjectAttribute failed (Status 0x%08lx)\n", Status); @@ -4226,11 +4187,9 @@ break; case GroupAdminCommentInformation: - Status = SampSetObjectAttribute(GroupObject, - L"Description", - REG_SZ, - Buffer->AdminComment.AdminComment.Buffer, - Buffer->AdminComment.AdminComment.Length + sizeof(WCHAR)); + Status = SampSetObjectAttributeString(GroupObject, + L"Description", + &Buffer->AdminComment.AdminComment); break; default: @@ -4926,11 +4885,9 @@ goto done; } - Status = SampSetObjectAttribute(AliasObject, - L"Name", - REG_SZ, - NewAliasName.Buffer, - NewAliasName.Length + sizeof(WCHAR)); + Status = SampSetObjectAttributeString(AliasObject, + L"Name", + (PRPC_UNICODE_STRING)&NewAliasName); if (!NT_SUCCESS(Status)) { TRACE("SampSetObjectAttribute failed (Status 0x%08lx)\n", Status); @@ -4976,11 +4933,9 @@ break; case AliasAdminCommentInformation: - Status = SampSetObjectAttribute(AliasObject, - L"Description", - REG_SZ, - Buffer->AdminComment.AdminComment.Buffer, - Buffer->AdminComment.AdminComment.Length + sizeof(WCHAR)); + Status = SampSetObjectAttributeString(AliasObject, + L"Description", + &Buffer->AdminComment.AdminComment); break; default: @@ -7039,11 +6994,9 @@ goto done; } - Status = SampSetObjectAttribute(UserObject, - L"Name", - REG_SZ, - NewUserName->Buffer, - NewUserName->Length + sizeof(WCHAR)); + Status = SampSetObjectAttributeString(UserObject, + L"Name", + NewUserName); if (!NT_SUCCESS(Status)) { TRACE("SampSetObjectAttribute failed (Status 0x%08lx)\n", Status); @@ -7089,27 +7042,21 @@ if (!NT_SUCCESS(Status)) goto done; - Status = SampSetObjectAttribute(UserObject, - L"FullName", - REG_SZ, - Buffer->General.FullName.Buffer, - Buffer->General.FullName.MaximumLength); - if (!NT_SUCCESS(Status)) - goto done; - - Status = SampSetObjectAttribute(UserObject, - L"AdminComment", - REG_SZ, - Buffer->General.AdminComment.Buffer, - Buffer->General.AdminComment.MaximumLength); - if (!NT_SUCCESS(Status)) - goto done; - - Status = SampSetObjectAttribute(UserObject, - L"UserComment", - REG_SZ, - Buffer->General.UserComment.Buffer, - Buffer->General.UserComment.MaximumLength); + Status = SampSetObjectAttributeString(UserObject, + L"FullName", + &Buffer->General.FullName); + if (!NT_SUCCESS(Status)) + goto done; + + Status = SampSetObjectAttributeString(UserObject, + L"AdminComment", + &Buffer->General.AdminComment); + if (!NT_SUCCESS(Status)) + goto done; + + Status = SampSetObjectAttributeString(UserObject, + L"UserComment", + &Buffer->General.UserComment); done: return Status; @@ -7144,11 +7091,9 @@ if (!NT_SUCCESS(Status)) goto done; - Status = SampSetObjectAttribute(UserObject, - L"UserComment", - REG_SZ, - Buffer->Preferences.UserComment.Buffer, - Buffer->Preferences.UserComment.MaximumLength); + Status = SampSetObjectAttributeString(UserObject, + L"UserComment", + &Buffer->Preferences.UserComment); done: return Status; @@ -7337,99 +7282,81 @@ if (WhichFields & USER_ALL_FULLNAME) { - Status = SampSetObjectAttribute(UserObject, - L"FullName", - REG_SZ, - Buffer->All.FullName.Buffer, - Buffer->All.FullName.MaximumLength); + Status = SampSetObjectAttributeString(UserObject, + L"FullName", + &Buffer->All.FullName); if (!NT_SUCCESS(Status)) goto done; } if (WhichFields & USER_ALL_ADMINCOMMENT) { - Status = SampSetObjectAttribute(UserObject, - L"AdminComment", - REG_SZ, - Buffer->All.AdminComment.Buffer, - Buffer->All.AdminComment.MaximumLength); + Status = SampSetObjectAttributeString(UserObject, + L"AdminComment", + &Buffer->All.AdminComment); if (!NT_SUCCESS(Status)) goto done; } if (WhichFields & USER_ALL_USERCOMMENT) { - Status = SampSetObjectAttribute(UserObject, - L"UserComment", - REG_SZ, - Buffer->All.UserComment.Buffer, - Buffer->All.UserComment.MaximumLength); + Status = SampSetObjectAttributeString(UserObject, + L"UserComment", + &Buffer->All.UserComment); if (!NT_SUCCESS(Status)) goto done; } if (WhichFields & USER_ALL_HOMEDIRECTORY) { - Status = SampSetObjectAttribute(UserObject, - L"HomeDirectory", - REG_SZ, - Buffer->All.HomeDirectory.Buffer, - Buffer->All.HomeDirectory.MaximumLength); + Status = SampSetObjectAttributeString(UserObject, + L"HomeDirectory", + &Buffer->All.HomeDirectory); if (!NT_SUCCESS(Status)) goto done; } if (WhichFields & USER_ALL_HOMEDIRECTORYDRIVE) { - Status = SampSetObjectAttribute(UserObject, - L"HomeDirectoryDrive", - REG_SZ, - Buffer->All.HomeDirectoryDrive.Buffer, - Buffer->All.HomeDirectoryDrive.MaximumLength); + Status = SampSetObjectAttributeString(UserObject, + L"HomeDirectoryDrive", + &Buffer->All.HomeDirectoryDrive); if (!NT_SUCCESS(Status)) goto done; } if (WhichFields & USER_ALL_SCRIPTPATH) { - Status = SampSetObjectAttribute(UserObject, - L"ScriptPath", - REG_SZ, - Buffer->All.ScriptPath.Buffer, - Buffer->All.ScriptPath.MaximumLength); + Status = SampSetObjectAttributeString(UserObject, + L"ScriptPath", + &Buffer->All.ScriptPath); if (!NT_SUCCESS(Status)) goto done; } if (WhichFields & USER_ALL_PROFILEPATH) { - Status = SampSetObjectAttribute(UserObject, - L"ProfilePath", - REG_SZ, - Buffer->All.ProfilePath.Buffer, - Buffer->All.ProfilePath.MaximumLength); + Status = SampSetObjectAttributeString(UserObject, + L"ProfilePath", + &Buffer->All.ProfilePath); if (!NT_SUCCESS(Status)) goto done; } if (WhichFields & USER_ALL_WORKSTATIONS) { - Status = SampSetObjectAttribute(UserObject, - L"WorkStations", - REG_SZ, - Buffer->All.WorkStations.Buffer, - Buffer->All.WorkStations.MaximumLength); + Status = SampSetObjectAttributeString(UserObject, + L"WorkStations", + &Buffer->All.WorkStations); if (!NT_SUCCESS(Status)) goto done; } if (WhichFields & USER_ALL_PARAMETERS) { - Status = SampSetObjectAttribute(UserObject, - L"Parameters", - REG_SZ, - Buffer->All.Parameters.Buffer, - Buffer->All.Parameters.MaximumLength); + Status = SampSetObjectAttributeString(UserObject, + L"Parameters", + &Buffer->All.Parameters); if (!NT_SUCCESS(Status)) goto done; } @@ -7630,11 +7557,9 @@ if (!NT_SUCCESS(Status)) break; - Status = SampSetObjectAttribute(UserObject, - L"FullName", - REG_SZ, - Buffer->Name.FullName.Buffer, - Buffer->Name.FullName.MaximumLength); + Status = SampSetObjectAttributeString(UserObject, + L"FullName", + &Buffer->Name.FullName); break; case UserAccountNameInformation: @@ -7643,11 +7568,9 @@ break; case UserFullNameInformation: - Status = SampSetObjectAttribute(UserObject, - L"FullName", - REG_SZ, - Buffer->FullName.FullName.Buffer, - Buffer->FullName.FullName.MaximumLength); + Status = SampSetObjectAttributeString(UserObject, + L"FullName", + &Buffer->FullName.FullName); break; case UserPrimaryGroupInformation: @@ -7656,62 +7579,48 @@ break; case UserHomeInformation: - Status = SampSetObjectAttribute(UserObject, - L"HomeDirectory", - REG_SZ, - Buffer->Home.HomeDirectory.Buffer, - Buffer->Home.HomeDirectory.MaximumLength); + Status = SampSetObjectAttributeString(UserObject, + L"HomeDirectory", + &Buffer->Home.HomeDirectory); if (!NT_SUCCESS(Status)) break; - Status = SampSetObjectAttribute(UserObject, - L"HomeDirectoryDrive", - REG_SZ, - Buffer->Home.HomeDirectoryDrive.Buffer, - Buffer->Home.HomeDirectoryDrive.MaximumLength); + Status = SampSetObjectAttributeString(UserObject, + L"HomeDirectoryDrive", + &Buffer->Home.HomeDirectoryDrive); break; case UserScriptInformation: - Status = SampSetObjectAttribute(UserObject, - L"ScriptPath", - REG_SZ, - Buffer->Script.ScriptPath.Buffer, - Buffer->Script.ScriptPath.MaximumLength); + Status = SampSetObjectAttributeString(UserObject, + L"ScriptPath", + &Buffer->Script.ScriptPath); break; case UserProfileInformation: - Status = SampSetObjectAttribute(UserObject, - L"ProfilePath", - REG_SZ, - Buffer->Profile.ProfilePath.Buffer, - Buffer->Profile.ProfilePath.MaximumLength); + Status = SampSetObjectAttributeString(UserObject, + L"ProfilePath", + &Buffer->Profile.ProfilePath); break; case UserAdminCommentInformation: - Status = SampSetObjectAttribute(UserObject, - L"AdminComment", - REG_SZ, - Buffer->AdminComment.AdminComment.Buffer, - Buffer->AdminComment.AdminComment.MaximumLength); + Status = SampSetObjectAttributeString(UserObject, + L"AdminComment", + &Buffer->AdminComment.AdminComment); break; case UserWorkStationsInformation: - Status = SampSetObjectAttribute(UserObject, - L"WorkStations", - REG_SZ, - Buffer->WorkStations.WorkStations.Buffer, - Buffer->WorkStations.WorkStations.MaximumLength); + Status = SampSetObjectAttributeString(UserObject, + L"WorkStations", + &Buffer->WorkStations.WorkStations); break; case UserSetPasswordInformation: TRACE("Password: %S\n", Buffer->SetPassword.Password.Buffer); TRACE("PasswordExpired: %d\n", Buffer->SetPassword.PasswordExpired); - Status = SampSetObjectAttribute(UserObject, - L"Password", - REG_SZ, - Buffer->SetPassword.Password.Buffer, - Buffer->SetPassword.Password.MaximumLength); + Status = SampSetObjectAttributeString(UserObject, + L"Password", + &Buffer->SetPassword.Password); break; case UserControlInformation: @@ -7730,11 +7639,9 @@ break; case UserParametersInformation: - Status = SampSetObjectAttribute(UserObject, - L"Parameters", - REG_SZ, - Buffer->Parameters.Parameters.Buffer, - Buffer->Parameters.Parameters.MaximumLength); + Status = SampSetObjectAttributeString(UserObject, + L"Parameters", + &Buffer->Parameters.Parameters); break; case UserAllInformation: @@ -8378,7 +8285,6 @@ OUT unsigned long *GrantedAccess, OUT unsigned long *RelativeId) { - UNICODE_STRING EmptyString = RTL_CONSTANT_STRING(L""); SAM_DOMAIN_FIXED_DATA FixedDomainData; SAM_USER_FIXED_DATA FixedUserData; PSAM_DB_OBJECT DomainObject; @@ -8537,11 +8443,9 @@ } /* Set the Name attribute */ - Status = SampSetObjectAttribute(UserObject, - L"Name", - REG_SZ, - (LPVOID)Name->Buffer, - Name->MaximumLength); + Status = SampSetObjectAttributeString(UserObject, + L"Name", + Name); if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); @@ -8549,11 +8453,9 @@ } /* Set the FullName attribute */ - Status = SampSetObjectAttribute(UserObject, - L"FullName", - REG_SZ, - EmptyString.Buffer, - EmptyString.MaximumLength); + Status = SampSetObjectAttributeString(UserObject, + L"FullName", + NULL); if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); @@ -8561,11 +8463,9 @@ } /* Set the HomeDirectory attribute */ - Status = SampSetObjectAttribute(UserObject, - L"HomeDirectory", - REG_SZ, - EmptyString.Buffer, - EmptyString.MaximumLength); + Status = SampSetObjectAttributeString(UserObject, + L"HomeDirectory", + NULL); if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); @@ -8573,11 +8473,9 @@ } /* Set the HomeDirectoryDrive attribute */ - Status = SampSetObjectAttribute(UserObject, - L"HomeDirectoryDrive", - REG_SZ, - EmptyString.Buffer, - EmptyString.MaximumLength); + Status = SampSetObjectAttributeString(UserObject, + L"HomeDirectoryDrive", + NULL); if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); @@ -8585,11 +8483,9 @@ } /* Set the ScriptPath attribute */ - Status = SampSetObjectAttribute(UserObject, - L"ScriptPath", - REG_SZ, - EmptyString.Buffer, - EmptyString.MaximumLength); + Status = SampSetObjectAttributeString(UserObject, + L"ScriptPath", + NULL); if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); @@ -8597,11 +8493,9 @@ } /* Set the ProfilePath attribute */ - Status = SampSetObjectAttribute(UserObject, - L"ProfilePath", - REG_SZ, - EmptyString.Buffer, - EmptyString.MaximumLength); + Status = SampSetObjectAttributeString(UserObject, + L"ProfilePath", + NULL); if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); @@ -8609,11 +8503,9 @@ } /* Set the AdminComment attribute */ - Status = SampSetObjectAttribute(UserObject, - L"AdminComment", - REG_SZ, - EmptyString.Buffer, - EmptyString.MaximumLength); + Status = SampSetObjectAttributeString(UserObject, + L"AdminComment", + NULL); if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); @@ -8621,11 +8513,9 @@ } /* Set the UserComment attribute */ - Status = SampSetObjectAttribute(UserObject, - L"UserComment", - REG_SZ, - EmptyString.Buffer, - EmptyString.MaximumLength); + Status = SampSetObjectAttributeString(UserObject, + L"UserComment", + NULL); if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); @@ -8633,11 +8523,9 @@ } /* Set the WorkStations attribute */ - Status = SampSetObjectAttribute(UserObject, - L"WorkStations", - REG_SZ, - EmptyString.Buffer, - EmptyString.MaximumLength); + Status = SampSetObjectAttributeString(UserObject, + L"WorkStations", + NULL); if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); @@ -8645,11 +8533,9 @@ } /* Set the Parameters attribute */ - Status = SampSetObjectAttribute(UserObject, - L"Parameters", - REG_SZ, - EmptyString.Buffer, - EmptyString.MaximumLength); + Status = SampSetObjectAttributeString(UserObject, + L"Parameters", + NULL); if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); Modified: trunk/reactos/dll/win32/samsrv/samsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.h?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] Mon Sep 2 20:36:42 2013 @@ -194,8 +194,12 @@ NTSTATUS SampGetObjectAttributeString(PSAM_DB_OBJECT DbObject, LPWSTR AttributeName, - RPC_UNICODE_STRING *String); - + PRPC_UNICODE_STRING String); + +NTSTATUS +SampSetObjectAttributeString(PSAM_DB_OBJECT DbObject, + LPWSTR AttributeName, + PRPC_UNICODE_STRING String); /* domain.c */

1 0

[akhaldi] 59963: [CMLIB] * Fix a trace.
by akhaldi＠svn.reactos.org 02 Sep '13

02 Sep '13

Author: akhaldi Date: Mon Sep 2 17:46:10 2013 New Revision: 59963 URL: http://svn.reactos.org/svn/reactos?rev=59963&view=rev Log: [CMLIB] * Fix a trace. Modified: trunk/reactos/lib/cmlib/hivecell.c Modified: trunk/reactos/lib/cmlib/hivecell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivecell.c?rev=5… ============================================================================== --- trunk/reactos/lib/cmlib/hivecell.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hivecell.c [iso-8859-1] Mon Sep 2 17:46:10 2013 @@ -109,7 +109,7 @@ ASSERT(RegistryHive->ReadOnly == FALSE); - CMLTRACE(CMLIB_HCELL_DEBUG, "%s - Hive %p, CellIndex %08lx, HoldingLock %b\n", + CMLTRACE(CMLIB_HCELL_DEBUG, "%s - Hive %p, CellIndex %08lx, HoldingLock %u\n", __FUNCTION__, RegistryHive, CellIndex, HoldingLock); if ((CellIndex & HCELL_TYPE_MASK) >> HCELL_TYPE_SHIFT != Stable)

1 0

[akhaldi] 59962: [COMCTL32] * Implement an undocumented flag for the rebar control. This flag is used by browseui and is needed to show the explorer window properly. Should be sent Upstream. Brough...
by akhaldi＠svn.reactos.org 02 Sep '13

02 Sep '13

Author: akhaldi Date: Mon Sep 2 12:56:20 2013 New Revision: 59962 URL: http://svn.reactos.org/svn/reactos?rev=59962&view=rev Log: [COMCTL32] * Implement an undocumented flag for the rebar control. This flag is used by browseui and is needed to show the explorer window properly. Should be sent Upstream. Brought to you by Giannis Adamopoulos (Smiley). * Update the sync diff. Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff trunk/reactos/dll/win32/comctl32/rebar.c Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/comctl32_ros.diff [iso-8859-1] Mon Sep 2 12:56:20 2013 @@ -1,8 +1,90 @@ -Index: commctrl.c -=================================================================== ---- commctrl.c (revision 55577) -+++ commctrl.c (working copy) -@@ -71,6 +71,19 @@ +diff -prudN e:\Wine\dlls\comctl32/comctl32.spec e:\reactos\dll\win32\comctl32/comctl32.spec +--- e:\Wine\dlls\comctl32/comctl32.spec 2011-09-16 23:22:35.964767000 +0100 ++++ e:\reactos\dll\win32\comctl32/comctl32.spec 2012-06-04 11:26:55.545450700 +0100 +@@ -15,7 +15,7 @@ + 11 stdcall -noname DPA_Merge(ptr ptr long ptr ptr long) + #12 stub Cctl1632_ThunkData32 + 13 stdcall MakeDragList(long) +- 14 stdcall LBItemFromPt(long int64 long) ++ 14 stdcall LBItemFromPt(long double long) #(long int64 long) + 15 stdcall DrawInsert(long long long) + 16 stdcall CreateUpDownControl(long long long long long long long long long long long long) + 17 stdcall InitCommonControls() +@@ -30,8 +30,8 @@ + 155 stdcall -noname FindMRUStringA(long str ptr) + 156 stdcall -noname DelMRUString(long long) + 157 stdcall -noname CreateMRUListLazyA(ptr long long long) +-163 stub -noname CreatePage +-164 stub -noname CreateProxyPage ++163 stdcall -noname CreatePage(long ptr) ++164 stdcall -noname CreateProxyPage(long long) + 167 stdcall -noname AddMRUData(long ptr long) + 169 stdcall -noname FindMRUData(long ptr long ptr) + 233 stdcall -noname Str_GetPtrA(str str long) +@@ -88,13 +88,13 @@ + 376 stdcall -noname IntlStrEqWorkerA(long str str long) + 377 stdcall -noname IntlStrEqWorkerW(long wstr wstr long) + 382 stdcall -noname SmoothScrollWindow(ptr) +-383 stub -noname DoReaderMode ++383 stdcall -noname DoReaderMode(ptr) + 384 stdcall -noname SetPathWordBreakProc(ptr long) + 385 stdcall -ordinal DPA_EnumCallback(long long long) + 386 stdcall -ordinal DPA_DestroyCallback(ptr ptr long) + 387 stdcall -ordinal DSA_EnumCallback(ptr ptr long) + 388 stdcall -ordinal DSA_DestroyCallback(ptr ptr long) +-389 stub -noname SHGetProcessDword ++389 stdcall -noname SHGetProcessDword(long long) + 390 stdcall -noname ImageList_SetColorTable(ptr long long ptr) + 400 stdcall -ordinal CreateMRUListW(ptr) + 401 stdcall -ordinal AddMRUStringW(long wstr) +@@ -188,6 +188,7 @@ + @ stdcall PropertySheet(ptr) PropertySheetA + @ stdcall PropertySheetA(ptr) + @ stdcall PropertySheetW(ptr) ++@ stdcall RegisterClassNameW(wstr) + @ stdcall TaskDialogIndirect(ptr ptr ptr ptr) + @ stdcall UninitializeFlatSB(long) + @ stdcall _TrackMouseEvent(ptr) + +diff -prudN e:\Wine\dlls\comctl32/commctrl.c e:\reactos\dll\win32\comctl32/commctrl.c +--- e:\Wine\dlls\comctl32/commctrl.c 2011-11-24 17:55:01.900415100 +0100 ++++ e:\reactos\dll\win32\comctl32/commctrl.c 2013-01-25 14:12:39.829654200 +0100 +@@ -52,25 +52,42 @@ + * -- ICC_WIN95_CLASSES + */ + ++#define WIN32_NO_STATUS ++#define _INC_WINDOWS ++#define COM_NO_WINDOWS_H ++ + #include <stdarg.h> +-#include <string.h> +-#include <stdlib.h> ++//#include <string.h> ++//#include <stdlib.h> + +-#include "windef.h" +-#include "winbase.h" +-#include "wingdi.h" +-#include "winuser.h" +-#include "winnls.h" +-#include "commctrl.h" +-#include "winerror.h" +-#include "winreg.h" ++#include <windef.h> ++#include <winbase.h> ++//#include "wingdi.h" ++//#include "winuser.h" ++#include <winnls.h> ++//#include "commctrl.h" ++//#include "winerror.h" ++#include <winreg.h> + #define NO_SHLWAPI_STREAM +-#include "shlwapi.h" ++#include <shlwapi.h> + #include "comctl32.h" +-#include "wine/debug.h" ++#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(commctrl); @@ -22,7 +104,7 @@ static LRESULT WINAPI COMCTL32_SubclassProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); -@@ -92,6 +105,67 @@ +@@ -92,6 +109,67 @@ static const WCHAR strCC32SubclassInfo[] 'C','C','3','2','S','u','b','c','l','a','s','s','I','n','f','o',0 }; @@ -90,7 +172,7 @@ /*********************************************************************** * DllMain [Internal] -@@ -930,6 +1004,12 @@ +@@ -930,6 +1008,12 @@ HRESULT WINAPI DllGetVersion (DLLVERSION HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline) { TRACE("(%u, %s): stub\n", bInstall, debugstr_w(cmdline)); @@ -103,7 +185,7 @@ return S_OK; } -@@ -1593,12 +1673,114 @@ +@@ -1593,12 +1677,114 @@ LRESULT WINAPI SetPathWordBreakProc(HWND * * Draw text with shadow. */ @@ -222,7 +304,7 @@ } /*********************************************************************** -@@ -1821,3 +1821,15 @@ +@@ -1639,3 +1825,15 @@ HRESULT WINAPI TaskDialogIndirect(const if (pfVerificationFlagChecked) *pfVerificationFlagChecked = TRUE; return S_OK; } @@ -239,11 +321,97 @@ + return TRUE; +} -Index: propsheet.c -=================================================================== ---- propsheet.c (revision 38890) -+++ propsheet.c (working copy) -@@ -2425,6 +2425,9 @@ +diff -prudN e:\Wine\dlls\comctl32/listview.c e:\reactos\dll\win32\comctl32/listview.c +--- e:\Wine\dlls\comctl32/listview.c 2013-03-16 11:54:52.374454400 +0100 ++++ e:\reactos\dll\win32\comctl32/listview.c 2013-03-17 19:12:46.522399200 +0100 +@@ -314,6 +314,7 @@ typedef struct tagLISTVIEW_INFO + COLORREF clrBk; + COLORREF clrText; + COLORREF clrTextBk; ++ BOOL bDefaultBkColor; + + /* font */ + HFONT hDefaultFont; +@@ -1700,8 +1701,19 @@ static inline BOOL LISTVIEW_GetItemW(con + /* used to handle collapse main item column case */ + static inline BOOL LISTVIEW_DrawFocusRect(const LISTVIEW_INFO *infoPtr, HDC hdc) + { +- return (infoPtr->rcFocus.left < infoPtr->rcFocus.right) ? +- DrawFocusRect(hdc, &infoPtr->rcFocus) : FALSE; ++ BOOL Ret = FALSE; ++ ++ if (infoPtr->rcFocus.left < infoPtr->rcFocus.right) ++ { ++ DWORD dwOldBkColor, dwOldTextColor; ++ ++ dwOldBkColor = SetBkColor(hdc, RGB(255, 255, 255)); ++ dwOldTextColor = SetBkColor(hdc, RGB(0, 0, 0)); ++ Ret = DrawFocusRect(hdc, &infoPtr->rcFocus); ++ SetBkColor(hdc, dwOldBkColor); ++ SetBkColor(hdc, dwOldTextColor); ++ } ++ return Ret; + } + + /* Listview invalidation functions: use _only_ these functions to invalidate */ +@@ -4734,7 +4746,10 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_I + if (infoPtr->uView == LV_VIEW_DETAILS && infoPtr->dwLvExStyle & LVS_EX_GRIDLINES) + rcLabel.bottom--; + +- DrawTextW(hdc, lvItem.pszText, -1, &rcLabel, uFormat); ++ if ((!(lvItem.state & LVIS_SELECTED) || !infoPtr->bFocus) && (infoPtr->dwLvExStyle & LVS_EX_TRANSPARENTSHADOWTEXT)) ++ DrawShadowText(hdc, lvItem.pszText, -1, &rcLabel, uFormat, RGB(255, 255, 255), RGB(0, 0, 0), 2, 2); ++ else ++ DrawTextW(hdc, lvItem.pszText, -1, &rcLabel, uFormat); + + postpaint: + if (cdsubitemmode & CDRF_NOTIFYPOSTPAINT) +@@ -5143,7 +5158,11 @@ enddraw: + + /* Draw marquee rectangle if appropriate */ + if (infoPtr->bMarqueeSelect) ++ { ++ SetBkColor(hdc, RGB(255, 255, 255)); ++ SetTextColor(hdc, RGB(0, 0, 0)); + DrawFocusRect(hdc, &infoPtr->marqueeDrawRect); ++ } + + if (cdmode & CDRF_NOTIFYPOSTPAINT) + notify_postpaint(infoPtr, &nmlvcd); +@@ -7952,6 +7971,7 @@ static BOOL LISTVIEW_SetBkColor(LISTVIEW + { + TRACE("(color=%x)\n", color); + ++ infoPtr->bDefaultBkColor = FALSE; + if(infoPtr->clrBk != color) { + if (infoPtr->clrBk != CLR_NONE) DeleteObject(infoPtr->hBkBrush); + infoPtr->clrBk = color; +@@ -9362,6 +9382,7 @@ static LRESULT LISTVIEW_NCCreate(HWND hw + infoPtr->clrText = CLR_DEFAULT; + infoPtr->clrTextBk = CLR_DEFAULT; + LISTVIEW_SetBkColor(infoPtr, comctl32_color.clrWindow); ++ infoPtr->bDefaultBkColor = TRUE; + + /* set default values */ + infoPtr->nFocusedItem = -1; +@@ -11644,6 +11665,12 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg + + case WM_SYSCOLORCHANGE: + COMCTL32_RefreshSysColors(); ++ if (infoPtr->bDefaultBkColor) ++ { ++ LISTVIEW_SetBkColor(infoPtr, comctl32_color.clrWindow); ++ infoPtr->bDefaultBkColor = TRUE; ++ LISTVIEW_InvalidateList(infoPtr); ++ } + return 0; + + /* case WM_TIMER: */ + +diff -prudN e:\Wine\dlls\comctl32/propsheet.c e:\reactos\dll\win32\comctl32/propsheet.c +--- e:\Wine\dlls\comctl32/propsheet.c 2013-03-02 14:17:59.122793000 +0100 ++++ e:\reactos\dll\win32\comctl32/propsheet.c 2013-03-16 12:21:47.383897000 +0100 +@@ -2430,6 +2430,9 @@ static void PROPSHEET_SetWizButtons(HWND HWND hwndBack = GetDlgItem(hwndDlg, IDC_BACK_BUTTON); HWND hwndNext = GetDlgItem(hwndDlg, IDC_NEXT_BUTTON); HWND hwndFinish = GetDlgItem(hwndDlg, IDC_FINISH_BUTTON); @@ -253,7 +421,7 @@ TRACE("%d\n", dwFlags); -@@ -2432,17 +2435,6 @@ +@@ -2437,17 +2440,6 @@ static void PROPSHEET_SetWizButtons(HWND EnableWindow(hwndNext, FALSE); EnableWindow(hwndFinish, FALSE); @@ -271,7 +439,7 @@ if (dwFlags & PSWIZB_BACK) EnableWindow(hwndBack, TRUE); -@@ -2472,6 +2464,22 @@ +@@ -2477,6 +2469,22 @@ static void PROPSHEET_SetWizButtons(HWND } else if (!(dwFlags & PSWIZB_DISABLEDFINISH)) EnableWindow(hwndFinish, TRUE); @@ -294,20 +462,229 @@ } /****************************************************************************** -Index: tooltips.c -=================================================================== ---- tooltips.c (revision 38890) -+++ tooltips.c (working copy) -@@ -2488,8 +2488,33 @@ +diff -prudN e:\Wine\dlls\comctl32/rebar.c e:\reactos\dll\win32\comctl32/rebar.c +--- e:\Wine\dlls\comctl32/rebar.c 2013-03-02 14:17:59.125795000 +0100 ++++ e:\reactos\dll\win32\comctl32/rebar.c 2013-09-02 13:40:15.983276500 +0100 +@@ -51,7 +51,6 @@ + * - WM_QUERYNEWPALETTE + * - WM_RBUTTONDOWN + * - WM_RBUTTONUP +- * - WM_SYSCOLORCHANGE + * - WM_VKEYTOITEM + * - WM_WININICHANGE + * Notifications: + +@@ -2544,10 +2543,8 @@ REBAR_InsertBandT(REBAR_INFO *infoPtr, I + + /* initialize band */ + memset(lpBand, 0, sizeof(*lpBand)); +- lpBand->clrFore = infoPtr->clrText == CLR_NONE ? infoPtr->clrBtnText : +- infoPtr->clrText; +- lpBand->clrBack = infoPtr->clrBk == CLR_NONE ? infoPtr->clrBtnFace : +- infoPtr->clrBk; ++ lpBand->clrFore = infoPtr->clrText; ++ lpBand->clrBack = infoPtr->clrBk; + lpBand->iImage = -1; + + REBAR_CommonSetupBand(infoPtr->hwndSelf, lprbbi, lpBand); +@@ -2927,12 +2924,20 @@ REBAR_ShowBand (REBAR_INFO *infoPtr, INT + + static LRESULT - TOOLTIPS_NotifyFormat (HWND hwnd, WPARAM wParam, LPARAM lParam) +-REBAR_SizeToRect (REBAR_INFO *infoPtr, const RECT *lpRect) ++REBAR_SizeToRect (REBAR_INFO *infoPtr, WPARAM flags, RECT *lpRect) { -- FIXME ("hwnd=%p wParam=%lx lParam=%lx\n", hwnd, wParam, lParam); -+ TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd); + if (!lpRect) return FALSE; + + TRACE("[%s]\n", wine_dbgstr_rect(lpRect)); + REBAR_SizeToHeight(infoPtr, get_rect_cy(infoPtr, lpRect)); ++ ++ /* Note that this undocumented flag is available on comctl32 v6 or later */ ++ if ((flags & RBSTR_CHANGERECT) != 0) ++ { ++ RECT rcRebar; ++ GetClientRect(infoPtr->hwndSelf, &rcRebar); ++ lpRect->bottom = lpRect->top + (rcRebar.bottom - rcRebar.top); ++ } + return TRUE; + } + +@@ -3713,7 +3718,7 @@ REBAR_WindowProc (HWND hwnd, UINT uMsg, + return REBAR_ShowBand (infoPtr, wParam, lParam); + + case RB_SIZETORECT: +- return REBAR_SizeToRect (infoPtr, (LPCRECT)lParam); ++ return REBAR_SizeToRect (infoPtr, wParam, (LPRECT)lParam); + + + /* Messages passed to parent */ +@@ -3797,6 +3802,8 @@ REBAR_WindowProc (HWND hwnd, UINT uMsg, + + case WM_SYSCOLORCHANGE: + COMCTL32_RefreshSysColors(); ++ infoPtr->clrBtnText = comctl32_color.clrBtnText; ++ infoPtr->clrBtnFace = comctl32_color.clrBtnFace; + return 0; + + /* case WM_VKEYTOITEM: supported according to ControlSpy */ + +--- e:\Wine\dlls\comctl32/tests/v6util.h 2011-09-16 23:22:36.002769200 +0100 ++++ e:\reactos\dll\win32\comctl32/tests/v6util.h 1970-01-01 01:00:00.000000000 +0100 +@@ -1,142 +0,0 @@ +-/* +- * Utility routines for comctl32 v6 tests +- * +- * Copyright 2006 Mike McCormack for CodeWeavers +- * Copyright 2007 George Gov +- * Copyright 2009 Owen Rudge for CodeWeavers +- * +- * This library is free software; you can redistribute it and/or +- * modify it under the terms of the GNU Lesser General Public +- * License as published by the Free Software Foundation; either +- * version 2.1 of the License, or (at your option) any later version. +- * +- * This library is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- * Lesser General Public License for more details. +- * +- * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +- */ +- +-#define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) +- +-#ifdef __i386__ +-#define ARCH "x86" +-#elif defined __x86_64__ +-#define ARCH "amd64" +-#else +-#define ARCH "none" +-#endif +- +-static const CHAR manifest_name[] = "cc6.manifest"; +- +-static const CHAR manifest[] = +- "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n" +- "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">\n" +- " <assemblyIdentity\n" +- " type=\"win32\"\n" +- " name=\"Wine.ComCtl32.Tests\"\n" +- " version=\"1.0.0.0\"\n" +- " processorArchitecture=\"" ARCH "\"\n" +- " />\n" +- "<description>Wine comctl32 test suite</description>\n" +- "<dependency>\n" +- " <dependentAssembly>\n" +- " <assemblyIdentity\n" +- " type=\"win32\"\n" +- " name=\"microsoft.windows.common-controls\"\n" +- " version=\"6.0.0.0\"\n" +- " processorArchitecture=\"" ARCH "\"\n" +- " publicKeyToken=\"6595b64144ccf1df\"\n" +- " language=\"*\"\n" +- " />\n" +- "</dependentAssembly>\n" +- "</dependency>\n" +- "</assembly>\n"; +- +-static void unload_v6_module(ULONG_PTR cookie, HANDLE hCtx) +-{ +- HANDLE hKernel32; +- BOOL (WINAPI *pDeactivateActCtx)(DWORD, ULONG_PTR); +- VOID (WINAPI *pReleaseActCtx)(HANDLE); +- +- hKernel32 = GetModuleHandleA("kernel32.dll"); +- pDeactivateActCtx = (void*)GetProcAddress(hKernel32, "DeactivateActCtx"); +- pReleaseActCtx = (void*)GetProcAddress(hKernel32, "ReleaseActCtx"); +- if (!pDeactivateActCtx || !pReleaseActCtx) +- { +- win_skip("Activation contexts unsupported\n"); +- return; +- } +- +- pDeactivateActCtx(0, cookie); +- pReleaseActCtx(hCtx); +- +- DeleteFileA(manifest_name); +-} +- +-static BOOL load_v6_module(ULONG_PTR *pcookie, HANDLE *hCtx) +-{ +- HANDLE hKernel32; +- HANDLE (WINAPI *pCreateActCtxA)(ACTCTXA*); +- BOOL (WINAPI *pActivateActCtx)(HANDLE, ULONG_PTR*); +- +- ACTCTXA ctx; +- BOOL ret; +- HANDLE file; +- DWORD written; +- +- hKernel32 = GetModuleHandleA("kernel32.dll"); +- pCreateActCtxA = (void*)GetProcAddress(hKernel32, "CreateActCtxA"); +- pActivateActCtx = (void*)GetProcAddress(hKernel32, "ActivateActCtx"); +- if (!(pCreateActCtxA && pActivateActCtx)) +- { +- win_skip("Activation contexts unsupported. No version 6 tests possible.\n"); +- return FALSE; +- } +- +- /* create manifest */ +- file = CreateFileA( manifest_name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL ); +- if (file != INVALID_HANDLE_VALUE) +- { +- ret = (WriteFile( file, manifest, sizeof(manifest)-1, &written, NULL ) && +- written == sizeof(manifest)-1); +- CloseHandle( file ); +- if (!ret) +- { +- DeleteFileA( manifest_name ); +- skip("Failed to fill manifest file. Skipping comctl32 V6 tests.\n"); +- return FALSE; +- } +- else +- trace("created %s\n", manifest_name); +- } +- else +- { +- skip("Failed to create manifest file. Skipping comctl32 V6 tests.\n"); +- return FALSE; +- } +- +- memset(&ctx, 0, sizeof(ctx)); +- ctx.cbSize = sizeof(ctx); +- ctx.lpSource = manifest_name; +- +- *hCtx = pCreateActCtxA(&ctx); +- ok(*hCtx != 0, "Expected context handle\n"); +- +- ret = pActivateActCtx(*hCtx, pcookie); +- expect(TRUE, ret); +- +- if (!ret) +- { +- win_skip("A problem during context activation occurred.\n"); +- DeleteFileA(manifest_name); +- } +- +- return ret; +-} +- +-#undef expect +-#undef ARCH +diff -prudN e:\Wine\dlls\comctl32/tooltips.c e:\reactos\dll\win32\comctl32/tooltips.c +--- e:\Wine\dlls\comctl32/tooltips.c 2013-03-02 14:17:59.178196600 +0100 ++++ e:\reactos\dll\win32\comctl32/tooltips.c 2013-03-16 12:24:45.122483600 +0100 +@@ -2002,7 +2002,32 @@ TOOLTIPS_NCHitTest (const TOOLTIPS_INFO + static LRESULT + TOOLTIPS_NotifyFormat (TOOLTIPS_INFO *infoPtr, WPARAM wParam, LPARAM lParam) + { +- FIXME ("hwnd=%p wParam=%lx lParam=%lx\n", infoPtr->hwndSelf, wParam, lParam); + TTTOOL_INFO *toolPtr = infoPtr->tools; -+ INT nResult; - -+ TRACE("hwnd=%p wParam=%lx lParam=%lx\n", hwnd, wParam, lParam); ++ LRESULT nResult; ++ ++ TRACE("infoPtr=%p wParam=%lx lParam=%p\n", infoPtr, wParam, (PVOID)lParam); + + if (lParam == NF_QUERY) { + if (toolPtr->bNotifyUnicode) { @@ -317,8 +694,8 @@ + } + } + else if (lParam == NF_REQUERY) { -+ nResult = (INT) SendMessageW (toolPtr->hwnd, WM_NOTIFYFORMAT, -+ (WPARAM)hwnd, (LPARAM)NF_QUERY); ++ nResult = SendMessageW (toolPtr->hwnd, WM_NOTIFYFORMAT, ++ (WPARAM)infoPtr->hwndSelf, (LPARAM)NF_QUERY); + if (nResult == NFR_ANSI) { + toolPtr->bNotifyUnicode = FALSE; + TRACE(" -- WM_NOTIFYFORMAT returns: NFR_ANSI\n"); @@ -330,14 +707,14 @@ + } + return nResult; + } + return 0; } - -Index: treeview.c -=================================================================== ---- treeview.c (revision 38890) -+++ treeview.c (working copy) -@@ -2830,7 +2830,12 @@ + +diff -prudN e:\Wine\dlls\comctl32/treeview.c e:\reactos\dll\win32\comctl32/treeview.c +--- e:\Wine\dlls\comctl32/treeview.c 2013-03-02 14:17:59.181198600 +0100 ++++ e:\reactos\dll\win32\comctl32/treeview.c 2013-03-16 12:26:03.285023200 +0100 +@@ -2921,7 +2921,12 @@ TREEVIEW_Refresh(TREEVIEW_INFO *infoPtr, } } @@ -351,151 +728,3 @@ if (infoPtr->cdmode & CDRF_NOTIFYPOSTPAINT) infoPtr->cdmode = -Index: listview.c -=================================================================== ---- listview.c (revision 51320) -+++ listview.c (working copy) -@@ -315,6 +315,7 @@ - COLORREF clrBk; - COLORREF clrText; - COLORREF clrTextBk; -+ BOOL bDefaultBkColor; - - /* font */ - HFONT hDefaultFont; -@@ -1699,8 +1700,19 @@ - /* used to handle collapse main item column case */ - static inline BOOL LISTVIEW_DrawFocusRect(const LISTVIEW_INFO *infoPtr, HDC hdc) - { -- return (infoPtr->rcFocus.left < infoPtr->rcFocus.right) ? -- DrawFocusRect(hdc, &infoPtr->rcFocus) : FALSE; -+ BOOL Ret = FALSE; -+ -+ if (infoPtr->rcFocus.left < infoPtr->rcFocus.right) -+ { -+ DWORD dwOldBkColor, dwOldTextColor; -+ -+ dwOldBkColor = SetBkColor(hdc, RGB(255, 255, 255)); -+ dwOldTextColor = SetBkColor(hdc, RGB(0, 0, 0)); -+ Ret = DrawFocusRect(hdc, &infoPtr->rcFocus); -+ SetBkColor(hdc, dwOldBkColor); -+ SetBkColor(hdc, dwOldTextColor); -+ } -+ return Ret; - } - - /* Listview invalidation functions: use _only_ these functions to invalidate */ -@@ -4698,7 +4710,10 @@ - if (infoPtr->uView == LV_VIEW_DETAILS && infoPtr->dwLvExStyle & LVS_EX_GRIDLINES) - rcLabel.bottom--; - -- DrawTextW(hdc, lvItem.pszText, -1, &rcLabel, uFormat); -+ if ((!(lvItem.state & LVIS_SELECTED) || !infoPtr->bFocus) && (infoPtr->dwLvExStyle & LVS_EX_TRANSPARENTSHADOWTEXT)) -+ DrawShadowText(hdc, lvItem.pszText, -1, &rcLabel, uFormat, RGB(255, 255, 255), RGB(0, 0, 0), 2, 2); -+ else -+ DrawTextW(hdc, lvItem.pszText, -1, &rcLabel, uFormat); - - postpaint: - if (cdsubitemmode & CDRF_NOTIFYPOSTPAINT) -@@ -5117,7 +5132,11 @@ - - /* Draw marquee rectangle if appropriate */ - if (infoPtr->bMarqueeSelect) -+ { -+ SetBkColor(hdc, RGB(255, 255, 255)); -+ SetTextColor(hdc, RGB(0, 0, 0)); - DrawFocusRect(hdc, &infoPtr->marqueeDrawRect); -+ } - - if (cdmode & CDRF_NOTIFYPOSTPAINT) - notify_postpaint(infoPtr, &nmlvcd); -@@ -7927,6 +7946,7 @@ - { - TRACE("(color=%x)\n", color); - -+ infoPtr->bDefaultBkColor = FALSE; - if(infoPtr->clrBk != color) { - if (infoPtr->clrBk != CLR_NONE) DeleteObject(infoPtr->hBkBrush); - infoPtr->clrBk = color; -@@ -9314,6 +9334,7 @@ - infoPtr->clrText = CLR_DEFAULT; - infoPtr->clrTextBk = CLR_DEFAULT; - LISTVIEW_SetBkColor(infoPtr, comctl32_color.clrWindow); -+ infoPtr->bDefaultBkColor = TRUE; - - /* set default values */ - infoPtr->nFocusedItem = -1; -@@ -11570,6 +11591,12 @@ - - case WM_SYSCOLORCHANGE: - COMCTL32_RefreshSysColors(); -+ if (infoPtr->bDefaultBkColor) -+ { -+ LISTVIEW_SetBkColor(infoPtr, comctl32_color.clrWindow); -+ infoPtr->bDefaultBkColor = TRUE; -+ LISTVIEW_InvalidateList(infoPtr); -+ } - return 0; - - /* case WM_TIMER: */ -Index: rebar.c -=================================================================== ---- rebar.c (revision 51320) -+++ rebar.c (working copy) -@@ -51,7 +51,6 @@ - * - WM_QUERYNEWPALETTE - * - WM_RBUTTONDOWN - * - WM_RBUTTONUP -- * - WM_SYSCOLORCHANGE - * - WM_VKEYTOITEM - * - WM_WININICHANGE - * Notifications: -@@ -2540,10 +2539,8 @@ - - /* initialize band */ - memset(lpBand, 0, sizeof(*lpBand)); -- lpBand->clrFore = infoPtr->clrText == CLR_NONE ? infoPtr->clrBtnText : -- infoPtr->clrText; -- lpBand->clrBack = infoPtr->clrBk == CLR_NONE ? infoPtr->clrBtnFace : -- infoPtr->clrBk; -+ lpBand->clrFore = infoPtr->clrText; -+ lpBand->clrBack = infoPtr->clrBk; - lpBand->iImage = -1; - - REBAR_CommonSetupBand(infoPtr->hwndSelf, lprbbi, lpBand); -@@ -3793,6 +3790,8 @@ - - case WM_SYSCOLORCHANGE: - COMCTL32_RefreshSysColors(); -+ infoPtr->clrBtnText = comctl32_color.clrBtnText; -+ infoPtr->clrBtnFace = comctl32_color.clrBtnFace; - return 0; - - /* case WM_VKEYTOITEM: supported according to ControlSpy */ -Index: monthcal.c -=================================================================== ---- monthcal.c (Revision 51719) -+++ monthcal.c (Arbeitskopie) -@@ -143,8 +143,8 @@ - /* empty SYSTEMTIME const */ - static const SYSTEMTIME st_null; - /* valid date limits */ --static const SYSTEMTIME max_allowed_date = { .wYear = 9999, .wMonth = 12, .wDay = 31 }; --static const SYSTEMTIME min_allowed_date = { .wYear = 1752, .wMonth = 9, .wDay = 14 }; -+static const SYSTEMTIME max_allowed_date = { 9999, 12, 0, 31, 0, 0, 0, 0 }; -+static const SYSTEMTIME min_allowed_date = { 1752, 9, 0, 14, 0, 0, 0, 0 }; - - /* Prev/Next buttons */ - enum nav_direction -Index: comctl32.spec -=================================================================== ---- comctl32.spec (revision 56653) -+++ comctl32.spec (working copy) -@@ -188,6 +188,7 @@ - @ stdcall PropertySheet(ptr) PropertySheetA - @ stdcall PropertySheetA(ptr) - @ stdcall PropertySheetW(ptr) -+@ stdcall RegisterClassNameW(wstr) - @ stdcall TaskDialogIndirect(ptr ptr ptr ptr) - @ stdcall UninitializeFlatSB(long) - @ stdcall _TrackMouseEvent(ptr) Modified: trunk/reactos/dll/win32/comctl32/rebar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/rebar.c… ============================================================================== --- trunk/reactos/dll/win32/comctl32/rebar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/rebar.c [iso-8859-1] Mon Sep 2 12:56:20 2013 @@ -2924,12 +2924,20 @@ static LRESULT -REBAR_SizeToRect (REBAR_INFO *infoPtr, const RECT *lpRect) +REBAR_SizeToRect (REBAR_INFO *infoPtr, WPARAM flags, RECT *lpRect) { if (!lpRect) return FALSE; TRACE("[%s]\n", wine_dbgstr_rect(lpRect)); REBAR_SizeToHeight(infoPtr, get_rect_cy(infoPtr, lpRect)); + + /* Note that this undocumented flag is available on comctl32 v6 or later */ + if ((flags & RBSTR_CHANGERECT) != 0) + { + RECT rcRebar; + GetClientRect(infoPtr->hwndSelf, &rcRebar); + lpRect->bottom = lpRect->top + (rcRebar.bottom - rcRebar.top); + } return TRUE; } @@ -3710,7 +3718,7 @@ return REBAR_ShowBand (infoPtr, wParam, lParam); case RB_SIZETORECT: - return REBAR_SizeToRect (infoPtr, (LPCRECT)lParam); + return REBAR_SizeToRect (infoPtr, wParam, (LPRECT)lParam); /* Messages passed to parent */

1 0

[gadamopoulos] 59961: [shell32] - Fix a warning
by gadamopoulos＠svn.reactos.org 02 Sep '13

02 Sep '13

Author: gadamopoulos Date: Mon Sep 2 12:18:37 2013 New Revision: 59961 URL: http://svn.reactos.org/svn/reactos?rev=59961&view=rev Log: [shell32] - Fix a warning Modified: trunk/reactos/dll/win32/shell32/defcontextmenu.cpp Modified: trunk/reactos/dll/win32/shell32/defcontextmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/defconte… ============================================================================== --- trunk/reactos/dll/win32/shell32/defcontextmenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/defcontextmenu.cpp [iso-8859-1] Mon Sep 2 12:18:37 2013 @@ -1489,7 +1489,7 @@ { LPSHELLBROWSER lpSB; HWND hwndTree; - LPWSTR FlagsName; + LPCWSTR FlagsName; WCHAR wszKey[256]; HRESULT hr; DWORD wFlags;

1 0

[akhaldi] 59960: [WIN32K] * Fix some print specifiers. Dedicated to the Island.
by akhaldi＠svn.reactos.org 01 Sep '13

01 Sep '13

Author: akhaldi Date: Sun Sep 1 23:58:37 2013 New Revision: 59960 URL: http://svn.reactos.org/svn/reactos?rev=59960&view=rev Log: [WIN32K] * Fix some print specifiers. Dedicated to the Island. Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c trunk/reactos/win32ss/user/ntuser/class.c trunk/reactos/win32ss/user/ntuser/desktop.c trunk/reactos/win32ss/user/ntuser/display.c trunk/reactos/win32ss/user/ntuser/event.c trunk/reactos/win32ss/user/ntuser/focus.c trunk/reactos/win32ss/user/ntuser/hook.c trunk/reactos/win32ss/user/ntuser/input.c trunk/reactos/win32ss/user/ntuser/kbdlayout.c trunk/reactos/win32ss/user/ntuser/keyboard.c trunk/reactos/win32ss/user/ntuser/menu.c trunk/reactos/win32ss/user/ntuser/message.c trunk/reactos/win32ss/user/ntuser/metric.c trunk/reactos/win32ss/user/ntuser/misc.c trunk/reactos/win32ss/user/ntuser/monitor.c trunk/reactos/win32ss/user/ntuser/mouse.c trunk/reactos/win32ss/user/ntuser/msgqueue.c trunk/reactos/win32ss/user/ntuser/object.c trunk/reactos/win32ss/user/ntuser/painting.c trunk/reactos/win32ss/user/ntuser/prop.c trunk/reactos/win32ss/user/ntuser/scrollbar.c trunk/reactos/win32ss/user/ntuser/sysparams.c trunk/reactos/win32ss/user/ntuser/timer.c trunk/reactos/win32ss/user/ntuser/windc.c trunk/reactos/win32ss/user/ntuser/window.c trunk/reactos/win32ss/user/ntuser/winpos.c trunk/reactos/win32ss/user/ntuser/winsta.c Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Sun Sep 1 23:58:37 2013 @@ -365,7 +365,7 @@ if (Error == FT_Err_Unknown_File_Format) DPRINT("Unknown font file format\n"); else - DPRINT("Error reading font file (error code: %u)\n", Error); + DPRINT("Error reading font file (error code: %d)\n", Error); return 0; } @@ -400,7 +400,7 @@ FontGDI->face = Face; DPRINT("Font loaded: %s (%s)\n", Face->family_name, Face->style_name); - DPRINT("Num glyphs: %u\n", Face->num_glyphs); + DPRINT("Num glyphs: %d\n", Face->num_glyphs); /* Add this font resource to the font table */ @@ -1127,7 +1127,7 @@ wcscpy(Info->EnumLogFontEx.elfScript, ElfScripts[i]); else { - DPRINT1("Unknown elfscript for bit %d\n", i); + DPRINT1("Unknown elfscript for bit %u\n", i); } } } @@ -1529,7 +1529,7 @@ FT_CharMap found = 0, charmap; XFORM xForm; - DPRINT("%d, %08x, %p, %08lx, %p, %p\n", wch, iFormat, pgm, + DPRINT("%u, %08x, %p, %08lx, %p, %p\n", wch, iFormat, pgm, cjBuf, pvBuf, pmat2); pdcattr = dc->pdcattr; @@ -1771,7 +1771,7 @@ gm.gmptGlyphOrigin.x = left >> 6; gm.gmptGlyphOrigin.y = top >> 6; - DPRINT("CX %d CY %d BBX %d BBY %d GOX %d GOY %d\n", + DPRINT("CX %d CY %d BBX %u BBY %u GOX %d GOY %d\n", gm.gmCellIncX, gm.gmCellIncY, gm.gmBlackBoxX, gm.gmBlackBoxY, gm.gmptGlyphOrigin.x, gm.gmptGlyphOrigin.y); @@ -2129,11 +2129,11 @@ } default: - DPRINT1("Unsupported format %d\n", iFormat); + DPRINT1("Unsupported format %u\n", iFormat); return GDI_ERROR; } - DPRINT("ftGdiGetGlyphOutline END and needed %d\n", needed); + DPRINT("ftGdiGetGlyphOutline END and needed %lu\n", needed); return needed; } @@ -2211,7 +2211,7 @@ dc->ppdev->devinfo.lfDefaultFont.lfHeight : abs(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))); if (error) { - DPRINT1("Error in setting pixel sizes: %u\n", error); + DPRINT1("Error in setting pixel sizes: %d\n", error); } /* Get the DC's world-to-device transformation matrix */ @@ -2235,7 +2235,7 @@ error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); if (error) { - DPRINT1("WARNING: Failed to load and render glyph! [index: %u]\n", glyph_index); + DPRINT1("WARNING: Failed to load and render glyph! [index: %d]\n", glyph_index); break; } @@ -2248,7 +2248,7 @@ RenderMode); if (!realglyph) { - DPRINT1("Failed to render glyph! [index: %u]\n", glyph_index); + DPRINT1("Failed to render glyph! [index: %d]\n", glyph_index); break; } } @@ -2392,7 +2392,7 @@ } } Exit: - DPRINT("CharSet %d CodePage %d\n",csi.ciCharset, csi.ciACP); + DPRINT("CharSet %u CodePage %u\n", csi.ciCharset, csi.ciACP); return (MAKELONG(csi.ciACP, csi.ciCharset)); } @@ -3378,7 +3378,7 @@ dc->ppdev->devinfo.lfDefaultFont.lfHeight : abs(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))); if (error) { - DPRINT1("Error in setting pixel sizes: %u\n", error); + DPRINT1("Error in setting pixel sizes: %d\n", error); IntUnLockFreeType; goto fail; } @@ -3442,7 +3442,7 @@ error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); if (error) { - DPRINT1("WARNING: Failed to load and render glyph! [index: %u]\n", glyph_index); + DPRINT1("WARNING: Failed to load and render glyph! [index: %d]\n", glyph_index); } glyph = face->glyph; @@ -3454,7 +3454,7 @@ RenderMode); if (!realglyph) { - DPRINT1("Failed to render glyph! [index: %u]\n", glyph_index); + DPRINT1("Failed to render glyph! [index: %d]\n", glyph_index); IntUnLockFreeType; goto fail; } @@ -3523,7 +3523,7 @@ error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); if (error) { - DPRINT1("Failed to load and render glyph! [index: %u]\n", glyph_index); + DPRINT1("Failed to load and render glyph! [index: %d]\n", glyph_index); IntUnLockFreeType; goto fail2; } @@ -3536,7 +3536,7 @@ RenderMode); if (!realglyph) { - DPRINT1("Failed to render glyph! [index: %u]\n", glyph_index); + DPRINT1("Failed to render glyph! [index: %d]\n", glyph_index); IntUnLockFreeType; goto fail2; } @@ -3549,8 +3549,8 @@ FT_Get_Kerning(face, previous, glyph_index, 0, &delta); TextLeft += delta.x; } - DPRINT("TextLeft: %d\n", TextLeft); - DPRINT("TextTop: %d\n", TextTop); + DPRINT("TextLeft: %I64d\n", TextLeft); + DPRINT("TextTop: %lu\n", TextTop); DPRINT("Advance: %d\n", realglyph->root.advance.x); if (fuOptions & ETO_OPAQUE) @@ -3655,12 +3655,12 @@ if (NULL == Dx) { TextLeft += realglyph->root.advance.x >> 10; - DPRINT("New TextLeft: %d\n", TextLeft); + DPRINT("New TextLeft: %I64d\n", TextLeft); } else { TextLeft += Dx[i<<DxShift] << 6; - DPRINT("New TextLeft2: %d\n", TextLeft); + DPRINT("New TextLeft2: %I64d\n", TextLeft); } if (DxShift) Modified: trunk/reactos/win32ss/user/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/class.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] Sun Sep 1 23:58:37 2013 @@ -2357,7 +2357,7 @@ // If null instance use client. if (!hInstance) hInstance = hModClient; - TRACE("GetClassInfo(%wZ, 0x%x)\n", SafeClassName, hInstance); + TRACE("GetClassInfo(%wZ, %p)\n", SafeClassName, hInstance); /* NOTE: Need exclusive lock because getting the wndproc might require the creation of a call procedure handle */ Modified: trunk/reactos/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/deskto… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] Sun Sep 1 23:58:37 2013 @@ -235,12 +235,12 @@ if (versionInfo.dwMajorVersion <= 4) len = swprintf(buffer, - L"ReactOS Version %d.%d %s Build %d", + L"ReactOS Version %lu.%lu %s Build %lu", versionInfo.dwMajorVersion, versionInfo.dwMinorVersion, versionInfo.szCSDVersion, versionInfo.dwBuildNumber&0xFFFF); else len = swprintf(buffer, - L"ReactOS %s (Build %d)", + L"ReactOS %s (Build %lu)", versionInfo.szCSDVersion, versionInfo.dwBuildNumber&0xFFFF); return len; Modified: trunk/reactos/win32ss/user/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/displa… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/display.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/display.c [iso-8859-1] Sun Sep 1 23:58:37 2013 @@ -197,7 +197,7 @@ if (NT_SUCCESS(Status)) { iVGACompatible = _wtoi(&awcDeviceName[13]); - ERR("VGA adapter = %ld\n", iVGACompatible); + ERR("VGA adapter = %lu\n", iVGACompatible); } /* Get the maximum mumber of adapters */ @@ -206,7 +206,7 @@ ERR("Could not read MaxObjectNumber, defaulting to 0.\n"); } - TRACE("Found %ld devices\n", ulMaxObjectNumber + 1); + TRACE("Found %lu devices\n", ulMaxObjectNumber + 1); /* Loop through all adapters */ for (iDevNum = 0; iDevNum <= ulMaxObjectNumber; iDevNum++) @@ -350,8 +350,8 @@ DISPLAY_DEVICEW dispdev; NTSTATUS Status; - TRACE("Enter NtUserEnumDisplayDevices(%wZ, %ld)\n", - pustrDevice, iDevNum); + TRACE("Enter NtUserEnumDisplayDevices(%wZ, %lu)\n", + pustrDevice, iDevNum); dispdev.cb = sizeof(dispdev); @@ -463,8 +463,8 @@ PDEVMODEENTRY pdmentry; ULONG i, iFoundMode; - TRACE("Enter UserEnumDisplaySettings('%wZ', %ld)\n", - pustrDevice, iModeNum); + TRACE("Enter UserEnumDisplaySettings('%wZ', %lu)\n", + pustrDevice, iModeNum); /* Ask GDI for the GRAPHICS_DEVICE */ pGraphicsDevice = EngpFindGraphicsDevice(pustrDevice, 0, 0); @@ -568,8 +568,8 @@ ULONG cbSize, cbExtra; DEVMODEW dmReg, *pdm; - TRACE("Enter NtUserEnumDisplaySettings(%wZ, %ld, %p, 0x%lx)\n", - pustrDevice, iModeNum, lpDevMode, dwFlags); + TRACE("Enter NtUserEnumDisplaySettings(%wZ, %lu, %p, 0x%lx)\n", + pustrDevice, iModeNum, lpDevMode, dwFlags); if (pustrDevice) { Modified: trunk/reactos/win32ss/user/ntuser/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/event.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/event.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/event.c [iso-8859-1] Sun Sep 1 23:58:37 2013 @@ -136,7 +136,7 @@ { if (pEH) { - TRACE("IntRemoveEvent pEH 0x%x\n",pEH); + TRACE("IntRemoveEvent pEH %p\n", pEH); KeEnterCriticalRegion(); RemoveEntryList(&pEH->Chain); GlobalEvents->Counts--; @@ -224,7 +224,7 @@ PLIST_ENTRY pLE; PTHREADINFO pti, ptiCurrent; - TRACE("IntNotifyWinEvent GlobalEvents = 0x%x pWnd 0x%x\n",GlobalEvents, pWnd); + TRACE("IntNotifyWinEvent GlobalEvents = %p pWnd %p\n", GlobalEvents, pWnd); if (!GlobalEvents || !GlobalEvents->Counts) return; @@ -334,7 +334,7 @@ HANDLE Handle; PETHREAD Thread = NULL; - TRACE("NtUserSetWinEventHook hmod 0x%x, pfn 0x%x\n",hmodWinEventProc, lpfnWinEventProc); + TRACE("NtUserSetWinEventHook hmod %p, pfn %p\n", hmodWinEventProc, lpfnWinEventProc); UserEnterExclusive(); Modified: trunk/reactos/win32ss/user/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/focus.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/focus.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/focus.c [iso-8859-1] Sun Sep 1 23:58:37 2013 @@ -373,7 +373,7 @@ hWnd = UserHMGetHandle(Wnd); - TRACE("SetForegroundAndFocusWindow(%x, %s)\n", hWnd, (MouseActivate ? "TRUE" : "FALSE")); + TRACE("SetForegroundAndFocusWindow(%p, %s)\n", hWnd, (MouseActivate ? "TRUE" : "FALSE")); PrevForegroundQueue = IntGetFocusMessageQueue(); // Use this active desktop. pti = PsGetCurrentThreadWin32Thread(); @@ -710,7 +710,7 @@ IntSendFocusMessages( pti, Window); - TRACE("Focus: %d -> %d\n", hWndPrev, Window->head.h); + TRACE("Focus: %p -> %p\n", hWndPrev, Window->head.h); } else /* NULL hwnd passed in */ { @@ -761,7 +761,7 @@ RETURN( ThreadQueue ? (ThreadQueue->spwndCapture ? UserHMGetHandle(ThreadQueue->spwndCapture) : 0) : 0); CLEANUP: - TRACE("Leave IntGetCapture, ret=%i\n",_ret_); + TRACE("Leave IntGetCapture, ret=%p\n", _ret_); END_CLEANUP; } @@ -962,7 +962,7 @@ RETURN( UserGetForegroundWindow()); CLEANUP: - TRACE("Leave NtUserGetForegroundWindow, ret=%i\n",_ret_); + TRACE("Leave NtUserGetForegroundWindow, ret=%p\n", _ret_); UserLeave(); END_CLEANUP; } @@ -975,7 +975,7 @@ PWND Window; DECLARE_RETURN(HWND); - TRACE("Enter NtUserSetActiveWindow(%x)\n", hWnd); + TRACE("Enter NtUserSetActiveWindow(%p)\n", hWnd); UserEnterExclusive(); Window = NULL; @@ -1013,13 +1013,13 @@ { DECLARE_RETURN(HWND); - TRACE("Enter NtUserSetCapture(%x)\n", hWnd); + TRACE("Enter NtUserSetCapture(%p)\n", hWnd); UserEnterExclusive(); RETURN( co_UserSetCapture(hWnd)); CLEANUP: - TRACE("Leave NtUserSetCapture, ret=%i\n",_ret_); + TRACE("Leave NtUserSetCapture, ret=%p\n", _ret_); UserLeave(); END_CLEANUP; } @@ -1035,7 +1035,7 @@ DECLARE_RETURN(HWND); HWND ret; - TRACE("Enter NtUserSetFocus(%x)\n", hWnd); + TRACE("Enter NtUserSetFocus(%p)\n", hWnd); UserEnterExclusive(); if (hWnd) Modified: trunk/reactos/win32ss/user/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/hook.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/hook.c [iso-8859-1] Sun Sep 1 23:58:37 2013 @@ -35,7 +35,7 @@ ppi = PsGetCurrentProcessWin32Process(); - ERR("IntLoadHookModule. Client PID: %d\n", PsGetProcessId(ppi->peProcess)); + ERR("IntLoadHookModule. Client PID: %p\n", PsGetProcessId(ppi->peProcess)); /* Check if this is the api hook */ if(iHookID == WH_APIHOOK) @@ -109,7 +109,7 @@ { if(ptiCurrent->ppi->W32PF_flags & W32PF_APIHOOKLOADED) { - TRACE("IntHookModuleUnloaded: sending message to PID %d, ppi=0x%x\n", PsGetProcessId(ptiCurrent->ppi->peProcess), ptiCurrent->ppi); + TRACE("IntHookModuleUnloaded: sending message to PID %p, ppi=%p\n", PsGetProcessId(ptiCurrent->ppi->peProcess), ptiCurrent->ppi); co_MsqSendMessageAsync( ptiCurrent, 0, iHookID, @@ -155,7 +155,7 @@ return FALSE; } - ERR("UserRegisterUserApiHook. Server PID: %d\n", PsGetProcessId(pti->ppi->peProcess)); + ERR("UserRegisterUserApiHook. Server PID: %p\n", PsGetProcessId(pti->ppi->peProcess)); /* Register the api hook */ gpsi->dwSRVIFlags |= SRVINFO_APIHOOK; @@ -222,7 +222,7 @@ return FALSE; } - ERR("UserUnregisterUserApiHook. Server PID: %d\n", PsGetProcessId(pti->ppi->peProcess)); + ERR("UserUnregisterUserApiHook. Server PID: %p\n", PsGetProcessId(pti->ppi->peProcess)); /* Unregister the api hook */ gpsi->dwSRVIFlags &= ~SRVINFO_APIHOOK; @@ -1086,7 +1086,7 @@ if (!pti || !pdo) { - ERR("Kill Thread Hooks pti 0x%x pdo 0x%x\n",pti,pdo); + ERR("Kill Thread Hooks pti %p pdo %p\n", pti, pdo); return; } @@ -1283,7 +1283,7 @@ if ( (pti->TIF_flags & TIF_DISABLEHOOKS) || (ptiHook->TIF_flags & TIF_INCLEANUP)) { - TRACE("Next Hook 0x%x, 0x%x\n",ptiHook->rpdesk,pdo); + TRACE("Next Hook %p, %p\n", ptiHook->rpdesk, pdo); continue; } @@ -1582,7 +1582,7 @@ Hook->Proc = HookProc; Hook->Ansi = Ansi; - TRACE("Set Hook Desk 0x%x DeskInfo 0x%x Handle Desk 0x%x\n",pti->rpdesk, pti->pDeskInfo,Hook->head.rpdesk); + TRACE("Set Hook Desk %p DeskInfo %p Handle Desk %p\n", pti->rpdesk, pti->pDeskInfo, Hook->head.rpdesk); if (ThreadId) /* Thread-local hook */ { @@ -1684,7 +1684,7 @@ RETURN( Handle); CLEANUP: - TRACE("Leave NtUserSetWindowsHookEx, ret=%i\n",_ret_); + TRACE("Leave NtUserSetWindowsHookEx, ret=%p\n", _ret_); UserLeave(); END_CLEANUP; } Modified: trunk/reactos/win32ss/user/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/input.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/input.c [iso-8859-1] Sun Sep 1 23:58:37 2013 @@ -62,7 +62,7 @@ TO = 1000 * gspv.iScrSaverTimeout; if (Test > TO) { - TRACE("Screensaver Message Start! Tick %d Timeout %d \n", Test, gspv.iScrSaverTimeout); + TRACE("Screensaver Message Start! Tick %lu Timeout %d \n", Test, gspv.iScrSaverTimeout); if (ppiScrnSaver) // We are or we are not the screensaver, prevent reentry... { @@ -146,7 +146,7 @@ ptiRawInput->TIF_flags |= TIF_SYSTEMTHREAD; ptiRawInput->pClientInfo->dwTIFlags = ptiRawInput->TIF_flags; - TRACE("Raw Input Thread 0x%x\n", ptiRawInput); + TRACE("Raw Input Thread %p\n", ptiRawInput); KeSetPriorityThread(&PsGetCurrentThread()->Tcb, LOW_REALTIME_PRIORITY + 3); @@ -461,7 +461,7 @@ ptiFrom->MessageQueue = ptiTo->MessageQueue; ptiFrom->MessageQueue->cThreads++; - ERR("ptiTo S Share count %d\n", ptiFrom->MessageQueue->cThreads); + ERR("ptiTo S Share count %lu\n", ptiFrom->MessageQueue->cThreads); // FIXME: conditions? if (ptiFrom->pqAttach == gpqForeground) @@ -525,7 +525,7 @@ if (pai->pti1 == ptiFrom) { ptiFrom->MessageQueue->cThreads--; - ERR("ptiTo L Share count %d\n", ptiFrom->MessageQueue->cThreads); + ERR("ptiTo L Share count %lu\n", ptiFrom->MessageQueue->cThreads); /* Use the message queue of the last attachment */ ptiFrom->MessageQueue = pai->pti2->MessageQueue; ptiFrom->MessageQueue->CursorObject = NULL; @@ -538,7 +538,7 @@ } ptiFrom->MessageQueue->cThreads--; - ERR("ptiTo E Share count %d\n", ptiFrom->MessageQueue->cThreads); + ERR("ptiTo E Share count %lu\n", ptiFrom->MessageQueue->cThreads); ptiFrom->MessageQueue = ptiFrom->pqAttach; // FIXME: conditions? ptiFrom->MessageQueue->CursorObject = NULL; @@ -639,7 +639,7 @@ } cleanup: - TRACE("Leave NtUserSendInput, ret=%i\n", uRet); + TRACE("Leave NtUserSendInput, ret=%u\n", uRet); UserLeave(); return uRet; } Modified: trunk/reactos/win32ss/user/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/kbdlay… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/kbdlayout.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/kbdlayout.c [iso-8859-1] Sun Sep 1 23:58:37 2013 @@ -235,7 +235,7 @@ pKl->iBaseCharset = cs.ciCharset; pKl->dwFontSigs = cs.fs.fsCsb[0]; pKl->CodePage = (USHORT)cs.ciACP; - TRACE("Charset %d Font Sig %d CodePage %d\n", pKl->iBaseCharset, pKl->dwFontSigs, pKl->CodePage); + TRACE("Charset %u Font Sig %lu CodePage %u\n", pKl->iBaseCharset, pKl->dwFontSigs, pKl->CodePage); } else { @@ -695,7 +695,7 @@ if (!pKl) { - ERR("Invalid HKL %x!\n", hKl); + ERR("Invalid HKL %p!\n", hKl); goto cleanup; } @@ -741,7 +741,7 @@ if (pKl) bRet = UserUnloadKbl(pKl); else - ERR("Invalid HKL %x!\n", hKl); + ERR("Invalid HKL %p!\n", hKl); UserLeave(); return bRet; Modified: trunk/reactos/win32ss/user/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/keyboa… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/keyboard.c [iso-8859-1] Sun Sep 1 23:58:37 2013 @@ -361,7 +361,7 @@ *pbLigature = (wch == WCH_LGTR); *pwcTranslatedChar = wch; - TRACE("%d %04x: dwModNumber %08x Char %04x\n", + TRACE("%lu %04x: dwModNumber %08x Char %04x\n", i, wVirtKey, dwModNumber, wch); if (*pbDead) @@ -614,7 +614,7 @@ UserLeave(); - TRACE("Leave NtUserGetAsyncKeyState, ret=%i\n", wRet); + TRACE("Leave NtUserGetAsyncKeyState, ret=%u\n", wRet); return wRet; } @@ -1257,7 +1257,7 @@ ret = IntMapVirtualKeyEx(uCode, uType, pKbdTbl); UserLeave(); - TRACE("Leave NtUserMapVirtualKeyEx, ret=%i\n", ret); + TRACE("Leave NtUserMapVirtualKeyEx, ret=%u\n", ret); return ret; } @@ -1315,7 +1315,7 @@ pwszBuff = ExAllocatePoolWithTag(NonPagedPool, sizeof(WCHAR) * cchBuff, TAG_STRING); if (!pwszBuff) { - ERR("ExAllocatePoolWithTag(%d) failed\n", sizeof(WCHAR) * cchBuff); + ERR("ExAllocatePoolWithTag(%u) failed\n", sizeof(WCHAR) * cchBuff); return 0; } RtlZeroMemory(pwszBuff, sizeof(WCHAR) * cchBuff); @@ -1443,7 +1443,7 @@ cleanup: UserLeave(); - TRACE("Leave NtUserGetKeyNameText, ret=%i\n", dwRet); + TRACE("Leave NtUserGetKeyNameText, ret=%lu\n", dwRet); return dwRet; } @@ -1489,7 +1489,7 @@ PKL pKl = NULL; DWORD i, dwModBits = 0, dwModNumber = 0, Ret = (DWORD)-1; - TRACE("NtUserVkKeyScanEx() wch %d, KbdLayout 0x%p\n", wch, dwhkl); + TRACE("NtUserVkKeyScanEx() wch %u, KbdLayout 0x%p\n", wch, dwhkl); UserEnterShared(); if (bUsehKL) @@ -1523,7 +1523,7 @@ if (pVkToWch->wch[dwModNumber] == wch) { dwModBits = pKbdTbl->pCharModifiers->ModNumber[dwModNumber]; - TRACE("i %d wC %04x: dwModBits %08x dwModNumber %08x MaxModBits %08x\n", + TRACE("i %lu wC %04x: dwModBits %08x dwModNumber %08x MaxModBits %08x\n", i, wch, dwModBits, dwModNumber, pKbdTbl->pCharModifiers->wMaxModBits); Ret = (dwModBits << 8) | (pVkToWch->VirtualKey & 0xFF); goto Exit; Modified: trunk/reactos/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] Sun Sep 1 23:58:37 2013 @@ -1514,7 +1514,7 @@ RETURN( IntCheckMenuItem(Menu, uIDCheckItem, uCheck)); CLEANUP: - TRACE("Leave NtUserCheckMenuItem, ret=%i\n",_ret_); + TRACE("Leave NtUserCheckMenuItem, ret=%lu\n",_ret_); UserLeave(); END_CLEANUP; } @@ -1540,8 +1540,8 @@ if (!NT_SUCCESS(Status)) { - ERR("Validation of window station handle (0x%X) failed\n", - CurrentProcess->Win32WindowStation); + ERR("Validation of window station handle (%p) failed\n", + CurrentProcess->Win32WindowStation); SetLastNtError(Status); return (HMENU)0; } @@ -1647,7 +1647,7 @@ RETURN( retValue ); CLEANUP: - TRACE("Leave NtUserGetTitleBarInfo, ret=%i\n",_ret_); + TRACE("Leave NtUserGetTitleBarInfo, ret=%u\n",_ret_); UserLeave(); END_CLEANUP; } @@ -1728,7 +1728,7 @@ RETURN( IntEnableMenuItem(Menu, uIDEnableItem, uEnable)); CLEANUP: - TRACE("Leave NtUserEnableMenuItem, ret=%i\n",_ret_); + TRACE("Leave NtUserEnableMenuItem, ret=%u\n",_ret_); UserLeave(); END_CLEANUP; } @@ -1993,7 +1993,7 @@ RETURN(0xFFFFFFFF); CLEANUP: - TRACE("Leave NtUserGetMenuIndex, ret=%i\n",_ret_); + TRACE("Leave NtUserGetMenuIndex, ret=%u\n",_ret_); UserLeave(); END_CLEANUP; } @@ -2105,7 +2105,7 @@ RETURN(FALSE); CLEANUP: - TRACE("Leave NtUserHiliteMenuItem, ret=%i\n",_ret_); + TRACE("Leave NtUserHiliteMenuItem, ret=%u\n",_ret_); UserLeave(); END_CLEANUP; } @@ -2516,7 +2516,7 @@ RETURN( res); CLEANUP: - TRACE("Leave NtUserBuildMenuItemList, ret=%i\n",_ret_); + TRACE("Leave NtUserBuildMenuItemList, ret=%lu\n",_ret_); UserLeave(); END_CLEANUP; } @@ -2545,7 +2545,7 @@ RETURN( IntGetMenuDefaultItem(Menu, fByPos, gmdiFlags, &gismc)); CLEANUP: - TRACE("Leave NtUserGetMenuDefaultItem, ret=%i\n",_ret_); + TRACE("Leave NtUserGetMenuDefaultItem, ret=%u\n",_ret_); UserLeave(); END_CLEANUP; } Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Sun Sep 1 23:58:37 2013 @@ -526,7 +526,7 @@ } } - TRACE("IdlePing ppi 0x%x\n",ppi); + TRACE("IdlePing ppi %p\n", ppi); if ( ppi && ppi->InputIdleEvent ) { TRACE("InputIdleEvent\n"); @@ -539,7 +539,7 @@ { PPROCESSINFO ppi = PsGetCurrentProcessWin32Process(); - TRACE("IdlePong ppi 0x%x\n",ppi); + TRACE("IdlePong ppi %p\n", ppi); if ( ppi && ppi->InputIdleEvent ) { KeClearEvent(ppi->InputIdleEvent); @@ -608,7 +608,7 @@ pWnd == UserGetMessageWindow() ) // pWnd->fnid == FNID_MESSAGEWND return 0; - TRACE("Internal Event Msg %p hWnd 0x%x\n",msg,pWnd->head.h); + TRACE("Internal Event Msg %u hWnd %p\n", msg, pWnd->head.h); switch(msg) { @@ -1202,13 +1202,13 @@ pti = Window->head.pti; if ( pti->TIF_flags & TIF_INCLEANUP ) { - ERR("Attempted to post message to window 0x%x when the thread is in cleanup!\n", Wnd); + ERR("Attempted to post message to window %p when the thread is in cleanup!\n", Wnd); return FALSE; } if ( Window->state & WNDS_DESTROYED ) { - ERR("Attempted to post message to window 0x%x that is being destroyed!\n", Wnd); + ERR("Attempted to post message to window %p that is being destroyed!\n", Wnd); /* FIXME: Last error code? */ return FALSE; } @@ -1366,7 +1366,7 @@ if (Window->state & WNDS_DESTROYED) { /* FIXME: Last error? */ - ERR("Attempted to send message to window 0x%x that is being destroyed!\n", hWnd); + ERR("Attempted to send message to window %p that is being destroyed!\n", hWnd); RETURN( FALSE); } @@ -1531,7 +1531,7 @@ if (Window->state & WNDS_DESTROYED) { /* FIXME: last error? */ - ERR("Attempted to send message to window 0x%x that is being destroyed!\n", hWnd); + ERR("Attempted to send message to window %p that is being destroyed!\n", hWnd); RETURN(FALSE); } @@ -1900,7 +1900,7 @@ ULONG wDragWidth, wDragHeight; DECLARE_RETURN(BOOL); - TRACE("Enter NtUserDragDetect(%x)\n", hWnd); + TRACE("Enter NtUserDragDetect(%p)\n", hWnd); UserEnterExclusive(); wDragWidth = UserGetSystemMetrics(SM_CXDRAG); @@ -2190,7 +2190,7 @@ } else { - TRACE("No Window for Translate. hwnd 0x%p Msg %d\n",SafeMsg.hwnd,SafeMsg.message); + TRACE("No Window for Translate. hwnd 0x%p Msg %u\n", SafeMsg.hwnd, SafeMsg.message); Ret = FALSE; } UserLeave(); @@ -2691,7 +2691,7 @@ CWP.message = Msg; CWP.wParam = wParam; CWP.lParam = lParam; - TRACE("WH_CALLWNDPROC: Hook %x NextHook %x\n", Hook, NextObj ); + TRACE("WH_CALLWNDPROC: Hook %p NextHook %p\n", Hook, NextObj); lResult = co_IntCallHookProc( Hook->HookId, HC_ACTION, @@ -2819,7 +2819,7 @@ pti->pClientInfo->dwTIFlags = pti->TIF_flags; } - TRACE("WFII: ppi 0x%x\n",W32Process); + TRACE("WFII: ppi %p\n", W32Process); TRACE("WFII: waiting for %p\n", Handles[1] ); do { Modified: trunk/reactos/win32ss/user/ntuser/metric.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/metric… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/metric.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/metric.c [iso-8859-1] Sun Sep 1 23:58:37 2013 @@ -181,7 +181,7 @@ { ASSERT(gpsi); ASSERT(Setup); - TRACE("UserGetSystemMetrics(%d)\n", Index); + TRACE("UserGetSystemMetrics(%lu)\n", Index); /* Get metrics from array */ if (Index < SM_CMETRICS) @@ -202,7 +202,7 @@ return 0; // FIXME } - ERR("UserGetSystemMetrics() called with invalid index %d\n", Index); + ERR("UserGetSystemMetrics() called with invalid index %lu\n", Index); return 0; } Modified: trunk/reactos/win32ss/user/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/misc.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/misc.c [iso-8859-1] Sun Sep 1 23:58:37 2013 @@ -273,7 +273,7 @@ break; } - TRACE("Leave NtUserGetThreadState, ret=%i\n", ret); + TRACE("Leave NtUserGetThreadState, ret=%lu\n", ret); UserLeave(); return ret; @@ -318,7 +318,7 @@ // FIXME: Check if this works on non-interactive winsta Result = gspv.iDblClickTime; - TRACE("Leave NtUserGetDoubleClickTime, ret=%i\n", Result); + TRACE("Leave NtUserGetDoubleClickTime, ret=%u\n", Result); UserLeave(); return Result; } @@ -425,7 +425,7 @@ RETURN( TRUE); CLEANUP: - TRACE("Leave NtUserGetGUIThreadInfo, ret=%i\n",_ret_); + TRACE("Leave NtUserGetGUIThreadInfo, ret=%u\n",_ret_); UserLeave(); END_CLEANUP; } @@ -491,7 +491,7 @@ RETURN( Ret); CLEANUP: - TRACE("Leave NtUserGetGuiResources, ret=%i\n",_ret_); + TRACE("Leave NtUserGetGuiResources, ret=%lu\n",_ret_); UserLeave(); END_CLEANUP; } Modified: trunk/reactos/win32ss/user/ntuser/monitor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/monito… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/monitor.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/monitor.c [iso-8859-1] Sun Sep 1 23:58:37 2013 @@ -700,7 +700,7 @@ pMonitor = UserGetMonitorObject(hMonitor); if (!pMonitor) { - TRACE("Couldnt find monitor 0x%lx\n", hMonitor); + TRACE("Couldnt find monitor %p\n", hMonitor); goto cleanup; } Modified: trunk/reactos/win32ss/user/ntuser/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/mouse.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/mouse.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/mouse.c [iso-8859-1] Sun Sep 1 23:58:37 2013 @@ -402,7 +402,7 @@ lpEventTrack->dwFlags & TME_NONCLIENT ? WM_NCMOUSELEAVE : WM_MOUSELEAVE, 0, 0); } - TRACE("IntTrackMouseEvent spwndTrack 0x%x pwnd 0x%x\n", pDesk->spwndTrack, pWnd); + TRACE("IntTrackMouseEvent spwndTrack %p pwnd %p\n", pDesk->spwndTrack, pWnd); return TRUE; } Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Sun Sep 1 23:58:37 2013 @@ -260,7 +260,7 @@ static VOID UpdateKeyState(PUSER_MESSAGE_QUEUE MessageQueue, WORD wVk, BOOL bIsDown) { - TRACE("UpdateKeyState wVk: %d, bIsDown: %d\n", wVk, bIsDown); + TRACE("UpdateKeyState wVk: %u, bIsDown: %d\n", wVk, bIsDown); if (bIsDown) { @@ -282,7 +282,7 @@ UCHAR key; BOOL down = FALSE; - TRACE("UpdateKeyStateFromMsg message:%d\n", msg->message); + TRACE("UpdateKeyStateFromMsg message:%u\n", msg->message); switch (msg->message) { @@ -626,7 +626,7 @@ } else { - TRACE("Posting mouse message to hwnd=0x%x!\n", UserHMGetHandle(pwnd)); + TRACE("Posting mouse message to hwnd=%p!\n", UserHMGetHandle(pwnd)); MsqPostMessage(pti, Msg, TRUE, QS_MOUSEBUTTON, 0); } } @@ -1011,7 +1011,7 @@ if (pti->TIF_flags & TIF_INCLEANUP || ptirec->TIF_flags & TIF_INCLEANUP) { if (uResult) *uResult = -1; - ERR("MsqSM: Current pti %d or Rec pti %d\n",pti->TIF_flags & TIF_INCLEANUP, ptirec->TIF_flags & TIF_INCLEANUP); + ERR("MsqSM: Current pti %lu or Rec pti %lu\n", pti->TIF_flags & TIF_INCLEANUP, ptirec->TIF_flags & TIF_INCLEANUP); return STATUS_UNSUCCESSFUL; } @@ -1387,7 +1387,7 @@ pwndMsg = co_WinPosWindowFromPoint(NULL, &msg->pt, &hittest); } - TRACE("Got mouse message for 0x%x, hittest: 0x%x\n", msg->hwnd, hittest ); + TRACE("Got mouse message for %p, hittest: 0x%x\n", msg->hwnd, hittest); if (pwndMsg == NULL || pwndMsg->head.pti != pti) { Modified: trunk/reactos/win32ss/user/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/object… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/object.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/object.c [iso-8859-1] Sun Sep 1 23:58:37 2013 @@ -23,7 +23,7 @@ L"Accel", L"DDEaccess", L"DDEconv", L"DDExact", L"Monitor", L"KBDlayout", L"KBDfile", L"Event", L"Timer", L"InputContext", L"HidData", L"DeviceInfo", L"TouchInput",L"GestureInfo"}; - ERR("Total handles count: %d\n", gpsi->cHandleEntries); + ERR("Total handles count: %lu\n", gpsi->cHandleEntries); memset(HandleCounts, 0, sizeof(HandleCounts)); @@ -31,13 +31,13 @@ ppiList = gppiList; while (ppiList) { - ERR("Process %s (%d) handles count: %d\n\t", ppiList->peProcess->ImageFileName, ppiList->peProcess->UniqueProcessId, ppiList->UserHandleCount); + ERR("Process %s (%p) handles count: %d\n\t", ppiList->peProcess->ImageFileName, ppiList->peProcess->UniqueProcessId, ppiList->UserHandleCount); for (i = 1 ;i < TYPE_CTYPES; i++) { HandleCounts[i] += ppiList->DbgHandleCount[i]; - DbgPrint("%S: %d, ", TypeNames[i], ppiList->DbgHandleCount[i]); + DbgPrint("%S: %lu, ", TypeNames[i], ppiList->DbgHandleCount[i]); if (i % 6 == 0) DbgPrint("\n\t"); } @@ -97,7 +97,7 @@ { PUSER_HANDLE_ENTRY entry; PPROCESSINFO ppi = PsGetCurrentProcessWin32Process(); - TRACE("handles used %i\n",gpsi->cHandleEntries); + TRACE("handles used %lu\n", gpsi->cHandleEntries); if (ht->freelist) { @@ -111,7 +111,7 @@ if (ht->nb_handles >= ht->allocated_handles) /* Need to grow the array */ { - ERR("Out of user handles! Used -> %i, NM_Handle -> %d\n", gpsi->cHandleEntries, ht->nb_handles); + ERR("Out of user handles! Used -> %lu, NM_Handle -> %d\n", gpsi->cHandleEntries, ht->nb_handles); #if DBG DbgUserDumpHandleTable(); @@ -420,10 +420,10 @@ if (!entry) { - ERR("Warning! Dereference Object without ENTRY! Obj -> 0x%x\n", object); + ERR("Warning! Dereference Object without ENTRY! Obj -> %p\n", object); return FALSE; } - TRACE("Warning! Dereference to zero! Obj -> 0x%x\n", object); + TRACE("Warning! Dereference to zero! Obj -> %p\n", object); ((PHEAD)object)->cLockObj = 0; Modified: trunk/reactos/win32ss/user/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] Sun Sep 1 23:58:37 2013 @@ -767,7 +767,7 @@ if (Message->hwnd == NULL) { - ERR("PAINTING BUG: Thread marked as containing dirty windows, but no dirty windows found! Counts %d\n",Thread->cPaintsReady); + ERR("PAINTING BUG: Thread marked as containing dirty windows, but no dirty windows found! Counts %u\n",Thread->cPaintsReady); /* Hack to stop spamming the debuglog ! */ Thread->cPaintsReady = 0; return FALSE; @@ -1583,7 +1583,7 @@ RETURN(TRUE); CLEANUP: - TRACE("Leave NtUserScrollDC, ret=%i\n",_ret_); + TRACE("Leave NtUserScrollDC, ret=%lu\n",_ret_); UserLeave(); END_CLEANUP; } @@ -1819,7 +1819,7 @@ if (Window) UserDerefObjectCo(Window); - TRACE("Leave NtUserScrollWindowEx, ret=%i\n",_ret_); + TRACE("Leave NtUserScrollWindowEx, ret=%lu\n",_ret_); UserLeave(); END_CLEANUP; } Modified: trunk/reactos/win32ss/user/ntuser/prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/prop.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/prop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/prop.c [iso-8859-1] Sun Sep 1 23:58:37 2013 @@ -174,7 +174,7 @@ RETURN(Data); CLEANUP: - TRACE("Leave NtUserRemoveProp, ret=%i\n",_ret_); + TRACE("Leave NtUserRemoveProp, ret=%p\n", _ret_); UserLeave(); END_CLEANUP; } Modified: trunk/reactos/win32ss/user/ntuser/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/scroll… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/scrollbar.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/scrollbar.c [iso-8859-1] Sun Sep 1 23:58:37 2013 @@ -575,7 +575,7 @@ Size = 3 * (sizeof(SBINFOEX)); if(!(Window->pSBInfoex = ExAllocatePoolWithTag(PagedPool, Size, TAG_SBARINFO))) { - ERR("Unable to allocate memory for scrollbar information for window 0x%x\n", Window->head.h); + ERR("Unable to allocate memory for scrollbar information for window %p\n", Window->head.h); return FALSE; } @@ -583,7 +583,7 @@ if(!(Window->pSBInfo = DesktopHeapAlloc( Window->head.rpdesk, sizeof(SBINFO)))) { - ERR("Unable to allocate memory for scrollbar information for window 0x%x\n", Window->head.h); + ERR("Unable to allocate memory for scrollbar information for window %p\n", Window->head.h); return FALSE; } @@ -888,7 +888,7 @@ if(wSBflags != SB_BOTH && !SBID_IS_VALID(wSBflags)) { EngSetLastError(ERROR_INVALID_PARAMETER); - ERR("Trying to set scrollinfo for unknown scrollbar type %d", wSBflags); + ERR("Trying to set scrollinfo for unknown scrollbar type %u", wSBflags); RETURN(FALSE); } @@ -913,7 +913,7 @@ if(InfoH) Chg = (IntEnableScrollBar(TRUE, InfoH, wArrows) || Chg); - ERR("FIXME: EnableScrollBar wSBflags %d wArrows %d Chg %d\n",wSBflags,wArrows, Chg); + ERR("FIXME: EnableScrollBar wSBflags %u wArrows %u Chg %d\n", wSBflags, wArrows, Chg); // Done in user32: // SCROLL_RefreshScrollBar( hwnd, nBar, TRUE, TRUE ); @@ -968,7 +968,7 @@ if (Window) UserDerefObjectCo(Window); - TRACE("Leave NtUserSetScrollInfo, ret=%i\n",_ret_); + TRACE("Leave NtUserSetScrollInfo, ret=%lu\n", _ret_); UserLeave(); END_CLEANUP; @@ -998,7 +998,7 @@ RETURN(ret); CLEANUP: - TRACE("Leave NtUserShowScrollBar, ret%i\n",_ret_); + TRACE("Leave NtUserShowScrollBar, ret%lu\n", _ret_); UserLeave(); END_CLEANUP; Modified: trunk/reactos/win32ss/user/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/syspar… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/sysparams.c [iso-8859-1] Sun Sep 1 23:58:37 2013 @@ -680,7 +680,7 @@ /* Yes, Windows really loads the current setting from the registry. */ ulTile = SpiLoadInt(KEY_DESKTOP, L"TileWallpaper", 0); ulStyle = SpiLoadInt(KEY_DESKTOP, L"WallpaperStyle", 0); - TRACE("SpiSetWallpaper: ulTile=%ld, ulStyle=%d\n", ulTile, ulStyle); + TRACE("SpiSetWallpaper: ulTile=%lu, ulStyle=%lu\n", ulTile, ulStyle); /* Check the values we found in the registry */ if(ulTile && !ulStyle) @@ -1544,7 +1544,7 @@ break; default: - ERR("Invalid SPI value: %d\n", uiAction); + ERR("Invalid SPI value: %u\n", uiAction); EngSetLastError(ERROR_INVALID_PARAMETER); return 0; } @@ -1619,7 +1619,7 @@ { BOOL bResult; - TRACE("Enter NtUserSystemParametersInfo(%d)\n", uiAction); + TRACE("Enter NtUserSystemParametersInfo(%u)\n", uiAction); UserEnterExclusive(); // FIXME: Get rid of the flags and only use this from um. kernel can access data directly. Modified: trunk/reactos/win32ss/user/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/timer.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/timer.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/timer.c [iso-8859-1] Sun Sep 1 23:58:37 2013 @@ -281,8 +281,8 @@ CALLBACK SystemTimerProc(HWND hwnd, UINT uMsg, - UINT_PTR idEvent, - DWORD dwTime) + UINT_PTR idEvent, + DWORD dwTime) { PDESKTOP pDesk; PWND pWnd = NULL; @@ -292,7 +292,7 @@ pWnd = UserGetWindowObject(hwnd); if (!pWnd) { - ERR( "System Timer Proc has invalid window handle! 0x%x Id: %d\n", hwnd, idEvent); + ERR("System Timer Proc has invalid window handle! %p Id: %u\n", hwnd, idEvent); return; } } @@ -348,7 +348,7 @@ return; // Not this window so just return. default: - ERR( "System Timer Proc invalid id %d!\n", idEvent ); + ERR("System Timer Proc invalid id %u!\n", idEvent); break; } IntKillTimer(pWnd, idEvent, TRUE); @@ -561,8 +561,8 @@ IntKillTimer(PWND Window, UINT_PTR IDEvent, BOOL SystemTimer) { PTIMER pTmr = NULL; - TRACE("IntKillTimer Window %x id %p systemtimer %s\n", - Window, IDEvent, SystemTimer ? "TRUE" : "FALSE"); + TRACE("IntKillTimer Window %p id %p systemtimer %s\n", + Window, IDEvent, SystemTimer ? "TRUE" : "FALSE"); TimerEnterExclusive(); pTmr = FindTimer(Window, IDEvent, SystemTimer ? TMRF_SYSTEM : 0); @@ -633,7 +633,7 @@ RETURN(IntSetTimer(Window, nIDEvent, uElapse, lpTimerFunc, TMRF_TIFROMWND)); CLEANUP: - TRACE("Leave NtUserSetTimer, ret=%i\n", _ret_); + TRACE("Leave NtUserSetTimer, ret=%u\n", _ret_); END_CLEANUP; } @@ -679,7 +679,7 @@ RETURN(IntSetTimer(UserGetWindowObject(hWnd), nIDEvent, uElapse, NULL, TMRF_SYSTEM)); CLEANUP: - TRACE("Leave NtUserSetSystemTimer, ret=%i\n", _ret_); + TRACE("Leave NtUserSetSystemTimer, ret=%u\n", _ret_); END_CLEANUP; } Modified: trunk/reactos/win32ss/user/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/windc.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/windc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/windc.c [iso-8859-1] Sun Sep 1 23:58:37 2013 @@ -98,7 +98,7 @@ } else { - TRACE("FREE DCATTR!!!! NOT DCE_WINDOW_DC!!!!! hDC-> %x\n", pDce->hDC); + TRACE("FREE DCATTR!!!! NOT DCE_WINDOW_DC!!!!! hDC-> %p\n", pDce->hDC); GreSetDCOwner(pDce->hDC, GDI_OBJ_HMGR_NONE); pDce->ptiOwner = NULL; } @@ -296,7 +296,7 @@ } } dce->DCXFlags &= ~DCX_DCEBUSY; - TRACE("Exit!!!!! DCX_CACHE!!!!!! hDC-> %x \n", dce->hDC); + TRACE("Exit!!!!! DCX_CACHE!!!!!! hDC-> %p \n", dce->hDC); if (!GreSetDCOwner(dce->hDC, GDI_OBJ_HMGR_NONE)) return 0; dce->ptiOwner = NULL; // Reset ownership. @@ -515,7 +515,7 @@ if (!GreIsHandleValid(Dce->hDC)) { - ERR("FIXME: Got DCE with invalid hDC! 0x%x\n", Dce->hDC); + ERR("FIXME: Got DCE with invalid hDC! %p\n", Dce->hDC); Dce->hDC = DceCreateDisplayDC(); /* FIXME: Handle error */ } @@ -577,7 +577,7 @@ if (Dce->DCXFlags & DCX_CACHE) { - TRACE("ENTER!!!!!! DCX_CACHE!!!!!! hDC-> %x\n", Dce->hDC); + TRACE("ENTER!!!!!! DCX_CACHE!!!!!! hDC-> %p\n", Dce->hDC); // Need to set ownership so Sync dcattr will work. GreSetDCOwner(Dce->hDC, GDI_OBJ_HMGR_POWNED); Dce->ptiOwner = GetW32ThreadInfo(); // Set the temp owning @@ -621,7 +621,7 @@ if (Force && GreGetObjectOwner(pdce->hDC) != GDI_OBJ_HMGR_POWNED) { - TRACE("Change ownership for DCE! -> %x\n" , pdce); + TRACE("Change ownership for DCE! -> %p\n" , pdce); // NOTE: Windows sets W32PF_OWNDCCLEANUP and moves on. if (GreIsHandleValid(pdce->hDC)) { @@ -629,7 +629,8 @@ } else { - ERR("Attempted to change ownership of an DCEhDC 0x%x currently being destroyed!!!\n",pdce->hDC); + ERR("Attempted to change ownership of an DCEhDC %p currently being destroyed!!!\n", + pdce->hDC); Hit = TRUE; } } @@ -651,7 +652,7 @@ if (IsListEmpty(&pdce->List)) { - ERR("List is Empty! DCE! -> %x\n" , pdce); + ERR("List is Empty! DCE! -> %p\n" , pdce); return NULL; } @@ -710,10 +711,11 @@ pDCE->hwndCurrent = 0; pDCE->pwndOrg = pDCE->pwndClip = NULL; - TRACE("POWNED DCE going Cheap!! DCX_CACHE!! hDC-> %x \n", pDCE->hDC); + TRACE("POWNED DCE going Cheap!! DCX_CACHE!! hDC-> %p \n", + pDCE->hDC); if (!GreSetDCOwner( pDCE->hDC, GDI_OBJ_HMGR_NONE)) { - ERR("Fail Owner Switch hDC-> %x \n", pDCE->hDC); + ERR("Fail Owner Switch hDC-> %p \n", pDCE->hDC); break; } /* Do not change owner so thread can clean up! */ @@ -726,7 +728,8 @@ } else { - ERR("Not POWNED or CLASSDC hwndCurrent -> %x \n", pDCE->hwndCurrent); + ERR("Not POWNED or CLASSDC hwndCurrent -> %p \n", + pDCE->hwndCurrent); // ASSERT(FALSE); /* bug 5320 */ } } @@ -1017,7 +1020,7 @@ RETURN( UserGetDCEx(Wnd, ClipRegion, Flags)); CLEANUP: - TRACE("Leave NtUserGetDCEx, ret=%i\n",_ret_); + TRACE("Leave NtUserGetDCEx, ret=%p\n", _ret_); UserLeave(); END_CLEANUP; } @@ -1043,7 +1046,7 @@ HDC APIENTRY NtUserGetDC(HWND hWnd) { - TRACE("NtUGetDC -> %x:%x\n", hWnd, !hWnd ? DCX_CACHE | DCX_WINDOW : DCX_USESTYLE ); + TRACE("NtUGetDC -> %p:%x\n", hWnd, !hWnd ? DCX_CACHE | DCX_WINDOW : DCX_USESTYLE); return NtUserGetDCEx(hWnd, NULL, NULL == hWnd ? DCX_CACHE | DCX_WINDOW : DCX_USESTYLE); } Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Sun Sep 1 23:58:37 2013 @@ -814,7 +814,7 @@ Current = WThread->WindowListHead.Flink; Wnd = CONTAINING_RECORD(Current, WND, ThreadListEntry); - TRACE("thread cleanup: while destroy wnds, wnd=0x%x\n",Wnd); + TRACE("thread cleanup: while destroy wnds, wnd=%p\n", Wnd); /* Window removes itself from the list */ @@ -828,7 +828,7 @@ UserRefObjectCo(Wnd, &Ref); // FIXME: Temp HACK?? if (!co_UserDestroyWindow(Wnd)) { - ERR("Unable to destroy window 0x%x at thread cleanup... This is _VERY_ bad!\n", Wnd); + ERR("Unable to destroy window %p at thread cleanup... This is _VERY_ bad!\n", Wnd); } UserDerefObjectCo(Wnd); // FIXME: Temp HACK?? } @@ -1727,7 +1727,7 @@ goto AllocError; } - TRACE("Created window object with handle %X\n", hWnd); + TRACE("Created window object with handle %p\n", hWnd); if (pdeskCreated && pdeskCreated->DesktopWindow == NULL ) { /* HACK: Helper for win32csr/desktopbg.c */ @@ -1837,7 +1837,7 @@ if (!CallProc) { EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); - ERR("Warning: Unable to create CallProc for edit control. Control may not operate correctly! hwnd %x\n",hWnd); + ERR("Warning: Unable to create CallProc for edit control. Control may not operate correctly! hwnd %p\n", hWnd); } else { @@ -2330,7 +2330,7 @@ } } - TRACE("co_UserCreateWindowEx(): Created window %X\n", hWnd); + TRACE("co_UserCreateWindowEx(): Created window %p\n", hWnd); ret = Window; cleanup: @@ -2742,7 +2742,7 @@ RETURN(ret); CLEANUP: - TRACE("Leave NtUserDestroyWindow, ret=%i\n",_ret_); + TRACE("Leave NtUserDestroyWindow, ret=%u\n", _ret_); UserLeave(); END_CLEANUP; } @@ -3022,7 +3022,7 @@ RETURN( Ret); CLEANUP: - TRACE("Leave NtUserFindWindowEx, ret %i\n",_ret_); + TRACE("Leave NtUserFindWindowEx, ret %p\n", _ret_); UserLeave(); END_CLEANUP; } @@ -3119,7 +3119,7 @@ RETURN(Ancestor ? Ancestor->head.h : NULL); CLEANUP: - TRACE("Leave NtUserGetAncestor, ret=%i\n",_ret_); + TRACE("Leave NtUserGetAncestor, ret=%p\n", _ret_); UserLeave(); END_CLEANUP; } @@ -3186,7 +3186,7 @@ RETURN( (DWORD) co_IntSendMessage( Wnd->head.h, LB_GETLISTBOXINFO, 0, 0 )); CLEANUP: - TRACE("Leave NtUserGetListBoxInfo, ret=%i\n",_ret_); + TRACE("Leave NtUserGetListBoxInfo, ret=%lu\n", _ret_); UserLeave(); END_CLEANUP; } @@ -3231,7 +3231,7 @@ RETURN( co_UserSetParent(hWndChild, hWndNewParent)); CLEANUP: - TRACE("Leave NtUserSetParent, ret=%i\n",_ret_); + TRACE("Leave NtUserSetParent, ret=%p\n", _ret_); UserLeave(); END_CLEANUP; } @@ -3418,7 +3418,7 @@ RETURN(Menu->MenuInfo.Self); CLEANUP: - TRACE("Leave NtUserGetSystemMenu, ret=%i\n",_ret_); + TRACE("Leave NtUserGetSystemMenu, ret=%p\n", _ret_); UserLeave(); END_CLEANUP; } @@ -3598,7 +3598,7 @@ break; default: - ERR("NtUserSetWindowLong(): Unsupported index %d\n", Index); + ERR("NtUserSetWindowLong(): Unsupported index %lu\n", Index); EngSetLastError(ERROR_INVALID_INDEX); OldValue = 0; break; @@ -3697,7 +3697,7 @@ RETURN( OldValue); CLEANUP: - TRACE("Leave NtUserSetWindowWord, ret=%i\n",_ret_); + TRACE("Leave NtUserSetWindowWord, ret=%u\n", _ret_); UserLeave(); END_CLEANUP; } @@ -3798,7 +3798,7 @@ RETURN( Result); CLEANUP: - TRACE("Leave NtUserQueryWindow, ret=%i\n",_ret_); + TRACE("Leave NtUserQueryWindow, ret=%u\n", _ret_); UserLeave(); END_CLEANUP; } @@ -3837,7 +3837,7 @@ RETURN( Ret); CLEANUP: - TRACE("Leave NtUserRegisterWindowMessage, ret=%i\n",_ret_); + TRACE("Leave NtUserRegisterWindowMessage, ret=%u\n", _ret_); UserLeave(); END_CLEANUP; } Modified: trunk/reactos/win32ss/user/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winpos… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] Sun Sep 1 23:58:37 2013 @@ -1612,7 +1612,7 @@ WvrFlags = co_WinPosDoNCCALCSize(Window, &WinPos, &NewWindowRect, &NewClientRect); - TRACE("co_WinPosDoNCCALCSize returned %d\n", WvrFlags); + TRACE("co_WinPosDoNCCALCSize returned %lu\n", WvrFlags); /* Validate link windows. (also take into account shell window in hwndShellWindow) */ if (!(WinPos.flags & SWP_NOZORDER) && WinPos.hwnd != UserGetShellWindow()) @@ -2723,7 +2723,7 @@ Ret = IntDeferWindowPos(WinPosInfo, Wnd, WndInsertAfter, x, y, cx, cy, Flags); Exit: - TRACE("Leave NtUserDeferWindowPos, ret=%i\n", Ret); + TRACE("Leave NtUserDeferWindowPos, ret=%p\n", Ret); UserLeave(); return Ret; } @@ -3312,7 +3312,7 @@ if (Window) UserDereferenceObject(Window); if (DesktopWindow) UserDerefObjectCo(DesktopWindow); - TRACE("Leave NtUserWindowFromPoint, ret=%i\n",_ret_); + TRACE("Leave NtUserWindowFromPoint, ret=%p\n", _ret_); UserLeave(); END_CLEANUP; } Modified: trunk/reactos/win32ss/user/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winsta… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winsta.c [iso-8859-1] Sun Sep 1 23:58:37 2013 @@ -65,7 +65,7 @@ else { swprintf(wstrWindowStationsDir, - L"%ws\\%ld%ws", + L"%ws\\%lu%ws", SESSION_DIR, Peb->SessionId, WINSTA_OBJ_DIR); @@ -88,7 +88,7 @@ return Status; } - TRACE("Created directory %wZ for session %d\n", &gustrWindowStationsDir, Peb->SessionId); + TRACE("Created directory %wZ for session %lu\n", &gustrWindowStationsDir, Peb->SessionId); return Status; } @@ -100,7 +100,7 @@ { PWINSTATION_OBJECT WinSta = (PWINSTATION_OBJECT)Parameters->Object; - TRACE("Deleting window station (0x%X)\n", WinSta); + TRACE("Deleting window station (0x%p)\n", WinSta); UserEmptyClipboardData(WinSta); @@ -457,7 +457,7 @@ InitCursorImpl(); } - TRACE("NtUserCreateWindowStation created object 0x%x with name %wZ handle 0x%x\n", + TRACE("NtUserCreateWindowStation created object %p with name %wZ handle %p\n", WindowStation, &WindowStationObject->Name, WindowStation); return WindowStation; } @@ -510,7 +510,7 @@ return 0; } - TRACE("Opened window station %wZ with handle 0x%x\n", ObjectAttributes->ObjectName, hwinsta); + TRACE("Opened window station %wZ with handle %p\n", ObjectAttributes->ObjectName, hwinsta); return hwinsta; } @@ -544,7 +544,7 @@ PWINSTATION_OBJECT Object; NTSTATUS Status; - TRACE("NtUserCloseWindowStation called (0x%x)\n", hWinSta); + TRACE("NtUserCloseWindowStation called (%p)\n", hWinSta); if (hWinSta == UserGetProcessWindowStation()) { @@ -560,13 +560,13 @@ if (!NT_SUCCESS(Status)) { - ERR("Validation of window station handle (0x%x) failed\n", hWinSta); + ERR("Validation of window station handle (%p) failed\n", hWinSta); return FALSE; } ObDereferenceObject(Object); - TRACE("Closing window station handle (0x%x)\n", hWinSta); + TRACE("Closing window station handle (%p)\n", hWinSta); Status = ObCloseHandle(hWinSta, UserMode); if (!NT_SUCCESS(Status)) @@ -633,7 +633,7 @@ DWORD nDataSize = 0; /* try windowstation */ - TRACE("Trying to open window station 0x%x\n", hObject); + TRACE("Trying to open window station %p\n", hObject); Status = ObReferenceObjectByHandle( hObject, 0, @@ -645,7 +645,7 @@ if (Status == STATUS_OBJECT_TYPE_MISMATCH) { /* try desktop */ - TRACE("Trying to open desktop 0x%x\n", hObject); + TRACE("Trying to open desktop %p\n", hObject); Status = IntValidateDesktopHandle( hObject, UserMode, @@ -717,7 +717,7 @@ /* try to copy data to caller */ if (Status == STATUS_SUCCESS) { - TRACE("Trying to copy data to caller (len = %d, len needed = %d)\n", nLength, nDataSize); + TRACE("Trying to copy data to caller (len = %lu, len needed = %lu)\n", nLength, nDataSize); *nLengthNeeded = nDataSize; if (nLength >= nDataSize) Status = MmCopyToCaller(pvInformation, pvData, nDataSize); @@ -835,8 +835,8 @@ &NewWinSta); if (!NT_SUCCESS(Status)) { - TRACE("Validation of window station handle (0x%X) failed\n", - hWindowStation); + TRACE("Validation of window station handle (%p) failed\n", + hWindowStation); SetLastNtError(Status); return FALSE; } @@ -914,8 +914,8 @@ PWINSTATION_OBJECT Object; NTSTATUS Status; - TRACE("About to set process window station with handle (0x%X)\n", - hWindowStation); + TRACE("About to set process window station with handle (%p)\n", + hWindowStation); if(PsGetCurrentProcessWin32Process() != LogonProcess) { @@ -931,8 +931,8 @@ &Object); if (!NT_SUCCESS(Status)) { - TRACE("Validation of window station handle (0x%X) failed\n", - hWindowStation); + TRACE("Validation of window station handle (%p) failed\n", + hWindowStation); SetLastNtError(Status); return FALSE; } @@ -959,8 +959,8 @@ NTSTATUS Status; BOOL Ret; - TRACE("About to set process window station with handle (0x%X)\n", - hWindowStation); + TRACE("About to set process window station with handle (%p)\n", + hWindowStation); if(PsGetCurrentProcessWin32Process() != LogonProcess) { @@ -976,8 +976,8 @@ &Object); if (!NT_SUCCESS(Status)) { - TRACE("Validation of window station handle (0x%X) failed\n", - hWindowStation); + TRACE("Validation of window station handle (%p) failed\n", + hWindowStation); SetLastNtError(Status); return FALSE; } @@ -1086,7 +1086,7 @@ ReturnLength += DirEntry->Name.Length + sizeof(WCHAR); EntryCount++; } - TRACE("Required size: %d Entry count: %d\n", ReturnLength, EntryCount); + TRACE("Required size: %lu Entry count: %lu\n", ReturnLength, EntryCount); if (NULL != pRequiredSize) { Status = MmCopyToCaller(pRequiredSize, &ReturnLength, sizeof(ULONG)); @@ -1205,7 +1205,7 @@ if (DesktopName) ReturnLength += DesktopName->Length + sizeof(WCHAR); EntryCount++; } - TRACE("Required size: %d Entry count: %d\n", ReturnLength, EntryCount); + TRACE("Required size: %lu Entry count: %lu\n", ReturnLength, EntryCount); if (NULL != pRequiredSize) { Status = MmCopyToCaller(pRequiredSize, &ReturnLength, sizeof(ULONG));

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs