Ros-diffs May 2010

ros-diffs@reactos.org

21 participants
438 discussions

[mjmartin] 47075: [win32k] - Only call ExFreePool.. if Buffer is not NULL, which can occur if the Unicode String MessageNameUnsafe coming from user mode is incorrect. Fixes a bugcheck when using OllyDbg V2.0.
by mjmartin＠svn.reactos.org 01 May '10

01 May '10

Author: mjmartin Date: Sat May 1 15:32:38 2010 New Revision: 47075 URL: http://svn.reactos.org/svn/reactos?rev=47075&view=rev Log: [win32k] - Only call ExFreePool.. if Buffer is not NULL, which can occur if the Unicode String MessageNameUnsafe coming from user mode is incorrect. Fixes a bugcheck when using OllyDbg V2.0. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Sat May 1 15:32:38 2010 @@ -4268,8 +4268,8 @@ } Ret = (UINT)IntAddAtom(SafeMessageName.Buffer); - - ExFreePoolWithTag(SafeMessageName.Buffer, TAG_STRING); + if (SafeMessageName.Buffer) + ExFreePoolWithTag(SafeMessageName.Buffer, TAG_STRING); RETURN( Ret); CLEANUP:

1 0

[tkreuzer] 47074: [GDI32] - Fix pointer arithmetics in the gdi batch code (&pTeb->GdiTebBatch.Buffer[0] is a PULONG, but pTeb->GdiTebBatch.Offset is a byte offset) - To prevent this from happening again, refactor the code to use one common routine GdiAllocBatchCommand to do most of the stuff. - Reenable gdi batch for SelectObject - Fixes gdi handle leak, causes some drawing problems in Acrobat reader, but those are less critical and I'll investigate those.
by tkreuzer＠svn.reactos.org 01 May '10

01 May '10

Author: tkreuzer Date: Sat May 1 15:02:46 2010 New Revision: 47074 URL: http://svn.reactos.org/svn/reactos?rev=47074&view=rev Log: [GDI32] - Fix pointer arithmetics in the gdi batch code (&pTeb->GdiTebBatch.Buffer[0] is a PULONG, but pTeb->GdiTebBatch.Offset is a byte offset) - To prevent this from happening again, refactor the code to use one common routine GdiAllocBatchCommand to do most of the stuff. - Reenable gdi batch for SelectObject - Fixes gdi handle leak, causes some drawing problems in Acrobat reader, but those are less critical and I'll investigate those. Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h trunk/reactos/dll/win32/gdi32/objects/dc.c trunk/reactos/dll/win32/gdi32/objects/region.c Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/include/gd… ============================================================================== --- trunk/reactos/dll/win32/gdi32/include/gdi32p.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/include/gdi32p.h [iso-8859-1] Sat May 1 15:02:46 2010 @@ -292,4 +292,91 @@ BOOL FASTCALL EndPagePrinterEx(PVOID,HANDLE); BOOL FASTCALL LoadTheSpoolerDrv(VOID); + +FORCEINLINE +PVOID +GdiAllocBatchCommand( + HDC hdc, + USHORT Cmd) +{ + PTEB pTeb; + ULONG ulSize; + PGDIBATCHHDR pHdr; + + /* Get a pointer to the TEB */ + pTeb = NtCurrentTeb(); + + /* Check if we have a valid environment */ + if (!pTeb || !pTeb->Win32ThreadInfo) return NULL; + + /* Do we use a DC? */ + if (hdc) + { + /* If the batch DC is NULL, we set this one as the new one */ + if (!pTeb->GdiTebBatch.HDC) pTeb->GdiTebBatch.HDC = hdc; + + /* If not, check if the batch DC equal to our DC */ + else if (pTeb->GdiTebBatch.HDC != hdc) return NULL; + } + + /* Get the size of the entry */ + switch(Cmd) + { + case GdiBCPatBlt: + ulSize = 0; + break; + case GdiBCPolyPatBlt: + ulSize = 0; + break; + case GdiBCTextOut: + ulSize = 0; + break; + case GdiBCExtTextOut: + ulSize = 0; + break; + case GdiBCSetBrushOrg: + ulSize = 0; + break; + case GdiBCExtSelClipRgn: + ulSize = 0; + break; + case GdiBCSelObj: + ulSize = sizeof(GDIBSOBJECT); + break; + case GdiBCDelRgn: + ulSize = sizeof(GDIBSOBJECT); + break; + case GdiBCDelObj: + ulSize = sizeof(GDIBSOBJECT); + break; + default: + return NULL; + } + + /* Unsupported operation */ + if (ulSize == 0) return NULL; + + /* Check if the buffer is full */ + if ((pTeb->GdiBatchCount >= GDI_BatchLimit) || + ((pTeb->GdiTebBatch.Offset + ulSize) > GDIBATCHBUFSIZE)) + { + /* Call win32k, the kernel will call NtGdiFlushUserBatch to flush + the current batch */ + NtGdiFlush(); + } + + /* Get the head of the entry */ + pHdr = (PVOID)((PUCHAR)pTeb->GdiTebBatch.Buffer + pTeb->GdiTebBatch.Offset); + + /* Update Offset and batch count */ + pTeb->GdiTebBatch.Offset += ulSize; + pTeb->GdiBatchCount++; + + /* Fill in the core fields */ + pHdr->Cmd = Cmd; + pHdr->Size = ulSize; + + return pHdr; +} + /* EOF */ Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/dc… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/dc.c [iso-8859-1] Sat May 1 15:02:46 2010 @@ -1540,7 +1540,6 @@ PDC_ATTR pDc_Attr; HGDIOBJ hOldObj = NULL; UINT uType; -// PTEB pTeb; if(!GdiGetHandleUserData(hDC, GDI_OBJECT_TYPE_DC, (PVOID)&pDc_Attr)) { @@ -1582,29 +1581,23 @@ case GDI_OBJECT_TYPE_FONT: hOldObj = pDc_Attr->hlfntNew; if (hOldObj == hGdiObj) return hOldObj; -#if 0 + pDc_Attr->ulDirty_ &= ~SLOW_WIDTHS; pDc_Attr->ulDirty_ |= DIRTY_CHARSET; pDc_Attr->hlfntNew = hGdiObj; - pTeb = NtCurrentTeb(); - if (((pTeb->GdiTebBatch.HDC == 0) || - (pTeb->GdiTebBatch.HDC == hDC)) && - ((pTeb->GdiTebBatch.Offset + sizeof(GDIBSOBJECT)) <= GDIBATCHBUFSIZE) && - (!(pDc_Attr->ulDirty_ & DC_DIBSECTION))) + + if (!(pDc_Attr->ulDirty_ & DC_DIBSECTION)) { - PGDIBSOBJECT pgO = (PGDIBSOBJECT)(&pTeb->GdiTebBatch.Buffer[0] + - pTeb->GdiTebBatch.Offset); - pgO->gbHdr.Cmd = GdiBCSelObj; - pgO->gbHdr.Size = sizeof(GDIBSOBJECT); - pgO->hgdiobj = hGdiObj; - - pTeb->GdiTebBatch.Offset += sizeof(GDIBSOBJECT); - pTeb->GdiTebBatch.HDC = hDC; - pTeb->GdiBatchCount++; - if (pTeb->GdiBatchCount >= GDI_BatchLimit) NtGdiFlush(); - return hOldObj; + PGDIBSOBJECT pgO; + + pgO = GdiAllocBatchCommand(hDC, GdiBCSelObj); + if (pgO) + { + pgO->hgdiobj = hGdiObj; + return hOldObj; + } } -#endif + // default for select object font return NtGdiSelectFont(hDC, hGdiObj); Modified: trunk/reactos/dll/win32/gdi32/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/re… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/region.c [iso-8859-1] Sat May 1 15:02:46 2010 @@ -109,23 +109,14 @@ if ((GdiGetHandleUserData((HGDIOBJ) hRgn, GDI_OBJECT_TYPE_REGION, (PVOID) &Rgn_Attr)) && ( Rgn_Attr != NULL )) { - PTEB pTeb = NtCurrentTeb(); - if (pTeb->Win32ThreadInfo != NULL) - { - if ((pTeb->GdiTebBatch.Offset + sizeof(GDIBSOBJECT)) <= GDIBATCHBUFSIZE) - { - PGDIBSOBJECT pgO = (PGDIBSOBJECT)(&pTeb->GdiTebBatch.Buffer[0] + - pTeb->GdiTebBatch.Offset); - pgO->gbHdr.Cmd = GdiBCDelRgn; - pgO->gbHdr.Size = sizeof(GDIBSOBJECT); - pgO->hgdiobj = (HGDIOBJ)hRgn; - - pTeb->GdiTebBatch.Offset += sizeof(GDIBSOBJECT); - pTeb->GdiBatchCount++; - if (pTeb->GdiBatchCount >= GDI_BatchLimit) NtGdiFlush(); - return TRUE; - } - } + PGDIBSOBJECT pgO; + + pgO = GdiAllocBatchCommand(NULL, GdiBCDelRgn); + if (pgO) + { + pgO->hgdiobj = (HGDIOBJ)hRgn; + return TRUE; + } } return NtGdiDeleteObjectApp((HGDIOBJ) hRgn); }

1 0

[mjmartin] 47073: [win32k] - Revert the hack done in 47059 to apply a better solution. - co_IntCreateWindowEx: Add the WNDS2_WMCREATEMSGPROCESSED flag to state2 member of WND after sending the WM_CREATE message. - By setting this flag it can be examined elsewhere to determine if the window was created successfully. - co_UserDestroyWindow: Examine above mentioned flag to make sure the windows was created before calling hook procedure to inform of destroying window.
by mjmartin＠svn.reactos.org 01 May '10

01 May '10

Author: mjmartin Date: Sat May 1 14:02:23 2010 New Revision: 47073 URL: http://svn.reactos.org/svn/reactos?rev=47073&view=rev Log: [win32k] - Revert the hack done in 47059 to apply a better solution. - co_IntCreateWindowEx: Add the WNDS2_WMCREATEMSGPROCESSED flag to state2 member of WND after sending the WM_CREATE message. - By setting this flag it can be examined elsewhere to determine if the window was created successfully. - co_UserDestroyWindow: Examine above mentioned flag to make sure the windows was created before calling hook procedure to inform of destroying window. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Sat May 1 14:02:23 2010 @@ -2333,6 +2333,11 @@ IntNotifyWinEvent(EVENT_OBJECT_CREATE, Window->Wnd, OBJID_WINDOW, 0); + /* By setting the flag below it can be examined to determine if the window + was created successfully and a valid pwnd was passed back to caller since + from here the function has to succeed. */ + Window->Wnd->state2 |= WNDS2_WMCREATEMSGPROCESSED; + /* Send move and size messages. */ if (!(Window->state & WINDOWOBJECT_NEED_SIZE)) { @@ -2468,23 +2473,7 @@ CLEANUP: if (!_ret_ && Window && Window->Wnd && ti) - { - ULONG SavedHooks; - /* HACK: co_UserDestroyWindow will call CBT proc with code HCBT_DESTROYWND. - Applications can choke on this as a hwnd was never returned from this call */ - /* Save the flags */ - SavedHooks = ((PTHREADINFO)PsGetCurrentThreadWin32Thread())->fsHooks; - - /* Temporary remove the flag */ - ((PTHREADINFO)PsGetCurrentThreadWin32Thread())->fsHooks &= ~HOOKID_TO_FLAG(WH_CBT); - - /* Destroy the window */ co_UserDestroyWindow(Window); - - /* Restore the flag */ - ((PTHREADINFO)PsGetCurrentThreadWin32Thread())->fsHooks = SavedHooks; - } - // UserFreeWindowInfo(ti, Window); if (Window) { @@ -2649,8 +2638,8 @@ return FALSE; } - /* Call hooks */ - if (ISITHOOKED(WH_CBT)) + /* If window was created successfully and it is hooked */ + if ((Wnd->state2 & WNDS2_WMCREATEMSGPROCESSED) && (ISITHOOKED(WH_CBT))) { if (co_HOOK_CallHooks(WH_CBT, HCBT_DESTROYWND, (WPARAM) hWnd, 0)) return FALSE; }

1 0

[janderwald] 47072: - Partly revert 470470
by janderwald＠svn.reactos.org 01 May '10

01 May '10

Author: janderwald Date: Sat May 1 12:47:23 2010 New Revision: 47072 URL: http://svn.reactos.org/svn/reactos?rev=47072&view=rev Log: - Partly revert 470470 Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] Sat May 1 12:47:23 2010 @@ -278,8 +278,6 @@ PTIMER pTmr = FirstpTmr; if (!pTmr) return FALSE; - - ASSERT(Window); if (Window && ((ULONG_PTR)Window != 1)) {

1 0

[ekohl] 47071: [NEWINFLIB] - Change Unicode string functions from wcs* to str*W because glibc (Linux build) provides the wcs* functions but they use a wchar_t size of 32 bits instead of the required 16 bits. - Add a str*W to wcs* wrapper (infrosrtl.c) in order to use the wcs* function for the WIN32 build. - Add required str*W functions to the host library. ATTENTION: This might break the build bot although it has been tested on Windows and Linux!!!
by ekohl＠svn.reactos.org 01 May '10

01 May '10

Author: ekohl Date: Sat May 1 12:43:39 2010 New Revision: 47071 URL: http://svn.reactos.org/svn/reactos?rev=47071&view=rev Log: [NEWINFLIB] - Change Unicode string functions from wcs* to str*W because glibc (Linux build) provides the wcs* functions but they use a wchar_t size of 32 bits instead of the required 16 bits. - Add a str*W to wcs* wrapper (infrosrtl.c) in order to use the wcs* function for the WIN32 build. - Add required str*W functions to the host library. ATTENTION: This might break the build bot although it has been tested on Windows and Linux!!! Added: trunk/reactos/lib/newinflib/infrosrtl.c (with props) Modified: trunk/reactos/lib/host/wcsfuncs/wcsfuncs.c trunk/reactos/lib/newinflib/builddep.h trunk/reactos/lib/newinflib/infcore.c trunk/reactos/lib/newinflib/infget.c trunk/reactos/lib/newinflib/infhost.h trunk/reactos/lib/newinflib/infhostrtl.c trunk/reactos/lib/newinflib/inflib.rbuild trunk/reactos/lib/newinflib/infput.c trunk/reactos/lib/newinflib/infrosput.c Modified: trunk/reactos/lib/host/wcsfuncs/wcsfuncs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/host/wcsfuncs/wcsfuncs… ============================================================================== --- trunk/reactos/lib/host/wcsfuncs/wcsfuncs.c [iso-8859-1] (original) +++ trunk/reactos/lib/host/wcsfuncs/wcsfuncs.c [iso-8859-1] Sat May 1 12:43:39 2010 @@ -18,7 +18,30 @@ return i; } + +SIZE_T strlenW(PCWSTR str) +{ + SIZE_T i; + + for(i = 0; str[i]; i++); + + return i; +} + + PWSTR utf16_wcschr(PWSTR str, WCHAR c) +{ + SIZE_T i; + + for(i = 0; str[i] && str[i] != c; i++); + + if(str[i]) + return &str[i]; + else + return NULL; +} + +PWSTR strchrW(PWSTR str, WCHAR c) { SIZE_T i; @@ -46,3 +69,20 @@ return 0; } + +INT strncmpW(PCWSTR string1, PCWSTR string2, size_t count) +{ + while(count--) + { + if(*string1 != *string2) + return 1; + + if(*string1 == 0) + return 0; + + string1++; + string2++; + } + + return 0; +} Modified: trunk/reactos/lib/newinflib/builddep.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/newinflib/builddep.h?r… ============================================================================== --- trunk/reactos/lib/newinflib/builddep.h [iso-8859-1] (original) +++ trunk/reactos/lib/newinflib/builddep.h [iso-8859-1] Sat May 1 12:43:39 2010 @@ -28,20 +28,13 @@ #define INF_STATUS_BUFFER_OVERFLOW E2BIG #define INF_SUCCESS(x) (0 == (x)) -typedef char TCHAR, *PTCHAR, *PTSTR; -typedef const TCHAR *PCTSTR; - -#define _T(x) x -#define _tcsicmp strcasecmp -#define _tcslen strlen -#define _tcscpy strcpy -#define _tcstoul strtoul -#define _tcstol strtol #define STRFMT "%s" -#ifdef _MSC_VER -#define strcasecmp _stricmp -#endif +NTSTATUS NTAPI RtlMultiByteToUnicodeN(IN PWCHAR UnicodeString, + IN ULONG UnicodeSize, IN PULONG ResultSize, IN PCSTR MbString, IN ULONG MbSize); + +BOOLEAN NTAPI RtlIsTextUnicode( PVOID buf, INT len, INT *pf ); + #define IS_TEXT_UNICODE_ASCII16 1 #define IS_TEXT_UNICODE_REVERSE_ASCII16 16 @@ -69,9 +62,17 @@ #include <windows.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> -#include <tchar.h> extern PVOID InfpHeap; + +INT isspaceW(WCHAR c); +INT strlenW(PCWSTR s); +PWSTR strcpyW(PWSTR d, PCWSTR s); +PWSTR strncpyW(PWSTR d, PCWSTR s, SIZE_T c); +INT strcmpiW(PCWSTR s1, PCWSTR s2); +LONG strtolW(PCWSTR s, PWSTR *e, INT r); +ULONG strtoulW(PCWSTR s, PWSTR *e, INT r); + #define FREE(Area) RtlFreeHeap(InfpHeap, 0, (Area)) #define MALLOC(Size) RtlAllocateHeap(InfpHeap, 0, (Size)) Modified: trunk/reactos/lib/newinflib/infcore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/newinflib/infcore.c?re… ============================================================================== --- trunk/reactos/lib/newinflib/infcore.c [iso-8859-1] (original) +++ trunk/reactos/lib/newinflib/infcore.c [iso-8859-1] Sat May 1 12:43:39 2010 @@ -154,7 +154,7 @@ Section = Cache->FirstSection; while (Section != NULL) { - if (_wcsicmp (Section->Name, Name) == 0) + if (strcmpiW(Section->Name, Name) == 0) { return Section; } @@ -182,7 +182,7 @@ /* Allocate and initialize the new section */ Size = (ULONG)FIELD_OFFSET(INFCACHESECTION, - Name[wcslen (Name) + 1]); + Name[strlenW(Name) + 1]); Section = (PINFCACHESECTION)MALLOC(Size); if (Section == NULL) { @@ -193,7 +193,7 @@ Size); /* Copy section name */ - wcscpy (Section->Name, Name); + strcpyW(Section->Name, Name); /* Append section */ if (Cache->FirstSection == NULL) @@ -266,14 +266,14 @@ return NULL; } - Line->Key = (PWCHAR)MALLOC((wcslen(Key) + 1) * sizeof(WCHAR)); + Line->Key = (PWCHAR)MALLOC((strlenW(Key) + 1) * sizeof(WCHAR)); if (Line->Key == NULL) { DPRINT1("MALLOC() failed\n"); return NULL; } - wcscpy(Line->Key, Key); + strcpyW(Line->Key, Key); return (PVOID)Line->Key; } @@ -287,7 +287,7 @@ ULONG Size; Size = (ULONG)FIELD_OFFSET(INFCACHEFIELD, - Data[wcslen(Data) + 1]); + Data[strlenW(Data) + 1]); Field = (PINFCACHEFIELD)MALLOC(Size); if (Field == NULL) { @@ -296,7 +296,7 @@ } ZEROMEMORY (Field, Size); - wcscpy (Field->Data, Data); + strcpyW(Field->Data, Data); /* Append key */ if (Line->FirstField == NULL) @@ -325,7 +325,7 @@ Line = Section->FirstLine; while (Line != NULL) { - if (Line->Key != NULL && _wcsicmp (Line->Key, Key) == 0) + if (Line->Key != NULL && strcmpiW(Line->Key, Key) == 0) { return Line; } @@ -522,7 +522,7 @@ return p + 1; default: - if (!iswspace(*p)) + if (!isspaceW(*p)) { parser->start = p; set_state( parser, KEY_NAME ); @@ -595,7 +595,7 @@ set_state( parser, EOL_BACKSLASH ); return p; default: - if (!iswspace(*p)) token_end = p + 1; + if (!isspaceW(*p)) token_end = p + 1; else { push_token( parser, p ); @@ -647,7 +647,7 @@ set_state( parser, EOL_BACKSLASH ); return p; default: - if (!isspace(*p)) token_end = p + 1; + if (!isspaceW(*p)) token_end = p + 1; else { push_token( parser, p ); @@ -692,7 +692,7 @@ return p + 1; default: - if (iswspace(*p)) + if (isspaceW(*p)) continue; push_token( parser, p ); pop_state( parser ); @@ -749,7 +749,7 @@ set_state( parser, EOL_BACKSLASH ); return p; } - if (!iswspace(*p)) + if (!isspaceW(*p)) break; } parser->start = p; @@ -770,7 +770,7 @@ set_state( parser, EOL_BACKSLASH ); return p; } - if (!iswspace(*p)) + if (!isspaceW(*p)) break; } pop_state( parser ); Modified: trunk/reactos/lib/newinflib/infget.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/newinflib/infget.c?rev… ============================================================================== --- trunk/reactos/lib/newinflib/infget.c [iso-8859-1] (original) +++ trunk/reactos/lib/newinflib/infget.c [iso-8859-1] Sat May 1 12:43:39 2010 @@ -41,7 +41,7 @@ return &percent; } - wcsncpy(ValueName, str, *len); + strncpyW(ValueName, str, *len); ValueName[*len] = 0; DPRINT("Value name: %S\n", ValueName); @@ -94,7 +94,7 @@ if (Status == STATUS_SUCCESS) { - *len = wcslen(Data); + *len = strlenW(Data); DPRINT("Substitute: %S Length: %ul\n", Data, *len); return Data; } @@ -253,7 +253,7 @@ CacheLine = ((PINFCACHESECTION)(ContextIn->Section))->FirstLine; while (CacheLine != NULL) { - if (CacheLine->Key != NULL && _wcsicmp (CacheLine->Key, Key) == 0) + if (CacheLine->Key != NULL && strcmpiW (CacheLine->Key, Key) == 0) { if (ContextIn != ContextOut) @@ -289,7 +289,7 @@ CacheLine = (PINFCACHELINE)ContextIn->Line; while (CacheLine != NULL) { - if (CacheLine->Key != NULL && _wcsicmp (CacheLine->Key, Key) == 0) + if (CacheLine->Key != NULL && strcmpiW (CacheLine->Key, Key) == 0) { if (ContextIn != ContextOut) @@ -329,7 +329,7 @@ while (CacheSection != NULL) { /* Are the section names the same? */ - if (_wcsicmp(CacheSection->Name, Section) == 0) + if (strcmpiW(CacheSection->Name, Section) == 0) { return CacheSection->LineCount; } @@ -402,7 +402,7 @@ Ptr = ReturnBuffer; while (CacheField != NULL) { - *Ptr = (UCHAR)wcstoul(CacheField->Data, NULL, 16); + *Ptr = (UCHAR)strtoulW(CacheField->Data, NULL, 16); Ptr++; CacheField = CacheField->Next; @@ -450,7 +450,7 @@ Ptr = CacheField->Data; } - *IntegerValue = (LONG)wcstol(Ptr, NULL, 0); + *IntegerValue = (LONG)strtolW(Ptr, NULL, 0); return INF_STATUS_SUCCESS; } @@ -493,7 +493,7 @@ Size = 0; while (FieldPtr != NULL) { - Size += ((ULONG)wcslen (FieldPtr->Data) + 1); + Size += ((ULONG)strlenW(FieldPtr->Data) + 1); FieldPtr = FieldPtr->Next; } Size++; @@ -511,9 +511,9 @@ FieldPtr = CacheField; while (FieldPtr != NULL) { - Size = (ULONG)wcslen (FieldPtr->Data) + 1; - - wcscpy (Ptr, FieldPtr->Data); + Size = (ULONG)strlenW(FieldPtr->Data) + 1; + + strcpyW(Ptr, FieldPtr->Data); Ptr = Ptr + Size; FieldPtr = FieldPtr->Next; @@ -565,7 +565,7 @@ Ptr = CacheField->Data; } -// Size = (ULONG)wcslen (Ptr) + 1; +// Size = (ULONG)strlenW(Ptr) + 1; Size = InfpSubstituteString(Context->Inf, Ptr, NULL, @@ -579,7 +579,7 @@ if (ReturnBufferSize <= Size) return INF_STATUS_BUFFER_OVERFLOW; -// wcscpy (ReturnBuffer, Ptr); +// strcpyW(ReturnBuffer, Ptr); InfpSubstituteString(Context->Inf, Ptr, ReturnBuffer, Modified: trunk/reactos/lib/newinflib/infhost.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/newinflib/infhost.h?re… ============================================================================== --- trunk/reactos/lib/newinflib/infhost.h [iso-8859-1] (original) +++ trunk/reactos/lib/newinflib/infhost.h [iso-8859-1] Sat May 1 12:43:39 2010 @@ -13,12 +13,6 @@ #endif /* __cplusplus */ #include "infcommon.h" - -extern NTSTATUS NTAPI RtlMultiByteToUnicodeN(IN PWCHAR UnicodeString, - IN ULONG UnicodeSize, IN PULONG ResultSize, IN PCSTR MbString, IN ULONG MbSize); - -extern BOOLEAN NTAPI RtlIsTextUnicode( PVOID buf, INT len, INT *pf ); - extern int InfHostOpenBufferedFile(PHINF InfHandle, void *Buffer, Modified: trunk/reactos/lib/newinflib/infhostrtl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/newinflib/infhostrtl.c… ============================================================================== --- trunk/reactos/lib/newinflib/infhostrtl.c [iso-8859-1] (original) +++ trunk/reactos/lib/newinflib/infhostrtl.c [iso-8859-1] Sat May 1 12:43:39 2010 @@ -115,7 +115,7 @@ { for (i = 0; i < len; i++) { - if (wcschr(std_control_chars, s[i])) + if (strchrW(std_control_chars, s[i])) { out_flags |= IS_TEXT_UNICODE_CONTROLS; break; @@ -127,7 +127,7 @@ { for (i = 0; i < len; i++) { - if (wcschr(byterev_control_chars, s[i])) + if (strchrW(byterev_control_chars, s[i])) { out_flags |= IS_TEXT_UNICODE_REVERSE_CONTROLS; break; Modified: trunk/reactos/lib/newinflib/inflib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/newinflib/inflib.rbuil… ============================================================================== --- trunk/reactos/lib/newinflib/inflib.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/newinflib/inflib.rbuild [iso-8859-1] Sat May 1 12:43:39 2010 @@ -9,6 +9,7 @@ <file>infrosgen.c</file> <file>infrosget.c</file> <file>infrosput.c</file> + <file>infrosrtl.c</file> </module> <module name="newinflibhost" type="hoststaticlibrary" allowwarnings="true"> <include base="newinflibhost">.</include> Modified: trunk/reactos/lib/newinflib/infput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/newinflib/infput.c?rev… ============================================================================== --- trunk/reactos/lib/newinflib/infput.c [iso-8859-1] (original) +++ trunk/reactos/lib/newinflib/infput.c [iso-8859-1] Sat May 1 12:43:39 2010 @@ -37,7 +37,7 @@ } /* Doesn't fit? */ - Length = (ULONG)wcslen(Text) * sizeof(WCHAR); + Length = (ULONG)strlenW(Text) * sizeof(WCHAR); if (OutBuf->FreeSize < Length + 1 && INF_SUCCESS(OutBuf->Status)) { DPRINT("Out of free space. TotalSize %u FreeSize %u Length %u\n", Modified: trunk/reactos/lib/newinflib/infrosput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/newinflib/infrosput.c?… ============================================================================== --- trunk/reactos/lib/newinflib/infrosput.c [iso-8859-1] (original) +++ trunk/reactos/lib/newinflib/infrosput.c [iso-8859-1] Sat May 1 12:43:39 2010 @@ -64,13 +64,13 @@ HeaderBuffer = MALLOC(HeaderBufferSize); if (NULL != HeaderBuffer) { - wcscpy(HeaderBuffer, L"; "); + strcpyW(HeaderBuffer, L"; "); for (Index = 0; Index < HeaderComment->Length / sizeof(WCHAR); Index++) { HeaderBuffer[2 + Index] = HeaderComment->Buffer[Index]; } - wcscpy(HeaderBuffer + (2 + HeaderComment->Length / sizeof(WCHAR)), - L"\r\n\r\n"); + strcpyW(HeaderBuffer + (2 + HeaderComment->Length / sizeof(WCHAR)), + L"\r\n\r\n"); NtWriteFile(FileHandle, NULL, NULL, Added: trunk/reactos/lib/newinflib/infrosrtl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/newinflib/infrosrtl.c?… ============================================================================== --- trunk/reactos/lib/newinflib/infrosrtl.c (added) +++ trunk/reactos/lib/newinflib/infrosrtl.c [iso-8859-1] Sat May 1 12:43:39 2010 @@ -1,0 +1,51 @@ +/* + * PROJECT: .inf file parser + * LICENSE: GPL - See COPYING in the top level directory + * PROGRAMMER: Eric Kohl + */ + +/* INCLUDES *****************************************************************/ + +#include "inflib.h" +#include "infhost.h" + +#define NDEBUG +#include <debug.h> + + +/* FUNCTIONS ****************************************************************/ + +INT isspaceW(WCHAR c) +{ + return iswspace(c); +} + +INT strlenW(PCWSTR s) +{ + return wcslen(s); +} + +PWSTR strcpyW(PWSTR d, PCWSTR s) +{ + return wcscpy(d, s); +} + +PWSTR strncpyW(PWSTR d, PCWSTR s, SIZE_T c) +{ + return wcsncpy(d, s, c); +} + +INT strcmpiW(PCWSTR s1, PCWSTR s2) +{ + return wcsicmp(s1, s2); +} + +LONG strtolW(PCWSTR s, PWSTR *e, INT r) +{ + return wcstol(s, e, r); +} + +ULONG strtoulW(PCWSTR s, PWSTR *e, INT r) +{ + return wcstoul(s, e, r); +} Propchange: trunk/reactos/lib/newinflib/infrosrtl.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/lib/newinflib/infrosrtl.c ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision

1 0

[janderwald] 47070: [WIN32K] - Add an assert to PostTimerMessages to catch null pointer windows - Add another assert to catch special windows (Window == 1) - Improve check if the window is '1'
by janderwald＠svn.reactos.org 01 May '10

01 May '10

Author: janderwald Date: Sat May 1 12:42:45 2010 New Revision: 47070 URL: http://svn.reactos.org/svn/reactos?rev=47070&view=rev Log: [WIN32K] - Add an assert to PostTimerMessages to catch null pointer windows - Add another assert to catch special windows (Window == 1) - Improve check if the window is '1' Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] Sat May 1 12:42:45 2010 @@ -279,7 +279,9 @@ if (!pTmr) return FALSE; - if (Window && (int)Window != 1) + ASSERT(Window); + + if (Window && ((ULONG_PTR)Window != 1)) { if (!Window->Wnd) return FALSE; } @@ -294,6 +296,7 @@ (pTmr->pti == pti) && (pTmr->pWnd == Window)) { + ASSERT((ULONG_PTR)Window != 1); Msg.hwnd = Window->hSelf; Msg.message = (pTmr->flags & TMRF_SYSTEM) ? WM_SYSTIMER : WM_TIMER; Msg.wParam = (WPARAM) pTmr->nID;

1 0

[janderwald] 47069: [WIN32K] <bug> - The timer implementation uses a bitmap to store window-less timers. As an optimization to find the first free index, it uses the variable "HintIndex" which points to the first timer index. In order to find the next free index, the RtlFindClearBitsAndSet function is used. When a new timer is allocated, the "HintIndex" variable is increased, which increases the search offset. Now if more than NUM_WINDOW_LESS_TIMERS (1024) timers are allocated, no more timers ca
by janderwald＠svn.reactos.org 01 May '10

01 May '10

Author: janderwald Date: Sat May 1 11:55:16 2010 New Revision: 47069 URL: http://svn.reactos.org/svn/reactos?rev=47069&view=rev Log: [WIN32K] <bug> - The timer implementation uses a bitmap to store window-less timers. As an optimization to find the first free index, it uses the variable "HintIndex" which points to the first timer index. In order to find the next free index, the RtlFindClearBitsAndSet function is used. When a new timer is allocated, the "HintIndex" variable is increased, which increases the search offset. Now if more than NUM_WINDOW_LESS_TIMERS (1024) timers are allocated, no more timers can be allocated because RtlFindClearBitsAndSet will claim no more index are available, because the free indexes are below the search offset. </bug> <fix> Everytime a timer gets freed, store the freed index in "HintIndex". As a result the timer implementation will always find a free timer index (when there is one) </fix> Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] Sat May 1 11:55:16 2010 @@ -526,6 +526,8 @@ ASSERT(RtlAreBitsSet(&WindowLessTimersBitMap, IDEvent - 1, 1)); RtlClearBits(&WindowLessTimersBitMap, IDEvent - 1, 1); + HintIndex = IDEvent - 1; + IntUnlockWindowlessTimerBitmap(); }

1 0

[cgutman] 47068: [PCI] - Store correct bus and slot information in resource lists that we give in response to IRP_MN_QUERY_RESOURCES and IRP_MN_QUERY_RESOURCE_REQUIREMENTS - Fixes bug 4354
by cgutman＠svn.reactos.org 01 May '10

01 May '10

Author: cgutman Date: Sat May 1 03:52:47 2010 New Revision: 47068 URL: http://svn.reactos.org/svn/reactos?rev=47068&view=rev Log: [PCI] - Store correct bus and slot information in resource lists that we give in response to IRP_MN_QUERY_RESOURCES and IRP_MN_QUERY_RESOURCE_REQUIREMENTS - Fixes bug 4354 Modified: trunk/reactos/drivers/bus/pci/pdo.c Modified: trunk/reactos/drivers/bus/pci/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/pdo.c?rev=… ============================================================================== --- trunk/reactos/drivers/bus/pci/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pci/pdo.c [iso-8859-1] Sat May 1 03:52:47 2010 @@ -413,8 +413,8 @@ RtlZeroMemory(ResourceList, ListSize); ResourceList->ListSize = ListSize; ResourceList->InterfaceType = PCIBus; - ResourceList->BusNumber = 0; - ResourceList->SlotNumber = 0; + ResourceList->BusNumber = DeviceExtension->PciDevice->BusNumber; + ResourceList->SlotNumber = DeviceExtension->PciDevice->SlotNumber.u.AsULONG; ResourceList->AlternativeLists = 1; ResourceList->List[0].Version = 1; @@ -717,7 +717,7 @@ RtlZeroMemory(ResourceList, ListSize); ResourceList->Count = 1; ResourceList->List[0].InterfaceType = PCIBus; - ResourceList->List[0].BusNumber = 0; + ResourceList->List[0].BusNumber = DeviceExtension->PciDevice->BusNumber; PartialList = &ResourceList->List[0].PartialResourceList; PartialList->Version = 1;

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 May 2010