Ros-diffs January 2006

ros-diffs@reactos.org

23 participants
586 discussions

[cwittich] 20753: added icmp to build (does not compile yet, GvG will have a look at it)

by cwittich＠svn.reactos.org

added icmp to build (does not compile yet, GvG will have a look at it) Modified: trunk/reactos/baseaddress.xml Modified: trunk/reactos/lib/directory.xml Added: trunk/reactos/lib/icmp/icmp.xml _____ Modified: trunk/reactos/baseaddress.xml --- trunk/reactos/baseaddress.xml 2006-01-09 15:08:35 UTC (rev 20752) +++ trunk/reactos/baseaddress.xml 2006-01-09 16:01:46 UTC (rev 20753) @@ -56,6 +56,7 @@ <property name="BASEADDRESS_AVIFIL32" value="0x73ac0000" /> <property name="BASEADDRESS_LZ32" value="0x73d80000" /> <property name="BASEADDRESS_COREDLL" value="0x73d80000" /> +<property name="BASEADDRESS_ICMP" value="0x741F0000" /> <property name="BASEADDRESS_USERENV" value="0x74850000" /> <property name="BASEADDRESS_SYSSETUP" value="0x74a30000" /> <property name="BASEADDRESS_OLEDLG" value="0x74d00000" /> _____ Modified: trunk/reactos/lib/directory.xml --- trunk/reactos/lib/directory.xml 2006-01-09 15:08:35 UTC (rev 20752) +++ trunk/reactos/lib/directory.xml 2006-01-09 16:01:46 UTC (rev 20753) @@ -116,6 +116,9 @@ <directory name="hid"> <xi:include href="hid/hid.xml" /> </directory> +<directory name="icmp"> + <xi:include href="icmp/icmp.xml" /> +</directory> <directory name="imagehlp"> <xi:include href="imagehlp/imagehlp.xml" /> </directory> _____ Added: trunk/reactos/lib/icmp/icmp.xml --- trunk/reactos/lib/icmp/icmp.xml 2006-01-09 15:08:35 UTC (rev 20752) +++ trunk/reactos/lib/icmp/icmp.xml 2006-01-09 16:01:46 UTC (rev 20753) @@ -0,0 +1,14 @@ +<module name="icmp" type="win32dll" baseaddress="${BASEADDRESS_ICMP}" installbase="system32" installname="icmp.dll"> + <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> + <importlibrary definition="icmp.spec.def" /> + <include base="icmp">.</include> + <include base="ReactOS">include/wine</include> + <define name="__USE_W32API" /> + <define name="_WIN32_WINNT">0x501</define> + <library>kernel32</library> + <library>ws2_32</library> + <library>wine</library> + <file>icmp_main.c</file> + <file>icmp.rc</file> + <file>icmp.spec</file> +</module>

18 years, 8 months

[cwittich] 20752: added some stubs (Photoshop CS seems to work now)

by cwittich＠svn.reactos.org

added some stubs (Photoshop CS seems to work now) Modified: trunk/reactos/lib/secur32/secur32.def Modified: trunk/reactos/lib/secur32/sspi.c _____ Modified: trunk/reactos/lib/secur32/secur32.def --- trunk/reactos/lib/secur32/secur32.def 2006-01-09 13:51:37 UTC (rev 20751) +++ trunk/reactos/lib/secur32/secur32.def 2006-01-09 15:08:35 UTC (rev 20752) @@ -8,7 +8,7 @@ LsaFreeReturnBuffer@4 LsaCallAuthenticationPackage@28 ;AcceptSecurityContext@36 -;AcquireCredentialsHandleA@36 +AcquireCredentialsHandleA@36 ;AcquireCredentialsHandleW@36 ;@AddCredentialsA ;@AddCredentialsW @@ -39,7 +39,7 @@ ;@ImportSecurityContextW ;@InitSecurityInterfaceA ;@InitSecurityInterfaceW -;InitializeSecurityContextA@48 +InitializeSecurityContextA@48 ;InitializeSecurityContextW@48 LsaEnumerateLogonSessions@8 LsaGetLogonSessionData@8 _____ Modified: trunk/reactos/lib/secur32/sspi.c --- trunk/reactos/lib/secur32/sspi.c 2006-01-09 13:51:37 UTC (rev 20751) +++ trunk/reactos/lib/secur32/sspi.c 2006-01-09 15:08:35 UTC (rev 20752) @@ -35,3 +35,42 @@ DPRINT1("%s() not implemented!\n", __FUNCTION__); return ERROR_CALL_NOT_IMPLEMENTED; } + +SECURITY_STATUS +WINAPI +AcquireCredentialsHandleA ( + SEC_CHAR* pszPrincipal, + SEC_CHAR* pszPackage, + ULONG fUsage, + PLUID pID, + PVOID pAuth, + SEC_GET_KEY_FN pGetKeyFn, + PVOID pvGetKeyArgument, + PCredHandle phCred, + PTimeStamp pExpires + ) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +SECURITY_STATUS +WINAPI +InitializeSecurityContextA ( + PCredHandle phCred, + PCtxtHandle phContext, + SEC_CHAR* pszTarget, + ULONG fContextReq, + ULONG Reserved, + ULONG TargetData, + PSecBufferDesc pInput, + ULONG Reserved2, + PCtxtHandle phNewContext, + PSecBufferDesc pOut, + PULONG pfContextAttributes, + PTimeStamp pExpires + ) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +}

18 years, 8 months

[royce] 20751: synchronize differences between numberf, wnumberf, numberfl and wnumberfl, fixed bug in all 4 such that ("%6.1f", 42) was yielding " 42.0" instead of " 42.0"

by royce＠svn.reactos.org

synchronize differences between numberf, wnumberf, numberfl and wnumberfl, fixed bug in all 4 such that ("%6.1f", 42) was yielding " 42.0" instead of " 42.0" Modified: trunk/reactos/tools/ssprintf.cpp _____ Modified: trunk/reactos/tools/ssprintf.cpp --- trunk/reactos/tools/ssprintf.cpp 2006-01-09 11:24:09 UTC (rev 20750) +++ trunk/reactos/tools/ssprintf.cpp 2006-01-09 13:51:37 UTC (rev 20751) @@ -295,17 +295,13 @@ double e; long ie; - //int x; - char *buf, *tmp; int i = 0; int j = 0; - //int k = 0; + int ro = 0; double frac, intr; double p; - char sign; - char c; - char ro = 0; + char *buf, *tmp, sign, c; int result; union @@ -316,12 +312,14 @@ n.__n = &__n; - if ( exp_sign == 'g' || exp_sign == 'G' || exp_sign == 'e' || exp_sign == 'E' ) { + if ( exp_sign == 'g' || exp_sign == 'G' || exp_sign == 'e' || exp_sign == 'E' ) + { ie = ((unsigned int)n.n->exponent - (unsigned int)0x3ff); exponent = ie/3.321928; } - if ( exp_sign == 'g' || exp_sign == 'G' ) { + if ( exp_sign == 'g' || exp_sign == 'G' ) + { type |= ZEROTRUNC; if ( exponent < -4 || fabs(exponent) >= precision ) exp_sign -= 2; // g -> e and G -> E @@ -329,7 +327,8 @@ exp_sign = 'f'; } - if ( exp_sign == 'e' || exp_sign == 'E' ) { + if ( exp_sign == 'e' || exp_sign == 'E' ) + { frac = modf(exponent,&e); if ( frac > 0.5 ) e++; @@ -352,23 +351,29 @@ return true; } - if ( exp_sign == 'f' ) { + if ( exp_sign == 'f' ) + { buf = (char*)alloca(4096); - if (type & LEFT) { + if (type & LEFT) type &= ~ZEROPAD; - } c = (type & ZEROPAD) ? '0' : ' '; sign = 0; - if (type & SIGN) { - if (__n < 0) { + if (type & SIGN) + { + if (__n < 0) + { sign = '-'; __n = fabs(__n); size--; - } else if (type & PLUS) { + } + else if (type & PLUS) + { sign = '+'; size--; - } else if (type & SPACE) { + } + else if (type & SPACE) + { sign = ' '; size--; } @@ -377,11 +382,11 @@ frac = modf(__n,&intr); // # flags forces a . and prevents trucation of trailing zero's - - if ( precision > 0 ) { - //frac = modfl(__n,&intr); + if ( precision > 0 ) + { i = precision-1; - while ( i >= 0 ) { + while ( i >= 0 ) + { frac*=10.0L; frac = modf(frac, &p); buf[i] = (int)p + '0'; @@ -391,23 +396,26 @@ size -= precision; ro = 0; - if ( frac > 0.5 ) { + if ( frac > 0.5 ) ro = 1; - } - if ( precision >= 1 || type & SPECIAL) { + if ( precision >= 1 || type & SPECIAL) + { buf[i++] = '.'; size--; } } - if ( intr == 0.0 ) { + if ( intr == 0.0 ) + { buf[i++] = '0'; size--; } - else { - while ( intr > 0.0 ) { - p = intr; + else + { + while ( intr > 0.0 ) + { + p = intr; intr/=10.0L; modf(intr, &intr); @@ -419,12 +427,15 @@ } j = 0; - while ( j = '0' && buf[j] <= '8' ) { + while ( j = '0' && buf[j] <= '8' ) + { buf[j]++; ro = 0; } - else if ( buf[j] == '9' ) { + else if ( buf[j] == '9' ) + { buf[j] = '0'; } j++; @@ -434,7 +445,6 @@ buf[i] = 0; - size -= precision; if (!(type&(ZEROPAD+LEFT))) { while(size-->0) @@ -446,18 +456,16 @@ } if (!(type&(ZEROPAD+LEFT))) + { while(size-->0) - { f += ' '; - } - if (type & SPECIAL) { } if (!(type & LEFT)) + { while (size-- > 0) - { f += c; - } + } tmp = buf; if ( type & ZEROTRUNC && ((type & SPECIAL) != SPECIAL) ) @@ -469,9 +477,6 @@ i--; } } -// else -// while (i < precision--) -// putc('0', f); while (i-- > 0) { f += tmp[i]; @@ -493,10 +498,11 @@ int i = 0; int j = 0; + int ro = 0; double frac, intr; double p; - wchar_t *buf, *tmp, sign, c, ro = 0; + wchar_t *buf, *tmp, sign, c; int result; union @@ -507,7 +513,8 @@ n.__n = &__n; - if ( exp_sign == L'g' || exp_sign == L'G' || exp_sign == L'e' || exp_sign == L'E' ) { + if ( exp_sign == L'g' || exp_sign == L'G' || exp_sign == L'e' || exp_sign == L'E' ) + { ie = ((unsigned int)n.n->exponent - (unsigned int)0x3ff); exponent = ie/3.321928; } @@ -576,11 +583,11 @@ frac = modf(__n,&intr); // # flags forces a . and prevents trucation of trailing zero's - - if ( precision > 0 ) { - //frac = modfl(__n,&intr); + if ( precision > 0 ) + { i = precision-1; - while ( i >= 0 ) { + while ( i >= 0 ) + { frac*=10.0L; frac = modf(frac, &p); buf[i] = (int)p + L'0'; @@ -590,22 +597,25 @@ size -= precision; ro = 0; - if ( frac > 0.5 ) { + if ( frac > 0.5 ) ro = 1; - } - if ( precision >= 1 || type & SPECIAL) { + if ( precision >= 1 || type & SPECIAL) + { buf[i++] = L'.'; size--; } } - if ( intr == 0.0 ) { + if ( intr == 0.0 ) + { buf[i++] = L'0'; size--; } - else { - while ( intr > 0.0 ) { + else + { + while ( intr > 0.0 ) + { p = intr; intr/=10.0L; modf(intr, &intr); @@ -618,12 +628,15 @@ } j = 0; - while ( j = L'0' && buf[j] <= L'8' ) { + while ( j = L'0' && buf[j] <= L'8' ) + { buf[j]++; ro = 0; } - else if ( buf[j] == L'9' ) { + else if ( buf[j] == L'9' ) + { buf[j] = L'0'; } j++; @@ -633,7 +646,6 @@ buf[i] = 0; - size -= precision; if (!(type&(ZEROPAD+LEFT))) { while(size-->0) @@ -645,18 +657,16 @@ } if (!(type&(ZEROPAD+LEFT))) + { while(size-->0) - { f += L' '; - } - if (type & SPECIAL) { } if (!(type & LEFT)) + { while (size-- > 0) - { f += c; - } + } tmp = buf; if ( type & ZEROTRUNC && ((type & SPECIAL) != SPECIAL) ) @@ -687,34 +697,31 @@ long double e; long ie; - //int x; - char *buf, *tmp; int i = 0; int j = 0; - //int k = 0; + int ro = 0; long double frac, intr; long double p; - char sign; - char c; - char ro = 0; - + char *buf, *tmp, sign, c; int result; union { - long double* __n; - ieee_long_double_t* n; + long double* __n; + ieee_long_double_t* n; } n; n.__n = &__n; - if ( exp_sign == 'g' || exp_sign == 'G' || exp_sign == 'e' || exp_sign == 'E' ) { + if ( exp_sign == 'g' || exp_sign == 'G' || exp_sign == 'e' || exp_sign == 'E' ) + { ie = ((unsigned int)n.n->exponent - (unsigned int)0x3fff); exponent = ie/3.321928; } - if ( exp_sign == 'g' || exp_sign == 'G' ) { + if ( exp_sign == 'g' || exp_sign == 'G' ) + { type |= ZEROTRUNC; if ( exponent < -4 || fabs(exponent) >= precision ) exp_sign -= 2; // g -> e and G -> E @@ -722,11 +729,12 @@ exp_sign = 'f'; } - if ( exp_sign == 'e' || exp_sign == 'E' ) { + if ( exp_sign == 'e' || exp_sign == 'E' ) + { frac = modfl(exponent,&e); if ( frac > 0.5 ) e++; - else if ( frac < -0.5 ) + else if ( frac < -0.5 ) e--; result = numberf(f,__n/powl(10.0L,e),'f',size-4, precision, type); @@ -747,12 +755,9 @@ if ( exp_sign == 'f' ) { - buf = (char*)alloca(4096); if (type & LEFT) - { type &= ~ZEROPAD; - } c = (type & ZEROPAD) ? '0' : ' '; sign = 0; @@ -763,11 +768,13 @@ sign = '-'; __n = fabs(__n); size--; - } else if (type & PLUS) + } + else if (type & PLUS) { sign = '+'; size--; - } else if (type & SPACE) + } + else if (type & SPACE) { sign = ' '; size--; @@ -779,8 +786,6 @@ // # flags forces a . and prevents trucation of trailing zero's if ( precision > 0 ) { - //frac = modfl(__n,&intr); - i = precision-1; while ( i >= 0 ) { @@ -794,9 +799,7 @@ ro = 0; if ( frac > 0.5 ) - { ro = 1; - } if ( precision >= 1 || type & SPECIAL) { @@ -814,7 +817,7 @@ { while ( intr > 0.0 ) { - p=intr; + p = intr; intr/=10.0L; modfl(intr, &intr); @@ -826,7 +829,8 @@ } j = 0; - while ( j = '0' && buf[j] <= '8' ) { buf[j]++; @@ -843,7 +847,6 @@ buf[i] = 0; - size -= precision; if (!(type&(ZEROPAD+LEFT))) { while(size-->0) @@ -859,14 +862,13 @@ while(size-->0) f += ' '; } - if (type & SPECIAL) { - } if (!(type & LEFT)) + { while (size-- > 0) - { f += c; - } + } + tmp = buf; if ( type & ZEROTRUNC && ((type & SPECIAL) != SPECIAL) ) { @@ -896,29 +898,31 @@ long double e; long ie; - wchar_t *buf, *tmp, sign, c, ro = 0; int i = 0; int j = 0; + int ro = 0; long double frac, intr; long double p; - + wchar_t *buf, *tmp, sign, c; int result; union { - long double* __n; - ieee_long_double_t* n; + long double* __n; + ieee_long_double_t* n; } n; n.__n = &__n; - if ( exp_sign == L'g' || exp_sign == L'G' || exp_sign == L'e' || exp_sign == L'E' ) { + if ( exp_sign == L'g' || exp_sign == L'G' || exp_sign == L'e' || exp_sign == L'E' ) + { ie = ((unsigned int)n.n->exponent - (unsigned int)0x3fff); exponent = ie/3.321928; } - if ( exp_sign == L'g' || exp_sign == L'G' ) { + if ( exp_sign == L'g' || exp_sign == L'G' ) + { type |= ZEROTRUNC; if ( exponent < -4 || fabs(exponent) >= precision ) exp_sign -= 2; // g -> e and G -> E @@ -926,11 +930,12 @@ exp_sign = 'f'; } - if ( exp_sign == L'e' || exp_sign == L'E' ) { + if ( exp_sign == L'e' || exp_sign == L'E' ) + { frac = modfl(exponent,&e); if ( frac > 0.5 ) e++; - else if ( frac < -0.5 ) + else if ( frac < -0.5 ) e--; result = wnumberf(f,__n/powl(10.0L,e),L'f',size-4, precision, type); @@ -951,12 +956,9 @@ if ( exp_sign == L'f' ) { - buf = (wchar_t*)alloca(4096*sizeof(wchar_t)); if (type & LEFT) - { type &= ~ZEROPAD; - } c = (type & ZEROPAD) ? L'0' : L' '; sign = 0; @@ -967,11 +969,13 @@ sign = L'-'; __n = fabs(__n); size--; - } else if (type & PLUS) + } + else if (type & PLUS) { sign = L'+'; size--; - } else if (type & SPACE) + } + else if (type & SPACE) { sign = L' '; size--; @@ -983,8 +987,6 @@ // # flags forces a . and prevents trucation of trailing zero's if ( precision > 0 ) { - //frac = modfl(__n,&intr); - i = precision-1; while ( i >= 0 ) { @@ -998,9 +1000,7 @@ ro = 0; if ( frac > 0.5 ) - { ro = 1; - } if ( precision >= 1 || type & SPECIAL) { @@ -1018,7 +1018,7 @@ { while ( intr > 0.0 ) { - p=intr; + p = intr; intr/=10.0L; modfl(intr, &intr); @@ -1030,7 +1030,8 @@ } j = 0; - while ( j = L'0' && buf[j] <= L'8' ) { buf[j]++; @@ -1047,7 +1048,6 @@ buf[i] = 0; - size -= precision; if (!(type&(ZEROPAD+LEFT))) { while(size-->0) @@ -1063,14 +1063,13 @@ while(size-->0) f += L' '; } - if (type & SPECIAL) { - } if (!(type & LEFT)) + { while (size-- > 0) - { f += c; - } + } + tmp = buf; if ( type & ZEROTRUNC && ((type & SPECIAL) != SPECIAL) ) {

18 years, 8 months

[fireball] 20750: Fix module struct initialization in usbmouse, and make some visual changes to the same place in usbkeyboard.

by fireball＠svn.reactos.org

Fix module struct initialization in usbmouse, and make some visual changes to the same place in usbkeyboard. Modified: branches/usb2_6/reactos/drivers/usb/usbport/core_drivers/usbkey.c Modified: branches/usb2_6/reactos/drivers/usb/usbport/core_drivers/usbmouse.c _____ Modified: branches/usb2_6/reactos/drivers/usb/usbport/core_drivers/usbkey.c --- branches/usb2_6/reactos/drivers/usb/usbport/core_drivers/usbkey.c 2006-01-09 11:14:26 UTC (rev 20749) +++ branches/usb2_6/reactos/drivers/usb/usbport/core_drivers/usbkey.c 2006-01-09 11:24:09 UTC (rev 20750) @@ -212,21 +212,14 @@ static struct usb_driver usb_kbd_driver = { - THIS_MODULE, - "keyboard", - usb_kbd_probe, - usb_kbd_disconnect, - NULL, - NULL, - NULL, - usb_kbd_id_table, -/* - .owner = THIS_MODULE, - .name = "keyboard", - .probe = usb_kbd_probe, - .disconnect = usb_kbd_disconnect, - .id_table = usb_kbd_id_table, -*/ + /*.owner =*/ THIS_MODULE, + /*.name =*/ "keyboard", + /*.probe =*/ usb_kbd_probe, + /*.disconnect =*/ usb_kbd_disconnect, + /*.ioctl =*/ NULL, + /*.suspend =*/ NULL, + /*.resume =*/ NULL, + /*.id_table =*/ usb_kbd_id_table }; void UsbKeyBoardInit(void) _____ Modified: branches/usb2_6/reactos/drivers/usb/usbport/core_drivers/usbmouse.c --- branches/usb2_6/reactos/drivers/usb/usbport/core_drivers/usbmouse.c 2006-01-09 11:14:26 UTC (rev 20749) +++ branches/usb2_6/reactos/drivers/usb/usbport/core_drivers/usbmouse.c 2006-01-09 11:24:09 UTC (rev 20750) @@ -257,18 +257,14 @@ MODULE_DEVICE_TABLE (usb, usb_mouse_id_table); static struct usb_driver usb_mouse_driver = { - THIS_MODULE, - "usbmouse", - usb_mouse_probe, - usb_mouse_disconnect, - usb_mouse_id_table -/* - .owner = THIS_MODULE, - .name = "usbmouse", - .probe = usb_mouse_probe, - .disconnect = usb_mouse_disconnect, - .id_table = usb_mouse_id_table, -*/ + /*.owner =*/ THIS_MODULE, + /*.name =*/ "usbmouse", + /*.probe =*/ usb_mouse_probe, + /*.disconnect =*/ usb_mouse_disconnect, + /*.ioctl =*/ NULL, + /*.suspend =*/ NULL, + /*.resume =*/ NULL, + /*.id_table =*/ usb_mouse_id_table };

18 years, 8 months

[weiden] 20749: fixed growing the buffer

by weiden＠svn.reactos.org

fixed growing the buffer Modified: trunk/reactos/lib/userenv/misc.c _____ Modified: trunk/reactos/lib/userenv/misc.c --- trunk/reactos/lib/userenv/misc.c 2006-01-09 09:42:25 UTC (rev 20748) +++ trunk/reactos/lib/userenv/misc.c 2006-01-09 11:14:26 UTC (rev 20749) @@ -51,12 +51,12 @@ GetUserSidFromToken (HANDLE hToken, PUNICODE_STRING SidString) { - PSID_AND_ATTRIBUTES SidBuffer; + PSID_AND_ATTRIBUTES SidBuffer, nsb; ULONG Length; NTSTATUS Status; Length = 256; - SidBuffer = LocalAlloc (0, + SidBuffer = LocalAlloc (LMEM_FIXED, Length); if (SidBuffer == NULL) return FALSE; @@ -68,12 +68,16 @@ &Length); if (Status == STATUS_BUFFER_TOO_SMALL) { - SidBuffer = LocalReAlloc (SidBuffer, - Length, - 0); - if (SidBuffer == NULL) - return FALSE; + nsb = LocalReAlloc (SidBuffer, + Length, + LMEM_MOVEABLE); + if (nsb == NULL) + { + LocalFree((HLOCAL)SidBuffer); + return FALSE; + } + SidBuffer = nsb; Status = NtQueryInformationToken (hToken, TokenUser, (PVOID)SidBuffer, @@ -83,7 +87,7 @@ if (!NT_SUCCESS (Status)) { - LocalFree (SidBuffer); + LocalFree ((HLOCAL)SidBuffer); return FALSE; } @@ -93,7 +97,7 @@ SidBuffer[0].Sid, TRUE); - LocalFree (SidBuffer); + LocalFree ((HLOCAL)SidBuffer); if (!NT_SUCCESS (Status)) return FALSE;

18 years, 8 months

[ion] 20748: - Rename some files for MSVC compatibility. Thanks Brezenbak.

by ion＠svn.reactos.org

- Rename some files for MSVC compatibility. Thanks Brezenbak. Deleted: trunk/reactos/subsys/win32k/eng/brush.c Added: trunk/reactos/subsys/win32k/eng/engbrush.c Added: trunk/reactos/subsys/win32k/eng/engmisc.c Added: trunk/reactos/subsys/win32k/eng/engwindow.c Deleted: trunk/reactos/subsys/win32k/eng/misc.c Deleted: trunk/reactos/subsys/win32k/eng/window.c Added: trunk/reactos/subsys/win32k/misc/err.c Deleted: trunk/reactos/subsys/win32k/misc/error.c Added: trunk/reactos/subsys/win32k/ntuser/ntstubs.c Deleted: trunk/reactos/subsys/win32k/ntuser/stubs.c Deleted: trunk/reactos/subsys/win32k/objects/dib.c Added: trunk/reactos/subsys/win32k/objects/dibobj.c Deleted: trunk/reactos/subsys/win32k/objects/paint.c Added: trunk/reactos/subsys/win32k/objects/paintobj.c Deleted: trunk/reactos/subsys/win32k/objects/palette.c Added: trunk/reactos/subsys/win32k/objects/palobj.c Modified: trunk/reactos/subsys/win32k/win32k.xml _____ Deleted: trunk/reactos/subsys/win32k/eng/brush.c --- trunk/reactos/subsys/win32k/eng/brush.c 2006-01-09 00:41:48 UTC (rev 20747) +++ trunk/reactos/subsys/win32k/eng/brush.c 2006-01-09 09:42:25 UTC (rev 20748) @@ -1,64 +0,0 @@ -/* - * ReactOS W32 Subsystem - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: GDI Driver Brush Functions - * FILE: subsys/win32k/eng/brush.c - * PROGRAMER: Jason Filby - * REVISION HISTORY: - * 3/7/1999: Created - */ - -#include <w32k.h> - -#define NDEBUG -#include <debug.h> - -/* - * @implemented - */ -PVOID STDCALL -BRUSHOBJ_pvAllocRbrush(IN BRUSHOBJ *BrushObj, - IN ULONG ObjSize) -{ - BrushObj->pvRbrush=EngAllocMem(0, ObjSize, 0); - return(BrushObj->pvRbrush); -} - -/* - * @implemented - */ -PVOID STDCALL -BRUSHOBJ_pvGetRbrush(IN BRUSHOBJ *BrushObj) -{ - return(BrushObj->pvRbrush); -} - -/* - * @implemented - */ -ULONG STDCALL -BRUSHOBJ_ulGetBrushColor(IN BRUSHOBJ *BrushObj) -{ - return BrushObj->iSolidColor; -} - -/* EOF */ _____ Copied: trunk/reactos/subsys/win32k/eng/engbrush.c (from rev 20743, trunk/reactos/subsys/win32k/eng/brush.c) _____ Copied: trunk/reactos/subsys/win32k/eng/engmisc.c (from rev 20743, trunk/reactos/subsys/win32k/eng/misc.c) _____ Copied: trunk/reactos/subsys/win32k/eng/engwindow.c (from rev 20743, trunk/reactos/subsys/win32k/eng/window.c) _____ Deleted: trunk/reactos/subsys/win32k/eng/misc.c --- trunk/reactos/subsys/win32k/eng/misc.c 2006-01-09 00:41:48 UTC (rev 20747) +++ trunk/reactos/subsys/win32k/eng/misc.c 2006-01-09 09:42:25 UTC (rev 20748) @@ -1,236 +0,0 @@ -/* - * ReactOS W32 Subsystem - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* $Id$ */ - -#include <w32k.h> - -#define NDEBUG -#include <debug.h> - -BOOL STDCALL -IntEngEnter(PINTENG_ENTER_LEAVE EnterLeave, - SURFOBJ *DestObj, - RECTL *DestRect, - BOOL ReadOnly, - POINTL *Translate, - SURFOBJ **OutputObj) -{ - LONG Exchange; - SIZEL BitmapSize; - POINTL SrcPoint; - LONG Width; - RECTL ClippedDestRect; - - /* Normalize */ - if (DestRect->right < DestRect->left) - { - Exchange = DestRect->left; - DestRect->left = DestRect->right; - DestRect->right = Exchange; - } - if (DestRect->bottom < DestRect->top) - { - Exchange = DestRect->top; - DestRect->top = DestRect->bottom; - DestRect->bottom = Exchange; - } - - if (NULL != DestObj && STYPE_BITMAP != DestObj->iType && - (NULL == DestObj->pvScan0 || 0 == DestObj->lDelta)) - { - /* Driver needs to support DrvCopyBits, else we can't do anything */ - /* FIXME: Remove typecast! */ - if (!(((BITMAPOBJ*)DestObj)->flHooks & HOOK_COPYBITS)) - { - return FALSE; - } - - /* Allocate a temporary bitmap */ - BitmapSize.cx = DestRect->right - DestRect->left; - BitmapSize.cy = DestRect->bottom - DestRect->top; - Width = DIB_GetDIBWidthBytes(BitmapSize.cx, BitsPerFormat(DestObj->iBitmapFormat)); - EnterLeave->OutputBitmap = EngCreateBitmap(BitmapSize, Width, - DestObj->iBitmapFormat, - BMF_TOPDOWN | BMF_NOZEROINIT, NULL); - *OutputObj = EngLockSurface((HSURF)EnterLeave->OutputBitmap); - - EnterLeave->DestRect.left = 0; - EnterLeave->DestRect.top = 0; - EnterLeave->DestRect.right = BitmapSize.cx; - EnterLeave->DestRect.bottom = BitmapSize.cy; - SrcPoint.x = DestRect->left; - SrcPoint.y = DestRect->top; - ClippedDestRect = EnterLeave->DestRect; - if (SrcPoint.x < 0) - { - ClippedDestRect.left -= SrcPoint.x; - SrcPoint.x = 0; - } - if (DestObj->sizlBitmap.cx < SrcPoint.x + ClippedDestRect.right - ClippedDestRect.left) - { - ClippedDestRect.right = ClippedDestRect.left + DestObj->sizlBitmap.cx - SrcPoint.x; - } - if (SrcPoint.y < 0) - { - ClippedDestRect.top -= SrcPoint.y; - SrcPoint.y = 0; - } - if (DestObj->sizlBitmap.cy < SrcPoint.y + ClippedDestRect.bottom - ClippedDestRect.top) - { - ClippedDestRect.bottom = ClippedDestRect.top + DestObj->sizlBitmap.cy - SrcPoint.y; - } - EnterLeave->TrivialClipObj = EngCreateClip(); - EnterLeave->TrivialClipObj->iDComplexity = DC_TRIVIAL; - if (ClippedDestRect.left < (*OutputObj)->sizlBitmap.cx && - 0 <= ClippedDestRect.right && - SrcPoint.x < DestObj->sizlBitmap.cx && - ClippedDestRect.top <= (*OutputObj)->sizlBitmap.cy && - 0 <= ClippedDestRect.bottom && - SrcPoint.y < DestObj->sizlBitmap.cy && - ! GDIDEVFUNCS(DestObj).CopyBits( - *OutputObj, DestObj, - EnterLeave->TrivialClipObj, NULL, - &ClippedDestRect, &SrcPoint)) - { - EngDeleteClip(EnterLeave->TrivialClipObj); - EngFreeMem((*OutputObj)->pvBits); - EngUnlockSurface(*OutputObj); - EngDeleteSurface((HSURF)EnterLeave->OutputBitmap); - return FALSE; - } - EnterLeave->DestRect.left = DestRect->left; - EnterLeave->DestRect.top = DestRect->top; - EnterLeave->DestRect.right = DestRect->right; - EnterLeave->DestRect.bottom = DestRect->bottom; - Translate->x = - DestRect->left; - Translate->y = - DestRect->top; - } - else - { - Translate->x = 0; - Translate->y = 0; - *OutputObj = DestObj; - } - - if (NULL != *OutputObj - && 0 != (((BITMAPOBJ*) *OutputObj)->flHooks & HOOK_SYNCHRONIZE)) - { - if (NULL != GDIDEVFUNCS(*OutputObj).SynchronizeSurface) - { - GDIDEVFUNCS(*OutputObj).SynchronizeSurface(*OutputObj, DestRect, 0); - } - else if (STYPE_BITMAP == (*OutputObj)->iType - && NULL != GDIDEVFUNCS(*OutputObj).Synchronize) - { - GDIDEVFUNCS(*OutputObj).Synchronize((*OutputObj)->dhpdev, DestRect); - } - } - - EnterLeave->DestObj = DestObj; - EnterLeave->OutputObj = *OutputObj; - EnterLeave->ReadOnly = ReadOnly; - - return TRUE; -} - -BOOL STDCALL -IntEngLeave(PINTENG_ENTER_LEAVE EnterLeave) -{ - POINTL SrcPoint; - BOOL Result = TRUE; - - if (EnterLeave->OutputObj != EnterLeave->DestObj && NULL != EnterLeave->OutputObj) - { - if (! EnterLeave->ReadOnly) - { - SrcPoint.x = 0; - SrcPoint.y = 0; - if (EnterLeave->DestRect.left < 0) - { - SrcPoint.x = - EnterLeave->DestRect.left; - EnterLeave->DestRect.left = 0; - } - if (EnterLeave->DestObj->sizlBitmap.cx < EnterLeave->DestRect.right) - { - EnterLeave->DestRect.right = EnterLeave->DestObj->sizlBitmap.cx; - } - if (EnterLeave->DestRect.top < 0) - { - SrcPoint.y = - EnterLeave->DestRect.top; - EnterLeave->DestRect.top = 0; - } - if (EnterLeave->DestObj->sizlBitmap.cy < EnterLeave->DestRect.bottom) - { - EnterLeave->DestRect.bottom = EnterLeave->DestObj->sizlBitmap.cy; - } - if (SrcPoint.x < EnterLeave->OutputObj->sizlBitmap.cx && - EnterLeave->DestRect.left <= EnterLeave->DestRect.right && - EnterLeave->DestRect.left < EnterLeave->DestObj->sizlBitmap.cx && - SrcPoint.y < EnterLeave->OutputObj->sizlBitmap.cy && - EnterLeave->DestRect.top <= EnterLeave->DestRect.bottom && - EnterLeave->DestRect.top < EnterLeave->DestObj->sizlBitmap.cy) - { - Result = GDIDEVFUNCS(EnterLeave->DestObj).CopyBits( - EnterLeave->DestObj, - EnterLeave->OutputObj, - EnterLeave->TrivialClipObj, NULL, - &EnterLeave->DestRect, &SrcPoint); - } - else - { - Result = TRUE; - } - } - EngFreeMem(EnterLeave->OutputObj->pvBits); - EngUnlockSurface(EnterLeave->OutputObj); - EngDeleteSurface((HSURF)EnterLeave->OutputBitmap); - EngDeleteClip(EnterLeave->TrivialClipObj); - } - else - { - Result = TRUE; - } - - return Result; -} - -HANDLE STDCALL -EngGetCurrentProcessId(VOID) -{ - /* http://www.osr.com/ddk/graphics/gdifncs_5ovb.htm */ - return PsGetCurrentProcessId(); -} - -HANDLE STDCALL -EngGetCurrentThreadId(VOID) -{ - /* http://www.osr.com/ddk/graphics/gdifncs_25rb.htm */ - return PsGetCurrentThreadId(); -} - -HANDLE STDCALL -EngGetProcessHandle(VOID) -{ - /* http://www.osr.com/ddk/graphics/gdifncs_3tif.htm - In Windows 2000 and later, the EngGetProcessHandle function always returns NULL. - FIXME - what does NT4 return? */ - return NULL; -} - -/* EOF */ _____ Deleted: trunk/reactos/subsys/win32k/eng/window.c --- trunk/reactos/subsys/win32k/eng/window.c 2006-01-09 00:41:48 UTC (rev 20747) +++ trunk/reactos/subsys/win32k/eng/window.c 2006-01-09 09:42:25 UTC (rev 20748) @@ -1,391 +0,0 @@ -/* - * ReactOS W32 Subsystem - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: GDI WNDOBJ Functions - * FILE: subsys/win32k/eng/window.c - * PROGRAMER: Gregor Anich - * REVISION HISTORY: - * 16/11/2004: Created - */ - -/* TODO: Check how the WNDOBJ implementation should behave with a driver on windows. */ - -#include <w32k.h> - -#define NDEBUG -#include <debug.h> - -/* - * Calls the WNDOBJCHANGEPROC of the given WNDOBJ - */ -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%x), Changed = 0x%x\n", - WndObjInt->ChangeProc, flChanged); - WndObjInt->ChangeProc(pwo, flChanged); -} - -/* - * Fills the CLIPOBJ and client rect of the WNDOBJ with the data from the given WINDOW_OBJECT - */ -BOOLEAN -FASTCALL -IntEngWndUpdateClipObj( - WNDGDI *WndObjInt, - PWINDOW_OBJECT Window) -{ - HRGN hVisRgn; - PROSRGNDATA visRgn; - CLIPOBJ *ClipObj = NULL; - CLIPOBJ *OldClipObj; - - hVisRgn = VIS_ComputeVisibleRegion(Window, TRUE, TRUE, TRUE); - if (hVisRgn != NULL) - { - NtGdiOffsetRgn(hVisRgn, Window->ClientRect.left, Window->ClientRect.top); - visRgn = RGNDATA_LockRgn(hVisRgn); - if (visRgn != NULL) - { - if (visRgn->rdh.nCount > 0) - { - ClipObj = IntEngCreateClipRegion(visRgn->rdh.nCount, (PRECTL)visRgn->Buffer, - (PRECTL)&visRgn->rdh.rcBound); - DPRINT("Created visible region with %d 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); - { - INT i; - for (i = 0; i < visRgn->rdh.nCount; i++) - { - DPRINT(" Rect #%d: %d,%d %d,%d\n", i+1, - visRgn->Buffer[i].left, visRgn->Buffer[i].top, - visRgn->Buffer[i].right, visRgn->Buffer[i].bottom); - } - } - } - RGNDATA_UnlockRgn(visRgn); - } - else - { - DPRINT1("Warning: Couldn't lock visible region of window DC\n"); - } - } - else - { - DPRINT1("Warning: VIS_ComputeVisibleRegion failed!\n"); - } - - if (ClipObj == NULL) - { - /* Fall back to client rect */ - ClipObj = IntEngCreateClipRegion(1, (PRECTL)&Window->ClientRect, - (PRECTL)&Window->ClientRect); - } - - if (ClipObj == NULL) - { - DPRINT1("Warning: IntEngCreateClipRegion() failed!\n"); - return FALSE; - } - - RtlCopyMemory(&WndObjInt->WndObj.coClient, ClipObj, sizeof (CLIPOBJ)); - RtlCopyMemory(&WndObjInt->WndObj.rclClient, &Window->ClientRect, sizeof (RECT)); - OldClipObj = InterlockedExchangePointer(&WndObjInt->ClientClipObj, ClipObj); - if (OldClipObj != NULL) - IntEngDeleteClipRegion(OldClipObj); - - return TRUE; -} - -/* - * Updates all WNDOBJs of the given WINDOW_OBJECT and calls the change-procs. - */ -VOID -FASTCALL -IntEngWindowChanged( - PWINDOW_OBJECT Window, - FLONG flChanged) -{ - PLIST_ENTRY CurrentEntry; - WNDGDI *Current; - - ASSERT_IRQL(PASSIVE_LEVEL); - - CurrentEntry = Window->WndObjListHead.Flink; - while (CurrentEntry != &Window->WndObjListHead) - { - Current = CONTAINING_RECORD(CurrentEntry, WNDGDI, ListEntry); - - if (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; - - 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); - } - - CurrentEntry = CurrentEntry->Flink; - } - } - -} - -/* - * @implemented - */ -WNDOBJ* -STDCALL -EngCreateWnd( - SURFOBJ *pso, - HWND hWnd, - WNDOBJCHANGEPROC pfn, - FLONG fl, - int iPixelFormat) -{ - WNDGDI *WndObjInt = NULL; - WNDOBJ *WndObjUser = NULL; - PWINDOW_OBJECT Window; - BOOL calledFromUser; - DECLARE_RETURN(WNDOBJ*); - - DPRINT("EngCreateWnd: pso = 0x%x, hwnd = 0x%x, pfn = 0x%x, fl = 0x%x, 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), TAG_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 */ - InsertTailList(&Window->WndObjListHead, &WndObjInt->ListEntry); - - DPRINT("EngCreateWnd: SUCCESS!\n"); - - RETURN( WndObjUser); - -CLEANUP: - - if (!calledFromUser){ - UserLeave(); - } - - END_CLEANUP; -} - - -/* - * @implemented - */ -VOID -STDCALL -EngDeleteWnd( - IN WNDOBJ *pwo) -{ - WNDGDI *WndObjInt = ObjToGDI(pwo, WND); - PWINDOW_OBJECT Window; - BOOL calledFromUser; - - DPRINT("EngDeleteWnd: pwo = 0x%x\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"); - RemoveEntryList(&WndObjInt->ListEntry); - } - else - { - /* Remove object from window */ - RemoveEntryList(&WndObjInt->ListEntry); - } - - if (!calledFromUser){ - UserLeave(); - } - - /* Free resources */ - IntEngDeleteClipRegion(WndObjInt->ClientClipObj); - EngFreeMem(WndObjInt); -} - - -/* - * @implemented - */ -BOOL -STDCALL -WNDOBJ_bEnum( - IN WNDOBJ *pwo, - IN ULONG cj, - OUT ULONG *pul) -{ - WNDGDI *WndObjInt = ObjToGDI(pwo, WND); - BOOL Ret; - - DPRINT("WNDOBJ_bEnum: pwo = 0x%x, cj = %d, pul = 0x%x\n", pwo, cj, pul); - Ret = CLIPOBJ_bEnum(WndObjInt->ClientClipObj, cj, pul); - - DPRINT("WNDOBJ_bEnum: Returning %s\n", Ret ? "True" : "False"); - return Ret; -} - - -/* - * @implemented - */ -ULONG -STDCALL -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%x, iType = %d, iDirection = %d, cLimit = %d\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%x\n", Ret); - return Ret; -} - - -/* - * @implemented - */ -VOID -STDCALL -WNDOBJ_vSetConsumer( - IN WNDOBJ *pwo, - IN PVOID pvConsumer) -{ - BOOL Hack; - - DPRINT("WNDOBJ_vSetConsumer: pwo = 0x%x, pvConsumer = 0x%x\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); - } -} - -/* EOF */ - _____ Copied: trunk/reactos/subsys/win32k/misc/err.c (from rev 20743, trunk/reactos/subsys/win32k/misc/error.c) _____ Deleted: trunk/reactos/subsys/win32k/misc/error.c --- trunk/reactos/subsys/win32k/misc/error.c 2006-01-09 00:41:48 UTC (rev 20747) +++ trunk/reactos/subsys/win32k/misc/error.c 2006-01-09 09:42:25 UTC (rev 20748) @@ -1,64 +0,0 @@ -/* - * ReactOS W32 Subsystem - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Errors - * FILE: subsys/win32k/misc/error.c - * PROGRAMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * REVISION HISTORY: - * 06-06-2001 CSH Created - */ - -#include <w32k.h> - -#define NDEBUG -#include <debug.h> - -VOID FASTCALL -SetLastNtError(NTSTATUS Status) -{ - SetLastWin32Error(RtlNtStatusToDosError(Status)); -} - -VOID FASTCALL -SetLastWin32Error(DWORD Status) -{ - PTEB Teb = PsGetCurrentThread()->Tcb.Teb; - - if (NULL != Teb) - { - Teb->LastErrorValue = Status; - } -} - -NTSTATUS FASTCALL -GetLastNtError() -{ - PTEB Teb = PsGetCurrentThread()->Tcb.Teb; - - if ( NULL != Teb ) - { - return Teb->LastStatusValue; - } - return 0; -} - -/* EOF */ _____ Copied: trunk/reactos/subsys/win32k/ntuser/ntstubs.c (from rev 20743, trunk/reactos/subsys/win32k/ntuser/stubs.c) _____ Deleted: trunk/reactos/subsys/win32k/ntuser/stubs.c --- trunk/reactos/subsys/win32k/ntuser/stubs.c 2006-01-09 00:41:48 UTC (rev 20747) +++ trunk/reactos/subsys/win32k/ntuser/stubs.c 2006-01-09 09:42:25 UTC (rev 20748) @@ -1,760 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Native User stubs - * FILE: subsys/win32k/ntuser/stubs.c - * PROGRAMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * REVISION HISTORY: - * 04-06-2001 CSH Created - */ -#include <w32k.h> - -#define NDEBUG -#include <debug.h> - -DWORD -STDCALL -NtUserActivateKeyboardLayout( - DWORD Unknown0, - DWORD Unknown1) -{ - UNIMPLEMENTED - - return 0; -} - -DWORD -STDCALL -NtUserAttachThreadInput( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2) -{ - UNIMPLEMENTED - - return 0; -} - -DWORD -STDCALL -NtUserBitBltSysBmp( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4, - DWORD Unknown5, - DWORD Unknown6, - DWORD Unknown7) -{ - UNIMPLEMENTED - - return 0; -} - -DWORD -STDCALL -NtUserCallHwnd( - DWORD Unknown0, - DWORD Unknown1) -{ - switch (Unknown0) - { - case HWND_ROUTINE_REGISTERSHELLHOOKWINDOW: - if (IntIsWindow((HWND) Unknown1)) - return IntRegisterShellHookWindow((HWND) Unknown1); - return FALSE; - break; - case HWND_ROUTINE_DEREGISTERSHELLHOOKWINDOW: - if (IntIsWindow((HWND) Unknown1)) - return IntDeRegisterShellHookWindow((HWND) Unknown1); - return FALSE; - } - UNIMPLEMENTED - - return 0; -} - -DWORD -STDCALL -NtUserCallHwndParam( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2) -{ - UNIMPLEMENTED - - return 0; -} - -DWORD -STDCALL -NtUserCallHwndParamLock( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2) -{ - UNIMPLEMENTED - - return 0; -} - - -DWORD -STDCALL -NtUserConvertMemHandle( - DWORD Unknown0, - DWORD Unknown1) -{ - UNIMPLEMENTED - - return 0; -} - -DWORD -STDCALL -NtUserCreateLocalMemHandle( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3) -{ - UNIMPLEMENTED - - return 0; -} - -DWORD -STDCALL -NtUserDdeGetQualityOfService( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2) -{ - UNIMPLEMENTED - - return 0; -} - -DWORD -STDCALL -NtUserDdeInitialize( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4) -{ - UNIMPLEMENTED - - return 0; -} - -DWORD -STDCALL -NtUserDdeSetQualityOfService( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2) -{ - UNIMPLEMENTED - - return 0; -} - -DWORD -STDCALL -NtUserDragObject( - HWND hwnd1, - HWND hwnd2, - UINT u1, - DWORD dw1, - HCURSOR hc1 -) -{ - UNIMPLEMENTED - - return 0; -} - -DWORD -STDCALL -NtUserDrawAnimatedRects( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3) -{ - UNIMPLEMENTED - - return 0; -} - -DWORD -STDCALL -NtUserDrawCaption( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3) -{ - UNIMPLEMENTED - - return 0; -} - -DWORD -STDCALL -NtUserDrawCaptionTemp( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4, - DWORD Unknown5, [truncated at 1000 lines; 2248 more skipped]

18 years, 8 months

[ion] 20747: - Make ACPI use PCH. Cuts down compile time to 9 seconds on gcc.

by ion＠svn.reactos.org

- Make ACPI use PCH. Cuts down compile time to 9 seconds on gcc. Modified: trunk/reactos/drivers/bus/acpi/acpi.xml Modified: trunk/reactos/drivers/bus/acpi/dispatcher/dsfield.c Modified: trunk/reactos/drivers/bus/acpi/dispatcher/dsmethod.c Modified: trunk/reactos/drivers/bus/acpi/dispatcher/dsmthdat.c Modified: trunk/reactos/drivers/bus/acpi/dispatcher/dsobject.c Modified: trunk/reactos/drivers/bus/acpi/dispatcher/dsopcode.c Modified: trunk/reactos/drivers/bus/acpi/dispatcher/dsutils.c Modified: trunk/reactos/drivers/bus/acpi/dispatcher/dswexec.c Modified: trunk/reactos/drivers/bus/acpi/dispatcher/dswload.c Modified: trunk/reactos/drivers/bus/acpi/dispatcher/dswscope.c Modified: trunk/reactos/drivers/bus/acpi/dispatcher/dswstate.c Modified: trunk/reactos/drivers/bus/acpi/events/evevent.c Modified: trunk/reactos/drivers/bus/acpi/events/evmisc.c Modified: trunk/reactos/drivers/bus/acpi/events/evregion.c Modified: trunk/reactos/drivers/bus/acpi/events/evrgnini.c Modified: trunk/reactos/drivers/bus/acpi/events/evsci.c Modified: trunk/reactos/drivers/bus/acpi/events/evxface.c Modified: trunk/reactos/drivers/bus/acpi/events/evxfevnt.c Modified: trunk/reactos/drivers/bus/acpi/events/evxfregn.c Modified: trunk/reactos/drivers/bus/acpi/executer/amconfig.c Modified: trunk/reactos/drivers/bus/acpi/executer/amconvrt.c Modified: trunk/reactos/drivers/bus/acpi/executer/amcreate.c Modified: trunk/reactos/drivers/bus/acpi/executer/amdump.c Modified: trunk/reactos/drivers/bus/acpi/executer/amdyadic.c Modified: trunk/reactos/drivers/bus/acpi/executer/amfield.c Modified: trunk/reactos/drivers/bus/acpi/executer/amfldio.c Modified: trunk/reactos/drivers/bus/acpi/executer/ammisc.c Modified: trunk/reactos/drivers/bus/acpi/executer/ammonad.c Modified: trunk/reactos/drivers/bus/acpi/executer/ammutex.c Modified: trunk/reactos/drivers/bus/acpi/executer/amnames.c Modified: trunk/reactos/drivers/bus/acpi/executer/amprep.c Modified: trunk/reactos/drivers/bus/acpi/executer/amregion.c Modified: trunk/reactos/drivers/bus/acpi/executer/amresnte.c Modified: trunk/reactos/drivers/bus/acpi/executer/amresolv.c Modified: trunk/reactos/drivers/bus/acpi/executer/amresop.c Modified: trunk/reactos/drivers/bus/acpi/executer/amstore.c Modified: trunk/reactos/drivers/bus/acpi/executer/amstoren.c Modified: trunk/reactos/drivers/bus/acpi/executer/amstorob.c Modified: trunk/reactos/drivers/bus/acpi/executer/amsystem.c Modified: trunk/reactos/drivers/bus/acpi/executer/amutils.c Modified: trunk/reactos/drivers/bus/acpi/executer/amxface.c Modified: trunk/reactos/drivers/bus/acpi/hardware/hwacpi.c Modified: trunk/reactos/drivers/bus/acpi/hardware/hwgpe.c Modified: trunk/reactos/drivers/bus/acpi/hardware/hwregs.c Modified: trunk/reactos/drivers/bus/acpi/hardware/hwsleep.c Modified: trunk/reactos/drivers/bus/acpi/hardware/hwtimer.c Modified: trunk/reactos/drivers/bus/acpi/include/acexcep.h Modified: trunk/reactos/drivers/bus/acpi/include/acpi.h Modified: trunk/reactos/drivers/bus/acpi/namespace/nsaccess.c Modified: trunk/reactos/drivers/bus/acpi/namespace/nsalloc.c Modified: trunk/reactos/drivers/bus/acpi/namespace/nseval.c Modified: trunk/reactos/drivers/bus/acpi/namespace/nsinit.c Modified: trunk/reactos/drivers/bus/acpi/namespace/nsload.c Modified: trunk/reactos/drivers/bus/acpi/namespace/nsnames.c Modified: trunk/reactos/drivers/bus/acpi/namespace/nsobject.c Modified: trunk/reactos/drivers/bus/acpi/namespace/nssearch.c Modified: trunk/reactos/drivers/bus/acpi/namespace/nsutils.c Modified: trunk/reactos/drivers/bus/acpi/namespace/nswalk.c Modified: trunk/reactos/drivers/bus/acpi/namespace/nsxfname.c Modified: trunk/reactos/drivers/bus/acpi/namespace/nsxfobj.c Modified: trunk/reactos/drivers/bus/acpi/ospm/acpienum.c Modified: trunk/reactos/drivers/bus/acpi/ospm/acpisys.c Modified: trunk/reactos/drivers/bus/acpi/ospm/bn.c Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bm.c Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmnotify.c Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmpm.c Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmpower.c Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmrequest.c Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmsearch.c Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmutils.c Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmxface.c Modified: trunk/reactos/drivers/bus/acpi/ospm/fdo.c Modified: trunk/reactos/drivers/bus/acpi/ospm/include/acpisys.h Modified: trunk/reactos/drivers/bus/acpi/ospm/osl.c Modified: trunk/reactos/drivers/bus/acpi/ospm/pdo.c Modified: trunk/reactos/drivers/bus/acpi/parser/psargs.c Modified: trunk/reactos/drivers/bus/acpi/parser/psopcode.c Modified: trunk/reactos/drivers/bus/acpi/parser/psparse.c Modified: trunk/reactos/drivers/bus/acpi/parser/psscope.c Modified: trunk/reactos/drivers/bus/acpi/parser/pstree.c Modified: trunk/reactos/drivers/bus/acpi/parser/psutils.c Modified: trunk/reactos/drivers/bus/acpi/parser/pswalk.c Modified: trunk/reactos/drivers/bus/acpi/parser/psxface.c Modified: trunk/reactos/drivers/bus/acpi/resource/rsaddr.c Modified: trunk/reactos/drivers/bus/acpi/resource/rscalc.c Modified: trunk/reactos/drivers/bus/acpi/resource/rscreate.c Modified: trunk/reactos/drivers/bus/acpi/resource/rsdump.c Modified: trunk/reactos/drivers/bus/acpi/resource/rsio.c Modified: trunk/reactos/drivers/bus/acpi/resource/rsirq.c Modified: trunk/reactos/drivers/bus/acpi/resource/rslist.c Modified: trunk/reactos/drivers/bus/acpi/resource/rsmemory.c Modified: trunk/reactos/drivers/bus/acpi/resource/rsmisc.c Modified: trunk/reactos/drivers/bus/acpi/resource/rsutils.c Modified: trunk/reactos/drivers/bus/acpi/resource/rsxface.c Modified: trunk/reactos/drivers/bus/acpi/tables/tbconvrt.c Modified: trunk/reactos/drivers/bus/acpi/tables/tbget.c Modified: trunk/reactos/drivers/bus/acpi/tables/tbinstal.c Modified: trunk/reactos/drivers/bus/acpi/tables/tbutils.c Modified: trunk/reactos/drivers/bus/acpi/tables/tbxface.c Modified: trunk/reactos/drivers/bus/acpi/tables/tbxfroot.c [truncated at 100 lines; 11 more skipped] _____ Modified: trunk/reactos/drivers/bus/acpi/acpi.xml --- trunk/reactos/drivers/bus/acpi/acpi.xml 2006-01-09 00:36:08 UTC (rev 20746) +++ trunk/reactos/drivers/bus/acpi/acpi.xml 2006-01-09 00:41:48 UTC (rev 20747) @@ -134,4 +134,5 @@ <file>cmxface.c</file> </directory> <file>acpi.rc</file> + <pch>include/acpi.h</pch> </module> _____ Modified: trunk/reactos/drivers/bus/acpi/dispatcher/dsfield.c --- trunk/reactos/drivers/bus/acpi/dispatcher/dsfield.c 2006-01-09 00:36:08 UTC (rev 20746) +++ trunk/reactos/drivers/bus/acpi/dispatcher/dsfield.c 2006-01-09 00:41:48 UTC (rev 20747) @@ -24,13 +24,8 @@ */ -#include "acpi.h" -#include "amlcode.h" -#include "acdispat.h" -#include "acinterp.h" -#include "acnamesp.h" +#include <acpi.h> - #define _COMPONENT ACPI_DISPATCHER MODULE_NAME ("dsfield") _____ Modified: trunk/reactos/drivers/bus/acpi/dispatcher/dsmethod.c --- trunk/reactos/drivers/bus/acpi/dispatcher/dsmethod.c 2006-01-09 00:36:08 UTC (rev 20746) +++ trunk/reactos/drivers/bus/acpi/dispatcher/dsmethod.c 2006-01-09 00:41:48 UTC (rev 20747) @@ -24,16 +24,8 @@ */ -#include "acpi.h" -#include "acparser.h" -#include "amlcode.h" -#include "acdispat.h" -#include "acinterp.h" -#include "acnamesp.h" -#include "actables.h" -#include "acdebug.h" +#include <acpi.h> - #define _COMPONENT ACPI_DISPATCHER MODULE_NAME ("dsmethod") _____ Modified: trunk/reactos/drivers/bus/acpi/dispatcher/dsmthdat.c --- trunk/reactos/drivers/bus/acpi/dispatcher/dsmthdat.c 2006-01-09 00:36:08 UTC (rev 20746) +++ trunk/reactos/drivers/bus/acpi/dispatcher/dsmthdat.c 2006-01-09 00:41:48 UTC (rev 20747) @@ -24,14 +24,8 @@ */ -#include "acpi.h" -#include "acparser.h" -#include "acdispat.h" -#include "acinterp.h" -#include "amlcode.h" -#include "acnamesp.h" +#include <acpi.h> - #define _COMPONENT ACPI_DISPATCHER MODULE_NAME ("dsmthdat") _____ Modified: trunk/reactos/drivers/bus/acpi/dispatcher/dsobject.c --- trunk/reactos/drivers/bus/acpi/dispatcher/dsobject.c 2006-01-09 00:36:08 UTC (rev 20746) +++ trunk/reactos/drivers/bus/acpi/dispatcher/dsobject.c 2006-01-09 00:41:48 UTC (rev 20747) @@ -24,12 +24,7 @@ */ -#include "acpi.h" -#include "acparser.h" -#include "amlcode.h" -#include "acdispat.h" -#include "acinterp.h" -#include "acnamesp.h" +#include <acpi.h> #define _COMPONENT ACPI_DISPATCHER MODULE_NAME ("dsobject") _____ Modified: trunk/reactos/drivers/bus/acpi/dispatcher/dsopcode.c --- trunk/reactos/drivers/bus/acpi/dispatcher/dsopcode.c 2006-01-09 00:36:08 UTC (rev 20746) +++ trunk/reactos/drivers/bus/acpi/dispatcher/dsopcode.c 2006-01-09 00:41:48 UTC (rev 20747) @@ -25,14 +25,7 @@ */ -#include "acpi.h" -#include "acparser.h" -#include "amlcode.h" -#include "acdispat.h" -#include "acinterp.h" -#include "acnamesp.h" -#include "acevents.h" -#include "actables.h" +#include <acpi.h> #define _COMPONENT ACPI_DISPATCHER MODULE_NAME ("dsopcode") _____ Modified: trunk/reactos/drivers/bus/acpi/dispatcher/dsutils.c --- trunk/reactos/drivers/bus/acpi/dispatcher/dsutils.c 2006-01-09 00:36:08 UTC (rev 20746) +++ trunk/reactos/drivers/bus/acpi/dispatcher/dsutils.c 2006-01-09 00:41:48 UTC (rev 20747) @@ -24,13 +24,7 @@ */ -#include "acpi.h" -#include "acparser.h" -#include "amlcode.h" -#include "acdispat.h" -#include "acinterp.h" -#include "acnamesp.h" -#include "acdebug.h" +#include <acpi.h> #define _COMPONENT ACPI_DISPATCHER MODULE_NAME ("dsutils") _____ Modified: trunk/reactos/drivers/bus/acpi/dispatcher/dswexec.c --- trunk/reactos/drivers/bus/acpi/dispatcher/dswexec.c 2006-01-09 00:36:08 UTC (rev 20746) +++ trunk/reactos/drivers/bus/acpi/dispatcher/dswexec.c 2006-01-09 00:41:48 UTC (rev 20747) @@ -25,15 +25,8 @@ */ -#include "acpi.h" -#include "acparser.h" -#include "amlcode.h" -#include "acdispat.h" -#include "acinterp.h" -#include "acnamesp.h" -#include "acdebug.h" +#include <acpi.h> - #define _COMPONENT ACPI_DISPATCHER MODULE_NAME ("dswexec") _____ Modified: trunk/reactos/drivers/bus/acpi/dispatcher/dswload.c --- trunk/reactos/drivers/bus/acpi/dispatcher/dswload.c 2006-01-09 00:36:08 UTC (rev 20746) +++ trunk/reactos/drivers/bus/acpi/dispatcher/dswload.c 2006-01-09 00:41:48 UTC (rev 20747) @@ -24,15 +24,8 @@ */ -#include "acpi.h" -#include "acparser.h" -#include "amlcode.h" -#include "acdispat.h" -#include "acinterp.h" -#include "acnamesp.h" -#include "acevents.h" +#include <acpi.h> - #define _COMPONENT ACPI_DISPATCHER MODULE_NAME ("dswload") _____ Modified: trunk/reactos/drivers/bus/acpi/dispatcher/dswscope.c --- trunk/reactos/drivers/bus/acpi/dispatcher/dswscope.c 2006-01-09 00:36:08 UTC (rev 20746) +++ trunk/reactos/drivers/bus/acpi/dispatcher/dswscope.c 2006-01-09 00:41:48 UTC (rev 20747) @@ -24,11 +24,8 @@ */ -#include "acpi.h" -#include "acinterp.h" -#include "acdispat.h" +#include <acpi.h> - #define _COMPONENT ACPI_DISPATCHER MODULE_NAME ("dswscope") _____ Modified: trunk/reactos/drivers/bus/acpi/dispatcher/dswstate.c --- trunk/reactos/drivers/bus/acpi/dispatcher/dswstate.c 2006-01-09 00:36:08 UTC (rev 20746) +++ trunk/reactos/drivers/bus/acpi/dispatcher/dswstate.c 2006-01-09 00:41:48 UTC (rev 20747) @@ -24,12 +24,7 @@ */ -#include "acpi.h" -#include "amlcode.h" -#include "acparser.h" -#include "acdispat.h" -#include "acnamesp.h" -#include "acinterp.h" +#include <acpi.h> #define _COMPONENT ACPI_DISPATCHER MODULE_NAME ("dswstate") _____ Modified: trunk/reactos/drivers/bus/acpi/events/evevent.c --- trunk/reactos/drivers/bus/acpi/events/evevent.c 2006-01-09 00:36:08 UTC (rev 20746) +++ trunk/reactos/drivers/bus/acpi/events/evevent.c 2006-01-09 00:41:48 UTC (rev 20747) @@ -24,11 +24,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "acpi.h" -#include "achware.h" -#include "acevents.h" -#include "acnamesp.h" -#include "accommon.h" +#include <acpi.h> #define _COMPONENT ACPI_EVENTS MODULE_NAME ("evevent") _____ Modified: trunk/reactos/drivers/bus/acpi/events/evmisc.c --- trunk/reactos/drivers/bus/acpi/events/evmisc.c 2006-01-09 00:36:08 UTC (rev 20746) +++ trunk/reactos/drivers/bus/acpi/events/evmisc.c 2006-01-09 00:41:48 UTC (rev 20747) @@ -24,11 +24,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "acpi.h" -#include "acevents.h" -#include "acnamesp.h" -#include "acinterp.h" -#include "achware.h" +#include <acpi.h> #define _COMPONENT ACPI_EVENTS MODULE_NAME ("evmisc") _____ Modified: trunk/reactos/drivers/bus/acpi/events/evregion.c --- trunk/reactos/drivers/bus/acpi/events/evregion.c 2006-01-09 00:36:08 UTC (rev 20746) +++ trunk/reactos/drivers/bus/acpi/events/evregion.c 2006-01-09 00:41:48 UTC (rev 20747) @@ -24,11 +24,7 @@ */ -#include "acpi.h" -#include "acevents.h" -#include "acnamesp.h" -#include "acinterp.h" -#include "amlcode.h" +#include <acpi.h> #define _COMPONENT ACPI_EVENTS MODULE_NAME ("evregion") _____ Modified: trunk/reactos/drivers/bus/acpi/events/evrgnini.c --- trunk/reactos/drivers/bus/acpi/events/evrgnini.c 2006-01-09 00:36:08 UTC (rev 20746) +++ trunk/reactos/drivers/bus/acpi/events/evrgnini.c 2006-01-09 00:41:48 UTC (rev 20747) @@ -24,11 +24,7 @@ */ -#include "acpi.h" -#include "acevents.h" -#include "acnamesp.h" -#include "acinterp.h" -#include "amlcode.h" +#include <acpi.h> #define _COMPONENT ACPI_EVENTS MODULE_NAME ("evrgnini") _____ Modified: trunk/reactos/drivers/bus/acpi/events/evsci.c --- trunk/reactos/drivers/bus/acpi/events/evsci.c 2006-01-09 00:36:08 UTC (rev 20746) +++ trunk/reactos/drivers/bus/acpi/events/evsci.c 2006-01-09 00:41:48 UTC (rev 20747) @@ -24,12 +24,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "acpi.h" -#include "acnamesp.h" -#include "achware.h" -#include "acevents.h" +#include <acpi.h> - #define _COMPONENT ACPI_EVENTS MODULE_NAME ("evsci") _____ Modified: trunk/reactos/drivers/bus/acpi/events/evxface.c --- trunk/reactos/drivers/bus/acpi/events/evxface.c 2006-01-09 00:36:08 UTC (rev 20746) +++ trunk/reactos/drivers/bus/acpi/events/evxface.c 2006-01-09 00:41:48 UTC (rev 20747) @@ -24,12 +24,7 @@ */ -#include "acpi.h" -#include "achware.h" -#include "acnamesp.h" -#include "acevents.h" -#include "amlcode.h" -#include "acinterp.h" +#include <acpi.h> #define _COMPONENT ACPI_EVENTS MODULE_NAME ("evxface") _____ Modified: trunk/reactos/drivers/bus/acpi/events/evxfevnt.c --- trunk/reactos/drivers/bus/acpi/events/evxfevnt.c 2006-01-09 00:36:08 UTC (rev 20746) +++ trunk/reactos/drivers/bus/acpi/events/evxfevnt.c 2006-01-09 00:41:48 UTC (rev 20747) @@ -24,12 +24,7 @@ */ -#include "acpi.h" -#include "achware.h" -#include "acnamesp.h" -#include "acevents.h" -#include "amlcode.h" -#include "acinterp.h" +#include <acpi.h> #define _COMPONENT ACPI_EVENTS MODULE_NAME ("evxfevnt") _____ Modified: trunk/reactos/drivers/bus/acpi/events/evxfregn.c --- trunk/reactos/drivers/bus/acpi/events/evxfregn.c 2006-01-09 00:36:08 UTC (rev 20746) +++ trunk/reactos/drivers/bus/acpi/events/evxfregn.c 2006-01-09 00:41:48 UTC (rev 20747) @@ -25,12 +25,7 @@ */ -#include "acpi.h" -#include "achware.h" -#include "acnamesp.h" -#include "acevents.h" -#include "amlcode.h" -#include "acinterp.h" +#include <acpi.h> #define _COMPONENT ACPI_EVENTS MODULE_NAME ("evxfregn") _____ Modified: trunk/reactos/drivers/bus/acpi/executer/amconfig.c --- trunk/reactos/drivers/bus/acpi/executer/amconfig.c 2006-01-09 00:36:08 UTC (rev 20746) +++ trunk/reactos/drivers/bus/acpi/executer/amconfig.c 2006-01-09 00:41:48 UTC (rev 20747) @@ -24,14 +24,7 @@ */ -#include "acpi.h" -#include "acparser.h" -#include "acinterp.h" -#include "amlcode.h" -#include "acnamesp.h" -#include "acevents.h" -#include "actables.h" -#include "acdispat.h" +#include <acpi.h> #define _COMPONENT ACPI_EXECUTER _____ Modified: trunk/reactos/drivers/bus/acpi/executer/amconvrt.c --- trunk/reactos/drivers/bus/acpi/executer/amconvrt.c 2006-01-09 00:36:08 UTC (rev 20746) +++ trunk/reactos/drivers/bus/acpi/executer/amconvrt.c 2006-01-09 00:41:48 UTC (rev 20747) @@ -24,15 +24,8 @@ */ -#include "acpi.h" -#include "acparser.h" -#include "acnamesp.h" -#include "acinterp.h" -#include "acevents.h" -#include "amlcode.h" -#include "acdispat.h" +#include <acpi.h> - #define _COMPONENT ACPI_EXECUTER MODULE_NAME ("amconvrt") _____ Modified: trunk/reactos/drivers/bus/acpi/executer/amcreate.c --- trunk/reactos/drivers/bus/acpi/executer/amcreate.c 2006-01-09 00:36:08 UTC (rev 20746) +++ trunk/reactos/drivers/bus/acpi/executer/amcreate.c 2006-01-09 00:41:48 UTC (rev 20747) @@ -24,13 +24,7 @@ */ -#include "acpi.h" -#include "acparser.h" -#include "acinterp.h" -#include "amlcode.h" -#include "acnamesp.h" -#include "acevents.h" -#include "acdispat.h" +#include <acpi.h> #define _COMPONENT ACPI_EXECUTER _____ Modified: trunk/reactos/drivers/bus/acpi/executer/amdump.c --- trunk/reactos/drivers/bus/acpi/executer/amdump.c 2006-01-09 00:36:08 UTC (rev 20746) +++ trunk/reactos/drivers/bus/acpi/executer/amdump.c 2006-01-09 00:41:48 UTC (rev 20747) @@ -24,11 +24,7 @@ */ -#include "acpi.h" -#include "acinterp.h" -#include "amlcode.h" -#include "acnamesp.h" -#include "actables.h" +#include <acpi.h> #define _COMPONENT ACPI_EXECUTER MODULE_NAME ("amdump") _____ Modified: trunk/reactos/drivers/bus/acpi/executer/amdyadic.c --- trunk/reactos/drivers/bus/acpi/executer/amdyadic.c 2006-01-09 00:36:08 UTC (rev 20746) +++ trunk/reactos/drivers/bus/acpi/executer/amdyadic.c 2006-01-09 00:41:48 UTC (rev 20747) @@ -24,15 +24,10 @@ */ -#include "acpi.h" -#include "acparser.h" -#include "acnamesp.h" -#include "acinterp.h" -#include "acevents.h" -#include "amlcode.h" -#include "acdispat.h" +#include <acpi.h> + #define _COMPONENT ACPI_EXECUTER MODULE_NAME ("amdyadic") _____ Modified: trunk/reactos/drivers/bus/acpi/executer/amfield.c --- trunk/reactos/drivers/bus/acpi/executer/amfield.c 2006-01-09 00:36:08 UTC (rev 20746) +++ trunk/reactos/drivers/bus/acpi/executer/amfield.c 2006-01-09 00:41:48 UTC (rev 20747) @@ -24,15 +24,10 @@ */ -#include "acpi.h" -#include "acdispat.h" -#include "acinterp.h" -#include "amlcode.h" -#include "acnamesp.h" -#include "achware.h" -#include "acevents.h" +#include <acpi.h> + #define _COMPONENT ACPI_EXECUTER MODULE_NAME ("amfield") _____ Modified: trunk/reactos/drivers/bus/acpi/executer/amfldio.c --- trunk/reactos/drivers/bus/acpi/executer/amfldio.c 2006-01-09 00:36:08 UTC (rev 20746) +++ trunk/reactos/drivers/bus/acpi/executer/amfldio.c 2006-01-09 00:41:48 UTC (rev 20747) @@ -24,12 +24,7 @@ */ -#include "acpi.h" -#include "acinterp.h" -#include "amlcode.h" -#include "acnamesp.h" -#include "achware.h" -#include "acevents.h" +#include <acpi.h> #define _COMPONENT ACPI_EXECUTER _____ Modified: trunk/reactos/drivers/bus/acpi/executer/ammisc.c --- trunk/reactos/drivers/bus/acpi/executer/ammisc.c 2006-01-09 00:36:08 UTC (rev 20746) +++ trunk/reactos/drivers/bus/acpi/executer/ammisc.c 2006-01-09 00:41:48 UTC (rev 20747) @@ -25,13 +25,10 @@ */ -#include "acpi.h" -#include "acparser.h" -#include "acinterp.h" -#include "amlcode.h" -#include "acdispat.h" +#include <acpi.h> + #define _COMPONENT ACPI_EXECUTER MODULE_NAME ("ammisc") _____ Modified: trunk/reactos/drivers/bus/acpi/executer/ammonad.c --- trunk/reactos/drivers/bus/acpi/executer/ammonad.c 2006-01-09 00:36:08 UTC (rev 20746) +++ trunk/reactos/drivers/bus/acpi/executer/ammonad.c 2006-01-09 00:41:48 UTC (rev 20747) @@ -25,12 +25,7 @@ */ -#include "acpi.h" -#include "acparser.h" -#include "acdispat.h" -#include "acinterp.h" -#include "amlcode.h" -#include "acnamesp.h" +#include <acpi.h> #define _COMPONENT ACPI_EXECUTER _____ Modified: trunk/reactos/drivers/bus/acpi/executer/ammutex.c --- trunk/reactos/drivers/bus/acpi/executer/ammutex.c 2006-01-09 00:36:08 UTC (rev 20746) +++ trunk/reactos/drivers/bus/acpi/executer/ammutex.c 2006-01-09 00:41:48 UTC (rev 20747) @@ -25,12 +25,9 @@ */ -#include "acpi.h" -#include "acinterp.h" -#include "acnamesp.h" -#include "achware.h" -#include "acevents.h" +#include <acpi.h> + #define _COMPONENT ACPI_EXECUTER MODULE_NAME ("ammutex") _____ Modified: trunk/reactos/drivers/bus/acpi/executer/amnames.c --- trunk/reactos/drivers/bus/acpi/executer/amnames.c 2006-01-09 00:36:08 UTC (rev 20746) +++ trunk/reactos/drivers/bus/acpi/executer/amnames.c 2006-01-09 00:41:48 UTC (rev 20747) @@ -25,11 +25,9 @@ */ -#include "acpi.h" -#include "acinterp.h" -#include "amlcode.h" -#include "acnamesp.h" +#include <acpi.h> + #define _COMPONENT ACPI_EXECUTER MODULE_NAME ("amnames") _____ Modified: trunk/reactos/drivers/bus/acpi/executer/amprep.c --- trunk/reactos/drivers/bus/acpi/executer/amprep.c 2006-01-09 00:36:08 UTC (rev 20746) +++ trunk/reactos/drivers/bus/acpi/executer/amprep.c 2006-01-09 00:41:48 UTC (rev 20747) @@ -25,11 +25,7 @@ */ -#include "acpi.h" -#include "acinterp.h" -#include "amlcode.h" -#include "acnamesp.h" -#include "acparser.h" +#include <acpi.h> #define _COMPONENT ACPI_EXECUTER _____ Modified: trunk/reactos/drivers/bus/acpi/executer/amregion.c --- trunk/reactos/drivers/bus/acpi/executer/amregion.c 2006-01-09 00:36:08 UTC (rev 20746) +++ trunk/reactos/drivers/bus/acpi/executer/amregion.c 2006-01-09 00:41:48 UTC (rev 20747) @@ -25,14 +25,10 @@ */ -#include "acpi.h" -#include "acinterp.h" -#include "amlcode.h" -#include "acnamesp.h" -#include "achware.h" -#include "acevents.h" +#include <acpi.h> + #define _COMPONENT ACPI_EXECUTER MODULE_NAME ("amregion") _____ Modified: trunk/reactos/drivers/bus/acpi/executer/amresnte.c --- trunk/reactos/drivers/bus/acpi/executer/amresnte.c 2006-01-09 00:36:08 UTC (rev 20746) +++ trunk/reactos/drivers/bus/acpi/executer/amresnte.c 2006-01-09 00:41:48 UTC (rev 20747) @@ -25,16 +25,10 @@ */ -#include "acpi.h" -#include "amlcode.h" -#include "acparser.h" -#include "acdispat.h" -#include "acinterp.h" -#include "acnamesp.h" -#include "actables.h" -#include "acevents.h" +#include <acpi.h> + #define _COMPONENT ACPI_EXECUTER MODULE_NAME ("amresnte") _____ Modified: trunk/reactos/drivers/bus/acpi/executer/amresolv.c --- trunk/reactos/drivers/bus/acpi/executer/amresolv.c 2006-01-09 00:36:08 UTC (rev 20746) +++ trunk/reactos/drivers/bus/acpi/executer/amresolv.c 2006-01-09 00:41:48 UTC (rev 20747) @@ -25,16 +25,10 @@ */ -#include "acpi.h" -#include "amlcode.h" -#include "acparser.h" -#include "acdispat.h" -#include "acinterp.h" -#include "acnamesp.h" -#include "actables.h" -#include "acevents.h" +#include <acpi.h> + #define _COMPONENT ACPI_EXECUTER MODULE_NAME ("amresolv") _____ Modified: trunk/reactos/drivers/bus/acpi/executer/amresop.c --- trunk/reactos/drivers/bus/acpi/executer/amresop.c 2006-01-09 00:36:08 UTC (rev 20746) +++ trunk/reactos/drivers/bus/acpi/executer/amresop.c 2006-01-09 00:41:48 UTC (rev 20747) @@ -25,16 +25,10 @@ */ -#include "acpi.h" -#include "amlcode.h" -#include "acparser.h" -#include "acdispat.h" -#include "acinterp.h" -#include "acnamesp.h" -#include "actables.h" -#include "acevents.h" +#include <acpi.h> + #define _COMPONENT ACPI_EXECUTER MODULE_NAME ("amresop") _____ Modified: trunk/reactos/drivers/bus/acpi/executer/amstore.c --- trunk/reactos/drivers/bus/acpi/executer/amstore.c 2006-01-09 00:36:08 UTC (rev 20746) +++ trunk/reactos/drivers/bus/acpi/executer/amstore.c 2006-01-09 00:41:48 UTC (rev 20747) @@ -25,13 +25,7 @@ */ -#include "acpi.h" -#include "acparser.h" -#include "acdispat.h" -#include "acinterp.h" -#include "amlcode.h" -#include "acnamesp.h" -#include "actables.h" +#include <acpi.h> #define _COMPONENT ACPI_EXECUTER _____ Modified: trunk/reactos/drivers/bus/acpi/executer/amstoren.c --- trunk/reactos/drivers/bus/acpi/executer/amstoren.c 2006-01-09 00:36:08 UTC (rev 20746) +++ trunk/reactos/drivers/bus/acpi/executer/amstoren.c 2006-01-09 00:41:48 UTC (rev 20747) @@ -26,15 +26,10 @@ */ -#include "acpi.h" -#include "acparser.h" -#include "acdispat.h" -#include "acinterp.h" -#include "amlcode.h" -#include "acnamesp.h" -#include "actables.h" +#include <acpi.h> + #define _COMPONENT ACPI_EXECUTER MODULE_NAME ("amstoren") _____ Modified: trunk/reactos/drivers/bus/acpi/executer/amstorob.c --- trunk/reactos/drivers/bus/acpi/executer/amstorob.c 2006-01-09 00:36:08 UTC (rev 20746) +++ trunk/reactos/drivers/bus/acpi/executer/amstorob.c 2006-01-09 00:41:48 UTC (rev 20747) @@ -25,13 +25,7 @@ */ -#include "acpi.h" -#include "acparser.h" -#include "acdispat.h" -#include "acinterp.h" -#include "amlcode.h" -#include "acnamesp.h" -#include "actables.h" +#include <acpi.h> #define _COMPONENT ACPI_EXECUTER _____ Modified: trunk/reactos/drivers/bus/acpi/executer/amsystem.c --- trunk/reactos/drivers/bus/acpi/executer/amsystem.c 2006-01-09 00:36:08 UTC (rev 20746) +++ trunk/reactos/drivers/bus/acpi/executer/amsystem.c 2006-01-09 00:41:48 UTC (rev 20747) @@ -25,12 +25,9 @@ */ -#include "acpi.h" -#include "acinterp.h" -#include "acnamesp.h" -#include "achware.h" -#include "acevents.h" +#include <acpi.h> + #define _COMPONENT ACPI_EXECUTER MODULE_NAME ("amsystem") _____ Modified: trunk/reactos/drivers/bus/acpi/executer/amutils.c --- trunk/reactos/drivers/bus/acpi/executer/amutils.c 2006-01-09 00:36:08 UTC (rev 20746) +++ trunk/reactos/drivers/bus/acpi/executer/amutils.c 2006-01-09 00:41:48 UTC (rev 20747) @@ -25,13 +25,9 @@ */ -#include "acpi.h" -#include "acparser.h" -#include "acinterp.h" -#include "amlcode.h" -#include "acnamesp.h" -#include "acevents.h" +#include <acpi.h> + #define _COMPONENT ACPI_EXECUTER MODULE_NAME ("amutils") _____ Modified: trunk/reactos/drivers/bus/acpi/executer/amxface.c --- trunk/reactos/drivers/bus/acpi/executer/amxface.c 2006-01-09 00:36:08 UTC (rev 20746) +++ trunk/reactos/drivers/bus/acpi/executer/amxface.c 2006-01-09 00:41:48 UTC (rev 20747) @@ -25,10 +25,10 @@ */ -#include "acpi.h" -#include "acinterp.h" +#include <acpi.h> + #define _COMPONENT ACPI_EXECUTER MODULE_NAME ("amxface") _____ Modified: trunk/reactos/drivers/bus/acpi/hardware/hwacpi.c --- trunk/reactos/drivers/bus/acpi/hardware/hwacpi.c 2006-01-09 00:36:08 UTC (rev 20746) +++ trunk/reactos/drivers/bus/acpi/hardware/hwacpi.c 2006-01-09 00:41:48 UTC (rev 20747) @@ -25,10 +25,8 @@ */ -#include "acpi.h" -#include "achware.h" +#include <acpi.h> - #define _COMPONENT ACPI_HARDWARE MODULE_NAME ("hwacpi") _____ Modified: trunk/reactos/drivers/bus/acpi/hardware/hwgpe.c --- trunk/reactos/drivers/bus/acpi/hardware/hwgpe.c 2006-01-09 00:36:08 UTC (rev 20746) +++ trunk/reactos/drivers/bus/acpi/hardware/hwgpe.c 2006-01-09 00:41:48 UTC (rev 20747) @@ -24,10 +24,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "acpi.h" -#include "achware.h" -#include "acnamesp.h" -#include "acevents.h" +#include <acpi.h> #define _COMPONENT ACPI_HARDWARE MODULE_NAME ("hwgpe") _____ Modified: trunk/reactos/drivers/bus/acpi/hardware/hwregs.c --- trunk/reactos/drivers/bus/acpi/hardware/hwregs.c 2006-01-09 00:36:08 UTC (rev 20746) +++ trunk/reactos/drivers/bus/acpi/hardware/hwregs.c 2006-01-09 00:41:48 UTC (rev 20747) @@ -26,9 +26,7 @@ */ -#include "acpi.h" -#include "achware.h" -#include "acnamesp.h" +#include <acpi.h> #define _COMPONENT ACPI_HARDWARE MODULE_NAME ("hwregs") _____ Modified: trunk/reactos/drivers/bus/acpi/hardware/hwsleep.c --- trunk/reactos/drivers/bus/acpi/hardware/hwsleep.c 2006-01-09 00:36:08 UTC (rev 20746) +++ trunk/reactos/drivers/bus/acpi/hardware/hwsleep.c 2006-01-09 00:41:48 UTC (rev 20747) @@ -24,9 +24,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "acpi.h" -#include "acnamesp.h" -#include "achware.h" +#include <acpi.h> #define _COMPONENT ACPI_HARDWARE MODULE_NAME ("hwsleep") _____ Modified: trunk/reactos/drivers/bus/acpi/hardware/hwtimer.c --- trunk/reactos/drivers/bus/acpi/hardware/hwtimer.c 2006-01-09 00:36:08 UTC (rev 20746) +++ trunk/reactos/drivers/bus/acpi/hardware/hwtimer.c 2006-01-09 00:41:48 UTC (rev 20747) @@ -24,8 +24,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "acpi.h" -#include "achware.h" +#include <acpi.h> #define _COMPONENT ACPI_HARDWARE MODULE_NAME ("hwtimer") _____ Modified: trunk/reactos/drivers/bus/acpi/include/acexcep.h --- trunk/reactos/drivers/bus/acpi/include/acexcep.h 2006-01-09 00:36:08 UTC (rev 20746) +++ trunk/reactos/drivers/bus/acpi/include/acexcep.h 2006-01-09 00:41:48 UTC (rev 20747) @@ -146,102 +146,5 @@ #define AE_CODE_CTRL_MAX 0x0008 -#ifdef DEFINE_ACPI_GLOBALS -/* - * String versions of the exception codes above - * These strings must match the corresponding defines exactly - */ -static NATIVE_CHAR *acpi_gbl_exception_names_env[] = -{ - "AE_OK", - "AE_ERROR", - "AE_NO_ACPI_TABLES", - "AE_NO_NAMESPACE", - "AE_NO_MEMORY", - "AE_NOT_FOUND", - "AE_NOT_EXIST", - "AE_EXIST", - "AE_TYPE", - "AE_NULL_OBJECT", - "AE_NULL_ENTRY", - "AE_BUFFER_OVERFLOW", - "AE_STACK_OVERFLOW", - "AE_STACK_UNDERFLOW", - "AE_NOT_IMPLEMENTED", - "AE_VERSION_MISMATCH", - "AE_SUPPORT", - "AE_SHARE", - "AE_LIMIT", - "AE_TIME", - "AE_UNKNOWN_STATUS", - "AE_ACQUIRE_DEADLOCK", - "AE_RELEASE_DEADLOCK", - "AE_NOT_ACQUIRED", - "AE_ALREADY_ACQUIRED", - "AE_NO_HARDWARE_RESPONSE", - "AE_NO_GLOBAL_LOCK", -}; - -static NATIVE_CHAR *acpi_gbl_exception_names_pgm[] = -{ - "AE_BAD_PARAMETER", - "AE_BAD_CHARACTER", - "AE_BAD_PATHNAME", - "AE_BAD_DATA", - "AE_BAD_ADDRESS", -}; - -static NATIVE_CHAR *acpi_gbl_exception_names_tbl[] = -{ - "AE_BAD_SIGNATURE", - "AE_BAD_HEADER", - "AE_BAD_CHECKSUM", - "AE_BAD_VALUE", -}; - -static NATIVE_CHAR *acpi_gbl_exception_names_aml[] = -{ - "AE_AML_ERROR", - "AE_AML_PARSE", - "AE_AML_BAD_OPCODE", - "AE_AML_NO_OPERAND", - "AE_AML_OPERAND_TYPE", - "AE_AML_OPERAND_VALUE", - "AE_AML_UNINITIALIZED_LOCAL", - "AE_AML_UNINITIALIZED_ARG", - "AE_AML_UNINITIALIZED_ELEMENT", - "AE_AML_NUMERIC_OVERFLOW", - "AE_AML_REGION_LIMIT", - "AE_AML_BUFFER_LIMIT", - "AE_AML_PACKAGE_LIMIT", - "AE_AML_DIVIDE_BY_ZERO", - "AE_AML_BAD_NAME", - "AE_AML_NAME_NOT_FOUND", - "AE_AML_INTERNAL", - "AE_AML_INVALID_SPACE_ID", - "AE_AML_STRING_LIMIT", - "AE_AML_NO_RETURN_VALUE", - "AE_AML_METHOD_LIMIT", - "AE_AML_NOT_OWNER", - "AE_AML_MUTEX_ORDER", - "AE_AML_MUTEX_NOT_ACQUIRED", -}; - -static NATIVE_CHAR *acpi_gbl_exception_names_ctrl[] = -{ - "AE_CTRL_RETURN_VALUE", - "AE_CTRL_PENDING", - "AE_CTRL_TERMINATE", - "AE_CTRL_TRUE", - "AE_CTRL_FALSE", - "AE_CTRL_DEPTH", - "AE_CTRL_END", - "AE_CTRL_TRANSFER", -}; - - -#endif /* DEFINE_ACPI_GLOBALS */ - - #endif /* __ACEXCEP_H__ */ _____ Modified: trunk/reactos/drivers/bus/acpi/include/acpi.h --- trunk/reactos/drivers/bus/acpi/include/acpi.h 2006-01-09 00:36:08 UTC (rev 20746) +++ trunk/reactos/drivers/bus/acpi/include/acpi.h 2006-01-09 00:41:48 UTC (rev 20747) @@ -29,6 +29,7 @@ #include "platform/types.h" #undef ROUND_DOWN #undef ROUND_UP +#define DEFINE_ACPI_GLOBALS /* * Common includes for all ACPI driver files @@ -51,6 +52,18 @@ #include "achware.h" /* Hardware defines and interfaces */ #include "accommon.h" /* Common interfaces */ #include "acresrc.h" /* Resource Manager function prototypes */ +#include "acparser.h" +#include "acinterp.h" +#include "amlcode.h" +#include "acnamesp.h" +#include "acevents.h" +#include "actables.h" +#include "acdispat.h" +#include <ntddk.h> +#include <bm.h> +#include <bn.h> +#include <bmpower.h> +#include <acpisys.h> +#include <acglobal.h> - #endif /* __ACPI_H__ */ _____ Modified: trunk/reactos/drivers/bus/acpi/namespace/nsaccess.c --- trunk/reactos/drivers/bus/acpi/namespace/nsaccess.c 2006-01-09 00:36:08 UTC (rev 20746) [truncated at 1000 lines; 1117 more skipped]

18 years, 8 months

[gedmurphy] 20746: fix msvc warnings

by gedmurphy＠svn.reactos.org

fix msvc warnings Modified: trunk/reactos/subsys/system/servman/about.c Modified: trunk/reactos/subsys/system/servman/propsheet.c Modified: trunk/reactos/subsys/system/servman/query.c Modified: trunk/reactos/subsys/system/servman/servman.c Modified: trunk/reactos/subsys/system/servman/servman.h _____ Modified: trunk/reactos/subsys/system/servman/about.c --- trunk/reactos/subsys/system/servman/about.c 2006-01-09 00:34:53 UTC (rev 20745) +++ trunk/reactos/subsys/system/servman/about.c 2006-01-09 00:36:08 UTC (rev 20746) @@ -13,6 +13,9 @@ extern HINSTANCE hInstance; +#ifdef _MSC_VER +#pragma warning(disable : 4100) +#endif BOOL CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { _____ Modified: trunk/reactos/subsys/system/servman/propsheet.c --- trunk/reactos/subsys/system/servman/propsheet.c 2006-01-09 00:34:53 UTC (rev 20745) +++ trunk/reactos/subsys/system/servman/propsheet.c 2006-01-09 00:36:08 UTC (rev 20746) @@ -11,7 +11,9 @@ extern HINSTANCE hInstance; - +#ifdef _MSC_VER +#pragma warning(disable : 4100) +#endif /* Property page dialog callback */ INT_PTR CALLBACK GeneralPageProc(HWND hwndDlg, _____ Modified: trunk/reactos/subsys/system/servman/query.c --- trunk/reactos/subsys/system/servman/query.c 2006-01-09 00:34:53 UTC (rev 20745) +++ trunk/reactos/subsys/system/servman/query.c 2006-01-09 00:36:08 UTC (rev 20746) @@ -46,7 +46,7 @@ /* Create the icon image lists */ hSmall = ImageList_Create(GetSystemMetrics(SM_CXSMICON), - GetSystemMetrics(SM_CYSMICON), ILC_MASK | ILC_COLOR16, 1, 1); + GetSystemMetrics(SM_CYSMICON), ILC_MASK | ILC_COLOR16, 1, 1); /* Add an icon to each image list */ hiconItem = LoadImage(hInstance, MAKEINTRESOURCE(IDI_SM_ICON), IMAGE_ICON, 16, 16, 0); _____ Modified: trunk/reactos/subsys/system/servman/servman.c --- trunk/reactos/subsys/system/servman/servman.c 2006-01-09 00:34:53 UTC (rev 20745) +++ trunk/reactos/subsys/system/servman/servman.c 2006-01-09 00:36:08 UTC (rev 20746) @@ -177,12 +177,15 @@ SendMessage(hStatus, SB_SETPARTS, sizeof(statwidths)/sizeof(int), (LPARAM)statwidths); - /* populate the list view with all services */ + +/* ================= populate the list view with all services =================== */ + if (! RefreshServiceList() ) GetError(); } break; + case WM_SIZE: { RECT rcTool; @@ -241,7 +244,7 @@ // Specify the resource identifier of the descriptive // text for the given button. - idButton = lpttt->hdr.idFrom; + idButton = (UINT)lpttt->hdr.idFrom; switch (idButton) { case ID_PROP: @@ -337,11 +340,13 @@ break; case ID_HELP: + MessageBox(NULL, _T("Help is not yet implemented\n"), + _T("Note!"), MB_OK | MB_ICONINFORMATION); break; case ID_EXIT: - PostMessage(hwnd, WM_CLOSE, 0, 0); - break; + PostMessage(hwnd, WM_CLOSE, 0, 0); + break; case ID_VIEW_CUSTOMIZE: break; @@ -362,8 +367,9 @@ return 0; } - -//#pragma warning(disable : 4100) +#ifdef _MSC_VER +#pragma warning(disable : 4100) +#endif int WINAPI WinMain(HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) { @@ -426,7 +432,7 @@ DispatchMessage(&Msg); } } - return Msg.wParam; + return (int)Msg.wParam; } _____ Modified: trunk/reactos/subsys/system/servman/servman.h --- trunk/reactos/subsys/system/servman/servman.h 2006-01-09 00:34:53 UTC (rev 20745) +++ trunk/reactos/subsys/system/servman/servman.h 2006-01-09 00:36:08 UTC (rev 20746) @@ -13,15 +13,13 @@ BOOL RefreshServiceList(VOID); -BOOL CALLBACK -AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); +BOOL CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); VOID GetError(VOID); VOID FreeMemory(VOID); VOID DisplayString(PTCHAR); -LONG APIENTRY -PropSheets(HWND hwnd); +LONG APIENTRY PropSheets(HWND hwnd); DWORD GetServiceList(VOID);

18 years, 8 months

[gvg] 20745: Put in some UI logic

by gvg＠svn.reactos.org

Put in some UI logic Modified: trunk/reactos/lib/cpl/ncpa/tcpip_properties.c _____ Modified: trunk/reactos/lib/cpl/ncpa/tcpip_properties.c --- trunk/reactos/lib/cpl/ncpa/tcpip_properties.c 2006-01-09 00:30:33 UTC (rev 20744) +++ trunk/reactos/lib/cpl/ncpa/tcpip_properties.c 2006-01-09 00:34:53 UTC (rev 20745) @@ -1,30 +1,10 @@ /* - * ReactOS - * Copyright (C) 2004 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * PROJECT: ReactOS Network Control Panel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: lib/cpl/system/tcpip_properties.c + * PURPOSE: ReactOS Network Control Panel + * COPYRIGHT: Copyright 2004 Gero Kuehn (reactos.filter(a)gkware.com) */ -/* $Id$ - * - * PROJECT: ReactOS Network Control Panel - * FILE: lib/cpl/system/tcpip_properties.c - * PURPOSE: ReactOS Network Control Panel - * PROGRAMMER: Gero Kuehn (reactos.filter(a)gkware.com) - * UPDATE HISTORY: - * 08-15-2004 Created - */ #include <stdlib.h> #include <stdio.h> @@ -56,17 +36,32 @@ void InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc); static void -EnableDHCP( HWND hwndDlg, BOOL Enabled ) { - CheckDlgButton(hwndDlg,IDC_USEDHCP,Enabled ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg,IDC_NODHCP,Enabled ? BST_UNCHECKED : BST_CHECKED); +ManualDNS( HWND hwndDlg, BOOL Enabled ) { + CheckDlgButton(hwndDlg, IDC_FIXEDDNS, Enabled ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_AUTODNS, Enabled ? BST_UNCHECKED : BST_CHECKED); + EnableWindow(GetDlgItem(hwndDlg, IDC_DNS1), Enabled); + EnableWindow(GetDlgItem(hwndDlg, IDC_DNS2), Enabled); + if ( ! Enabled ) { + SendDlgItemMessage(hwndDlg, IDC_DNS1, IPM_CLEARADDRESS, 0, 0); + SendDlgItemMessage(hwndDlg, IDC_DNS2, IPM_CLEARADDRESS, 0, 0); + } } static void -ManualDNS( HWND hwndDlg, BOOL Enabled ) { - CheckDlgButton(hwndDlg,IDC_FIXEDDNS,Enabled ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg,IDC_AUTODNS,Enabled ? BST_UNCHECKED : BST_CHECKED); - EnableWindow(GetDlgItem(hwndDlg,IDC_DNS1),Enabled); - EnableWindow(GetDlgItem(hwndDlg,IDC_DNS2),Enabled); +EnableDHCP( HWND hwndDlg, BOOL Enabled ) { + CheckDlgButton(hwndDlg, IDC_USEDHCP, Enabled ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_NODHCP, Enabled ? BST_UNCHECKED : BST_CHECKED); + EnableWindow(GetDlgItem(hwndDlg, IDC_IPADDR), ! Enabled); + EnableWindow(GetDlgItem(hwndDlg, IDC_SUBNETMASK), ! Enabled); + EnableWindow(GetDlgItem(hwndDlg, IDC_DEFGATEWAY), ! Enabled); + EnableWindow(GetDlgItem(hwndDlg, IDC_AUTODNS), Enabled); + if ( Enabled ) { + SendDlgItemMessage(hwndDlg, IDC_IPADDR, IPM_CLEARADDRESS, 0, 0); + SendDlgItemMessage(hwndDlg, IDC_SUBNETMASK, IPM_CLEARADDRESS, 0, 0); + SendDlgItemMessage(hwndDlg, IDC_DEFGATEWAY, IPM_CLEARADDRESS, 0, 0); + } else { + ManualDNS(hwndDlg, TRUE); + } } static BOOL @@ -172,6 +167,7 @@ EnableDHCP( hwndDlg, pInfo->DhcpEnabled ); + if ( ! pInfo->DhcpEnabled ) { DWORD dwIPAddr; IP_ADDR_STRING *pString; @@ -208,7 +204,7 @@ NextDNSServer = pszDNS; - while( NextDNSServer && StaticDNS < 2 ) { + while( NextDNSServer && *NextDNSServer && StaticDNS < 2 ) { dwIPAddr = inet_addr(NextDNSServer); if( dwIPAddr != INADDR_NONE ) { SendDlgItemMessage(hwndDlg,IDC_DNS1 + StaticDNS, @@ -219,9 +215,8 @@ if( NextDNSServer ) NextDNSServer++; } - - ManualDNS( hwndDlg, StaticDNS ); } + ManualDNS( hwndDlg, StaticDNS ); } } break;

18 years, 8 months

[weiden] 20744: fixed desired access rights in GetFileSecurityW

by weiden＠svn.reactos.org

fixed desired access rights in GetFileSecurityW Modified: trunk/reactos/lib/advapi32/sec/misc.c _____ Modified: trunk/reactos/lib/advapi32/sec/misc.c --- trunk/reactos/lib/advapi32/sec/misc.c 2006-01-08 23:49:15 UTC (rev 20743) +++ trunk/reactos/lib/advapi32/sec/misc.c 2006-01-09 00:30:33 UTC (rev 20744) @@ -213,7 +213,7 @@ if (RequestedInformation & (OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION)) { - AccessMask |= STANDARD_RIGHTS_READ; + AccessMask |= READ_CONTROL; } if (RequestedInformation & SACL_SECURITY_INFORMATION)

18 years, 8 months

← Newer
1
...
31
32
33
34
35
36
37
...
59
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2006