ReactOS.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
List overview
Download
Ros-diffs
January 2014
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
ros-diffs@reactos.org
14 participants
426 discussions
Start a n
N
ew thread
[cwittich] 61885: [crt] partial sync of file.c with wine 1.7.11
by cwittich@svn.reactos.org
Author: cwittich Date: Wed Jan 29 20:11:11 2014 New Revision: 61885 URL:
http://svn.reactos.org/svn/reactos?rev=61885&view=rev
Log: [crt] partial sync of file.c with wine 1.7.11 Modified: trunk/reactos/lib/sdk/crt/stdio/file.c Modified: trunk/reactos/lib/sdk/crt/stdio/file.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/file.c?r…
============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] Wed Jan 29 20:11:11 2014 @@ -89,15 +89,25 @@ #define WX_APPEND 0x20 #define WX_TEXT 0x80 +/* values for exflag - it's used differently in msvcr90.dll*/ +#define EF_UTF8 0x01 +#define EF_UTF16 0x02 +#define EF_CRIT_INIT 0x04 +#define EF_UNK_UNICODE 0x08 + +static char utf8_bom[3] = { 0xef, 0xbb, 0xbf }; +static char utf16_bom[2] = { 0xff, 0xfe }; + /* FIXME: this should be allocated dynamically */ #define MAX_FILES 2048 #define FD_BLOCK_SIZE 64 +/* ioinfo structure size is different in msvcrXX.dll's */ typedef struct { HANDLE handle; unsigned char wxflag; char unk1; - BOOL crit_init; + int exflag; CRITICAL_SECTION crit; } ioinfo; @@ -734,10 +744,8 @@ /* _flushall calls fflush which calls _flushall */ int CDECL fflush(FILE* file); -/********************************************************************* - * _flushall (MSVCRT.@) - */ -int CDECL _flushall(void) +/* INTERNAL: Flush all stream buffer */ +static int flush_all_buffers(int mask) { int i, num_flushed = 0; FILE *file; @@ -748,8 +756,8 @@ if (file->_flag) { - if(file->_flag & _IOWRT) { - fflush(file); + if(file->_flag & mask) { + fflush(file); num_flushed++; } } @@ -761,21 +769,40 @@ } /********************************************************************* + * _flushall (MSVCRT.@) + */ +int CDECL _flushall(void) +{ + return flush_all_buffers(_IOWRT | _IOREAD); +} + +/********************************************************************* * fflush (MSVCRT.@) */ int CDECL fflush(FILE* file) { if(!file) { - _flushall(); + flush_all_buffers(_IOWRT); } else if(file->_flag & _IOWRT) { int res; _lock_file(file); res = flush_buffer(file); + /* FIXME + if(!res && (file->_flag & _IOCOMMIT)) + res = _commit(file->_file) ? EOF : 0; + */ _unlock_file(file); return res; - } + } else if(file->_flag & _IOREAD) { + _lock_file(file); + file->_cnt = 0; + file->_ptr = file->_base; + _unlock_file(file); + + return 0; + } return 0; } @@ -1220,7 +1247,9 @@ static int get_flags(const wchar_t* mode, int *open_flags, int* stream_flags) { int plus = strchrW(mode, '+') != NULL; - + + while(*mode == ' ') mode++; + switch(*mode++) { case 'R': case 'r': @@ -1241,23 +1270,97 @@ return -1; } - while (*mode) + /* FIXME */ + /* *stream_flags |= MSVCRT__commode; */ + + while (*mode && *mode!=',') switch (*mode++) { case 'B': case 'b': *open_flags |= _O_BINARY; *open_flags &= ~_O_TEXT; break; - case 'T': case 't': + case 't': *open_flags |= _O_TEXT; *open_flags &= ~_O_BINARY; break; + case 'D': + *open_flags |= _O_TEMPORARY; + break; + case 'T': + *open_flags |= _O_SHORT_LIVED; + break; + /* FIXME + case 'c': + *stream_flags |= _IOCOMMIT; + break; + case 'n': + *stream_flags &= ~_IOCOMMIT; + break; + */ + case 'N': + *open_flags |= _O_NOINHERIT; + break; case '+': case ' ': + case 'a': + case 'w': + break; + case 'S': + case 'R': + FIXME("ignoring cache optimization flag: %c\n", mode[-1]); break; default: - FIXME(":unknown flag %c not supported\n",mode[-1]); - } + ERR("incorrect mode flag: %c\n", mode[-1]); + break; + } + + if(*mode == ',') + { + static const WCHAR ccs[] = {'c','c','s'}; + static const WCHAR utf8[] = {'u','t','f','-','8'}; + static const WCHAR utf16le[] = {'u','t','f','-','1','6','l','e'}; + static const WCHAR unicode[] = {'u','n','i','c','o','d','e'}; + + mode++; + while(*mode == ' ') mode++; + if(!MSVCRT_CHECK_PMT(!strncmpW(ccs, mode, sizeof(ccs)/sizeof(ccs[0])))) + return -1; + mode += sizeof(ccs)/sizeof(ccs[0]); + while(*mode == ' ') mode++; + if(!MSVCRT_CHECK_PMT(*mode == '=')) + return -1; + mode++; + while(*mode == ' ') mode++; + + if(!strncmpiW(utf8, mode, sizeof(utf8)/sizeof(utf8[0]))) + { + *open_flags |= _O_U8TEXT; + mode += sizeof(utf8)/sizeof(utf8[0]); + } + else if(!strncmpiW(utf16le, mode, sizeof(utf16le)/sizeof(utf16le[0]))) + { + *open_flags |= _O_U16TEXT; + mode += sizeof(utf16le)/sizeof(utf16le[0]); + } + else if(!strncmpiW(unicode, mode, sizeof(unicode)/sizeof(unicode[0]))) + { + *open_flags |= _O_WTEXT; + mode += sizeof(unicode)/sizeof(unicode[0]); + } + else + { + _invalid_parameter(NULL, NULL, NULL, 0, 0); + *_errno() = EINVAL; + return -1; + } + + while(*mode == ' ') mode++; + } + + if(!MSVCRT_CHECK_PMT(*mode == 0)) + return -1; + return 0; } @@ -1446,19 +1549,23 @@ int wxflags = 0; unsigned unsupp; /* until we support everything */ - if (oflags & _O_APPEND) wxflags |= WX_APPEND; - if (oflags & _O_BINARY) {/* Nothing to do */} - else if (oflags & _O_TEXT) wxflags |= WX_TEXT; - else if (*__p__fmode() & _O_BINARY) {/* Nothing to do */} + if (oflags & _O_APPEND) wxflags |= WX_APPEND; + if (oflags & _O_BINARY) {/* Nothing to do */} + else if (oflags & _O_TEXT) wxflags |= WX_TEXT; + else if (oflags & _O_WTEXT) wxflags |= WX_TEXT; + else if (oflags & _O_U16TEXT) wxflags |= WX_TEXT; + else if (oflags & _O_U8TEXT) wxflags |= WX_TEXT; + else if (*__p__fmode() & _O_BINARY) {/* Nothing to do */} else wxflags |= WX_TEXT; /* default to TEXT*/ - if (oflags & _O_NOINHERIT) wxflags |= WX_DONTINHERIT; + if (oflags & _O_NOINHERIT) wxflags |= WX_DONTINHERIT; if ((unsupp = oflags & ~( _O_BINARY|_O_TEXT|_O_APPEND| _O_TRUNC|_O_EXCL|_O_CREAT| _O_RDWR|_O_WRONLY|_O_TEMPORARY| _O_NOINHERIT| - _O_SEQUENTIAL|_O_RANDOM|_O_SHORT_LIVED + _O_SEQUENTIAL|_O_RANDOM|_O_SHORT_LIVED| + _O_WTEXT|_O_U16TEXT|_O_U8TEXT ))) ERR(":unsupported oflags 0x%04x\n",unsupp); @@ -1639,6 +1746,29 @@ return fd; } +static int check_bom(HANDLE h, int oflags, BOOL seek) +{ + char bom[sizeof(utf8_bom)]; + DWORD r; + + oflags &= ~(_O_WTEXT|_O_U16TEXT|_O_U8TEXT); + + if (!ReadFile(h, bom, sizeof(utf8_bom), &r, NULL)) + return oflags; + + if (r==sizeof(utf8_bom) && !memcmp(bom, utf8_bom, sizeof(utf8_bom))) { + oflags |= _O_U8TEXT; + }else if (r>=sizeof(utf16_bom) && !memcmp(bom, utf16_bom, sizeof(utf16_bom))) { + if (seek && r>2) + SetFilePointer(h, 2, NULL, FILE_BEGIN); + oflags |= _O_U16TEXT; + }else if (seek) { + SetFilePointer(h, 0, NULL, FILE_BEGIN); + } + + return oflags; +} + /********************************************************************* * _wsopen_s (MSVCRT.@) */ @@ -1722,6 +1852,21 @@ sa.lpSecurityDescriptor = NULL; sa.bInheritHandle = (oflags & _O_NOINHERIT) ? FALSE : TRUE; + if ((oflags&(_O_WTEXT|_O_U16TEXT|_O_U8TEXT)) + && (creation==OPEN_ALWAYS || creation==OPEN_EXISTING) + && !(access&GENERIC_READ)) + { + hand = CreateFileW(path, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, + &sa, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0); + if (hand != INVALID_HANDLE_VALUE) + { + oflags = check_bom(hand, oflags, FALSE); + CloseHandle(hand); + } + else + oflags &= ~(_O_WTEXT|_O_U16TEXT|_O_U8TEXT); + } + hand = CreateFileW(path, access, sharing, &sa, creation, attrib, 0); if (hand == INVALID_HANDLE_VALUE) { @@ -1730,7 +1875,56 @@ return *_errno(); } + if (oflags & (_O_WTEXT|_O_U16TEXT|_O_U8TEXT)) + { + if ((access & GENERIC_WRITE) && (creation==CREATE_NEW + || creation==CREATE_ALWAYS || creation==TRUNCATE_EXISTING + || (creation==OPEN_ALWAYS && GetLastError()==ERROR_ALREADY_EXISTS))) + { + if (oflags & _O_U8TEXT) + { + DWORD written = 0, tmp; + + while(written!=sizeof(utf8_bom) && WriteFile(hand, (char*)utf8_bom+written, + sizeof(utf8_bom)-written, &tmp, NULL)) + written += tmp; + if (written != sizeof(utf8_bom)) { + WARN("error writing BOM\n"); + CloseHandle(hand); + *_errno() = GetLastError(); + return *_errno(); + } + } + else + { + DWORD written = 0, tmp; + + while(written!=sizeof(utf16_bom) && WriteFile(hand, (char*)utf16_bom+written, + sizeof(utf16_bom)-written, &tmp, NULL)) + written += tmp; + if (written != sizeof(utf16_bom)) + { + WARN("error writing BOM\n"); + CloseHandle(hand); + *_errno() = GetLastError(); + return *_errno(); + } + } + } + else if (access & GENERIC_READ) + oflags = check_bom(hand, oflags, TRUE); + } + *fd = alloc_fd(hand, wxflag); + if (*fd == -1) + return *_errno(); + + if (oflags & _O_WTEXT) + get_ioinfo(*fd)->exflag |= EF_UTF16|EF_UNK_UNICODE; + else if (oflags & _O_U16TEXT) + get_ioinfo(*fd)->exflag |= EF_UTF16; + else if (oflags & _O_U8TEXT) + get_ioinfo(*fd)->exflag |= EF_UTF8; TRACE(":fd (%d) handle (%p)\n", *fd, hand); return 0;
10 years, 10 months
1
0
0
0
[jgardou] 61884: [WIN32K] - Formatting, no code change.
by jgardou@svn.reactos.org
Author: jgardou Date: Wed Jan 29 19:09:15 2014 New Revision: 61884 URL:
http://svn.reactos.org/svn/reactos?rev=61884&view=rev
Log: [WIN32K] - Formatting, no code change. Modified: trunk/reactos/win32ss/gdi/eng/eng.h trunk/reactos/win32ss/gdi/eng/engwindow.c Modified: trunk/reactos/win32ss/gdi/eng/eng.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/eng.h?rev=…
============================================================================== --- trunk/reactos/win32ss/gdi/eng/eng.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/eng.h [iso-8859-1] Wed Jan 29 19:09:15 2014 @@ -18,8 +18,8 @@ VOID FASTCALL IntEngWindowChanged( - PWND Window, - FLONG flChanged); + _In_ PWND Window, + _In_ FLONG flChanged); VOID FASTCALL IntGdiAcquireSemaphore ( HSEMAPHORE hsem ); VOID FASTCALL IntGdiReleaseSemaphore ( HSEMAPHORE hsem ); Modified: trunk/reactos/win32ss/gdi/eng/engwindow.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/engwindow.…
============================================================================== --- trunk/reactos/win32ss/gdi/eng/engwindow.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/engwindow.c [iso-8859-1] Wed Jan 29 19:09:15 2014 @@ -6,9 +6,6 @@ * PROGRAMER: Gregor Anich */ -/* TODO: Check how the WNDOBJ implementation should behave with a driver on windows. - */ - #include <win32k.h> #define NDEBUG @@ -22,32 +19,32 @@ VOID FASTCALL IntEngWndCallChangeProc( - IN WNDOBJ *pwo, - IN FLONG flChanged) -{ - WNDGDI *WndObjInt = ObjToGDI(pwo, WND); - - if (WndObjInt->ChangeProc == NULL) - { - return; - } - - /* check flags of the WNDOBJ */ - flChanged &= WndObjInt->Flags; - if (flChanged == 0) - { - return; - } - - /* Call the WNDOBJCHANGEPROC */ - if (flChanged == WOC_CHANGED) - { - pwo = NULL; - } - - DPRINT("Calling WNDOBJCHANGEPROC (0x%p), Changed = 0x%x\n", - WndObjInt->ChangeProc, flChanged); - WndObjInt->ChangeProc(pwo, flChanged); + IN WNDOBJ *pwo, + IN FLONG flChanged) +{ + WNDGDI *WndObjInt = ObjToGDI(pwo, WND); + + if (WndObjInt->ChangeProc == NULL) + { + return; + } + + /* check flags of the WNDOBJ */ + flChanged &= WndObjInt->Flags; + if (flChanged == 0) + { + return; + } + + /* Call the WNDOBJCHANGEPROC */ + if (flChanged == WOC_CHANGED) + { + pwo = NULL; + } + + DPRINT("Calling WNDOBJCHANGEPROC (0x%p), Changed = 0x%x\n", + WndObjInt->ChangeProc, flChanged); + WndObjInt->ChangeProc(pwo, flChanged); } /* @@ -56,74 +53,74 @@ BOOLEAN FASTCALL IntEngWndUpdateClipObj( - WNDGDI *WndObjInt, - PWND Window) -{ - HRGN hVisRgn; - PROSRGNDATA visRgn; - CLIPOBJ *ClipObj = NULL; - CLIPOBJ *OldClipObj; - - DPRINT("IntEngWndUpdateClipObj\n"); - - hVisRgn = VIS_ComputeVisibleRegion(Window, TRUE, TRUE, TRUE); - if (hVisRgn != NULL) - { - NtGdiOffsetRgn(hVisRgn, Window->rcClient.left, Window->rcClient.top); - visRgn = RGNOBJAPI_Lock(hVisRgn, NULL); - if (visRgn != NULL) - { - if (visRgn->rdh.nCount > 0) - { - ClipObj = IntEngCreateClipRegion(visRgn->rdh.nCount, visRgn->Buffer, - &visRgn->rdh.rcBound); - DPRINT("Created visible region with %lu rects\n", visRgn->rdh.nCount); - DPRINT(" BoundingRect: %d, %d %d, %d\n", - visRgn->rdh.rcBound.left, visRgn->rdh.rcBound.top, - visRgn->rdh.rcBound.right, visRgn->rdh.rcBound.bottom); + WNDGDI *WndObjInt, + PWND Window) +{ + HRGN hVisRgn; + PROSRGNDATA visRgn; + CLIPOBJ *ClipObj = NULL; + CLIPOBJ *OldClipObj; + + DPRINT("IntEngWndUpdateClipObj\n"); + + hVisRgn = VIS_ComputeVisibleRegion(Window, TRUE, TRUE, TRUE); + if (hVisRgn != NULL) + { + NtGdiOffsetRgn(hVisRgn, Window->rcClient.left, Window->rcClient.top); + visRgn = RGNOBJAPI_Lock(hVisRgn, NULL); + if (visRgn != NULL) { - ULONG i; - for (i = 0; i < visRgn->rdh.nCount; i++) - { - DPRINT(" Rect #%lu: %ld,%ld %ld,%ld\n", i+1, - visRgn->Buffer[i].left, visRgn->Buffer[i].top, - visRgn->Buffer[i].right, visRgn->Buffer[i].bottom); - } + if (visRgn->rdh.nCount > 0) + { + ClipObj = IntEngCreateClipRegion(visRgn->rdh.nCount, visRgn->Buffer, + &visRgn->rdh.rcBound); + DPRINT("Created visible region with %lu rects\n", visRgn->rdh.nCount); + DPRINT(" BoundingRect: %d, %d %d, %d\n", + visRgn->rdh.rcBound.left, visRgn->rdh.rcBound.top, + visRgn->rdh.rcBound.right, visRgn->rdh.rcBound.bottom); + { + ULONG i; + for (i = 0; i < visRgn->rdh.nCount; i++) + { + DPRINT(" Rect #%lu: %ld,%ld %ld,%ld\n", i+1, + visRgn->Buffer[i].left, visRgn->Buffer[i].top, + visRgn->Buffer[i].right, visRgn->Buffer[i].bottom); + } + } + } + RGNOBJAPI_Unlock(visRgn); } - } - RGNOBJAPI_Unlock(visRgn); + else + { + DPRINT1("Warning: Couldn't lock visible region of window DC\n"); + } + GreDeleteObject(hVisRgn); } else { - DPRINT1("Warning: Couldn't lock visible region of window DC\n"); - } - GreDeleteObject(hVisRgn); - } - else - { - DPRINT1("Warning: VIS_ComputeVisibleRegion failed!\n"); - } - - if (ClipObj == NULL) - { - /* Fall back to client rect */ - ClipObj = IntEngCreateClipRegion(1, &Window->rcClient, - &Window->rcClient); - } - - if (ClipObj == NULL) - { - DPRINT1("Warning: IntEngCreateClipRegion() failed!\n"); - return FALSE; - } - - RtlCopyMemory(&WndObjInt->WndObj.coClient, ClipObj, sizeof (CLIPOBJ)); - RtlCopyMemory(&WndObjInt->WndObj.rclClient, &Window->rcClient, sizeof (RECT)); - OldClipObj = InterlockedExchangePointer((PVOID*)&WndObjInt->ClientClipObj, ClipObj); - if (OldClipObj != NULL) - IntEngDeleteClipRegion(OldClipObj); - - return TRUE; + DPRINT1("Warning: VIS_ComputeVisibleRegion failed!\n"); + } + + if (ClipObj == NULL) + { + /* Fall back to client rect */ + ClipObj = IntEngCreateClipRegion(1, &Window->rcClient, + &Window->rcClient); + } + + if (ClipObj == NULL) + { + DPRINT1("Warning: IntEngCreateClipRegion() failed!\n"); + return FALSE; + } + + RtlCopyMemory(&WndObjInt->WndObj.coClient, ClipObj, sizeof (CLIPOBJ)); + RtlCopyMemory(&WndObjInt->WndObj.rclClient, &Window->rcClient, sizeof (RECT)); + OldClipObj = InterlockedExchangePointer((PVOID*)&WndObjInt->ClientClipObj, ClipObj); + if (OldClipObj != NULL) + IntEngDeleteClipRegion(OldClipObj); + + return TRUE; } /* @@ -132,49 +129,49 @@ VOID FASTCALL IntEngWindowChanged( - PWND Window, - FLONG flChanged) -{ - PPROPERTY pprop; - WNDGDI *Current; - HWND hWnd; - - ASSERT_IRQL_LESS_OR_EQUAL(PASSIVE_LEVEL); - - hWnd = Window->head.h; - pprop = IntGetProp(Window, AtomWndObj); - if (!pprop) - { - return; - } - Current = (WNDGDI *)pprop->Data; - if ( gcountPWO && - Current && - Current->Hwnd == hWnd && - Current->WndObj.pvConsumer != NULL ) - { - /* Update the WNDOBJ */ - switch (flChanged) - { + _In_ PWND Window, + _In_ FLONG flChanged) +{ + PPROPERTY pprop; + WNDGDI *Current; + HWND hWnd; + + ASSERT_IRQL_LESS_OR_EQUAL(PASSIVE_LEVEL); + + hWnd = Window->head.h; + pprop = IntGetProp(Window, AtomWndObj); + if (!pprop) + { + return; + } + Current = (WNDGDI *)pprop->Data; + if ( gcountPWO && + Current && + Current->Hwnd == hWnd && + Current->WndObj.pvConsumer != NULL ) + { + /* Update the WNDOBJ */ + switch (flChanged) + { case WOC_RGN_CLIENT: - /* Update the clipobj and client rect of the WNDOBJ */ - IntEngWndUpdateClipObj(Current, Window); - break; + /* Update the clipobj and client rect of the WNDOBJ */ + IntEngWndUpdateClipObj(Current, Window); + break; case WOC_DELETE: - /* FIXME: Should the WNDOBJs be deleted by win32k or by the driver? */ - break; - } - - /* Call the change proc */ - IntEngWndCallChangeProc(&Current->WndObj, flChanged); - - /* HACK: Send WOC_CHANGED after WOC_RGN_CLIENT */ - if (flChanged == WOC_RGN_CLIENT) - { - IntEngWndCallChangeProc(&Current->WndObj, WOC_CHANGED); - } - } + /* FIXME: Should the WNDOBJs be deleted by win32k or by the driver? */ + break; + } + + /* Call the change proc */ + IntEngWndCallChangeProc(&Current->WndObj, flChanged); + + /* HACK: Send WOC_CHANGED after WOC_RGN_CLIENT */ + if (flChanged == WOC_RGN_CLIENT) + { + IntEngWndCallChangeProc(&Current->WndObj, WOC_CHANGED); + } + } } /* @@ -183,75 +180,75 @@ WNDOBJ* APIENTRY EngCreateWnd( - SURFOBJ *pso, - HWND hWnd, - WNDOBJCHANGEPROC pfn, - FLONG fl, - int iPixelFormat) -{ - WNDGDI *WndObjInt = NULL; - WNDOBJ *WndObjUser = NULL; - PWND Window; - BOOL calledFromUser; - DECLARE_RETURN(WNDOBJ*); - - DPRINT("EngCreateWnd: pso = 0x%p, hwnd = 0x%p, pfn = 0x%p, fl = 0x%lx, pixfmt = %d\n", - pso, hWnd, pfn, fl, iPixelFormat); - - calledFromUser = UserIsEntered(); - if (!calledFromUser){ - UserEnterShared(); - } - - /* Get window object */ - Window = UserGetWindowObject(hWnd); - if (Window == NULL) - { - RETURN( NULL); - } - - /* Create WNDOBJ */ - WndObjInt = EngAllocMem(0, sizeof (WNDGDI), GDITAG_WNDOBJ); - if (WndObjInt == NULL) - { - DPRINT1("Failed to allocate memory for a WND structure!\n"); - RETURN( NULL); - } - - /* Fill the clipobj */ - WndObjInt->ClientClipObj = NULL; - if (!IntEngWndUpdateClipObj(WndObjInt, Window)) - { - EngFreeMem(WndObjInt); - RETURN( NULL); - } - - /* Fill user object */ - WndObjUser = GDIToObj(WndObjInt, WND); - WndObjUser->psoOwner = pso; - WndObjUser->pvConsumer = NULL; - - /* Fill internal object */ - WndObjInt->Hwnd = hWnd; - WndObjInt->ChangeProc = pfn; - WndObjInt->Flags = fl; - WndObjInt->PixelFormat = iPixelFormat; - - /* associate object with window */ - IntSetProp(Window, AtomWndObj, WndObjInt); - ++gcountPWO; - - DPRINT("EngCreateWnd: SUCCESS!\n"); - - RETURN( WndObjUser); + SURFOBJ *pso, + HWND hWnd, + WNDOBJCHANGEPROC pfn, + FLONG fl, + int iPixelFormat) +{ + WNDGDI *WndObjInt = NULL; + WNDOBJ *WndObjUser = NULL; + PWND Window; + BOOL calledFromUser; + DECLARE_RETURN(WNDOBJ*); + + DPRINT1("EngCreateWnd: pso = 0x%p, hwnd = 0x%p, pfn = 0x%p, fl = 0x%lx, pixfmt = %d\n", + pso, hWnd, pfn, fl, iPixelFormat); + + calledFromUser = UserIsEntered(); + if (!calledFromUser) { + UserEnterShared(); + } + + /* Get window object */ + Window = UserGetWindowObject(hWnd); + if (Window == NULL) + { + RETURN( NULL); + } + + /* Create WNDOBJ */ + WndObjInt = EngAllocMem(0, sizeof (WNDGDI), GDITAG_WNDOBJ); + if (WndObjInt == NULL) + { + DPRINT1("Failed to allocate memory for a WND structure!\n"); + RETURN( NULL); + } + + /* Fill the clipobj */ + WndObjInt->ClientClipObj = NULL; + if (!IntEngWndUpdateClipObj(WndObjInt, Window)) + { + EngFreeMem(WndObjInt); + RETURN( NULL); + } + + /* Fill user object */ + WndObjUser = GDIToObj(WndObjInt, WND); + WndObjUser->psoOwner = pso; + WndObjUser->pvConsumer = NULL; + + /* Fill internal object */ + WndObjInt->Hwnd = hWnd; + WndObjInt->ChangeProc = pfn; + WndObjInt->Flags = fl; + WndObjInt->PixelFormat = iPixelFormat; + + /* associate object with window */ + IntSetProp(Window, AtomWndObj, WndObjInt); + ++gcountPWO; + + DPRINT("EngCreateWnd: SUCCESS!\n"); + + RETURN( WndObjUser); CLEANUP: - if (!calledFromUser){ - UserLeave(); - } - - END_CLEANUP; + if (!calledFromUser) { + UserLeave(); + } + + END_CLEANUP; } @@ -261,39 +258,39 @@ VOID APIENTRY EngDeleteWnd( - IN WNDOBJ *pwo) -{ - WNDGDI *WndObjInt = ObjToGDI(pwo, WND); - PWND Window; - BOOL calledFromUser; - - DPRINT("EngDeleteWnd: pwo = 0x%p\n", pwo); - - calledFromUser = UserIsEntered(); - if (!calledFromUser){ - UserEnterExclusive(); - } - - /* Get window object */ - Window = UserGetWindowObject(WndObjInt->Hwnd); - if (Window == NULL) - { - DPRINT1("Warning: Couldnt get window object for WndObjInt->Hwnd!!!\n"); - } - else - { - /* Remove object from window */ - IntRemoveProp(Window, AtomWndObj); - --gcountPWO; - } - - if (!calledFromUser){ - UserLeave(); - } - - /* Free resources */ - IntEngDeleteClipRegion(WndObjInt->ClientClipObj); - EngFreeMem(WndObjInt); + IN WNDOBJ *pwo) +{ + WNDGDI *WndObjInt = ObjToGDI(pwo, WND); + PWND Window; + BOOL calledFromUser; + + DPRINT("EngDeleteWnd: pwo = 0x%p\n", pwo); + + calledFromUser = UserIsEntered(); + if (!calledFromUser) { + UserEnterExclusive(); + } + + /* Get window object */ + Window = UserGetWindowObject(WndObjInt->Hwnd); + if (Window == NULL) + { + DPRINT1("Warning: Couldnt get window object for WndObjInt->Hwnd!!!\n"); + } + else + { + /* Remove object from window */ + IntRemoveProp(Window, AtomWndObj); + --gcountPWO; + } + + if (!calledFromUser) { + UserLeave(); + } + + /* Free resources */ + IntEngDeleteClipRegion(WndObjInt->ClientClipObj); + EngFreeMem(WndObjInt); } @@ -303,18 +300,18 @@ BOOL APIENTRY WNDOBJ_bEnum( - IN WNDOBJ *pwo, - IN ULONG cj, - OUT ULONG *pul) -{ - WNDGDI *WndObjInt = ObjToGDI(pwo, WND); - BOOL Ret; - - DPRINT("WNDOBJ_bEnum: pwo = 0x%p, cj = %lu, pul = 0x%p\n", pwo, cj, pul); - Ret = CLIPOBJ_bEnum(WndObjInt->ClientClipObj, cj, pul); - - DPRINT("WNDOBJ_bEnum: Returning %s\n", Ret ? "True" : "False"); - return Ret; + IN WNDOBJ *pwo, + IN ULONG cj, + OUT ULONG *pul) +{ + WNDGDI *WndObjInt = ObjToGDI(pwo, WND); + BOOL Ret; + + DPRINT("WNDOBJ_bEnum: pwo = 0x%p, cj = %lu, pul = 0x%p\n", pwo, cj, pul); + Ret = CLIPOBJ_bEnum(WndObjInt->ClientClipObj, cj, pul); + + DPRINT("WNDOBJ_bEnum: Returning %s\n", Ret ? "True" : "False"); + return Ret; } @@ -324,22 +321,22 @@ ULONG APIENTRY WNDOBJ_cEnumStart( - IN WNDOBJ *pwo, - IN ULONG iType, - IN ULONG iDirection, - IN ULONG cLimit) -{ - WNDGDI *WndObjInt = ObjToGDI(pwo, WND); - ULONG Ret; - - DPRINT("WNDOBJ_cEnumStart: pwo = 0x%p, iType = %lu, iDirection = %lu, cLimit = %lu\n", - pwo, iType, iDirection, cLimit); - - /* FIXME: Should we enumerate all rectangles or not? */ - Ret = CLIPOBJ_cEnumStart(WndObjInt->ClientClipObj, FALSE, iType, iDirection, cLimit); - - DPRINT("WNDOBJ_cEnumStart: Returning 0x%lx\n", Ret); - return Ret; + IN WNDOBJ *pwo, + IN ULONG iType, + IN ULONG iDirection, + IN ULONG cLimit) +{ + WNDGDI *WndObjInt = ObjToGDI(pwo, WND); + ULONG Ret; + + DPRINT("WNDOBJ_cEnumStart: pwo = 0x%p, iType = %lu, iDirection = %lu, cLimit = %lu\n", + pwo, iType, iDirection, cLimit); + + /* FIXME: Should we enumerate all rectangles or not? */ + Ret = CLIPOBJ_cEnumStart(WndObjInt->ClientClipObj, FALSE, iType, iDirection, cLimit); + + DPRINT("WNDOBJ_cEnumStart: Returning 0x%lx\n", Ret); + return Ret; } @@ -349,29 +346,29 @@ VOID APIENTRY WNDOBJ_vSetConsumer( - IN WNDOBJ *pwo, - IN PVOID pvConsumer) -{ - BOOL Hack; - - DPRINT("WNDOBJ_vSetConsumer: pwo = 0x%p, pvConsumer = 0x%p\n", pwo, pvConsumer); - - Hack = (pwo->pvConsumer == NULL); - pwo->pvConsumer = pvConsumer; - - /* HACKHACKHACK - * - * MSDN says that the WNDOBJCHANGEPROC will be called with the most recent state - * when a WNDOBJ is created - we do it here because most drivers will need pvConsumer - * in the callback to identify the WNDOBJ I think. - * - * - blight - */ - if (Hack) - { - IntEngWndCallChangeProc(pwo, WOC_RGN_CLIENT); - IntEngWndCallChangeProc(pwo, WOC_CHANGED); - IntEngWndCallChangeProc(pwo, WOC_DRAWN); + IN WNDOBJ *pwo, + IN PVOID pvConsumer) +{ + BOOL Hack; + + DPRINT("WNDOBJ_vSetConsumer: pwo = 0x%p, pvConsumer = 0x%p\n", pwo, pvConsumer); + + Hack = (pwo->pvConsumer == NULL); + pwo->pvConsumer = pvConsumer; + + /* HACKHACKHACK + * + * MSDN says that the WNDOBJCHANGEPROC will be called with the most recent state + * when a WNDOBJ is created - we do it here because most drivers will need pvConsumer + * in the callback to identify the WNDOBJ I think. + * + * - blight + */ + if (Hack) + { + IntEngWndCallChangeProc(pwo, WOC_RGN_CLIENT); + IntEngWndCallChangeProc(pwo, WOC_CHANGED); + IntEngWndCallChangeProc(pwo, WOC_DRAWN); } }
10 years, 10 months
1
0
0
0
[jgardou] 61883: [WIN32K] - Implement GDIOBJ_TryLockObject and used it for DRIVEROBJs - Fix EngUnlockDriverObj
by jgardou@svn.reactos.org
Author: jgardou Date: Wed Jan 29 18:32:14 2014 New Revision: 61883 URL:
http://svn.reactos.org/svn/reactos?rev=61883&view=rev
Log: [WIN32K] - Implement GDIOBJ_TryLockObject and used it for DRIVEROBJs - Fix EngUnlockDriverObj Modified: trunk/reactos/win32ss/gdi/eng/driverobj.c trunk/reactos/win32ss/gdi/eng/driverobj.h trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h trunk/reactos/win32ss/gdi/ntgdi/misc.h Modified: trunk/reactos/win32ss/gdi/eng/driverobj.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/driverobj.…
============================================================================== --- trunk/reactos/win32ss/gdi/eng/driverobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/driverobj.c [iso-8859-1] Wed Jan 29 18:32:14 2014 @@ -80,7 +80,7 @@ PEDRIVEROBJ pedo; /* Lock the object */ - pedo = DRIVEROBJ_LockObject(hdo); + pedo = DRIVEROBJ_TryLockObject(hdo); if (!pedo) { return FALSE; @@ -100,10 +100,11 @@ /* Prevent cleanup callback from being called again */ pedo->drvobj.pFreeProc = NULL; - /* NOTE: We don't care about the bLocked param, as our handle manager - allows freeing the object, while we hold any number of locks. */ + /* Unlock if the caller indicates it is locked */ + if (bLocked) + DRIVEROBJ_UnlockObject(pedo); - /* Delete the object */ + /* Now delete the object */ GDIOBJ_vDeleteObject(&pedo->baseobj); return TRUE; } @@ -117,7 +118,7 @@ PEDRIVEROBJ pedo; /* Lock the object */ - pedo = DRIVEROBJ_LockObject(hdo); + pedo = DRIVEROBJ_TryLockObject(hdo); /* Return pointer to the DRIVEROBJ structure */ return &pedo->drvobj; @@ -133,7 +134,7 @@ ULONG cLocks; /* First lock to get a pointer to the object */ - pedo = DRIVEROBJ_LockObject(hdo); + pedo = DRIVEROBJ_TryLockObject(hdo); if(!pedo) { /* Object could not be locked, fail. */ Modified: trunk/reactos/win32ss/gdi/eng/driverobj.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/driverobj.…
============================================================================== --- trunk/reactos/win32ss/gdi/eng/driverobj.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/driverobj.h [iso-8859-1] Wed Jan 29 18:32:14 2014 @@ -20,7 +20,7 @@ FORCEINLINE PEDRIVEROBJ -DRIVEROBJ_LockObject(HDRVOBJ hdo) +DRIVEROBJ_TryLockObject(HDRVOBJ hdo) { - return GDIOBJ_LockObject(hdo, GDIObjType_DRVOBJ_TYPE); + return GDIOBJ_TryLockObject(hdo, GDIObjType_DRVOBJ_TYPE); } Modified: trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c…
============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] Wed Jan 29 18:32:14 2014 @@ -52,11 +52,14 @@ #define ASSERT_EXCLUSIVE_OBJECT_TYPE(objt) \ ASSERT((objt) == GDIObjType_DC_TYPE || \ (objt) == GDIObjType_RGN_TYPE) +#define ASSERT_TRYLOCK_OBJECT_TYPE(objt) \ + ASSERT((objt) == GDIObjType_DRVOBJ_TYPE) #else #define DBG_INCREASE_LOCK_COUNT(ppi, hobj) #define DBG_DECREASE_LOCK_COUNT(x, y) #define ASSERT_SHARED_OBJECT_TYPE(objt) #define ASSERT_EXCLUSIVE_OBJECT_TYPE(objt) +#define ASSERT_TRYLOCK_OBJECT_TYPE(objt) #endif #if defined(_M_IX86) || defined(_M_AMD64) @@ -623,6 +626,72 @@ PGDIOBJ NTAPI +GDIOBJ_TryLockObject( + HGDIOBJ hobj, + UCHAR objt) +{ + PENTRY pentry; + POBJ pobj; + DWORD dwThreadId; + + /* Check if the handle type matches */ + ASSERT_TRYLOCK_OBJECT_TYPE(objt); + if ((((ULONG_PTR)hobj >> 16) & 0x1f) != objt) + { + DPRINT("Wrong object type: hobj=0x%p, objt=0x%x\n", hobj, objt); + return NULL; + } + + /* Reference the handle entry */ + pentry = ENTRY_ReferenceEntryByHandle(hobj, 0); + if (!pentry) + { + DPRINT("GDIOBJ: Requested handle 0x%p is not valid.\n", hobj); + return NULL; + } + + /* Get the pointer to the BASEOBJECT */ + pobj = pentry->einfo.pobj; + + /* Check if we already own the lock */ + dwThreadId = PtrToUlong(PsGetCurrentThreadId()); + if (pobj->dwThreadId != dwThreadId) + { + /* Disable APCs and try acquiring the push lock */ + KeEnterCriticalRegion(); + if(!ExTryAcquirePushLockExclusive(&pobj->pushlock)) + { + ULONG cRefs, ulIndex; + /* Already owned. Clean up and leave. */ + KeLeaveCriticalRegion(); + + /* Calculate the index */ + ulIndex = GDI_HANDLE_GET_INDEX(pobj->hHmgr); + + /* Decrement reference count */ + ASSERT((gpaulRefCount[ulIndex] & REF_MASK_COUNT) > 0); + cRefs = InterlockedDecrement((LONG*)&gpaulRefCount[ulIndex]); + ASSERT(cRefs & REF_MASK_VALID); + + return NULL; + } + + /* Set us as lock owner */ + ASSERT(pobj->dwThreadId == 0); + pobj->dwThreadId = dwThreadId; + } + + /* Increase lock count */ + pobj->cExclusiveLock++; + DBG_INCREASE_LOCK_COUNT(PsGetCurrentProcessWin32Process(), hobj); + DBG_LOGEVENT(&pobj->slhLog, EVENT_LOCK, 0); + + /* Return the object */ + return pobj; +} + +PGDIOBJ +NTAPI GDIOBJ_LockObject( HGDIOBJ hobj, UCHAR objt) Modified: trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h…
============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h [iso-8859-1] Wed Jan 29 18:32:14 2014 @@ -141,6 +141,12 @@ HGDIOBJ hobj, UCHAR objt); +PGDIOBJ +NTAPI +GDIOBJ_TryLockObject( + HGDIOBJ hobj, + UCHAR objt); + VOID NTAPI GDIOBJ_vUnlockObject( Modified: trunk/reactos/win32ss/gdi/ntgdi/misc.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/misc.h?r…
============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/misc.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/misc.h [iso-8859-1] Wed Jan 29 18:32:14 2014 @@ -113,6 +113,14 @@ } FORCEINLINE +BOOLEAN +ExTryAcquirePushLockExclusive(PEX_PUSH_LOCK PushLock) +{ + /* Try acquiring the lock */ + return !InterlockedBitTestAndSet((PLONG)PushLock, EX_PUSH_LOCK_LOCK_V); +} + +FORCEINLINE VOID ExReleasePushLockExclusive(PEX_PUSH_LOCK PushLock) {
10 years, 10 months
1
0
0
0
[akhaldi] 61882: [AFD] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716
by akhaldi@svn.reactos.org
Author: akhaldi Date: Wed Jan 29 11:00:53 2014 New Revision: 61882 URL:
http://svn.reactos.org/svn/reactos?rev=61882&view=rev
Log: [AFD] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 Modified: trunk/reactos/drivers/network/afd/afd/bind.c trunk/reactos/drivers/network/afd/afd/connect.c trunk/reactos/drivers/network/afd/afd/context.c trunk/reactos/drivers/network/afd/afd/event.c trunk/reactos/drivers/network/afd/afd/info.c trunk/reactos/drivers/network/afd/afd/listen.c trunk/reactos/drivers/network/afd/afd/lock.c trunk/reactos/drivers/network/afd/afd/read.c trunk/reactos/drivers/network/afd/afd/select.c trunk/reactos/drivers/network/afd/afd/tdi.c trunk/reactos/drivers/network/afd/afd/tdiconn.c trunk/reactos/drivers/network/afd/afd/write.c trunk/reactos/drivers/network/afd/include/afd.h trunk/reactos/drivers/network/afd/include/tdiconn.h Modified: trunk/reactos/drivers/network/afd/afd/bind.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/bi…
============================================================================== --- trunk/reactos/drivers/network/afd/afd/bind.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/bind.c [iso-8859-1] Wed Jan 29 11:00:53 2014 @@ -105,4 +105,3 @@ return UnlockAndMaybeComplete( FCB, Status, Irp, (ULONG_PTR)FCB->AddressFile.Handle ); } - Modified: trunk/reactos/drivers/network/afd/afd/connect.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/co…
============================================================================== --- trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] Wed Jan 29 11:00:53 2014 @@ -7,6 +7,7 @@ * UPDATE HISTORY: * 20040708 Created */ + #include "afd.h" NTSTATUS Modified: trunk/reactos/drivers/network/afd/afd/context.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/co…
============================================================================== --- trunk/reactos/drivers/network/afd/afd/context.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/context.c [iso-8859-1] Wed Jan 29 11:00:53 2014 @@ -7,6 +7,7 @@ * UPDATE HISTORY: * 20040708 Created */ + #include "afd.h" NTSTATUS NTAPI Modified: trunk/reactos/drivers/network/afd/afd/event.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ev…
============================================================================== --- trunk/reactos/drivers/network/afd/afd/event.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/event.c [iso-8859-1] Wed Jan 29 11:00:53 2014 @@ -7,6 +7,7 @@ * REVISIONS: * CSH 01/09-2000 Created */ + #include <afd.h> NTSTATUS AfdEventError( @@ -307,5 +308,4 @@ return STATUS_SUCCESS; } - /* EOF */ Modified: trunk/reactos/drivers/network/afd/afd/info.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/in…
============================================================================== --- trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] Wed Jan 29 11:00:53 2014 @@ -7,6 +7,7 @@ * UPDATE HISTORY: * 20040708 Created */ + #include "afd.h" NTSTATUS NTAPI Modified: trunk/reactos/drivers/network/afd/afd/listen.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/li…
============================================================================== --- trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] Wed Jan 29 11:00:53 2014 @@ -7,6 +7,7 @@ * UPDATE HISTORY: * 20040708 Created */ + #include "afd.h" static NTSTATUS SatisfyAccept( PAFD_DEVICE_EXTENSION DeviceExt, Modified: trunk/reactos/drivers/network/afd/afd/lock.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/lo…
============================================================================== --- trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] Wed Jan 29 11:00:53 2014 @@ -7,6 +7,7 @@ * UPDATE HISTORY: * 20040708 Created */ + #include "afd.h" PVOID GetLockedData(PIRP Irp, PIO_STACK_LOCATION IrpSp) Modified: trunk/reactos/drivers/network/afd/afd/read.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re…
============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Wed Jan 29 11:00:53 2014 @@ -7,6 +7,7 @@ * UPDATE HISTORY: * 20040708 Created */ + #include "afd.h" static VOID RefillSocketBuffer( PAFD_FCB FCB ) Modified: trunk/reactos/drivers/network/afd/afd/select.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/se…
============================================================================== --- trunk/reactos/drivers/network/afd/afd/select.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/select.c [iso-8859-1] Wed Jan 29 11:00:53 2014 @@ -7,6 +7,7 @@ * UPDATE HISTORY: * 20040708 Created */ + #include "afd.h" static VOID PrintEvents( ULONG Events ) { Modified: trunk/reactos/drivers/network/afd/afd/tdi.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/td…
============================================================================== --- trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] Wed Jan 29 11:00:53 2014 @@ -7,11 +7,11 @@ * REVISIONS: * CSH 01/09-2000 Created */ + #include <afd.h> -#include <pseh/pseh2.h> -#include "debug.h" -#include "tdiconn.h" -#include "tdi_proto.h" + +#include <tdikrnl.h> +#include <tdiinfo.h> #if DBG #if 0 Modified: trunk/reactos/drivers/network/afd/afd/tdiconn.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/td…
============================================================================== --- trunk/reactos/drivers/network/afd/afd/tdiconn.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/tdiconn.c [iso-8859-1] Wed Jan 29 11:00:53 2014 @@ -7,6 +7,7 @@ * UPDATE HISTORY: * 20040708 Created */ + #include <afd.h> UINT TdiAddressSizeFromType( UINT AddressType ) { @@ -261,4 +262,3 @@ return Status; } - Modified: trunk/reactos/drivers/network/afd/afd/write.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/wr…
============================================================================== --- trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] Wed Jan 29 11:00:53 2014 @@ -7,6 +7,7 @@ * UPDATE HISTORY: * 20040708 Created */ + #include "afd.h" static IO_COMPLETION_ROUTINE SendComplete; @@ -661,4 +662,3 @@ return UnlockAndMaybeComplete( FCB, Status, Irp, 0 ); } } - Modified: trunk/reactos/drivers/network/afd/include/afd.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/includ…
============================================================================== --- trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] Wed Jan 29 11:00:53 2014 @@ -11,16 +11,9 @@ #ifndef _AFD_H #define _AFD_H -#include <ntddk.h> #include <ntifs.h> #include <ndk/obtypes.h> -#include <ndk/obfuncs.h> -#include <ndk/mmtypes.h> -#include <ndk/mmfuncs.h> #include <tdi.h> -#include <tdikrnl.h> -#include <tdiinfo.h> -#include <string.h> #define _WINBASE_ #define _WINDOWS_H #define _INC_WINDOWS @@ -434,4 +427,4 @@ AfdPacketSocketWriteData(PDEVICE_OBJECT DeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp); -#endif/*_AFD_H*/ +#endif /* _AFD_H */ Modified: trunk/reactos/drivers/network/afd/include/tdiconn.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/includ…
============================================================================== --- trunk/reactos/drivers/network/afd/include/tdiconn.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/include/tdiconn.h [iso-8859-1] Wed Jan 29 11:00:53 2014 @@ -1,8 +1,4 @@ #pragma once - -#ifdef _MSC_VER -#include <ntddtdi.h> -#endif typedef VOID *PTDI_CONNECTION_INFO_PAIR;
10 years, 10 months
1
0
0
0
[akhaldi] 61881: [KS] * Properly name the main header. * Remove one time inclusions from the main header and put them back where they belong. CORE-7716
by akhaldi@svn.reactos.org
Author: akhaldi Date: Wed Jan 29 10:59:06 2014 New Revision: 61881 URL:
http://svn.reactos.org/svn/reactos?rev=61881&view=rev
Log: [KS] * Properly name the main header. * Remove one time inclusions from the main header and put them back where they belong. CORE-7716 Added: trunk/reactos/drivers/ksfilter/ks/precomp.h - copied, changed from r61860, trunk/reactos/drivers/ksfilter/ks/priv.h Removed: trunk/reactos/drivers/ksfilter/ks/priv.h Modified: trunk/reactos/drivers/ksfilter/ks/allocators.c trunk/reactos/drivers/ksfilter/ks/api.c trunk/reactos/drivers/ksfilter/ks/bag.c trunk/reactos/drivers/ksfilter/ks/clocks.c trunk/reactos/drivers/ksfilter/ks/connectivity.c trunk/reactos/drivers/ksfilter/ks/device.c trunk/reactos/drivers/ksfilter/ks/deviceinterface.c trunk/reactos/drivers/ksfilter/ks/driver.c trunk/reactos/drivers/ksfilter/ks/event.c trunk/reactos/drivers/ksfilter/ks/filter.c trunk/reactos/drivers/ksfilter/ks/filterfactory.c trunk/reactos/drivers/ksfilter/ks/image.c trunk/reactos/drivers/ksfilter/ks/irp.c trunk/reactos/drivers/ksfilter/ks/kcom.c trunk/reactos/drivers/ksfilter/ks/methods.c trunk/reactos/drivers/ksfilter/ks/misc.c trunk/reactos/drivers/ksfilter/ks/pin.c trunk/reactos/drivers/ksfilter/ks/property.c trunk/reactos/drivers/ksfilter/ks/swenum.c trunk/reactos/drivers/ksfilter/ks/topology.c trunk/reactos/drivers/ksfilter/ks/unknown.c trunk/reactos/drivers/ksfilter/ks/worker.c Modified: trunk/reactos/drivers/ksfilter/ks/allocators.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/alloca…
============================================================================== --- trunk/reactos/drivers/ksfilter/ks/allocators.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/allocators.c [iso-8859-1] Wed Jan 29 10:59:06 2014 @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */ -#include "priv.h" +#include "precomp.h" #define NDEBUG #include <debug.h> Modified: trunk/reactos/drivers/ksfilter/ks/api.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/api.c?…
============================================================================== --- trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] Wed Jan 29 10:59:06 2014 @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */ -#include "priv.h" +#include "precomp.h" #define NDEBUG #include <debug.h> Modified: trunk/reactos/drivers/ksfilter/ks/bag.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/bag.c?…
============================================================================== --- trunk/reactos/drivers/ksfilter/ks/bag.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/bag.c [iso-8859-1] Wed Jan 29 10:59:06 2014 @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */ -#include "priv.h" +#include "precomp.h" #define NDEBUG #include <debug.h> Modified: trunk/reactos/drivers/ksfilter/ks/clocks.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/clocks…
============================================================================== --- trunk/reactos/drivers/ksfilter/ks/clocks.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/clocks.c [iso-8859-1] Wed Jan 29 10:59:06 2014 @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */ -#include "priv.h" +#include "precomp.h" #define NDEBUG #include <debug.h> Modified: trunk/reactos/drivers/ksfilter/ks/connectivity.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/connec…
============================================================================== --- trunk/reactos/drivers/ksfilter/ks/connectivity.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/connectivity.c [iso-8859-1] Wed Jan 29 10:59:06 2014 @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */ -#include "priv.h" +#include "precomp.h" #define NDEBUG #include <debug.h> Modified: trunk/reactos/drivers/ksfilter/ks/device.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/device…
============================================================================== --- trunk/reactos/drivers/ksfilter/ks/device.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/device.c [iso-8859-1] Wed Jan 29 10:59:06 2014 @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */ -#include "priv.h" +#include "precomp.h" #define NDEBUG #include <debug.h> Modified: trunk/reactos/drivers/ksfilter/ks/deviceinterface.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/device…
============================================================================== --- trunk/reactos/drivers/ksfilter/ks/deviceinterface.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/deviceinterface.c [iso-8859-1] Wed Jan 29 10:59:06 2014 @@ -1,4 +1,4 @@ -#include "priv.h" +#include "precomp.h" #define NDEBUG #include <debug.h> Modified: trunk/reactos/drivers/ksfilter/ks/driver.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/driver…
============================================================================== --- trunk/reactos/drivers/ksfilter/ks/driver.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/driver.c [iso-8859-1] Wed Jan 29 10:59:06 2014 @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */ -#include "priv.h" +#include "precomp.h" #define NDEBUG #include <debug.h> Modified: trunk/reactos/drivers/ksfilter/ks/event.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/event.…
============================================================================== --- trunk/reactos/drivers/ksfilter/ks/event.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/event.c [iso-8859-1] Wed Jan 29 10:59:06 2014 @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */ -#include "priv.h" +#include "precomp.h" #define NDEBUG #include <debug.h> Modified: trunk/reactos/drivers/ksfilter/ks/filter.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/filter…
============================================================================== --- trunk/reactos/drivers/ksfilter/ks/filter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/filter.c [iso-8859-1] Wed Jan 29 10:59:06 2014 @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */ -#include "priv.h" +#include "precomp.h" #define NDEBUG #include <debug.h> Modified: trunk/reactos/drivers/ksfilter/ks/filterfactory.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/filter…
============================================================================== --- trunk/reactos/drivers/ksfilter/ks/filterfactory.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/filterfactory.c [iso-8859-1] Wed Jan 29 10:59:06 2014 @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */ -#include "priv.h" +#include "precomp.h" #define NDEBUG #include <debug.h> Modified: trunk/reactos/drivers/ksfilter/ks/image.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/image.…
============================================================================== --- trunk/reactos/drivers/ksfilter/ks/image.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/image.c [iso-8859-1] Wed Jan 29 10:59:06 2014 @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */ -#include "priv.h" +#include "precomp.h" #include <ntimage.h> #include <ndk/ldrfuncs.h> Modified: trunk/reactos/drivers/ksfilter/ks/irp.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/irp.c?…
============================================================================== --- trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] Wed Jan 29 10:59:06 2014 @@ -6,7 +6,9 @@ * PROGRAMMER: Johannes Anderwald */ -#include "priv.h" +#include "precomp.h" + +#include <ntifs.h> #define NDEBUG #include <debug.h> Modified: trunk/reactos/drivers/ksfilter/ks/kcom.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/kcom.c…
============================================================================== --- trunk/reactos/drivers/ksfilter/ks/kcom.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/kcom.c [iso-8859-1] Wed Jan 29 10:59:06 2014 @@ -7,7 +7,7 @@ Andrew Greenwood */ -#include "priv.h" +#include "precomp.h" #define NDEBUG #include <debug.h> Modified: trunk/reactos/drivers/ksfilter/ks/methods.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/method…
============================================================================== --- trunk/reactos/drivers/ksfilter/ks/methods.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/methods.c [iso-8859-1] Wed Jan 29 10:59:06 2014 @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */ -#include "priv.h" +#include "precomp.h" #define NDEBUG #include <debug.h> Modified: trunk/reactos/drivers/ksfilter/ks/misc.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/misc.c…
============================================================================== --- trunk/reactos/drivers/ksfilter/ks/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/misc.c [iso-8859-1] Wed Jan 29 10:59:06 2014 @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */ -#include "priv.h" +#include "precomp.h" #define NDEBUG #include <debug.h> Modified: trunk/reactos/drivers/ksfilter/ks/pin.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/pin.c?…
============================================================================== --- trunk/reactos/drivers/ksfilter/ks/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/pin.c [iso-8859-1] Wed Jan 29 10:59:06 2014 @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */ -#include "priv.h" +#include "precomp.h" #include <bdamedia.h> Copied: trunk/reactos/drivers/ksfilter/ks/precomp.h (from r61860, trunk/reactos/drivers/ksfilter/ks/priv.h) URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/precom…
============================================================================== --- trunk/reactos/drivers/ksfilter/ks/priv.h [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/precomp.h [iso-8859-1] Wed Jan 29 10:59:06 2014 @@ -1,6 +1,6 @@ #define _KSDDK_ -#include <ntifs.h> +#include <ntddk.h> #include <portcls.h> #include <kcom.h> #include <pseh/pseh2.h> Removed: trunk/reactos/drivers/ksfilter/ks/priv.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/priv.h…
============================================================================== --- trunk/reactos/drivers/ksfilter/ks/priv.h [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/priv.h (removed) @@ -1,47 +0,0 @@ -#define _KSDDK_ - -#include <ntifs.h> -#include <portcls.h> -#include <kcom.h> -#include <pseh/pseh2.h> - -#include "ksiface.h" -#include "kstypes.h" -#include "ksfunc.h" - -#define TAG_DEVICE_HEADER 'KSDH' -#define REG_PINFLAG_B_MANY 0x4 /* strmif.h */ -#define MERIT_DO_NOT_USE 0x200000 /* dshow.h */ - -#define DEFINE_KSPROPERTY_PINPROPOSEDATAFORMAT(PinSet,\ - PropGeneral, PropInstances, PropIntersection)\ -DEFINE_KSPROPERTY_TABLE(PinSet) {\ - DEFINE_KSPROPERTY_ITEM_PIN_CINSTANCES(PropInstances),\ - DEFINE_KSPROPERTY_ITEM_PIN_CTYPES(PropGeneral),\ - DEFINE_KSPROPERTY_ITEM_PIN_DATAFLOW(PropGeneral),\ - DEFINE_KSPROPERTY_ITEM_PIN_DATARANGES(PropGeneral),\ - DEFINE_KSPROPERTY_ITEM_PIN_DATAINTERSECTION(PropIntersection),\ - DEFINE_KSPROPERTY_ITEM_PIN_INTERFACES(PropGeneral),\ - DEFINE_KSPROPERTY_ITEM_PIN_MEDIUMS(PropGeneral),\ - DEFINE_KSPROPERTY_ITEM_PIN_COMMUNICATION(PropGeneral),\ - DEFINE_KSPROPERTY_ITEM_PIN_CATEGORY(PropGeneral),\ - DEFINE_KSPROPERTY_ITEM_PIN_NAME(PropGeneral),\ - DEFINE_KSPROPERTY_ITEM_PIN_CONSTRAINEDDATARANGES(PropGeneral),\ - DEFINE_KSPROPERTY_ITEM_PIN_PROPOSEDATAFORMAT(PropGeneral)\ -} - -#define DEFINE_KSPROPERTY_CONNECTIONSET(PinSet,\ - PropStateHandler, PropDataFormatHandler, PropAllocatorFraming)\ -DEFINE_KSPROPERTY_TABLE(PinSet) {\ - DEFINE_KSPROPERTY_ITEM_CONNECTION_STATE(PropStateHandler, PropStateHandler),\ - DEFINE_KSPROPERTY_ITEM_CONNECTION_DATAFORMAT(PropDataFormatHandler, PropDataFormatHandler),\ - DEFINE_KSPROPERTY_ITEM_CONNECTION_ALLOCATORFRAMING_EX(PropAllocatorFraming)\ -} - -#define DEFINE_KSPROPERTY_STREAMSET(PinSet,\ - PropStreamAllocator, PropMasterClock, PropPipeId)\ -DEFINE_KSPROPERTY_TABLE(PinSet) {\ - DEFINE_KSPROPERTY_ITEM_STREAM_ALLOCATOR(PropStreamAllocator, PropStreamAllocator),\ - DEFINE_KSPROPERTY_ITEM_STREAM_MASTERCLOCK(PropMasterClock, PropMasterClock),\ - DEFINE_KSPROPERTY_ITEM_STREAM_PIPE_ID(PropPipeId, PropPipeId)\ -} Modified: trunk/reactos/drivers/ksfilter/ks/property.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/proper…
============================================================================== --- trunk/reactos/drivers/ksfilter/ks/property.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/property.c [iso-8859-1] Wed Jan 29 10:59:06 2014 @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */ -#include "priv.h" +#include "precomp.h" #define NDEBUG #include <debug.h> Modified: trunk/reactos/drivers/ksfilter/ks/swenum.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/swenum…
============================================================================== --- trunk/reactos/drivers/ksfilter/ks/swenum.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/swenum.c [iso-8859-1] Wed Jan 29 10:59:06 2014 @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */ -#include "priv.h" +#include "precomp.h" #include <stdio.h> #include <swenum.h> Modified: trunk/reactos/drivers/ksfilter/ks/topology.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/topolo…
============================================================================== --- trunk/reactos/drivers/ksfilter/ks/topology.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/topology.c [iso-8859-1] Wed Jan 29 10:59:06 2014 @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */ -#include "priv.h" +#include "precomp.h" #define NDEBUG #include <debug.h> Modified: trunk/reactos/drivers/ksfilter/ks/unknown.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/unknow…
============================================================================== --- trunk/reactos/drivers/ksfilter/ks/unknown.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/unknown.c [iso-8859-1] Wed Jan 29 10:59:06 2014 @@ -7,7 +7,7 @@ * KJK::Hyperion */ -#include "priv.h" +#include "precomp.h" #define NDEBUG #include <debug.h> Modified: trunk/reactos/drivers/ksfilter/ks/worker.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/worker…
============================================================================== --- trunk/reactos/drivers/ksfilter/ks/worker.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/worker.c [iso-8859-1] Wed Jan 29 10:59:06 2014 @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */ -#include "priv.h" +#include "precomp.h" #define NDEBUG #include <debug.h>
10 years, 10 months
1
0
0
0
[akhaldi] 61880: [SERMOUSE] * Do not include debug.h from within the main header. * Improve the GUIDs situation. * Remove one time inclusions from the main header and put them back where they belon...
by akhaldi@svn.reactos.org
Author: akhaldi Date: Wed Jan 29 10:56:25 2014 New Revision: 61880 URL:
http://svn.reactos.org/svn/reactos?rev=61880&view=rev
Log: [SERMOUSE] * Do not include debug.h from within the main header. * Improve the GUIDs situation. * Remove one time inclusions from the main header and put them back where they belong. CORE-7716 Modified: trunk/reactos/drivers/input/sermouse/createclose.c trunk/reactos/drivers/input/sermouse/detect.c trunk/reactos/drivers/input/sermouse/fdo.c trunk/reactos/drivers/input/sermouse/internaldevctl.c trunk/reactos/drivers/input/sermouse/misc.c trunk/reactos/drivers/input/sermouse/readmouse.c trunk/reactos/drivers/input/sermouse/sermouse.c trunk/reactos/drivers/input/sermouse/sermouse.h Modified: trunk/reactos/drivers/input/sermouse/createclose.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/sermouse/cre…
============================================================================== --- trunk/reactos/drivers/input/sermouse/createclose.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/sermouse/createclose.c [iso-8859-1] Wed Jan 29 10:56:25 2014 @@ -7,6 +7,8 @@ */ #include "sermouse.h" + +#include <debug.h> NTSTATUS NTAPI SermouseCreate( Modified: trunk/reactos/drivers/input/sermouse/detect.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/sermouse/det…
============================================================================== --- trunk/reactos/drivers/input/sermouse/detect.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/sermouse/detect.c [iso-8859-1] Wed Jan 29 10:56:25 2014 @@ -9,6 +9,9 @@ */ #include "sermouse.h" + +#include <ntifs.h> +#include <debug.h> /* Most of this file is ripped from reactos/drivers/bus/serenum/detect.c */ Modified: trunk/reactos/drivers/input/sermouse/fdo.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/sermouse/fdo…
============================================================================== --- trunk/reactos/drivers/input/sermouse/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/sermouse/fdo.c [iso-8859-1] Wed Jan 29 10:56:25 2014 @@ -7,6 +7,8 @@ */ #include "sermouse.h" + +#include <debug.h> NTSTATUS NTAPI SermouseAddDevice( Modified: trunk/reactos/drivers/input/sermouse/internaldevctl.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/sermouse/int…
============================================================================== --- trunk/reactos/drivers/input/sermouse/internaldevctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/sermouse/internaldevctl.c [iso-8859-1] Wed Jan 29 10:56:25 2014 @@ -7,6 +7,8 @@ */ #include "sermouse.h" + +#include <debug.h> NTSTATUS NTAPI SermouseInternalDeviceControl( Modified: trunk/reactos/drivers/input/sermouse/misc.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/sermouse/mis…
============================================================================== --- trunk/reactos/drivers/input/sermouse/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/sermouse/misc.c [iso-8859-1] Wed Jan 29 10:56:25 2014 @@ -7,6 +7,8 @@ */ #include "sermouse.h" + +#include <debug.h> static IO_COMPLETION_ROUTINE ForwardIrpAndWaitCompletion; Modified: trunk/reactos/drivers/input/sermouse/readmouse.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/sermouse/rea…
============================================================================== --- trunk/reactos/drivers/input/sermouse/readmouse.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/sermouse/readmouse.c [iso-8859-1] Wed Jan 29 10:56:25 2014 @@ -9,6 +9,8 @@ */ #include "sermouse.h" + +#include <debug.h> static NTSTATUS SermouseDeviceIoControl( Modified: trunk/reactos/drivers/input/sermouse/sermouse.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/sermouse/ser…
============================================================================== --- trunk/reactos/drivers/input/sermouse/sermouse.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/sermouse/sermouse.c [iso-8859-1] Wed Jan 29 10:56:25 2014 @@ -6,8 +6,9 @@ * PROGRAMMERS: Copyright 2005-2006 Hervé Poussineau (hpoussin(a)reactos.org) */ -#define INITGUID #include "sermouse.h" + +#include <debug.h> static DRIVER_UNLOAD DriverUnload; static DRIVER_DISPATCH IrpStub; Modified: trunk/reactos/drivers/input/sermouse/sermouse.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/sermouse/ser…
============================================================================== --- trunk/reactos/drivers/input/sermouse/sermouse.h [iso-8859-1] (original) +++ trunk/reactos/drivers/input/sermouse/sermouse.h [iso-8859-1] Wed Jan 29 10:56:25 2014 @@ -1,8 +1,6 @@ -#include <ntifs.h> +#include <ntddk.h> +#include <ntddser.h> #include <kbdmou.h> -#include <ntddser.h> -#include <ntddmou.h> -#include <debug.h> #define SERMOUSE_TAG 'uoMS'
10 years, 10 months
1
0
0
0
[akhaldi] 61879: [MOUCLASS] * Do not include debug.h from within the main header. * Improve the GUIDs situation. * Remove one time inclusions from the main header and put them back where they belon...
by akhaldi@svn.reactos.org
Author: akhaldi Date: Wed Jan 29 10:54:59 2014 New Revision: 61879 URL:
http://svn.reactos.org/svn/reactos?rev=61879&view=rev
Log: [MOUCLASS] * Do not include debug.h from within the main header. * Improve the GUIDs situation. * Remove one time inclusions from the main header and put them back where they belong. CORE-7716 Added: trunk/reactos/drivers/input/mouclass/guid.c (with props) Modified: trunk/reactos/drivers/input/mouclass/CMakeLists.txt trunk/reactos/drivers/input/mouclass/misc.c trunk/reactos/drivers/input/mouclass/mouclass.c trunk/reactos/drivers/input/mouclass/mouclass.h Modified: trunk/reactos/drivers/input/mouclass/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/CMa…
============================================================================== --- trunk/reactos/drivers/input/mouclass/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/input/mouclass/CMakeLists.txt [iso-8859-1] Wed Jan 29 10:54:59 2014 @@ -2,6 +2,7 @@ add_library(mouclass SHARED misc.c mouclass.c + guid.c mouclass.rc) set_module_type(mouclass kernelmodedriver) Added: trunk/reactos/drivers/input/mouclass/guid.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/gui…
============================================================================== --- trunk/reactos/drivers/input/mouclass/guid.c (added) +++ trunk/reactos/drivers/input/mouclass/guid.c [iso-8859-1] Wed Jan 29 10:54:59 2014 @@ -0,0 +1,7 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#include <ntdef.h> +#include <initguid.h> +#include <ntddmou.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/drivers/input/mouclass/guid.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/input/mouclass/misc.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/mis…
============================================================================== --- trunk/reactos/drivers/input/mouclass/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/mouclass/misc.c [iso-8859-1] Wed Jan 29 10:54:59 2014 @@ -8,6 +8,8 @@ */ #include "mouclass.h" + +#include <debug.h> static IO_COMPLETION_ROUTINE ForwardIrpAndWaitCompletion; Modified: trunk/reactos/drivers/input/mouclass/mouclass.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/mou…
============================================================================== --- trunk/reactos/drivers/input/mouclass/mouclass.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/mouclass/mouclass.c [iso-8859-1] Wed Jan 29 10:54:59 2014 @@ -7,8 +7,12 @@ * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.org) */ -#define INITGUID #include "mouclass.h" + +#include <stdio.h> +#include <kbdmou.h> +#include <pseh/pseh2.h> +#include <debug.h> static DRIVER_UNLOAD DriverUnload; static DRIVER_DISPATCH ClassCreate; Modified: trunk/reactos/drivers/input/mouclass/mouclass.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/mou…
============================================================================== --- trunk/reactos/drivers/input/mouclass/mouclass.h [iso-8859-1] (original) +++ trunk/reactos/drivers/input/mouclass/mouclass.h [iso-8859-1] Wed Jan 29 10:54:59 2014 @@ -1,10 +1,5 @@ #include <ntifs.h> -#include <kbdmou.h> -#include <ntddkbd.h> -#include <stdio.h> -#include <pseh/pseh2.h> - -#include <debug.h> +#include <ntddmou.h> #define MAX_PATH 260
10 years, 10 months
1
0
0
0
[akhaldi] 61878: [KBDCLASS] * Do not include debug.h from within the main header. * Improve the GUIDs situation. * Remove one time inclusions from the main header and put them back where they belon...
by akhaldi@svn.reactos.org
Author: akhaldi Date: Wed Jan 29 10:53:48 2014 New Revision: 61878 URL:
http://svn.reactos.org/svn/reactos?rev=61878&view=rev
Log: [KBDCLASS] * Do not include debug.h from within the main header. * Improve the GUIDs situation. * Remove one time inclusions from the main header and put them back where they belong. CORE-7716 Added: trunk/reactos/drivers/input/kbdclass/guid.c (with props) Modified: trunk/reactos/drivers/input/kbdclass/CMakeLists.txt trunk/reactos/drivers/input/kbdclass/kbdclass.c trunk/reactos/drivers/input/kbdclass/kbdclass.h trunk/reactos/drivers/input/kbdclass/misc.c Modified: trunk/reactos/drivers/input/kbdclass/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/CMa…
============================================================================== --- trunk/reactos/drivers/input/kbdclass/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/input/kbdclass/CMakeLists.txt [iso-8859-1] Wed Jan 29 10:53:48 2014 @@ -2,6 +2,7 @@ add_library(kbdclass SHARED kbdclass.c misc.c + guid.c kbdclass.rc) set_module_type(kbdclass kernelmodedriver) Added: trunk/reactos/drivers/input/kbdclass/guid.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/gui…
============================================================================== --- trunk/reactos/drivers/input/kbdclass/guid.c (added) +++ trunk/reactos/drivers/input/kbdclass/guid.c [iso-8859-1] Wed Jan 29 10:53:48 2014 @@ -0,0 +1,8 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#define STDAPICALLTYPE __stdcall +#include <wdm.h> +#include <initguid.h> +#include <kbdmou.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/drivers/input/kbdclass/guid.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd…
============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.c [iso-8859-1] Wed Jan 29 10:53:48 2014 @@ -7,8 +7,12 @@ * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.org) */ -#define INITGUID #include "kbdclass.h" + +#include <stdio.h> +#include <pseh/pseh2.h> +#include <kbdmou.h> +#include <debug.h> static DRIVER_UNLOAD DriverUnload; static DRIVER_DISPATCH ClassCreate; Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd…
============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.h [iso-8859-1] (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.h [iso-8859-1] Wed Jan 29 10:53:48 2014 @@ -1,10 +1,5 @@ #include <ntifs.h> -#include <kbdmou.h> #include <ntddkbd.h> -#include <stdio.h> -#include <pseh/pseh2.h> - -#include <debug.h> #define MAX_PATH 260 Modified: trunk/reactos/drivers/input/kbdclass/misc.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/mis…
============================================================================== --- trunk/reactos/drivers/input/kbdclass/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/kbdclass/misc.c [iso-8859-1] Wed Jan 29 10:53:48 2014 @@ -8,6 +8,8 @@ */ #include "kbdclass.h" + +#include <debug.h> static IO_COMPLETION_ROUTINE ForwardIrpAndWaitCompletion;
10 years, 10 months
1
0
0
0
[akhaldi] 61877: [I8042PRT] * Remove one time inclusions from the main header and put them back where they belong. CORE-7716
by akhaldi@svn.reactos.org
Author: akhaldi Date: Wed Jan 29 10:52:04 2014 New Revision: 61877 URL:
http://svn.reactos.org/svn/reactos?rev=61877&view=rev
Log: [I8042PRT] * Remove one time inclusions from the main header and put them back where they belong. CORE-7716 Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.h trunk/reactos/drivers/input/i8042prt/keyboard.c trunk/reactos/drivers/input/i8042prt/misc.c Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/i80…
============================================================================== --- trunk/reactos/drivers/input/i8042prt/i8042prt.h [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.h [iso-8859-1] Wed Jan 29 10:52:04 2014 @@ -4,10 +4,6 @@ #include <ntifs.h> #include <kbdmou.h> #include <ntdd8042.h> -#include <ntddkbd.h> -#include <bugcodes.h> -#include <poclass.h> -#include <kdfuncs.h> /*----------------------------------------------------- * Structures Modified: trunk/reactos/drivers/input/i8042prt/keyboard.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/key…
============================================================================== --- trunk/reactos/drivers/input/i8042prt/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/keyboard.c [iso-8859-1] Wed Jan 29 10:52:04 2014 @@ -12,6 +12,9 @@ /* INCLUDES ****************************************************************/ #include "i8042prt.h" + +#include <poclass.h> +#include <ndk/kdfuncs.h> #include <debug.h> Modified: trunk/reactos/drivers/input/i8042prt/misc.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/mis…
============================================================================== --- trunk/reactos/drivers/input/i8042prt/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/misc.c [iso-8859-1] Wed Jan 29 10:52:04 2014 @@ -13,6 +13,7 @@ #include <debug.h> /* FUNCTIONS *****************************************************************/ + static IO_COMPLETION_ROUTINE ForwardIrpAndWaitCompletion; static NTSTATUS NTAPI
10 years, 10 months
1
0
0
0
[akhaldi] 61876: [HIDCLASS] * Improve the GUIDs situation. CORE-7716
by akhaldi@svn.reactos.org
Author: akhaldi Date: Wed Jan 29 10:51:04 2014 New Revision: 61876 URL:
http://svn.reactos.org/svn/reactos?rev=61876&view=rev
Log: [HIDCLASS] * Improve the GUIDs situation. CORE-7716 Added: trunk/reactos/drivers/hid/hidclass/guid.c (with props) Modified: trunk/reactos/drivers/hid/hidclass/CMakeLists.txt trunk/reactos/drivers/hid/hidclass/precomp.h Modified: trunk/reactos/drivers/hid/hidclass/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/CMake…
============================================================================== --- trunk/reactos/drivers/hid/hidclass/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidclass/CMakeLists.txt [iso-8859-1] Wed Jan 29 10:51:04 2014 @@ -6,6 +6,7 @@ hidclass.c hidclass.rc pdo.c + guid.c ${CMAKE_CURRENT_BINARY_DIR}/hidclass.def) add_library(hidclass SHARED ${SOURCE}) Added: trunk/reactos/drivers/hid/hidclass/guid.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/guid.…
============================================================================== --- trunk/reactos/drivers/hid/hidclass/guid.c (added) +++ trunk/reactos/drivers/hid/hidclass/guid.c [iso-8859-1] Wed Jan 29 10:51:04 2014 @@ -0,0 +1,9 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#include <ntdef.h> +#include <miniport.h> +#include <initguid.h> +#include <wdmguid.h> +#include <hidclass.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/drivers/hid/hidclass/guid.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/hid/hidclass/precomp.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/preco…
============================================================================== --- trunk/reactos/drivers/hid/hidclass/precomp.h [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidclass/precomp.h [iso-8859-1] Wed Jan 29 10:51:04 2014 @@ -4,8 +4,6 @@ #include <wdm.h> #include <hidpddi.h> #include <stdio.h> - -#include <initguid.h> #include <hidport.h> #define HIDCLASS_TAG 'CdiH'
10 years, 10 months
1
0
0
0
← Newer
1
2
3
4
5
...
43
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
Results per page:
10
25
50
100
200