Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 35368: - Move x86-specific code, which was accidentally committed to the generic part of crt library to arch specific area. - Include x86-specific _CI* functions into libcntpr.
by fireball＠svn.reactos.org 16 Aug '08

16 Aug '08

Author: fireball Date: Sat Aug 16 03:15:49 2008 New Revision: 35368 URL: http://svn.reactos.org/svn/reactos?rev=35368&view=rev Log: - Move x86-specific code, which was accidentally committed to the generic part of crt library to arch specific area. - Include x86-specific _CI* functions into libcntpr. Added: trunk/reactos/lib/sdk/crt/math/i386/ci.c (contents, props changed) - copied, changed from r35357, trunk/reactos/lib/sdk/crt/math/stubs.c Modified: trunk/reactos/lib/sdk/crt/crt.rbuild trunk/reactos/lib/sdk/crt/libcntpr.rbuild trunk/reactos/lib/sdk/crt/math/stubs.c Modified: trunk/reactos/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.rbuild?rev… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] Sat Aug 16 03:15:49 2008 @@ -104,6 +104,7 @@ <if property="ARCH" value="i386"> <directory name="i386"> <file>atan2.c</file> + <file>ci.c</file> <file>exp.c</file> <file>fmod.c</file> <file>ldexp.c</file> Modified: trunk/reactos/lib/sdk/crt/libcntpr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/libcntpr.rbuil… ============================================================================== --- trunk/reactos/lib/sdk/crt/libcntpr.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/libcntpr.rbuild [iso-8859-1] Sat Aug 16 03:15:49 2008 @@ -41,6 +41,7 @@ <file>aulldvrm_asm.s</file> <file>aullrem_asm.s</file> <file>aullshr_asm.s</file> + <file>ci.c</file> <file>ceil_asm.s</file> <file>cos_asm.s</file> <file>fabs_asm.s</file> Copied: trunk/reactos/lib/sdk/crt/math/i386/ci.c (from r35357, trunk/reactos/lib/sdk/crt/math/stubs.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/ci.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/stubs.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/i386/ci.c [iso-8859-1] Sat Aug 16 03:15:49 2008 @@ -135,90 +135,3 @@ FPU_DOUBLES(x, y); return fmod(x, y); } - -/* The following functions are likely workarounds for the pentium fdiv bug */ -void __stdcall _adj_fdiv_m32( unsigned int arg ) -{ - FIXME("_adj_fdiv_m32 stub\n"); -} -void __stdcall _adj_fdiv_m32i( int arg ) -{ - FIXME("_adj_fdiv_m32i stub\n"); -} - -void __stdcall _adj_fdiv_m64( unsigned __int64 arg ) -{ - FIXME("_adj_fdiv_m64 stub\n"); -} - -void _adj_fdiv_r(void) -{ - FIXME("_adj_fdiv_r stub\n"); -} - -void __stdcall _adj_fdivr_m32( unsigned int arg ) -{ - FIXME("_adj_fdivr_m32i stub\n"); -} - -void __stdcall _adj_fdivr_m32i( int arg ) -{ - FIXME("_adj_fdivr_m32i stub\n"); -} - -void __stdcall _adj_fdivr_m64( unsigned __int64 arg ) -{ - FIXME("_adj_fdivr_m64 stub\n"); -} - -void _adj_fpatan(void) -{ - FIXME("_adj_fpatan stub\n"); -} - -void __stdcall _adj_fdiv_m16i( short arg ) -{ - FIXME("_adj_fdiv_m16i stub\n"); -} - -void __stdcall _adj_fdivr_m16i( short arg ) -{ - FIXME("_adj_fdivr_m16i stub\n"); -} - -void _adj_fprem(void) -{ - FIXME("_adj_fprem stub\n"); -} - -void _adj_fprem1(void) -{ - FIXME("_adj_fprem1 stub\n"); -} - -void _adj_fptan(void) -{ - FIXME("_adj_fptan stub\n"); -} - -void _safe_fdiv(void) -{ - FIXME("_safe_fdiv stub\n"); -} - -void _safe_fdivr(void) -{ - FIXME("_safe_fdivr stub\n"); -} - -void _safe_fprem(void) -{ - FIXME("_safe_fprem stub\n"); -} - -void _safe_fprem1(void) -{ - FIXME("_safe_fprem1 stub\n"); -} - - Propchange: trunk/reactos/lib/sdk/crt/math/i386/ci.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/lib/sdk/crt/math/i386/ci.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Propchange: trunk/reactos/lib/sdk/crt/math/i386/ci.c ------------------------------------------------------------------------------ svn:mergeinfo = Modified: trunk/reactos/lib/sdk/crt/math/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/stubs.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/stubs.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/stubs.c [iso-8859-1] Sat Aug 16 03:15:49 2008 @@ -1,138 +1,134 @@ #include <precomp.h> #include <math.h> -#define FPU_DOUBLE(var) double var; \ - __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var) : ) -#define FPU_DOUBLES(var1,var2) double var1,var2; \ - __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var2) : ); \ - __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var1) : ) - -/* - * @implemented - */ -double CDECL _CIsin(void) -{ - FPU_DOUBLE(x); +double CDECL _CIsin(double x); +double CDECL _CIcos(double x); +double CDECL _CItan(double x); +double CDECL _CIsinh(double x); +double CDECL _CIcosh(double x); +double CDECL _CItanh(double x); +double CDECL _CIasin(double x); +double CDECL _CIacos(double x); +double CDECL _CIatan(double x); +double CDECL _CIatan2(double y, double x); +double CDECL _CIexp(double x); +double CDECL _CIlog(double x); +double CDECL _CIlog10(double x); +double CDECL _CIpow(double x, double y); +double CDECL _CIsqrt(double x); +double CDECL _CIfmod(double x, double y); + + +/* + * @implemented + */ +double CDECL _CIsin(double x) +{ return sin(x); } /* * @implemented */ -double CDECL _CIcos(void) -{ - FPU_DOUBLE(x); +double CDECL _CIcos(double x) +{ return cos(x); } /* * @implemented */ -double CDECL _CItan(void) -{ - FPU_DOUBLE(x); +double CDECL _CItan(double x) +{ return tan(x); } /* * @implemented */ -double CDECL _CIsinh(void) -{ - FPU_DOUBLE(x); +double CDECL _CIsinh(double x) +{ return sinh(x); } /* * @implemented */ -double CDECL _CIcosh(void) -{ - FPU_DOUBLE(x); +double CDECL _CIcosh(double x) +{ return cosh(x); } /* * @implemented */ -double CDECL _CItanh(void) -{ - FPU_DOUBLE(x); +double CDECL _CItanh(double x) +{ return tanh(x); } /* * @implemented */ -double CDECL _CIasin(void) -{ - FPU_DOUBLE(x); +double CDECL _CIasin(double x) +{ return asin(x); } /* * @implemented */ -double CDECL _CIacos(void) -{ - FPU_DOUBLE(x); +double CDECL _CIacos(double x) +{ return acos(x); } /* * @implemented */ -double CDECL _CIatan(void) -{ - FPU_DOUBLE(x); +double CDECL _CIatan(double x) +{ return atan(x); } /* * @implemented */ -double CDECL _CIatan2(void) -{ - FPU_DOUBLES(x, y); - return atan2(x, y); -} -/* - * @implemented - */ -double CDECL _CIexp(void) -{ - FPU_DOUBLE(x); +double CDECL _CIatan2(double x, double y) +{ + return atan2(y, x); +} +/* + * @implemented + */ +double CDECL _CIexp(double x) +{ return exp(x); } /* * @implemented */ -double CDECL _CIlog(void) -{ - FPU_DOUBLE(x); +double CDECL _CIlog(double x) +{ return log(x); } /* * @implemented */ -double CDECL _CIlog10(void) -{ - FPU_DOUBLE(x); +double CDECL _CIlog10(double x) +{ return log10(x); } /* * @implemented */ -double CDECL _CIpow(void) -{ - FPU_DOUBLES(x, y); +double CDECL _CIpow(double x, double y) +{ return pow(x, y); } /* * @implemented */ -double CDECL _CIsqrt(void) -{ - FPU_DOUBLE(x); +double CDECL _CIsqrt(double x) +{ return sqrt(x); } /* * @implemented */ -double CDECL _CIfmod(void) -{ - FPU_DOUBLES(x, y); +double CDECL _CIfmod(double x, double y) +{ return fmod(x, y); }

1 0

[dreimer] 35367: Update ReactOS Calc to Version 1.10.
by dreimer＠svn.reactos.org 16 Aug '08

16 Aug '08

Author: dreimer Date: Sat Aug 16 03:08:55 2008 New Revision: 35367 URL: http://svn.reactos.org/svn/reactos?rev=35367&view=rev Log: Update ReactOS Calc to Version 1.10. Modified: trunk/reactos/base/applications/calc/calc.h trunk/reactos/base/applications/calc/calc.rbuild trunk/reactos/base/applications/calc/convert.c trunk/reactos/base/applications/calc/rpn.c trunk/reactos/base/applications/calc/rpn_mpfr.c trunk/reactos/base/applications/calc/whatsnew.txt trunk/reactos/base/applications/calc/winmain.c Modified: trunk/reactos/base/applications/calc/calc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/cal… ============================================================================== --- trunk/reactos/base/applications/calc/calc.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/calc.h [iso-8859-1] Sat Aug 16 03:08:55 2008 @@ -42,7 +42,9 @@ #define IDC_STATIC ((DWORD)-1) #endif -#define CALC_VERSION TEXT("1.09") +#define CALC_VERSION TEXT("1.10") + +#define MAX_CALC_SIZE 256 /*#define USE_KEYBOARD_HOOK*/ @@ -144,7 +146,8 @@ #endif HWND hWnd; DWORD layout; - TCHAR buffer[256]; + TCHAR buffer[MAX_CALC_SIZE]; + TCHAR source[MAX_CALC_SIZE]; TCHAR *ptr; calc_number_t code; calc_number_t prev; Modified: trunk/reactos/base/applications/calc/calc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/cal… ============================================================================== --- trunk/reactos/base/applications/calc/calc.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/calc.rbuild [iso-8859-1] Sat Aug 16 03:08:55 2008 @@ -2,13 +2,13 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="calc" type="win32gui" installbase="system32" installname="calc.exe" allowwarnings="true" unicode="yes"> <include base="calc">.</include> - <define name="DISABLE_HTMLHELP_SUPPORT">1</define> + <define name="DISABLE_HTMLHELP_SUPPORT">1</define> <define name="_WIN32_WINNT">0x0501</define> <library>user32</library> <library>gdi32</library> <library>kernel32</library> <file>about.c</file> - <file>convert.c</file> + <file>convert.c</file> <file>function.c</file> <file>rpn.c</file> <file>utl.c</file> Modified: trunk/reactos/base/applications/calc/convert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/con… ============================================================================== --- trunk/reactos/base/applications/calc/convert.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/convert.c [iso-8859-1] Sat Aug 16 03:08:55 2008 @@ -561,4 +561,3 @@ ConvAdjust(hWnd, 0); } - Modified: trunk/reactos/base/applications/calc/rpn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/rpn… ============================================================================== --- trunk/reactos/base/applications/calc/rpn.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/rpn.c [iso-8859-1] Sat Aug 16 03:08:55 2008 @@ -310,6 +310,8 @@ operator_list[operation].op_p(&dc, &da, &db); } else operator_list[operation].op_f(&dc, &da, &db); + if (_finite(dc.f) == 0) + calc.is_nan = TRUE; } else { operator_list[operation].op_i(&dc, &da, &db); /* apply final limitator to result */ @@ -331,7 +333,6 @@ stack_node_t *op, ip; unsigned int prec; - percent_mode = FALSE; op = pop(); ip = *op; prec = operator_list[ip.node.operation].prec; @@ -373,6 +374,9 @@ return 0; } + if (func == RPN_OPERATOR_PERCENT) + percent_mode = TRUE; + tmp.node.number = *number; tmp.node.base = calc.base; tmp.node.operation = func; Modified: trunk/reactos/base/applications/calc/rpn_mpfr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/rpn… ============================================================================== --- trunk/reactos/base/applications/calc/rpn_mpfr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/rpn_mpfr.c [iso-8859-1] Sat Aug 16 03:08:55 2008 @@ -311,7 +311,6 @@ unsigned int prec; mpfr_init(ip.node.number.mf); - percent_mode = FALSE; op = pop(); node_copy(&ip, op); prec = operator_list[ip.node.operation].prec; @@ -355,6 +354,9 @@ return 0; } + if (func == RPN_OPERATOR_PERCENT) + percent_mode = TRUE; + mpfr_init(tmp.node.number.mf); rpn_copy(&tmp.node.number, number); tmp.node.operation = func; Modified: trunk/reactos/base/applications/calc/whatsnew.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/wha… ============================================================================== --- trunk/reactos/base/applications/calc/whatsnew.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/whatsnew.txt [iso-8859-1] Sat Aug 16 03:08:55 2008 @@ -1,3 +1,14 @@ +1.10 (20080813) +======================= +* Added Norvegian and Korean translations. +* Fixed Polish and Slovak translations. +* Fixed percent mode. +* Fixed some unsignaled overflow errors. +* Fixed conversion method, now scientific notation is recognized too. +* Added compilation for UNICODE executables. +* Plain MINGW toolchain do not support wWinMain function, so I switched to old WinMain if it is not under ReactOS' build tree. +* Detect error if UNICODE version is launched into Win9x (avoid the lock). + 1.09 (20080630) ======================= * Fixed bug with Conversion function: "Category" type must be found like "from" and "to" because the combobox sorts its items alphabetically. Modified: trunk/reactos/base/applications/calc/winmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/win… ============================================================================== --- trunk/reactos/base/applications/calc/winmain.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/winmain.c [iso-8859-1] Sat Aug 16 03:08:55 2008 @@ -784,68 +784,18 @@ static char *ReadConversion(const char *formula) { - unsigned int len = 256, n; - char *str; - char *code = NULL; - const char *p = formula; - char c; - calc_number_t x; - TCHAR buffer[SIZEOF(calc.buffer)]; -#ifdef UNICODE - char cbuffer[SIZEOF(calc.buffer)]; -#endif - - str = (char *)malloc(len); + int len = strlen(formula); + char *str = (char *)malloc(len+3); + if (str == NULL) return NULL; - /* prepare code string */ - rpn_alloc(&x); - convert_text2number(&x); - prepare_rpn_result(&x, - buffer, SIZEOF(buffer), - calc.base); - rpn_free(&x); - -#ifdef UNICODE - WideCharToMultiByte(CP_ACP, 0, buffer, -1, cbuffer, SIZEOF(cbuffer), NULL, NULL); -#endif - str[0] = '('; - n = 1; - while (1) { - if (code != NULL) { - c = *code++; - if (*code == '\0') - code = NULL; - } else - c = *p++; - - if (c == '\0') { - str[n++] = ')'; - if (n >= len-1) { - str = (char *)realloc(str, len += 16); - if (str == NULL) - return NULL; - } - break; - } else - if (c == '$') { -#ifdef UNICODE - code = cbuffer; -#else - code = buffer; -#endif - continue; - } - str[n++] = c; - if (n >= len-1) { - str = (char *)realloc(str, len += 16); - if (str == NULL) - return NULL; - } - } - str[n] = '\0'; + memcpy(str+1, formula, len); + str[len+1] = ')'; + str[len+2] = '\0'; + + _tcscpy(calc.source, (*calc.buffer == _T('\0')) ? _T("0") : calc.buffer); /* clear display content before proceeding */ calc.ptr = calc.buffer; @@ -991,6 +941,11 @@ case 'Q': PostMessage(hwnd, WM_COMMAND, (WPARAM)IDC_BUTTON_CANC, 0); break; case 'R': PostMessage(hwnd, WM_COMMAND, (WPARAM)IDC_BUTTON_MR, 0); break; } + } else + if (ch == '$') { + calc.ptr = + _tcscpy(calc.buffer, calc.source) + + _tcslen(calc.source); } else { for (x=0; x<SIZEOF(key2code); x++) { if (!(key2code[x].mask & BITMASK_IS_ASCII) || @@ -1650,13 +1605,15 @@ } return TRUE; case WM_HANDLE_FROM: - if (handle_sequence_input(hWnd, &calc.Convert[0]) == NULL) { + if (calc.is_nan) + break; + if (handle_sequence_input(hWnd, &calc.Convert[0]) == NULL) PostMessage(hWnd, WM_START_CONV, 0, MAKELPARAM(0x0001, WM_HANDLE_TO)); - } return TRUE; case WM_HANDLE_TO: - handle_sequence_input(hWnd, &calc.Convert[1]); + if (!calc.is_nan) + handle_sequence_input(hWnd, &calc.Convert[1]); return TRUE; case WM_CLOSE: calc.action = IDC_STATIC; @@ -1692,7 +1649,11 @@ return FALSE; } +#if defined(__GNUC__) && !defined(__REACTOS__) +int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nShowCmd) +#else int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nShowCmd) +#endif { MSG msg; DWORD dwLayout; @@ -1715,7 +1676,9 @@ else dwLayout = IDD_DIALOG_STANDARD; - CreateDialog(hInstance, MAKEINTRESOURCE(dwLayout), NULL, (DLGPROC)DlgMainProc); + /* This call will always fail if UNICODE for Win9x */ + if (NULL == CreateDialog(hInstance, MAKEINTRESOURCE(dwLayout), NULL, (DLGPROC)DlgMainProc)) + break; while (GetMessage(&msg, NULL, 0, 0)) { #ifndef USE_KEYBOARD_HOOK

1 0

[arty] 35366: Partial merge to keep current.
by arty＠svn.reactos.org 16 Aug '08

16 Aug '08

Author: arty Date: Fri Aug 15 23:31:02 2008 New Revision: 35366 URL: http://svn.reactos.org/svn/reactos?rev=35366&view=rev Log: Partial merge to keep current. Added: branches/arty-newcc/dll/win32/shell32/res/icons/182.ico - copied unchanged from r35355, trunk/reactos/dll/win32/shell32/res/icons/182.ico branches/arty-newcc/dll/win32/shell32/res/icons/183.ico - copied unchanged from r35355, trunk/reactos/dll/win32/shell32/res/icons/183.ico branches/arty-newcc/dll/win32/shell32/res/icons/184.ico - copied unchanged from r35355, trunk/reactos/dll/win32/shell32/res/icons/184.ico branches/arty-newcc/dll/win32/shell32/res/icons/185.ico - copied unchanged from r35355, trunk/reactos/dll/win32/shell32/res/icons/185.ico branches/arty-newcc/dll/win32/shell32/res/icons/186.ico - copied unchanged from r35355, trunk/reactos/dll/win32/shell32/res/icons/186.ico branches/arty-newcc/dll/win32/shell32/res/icons/187.ico - copied unchanged from r35355, trunk/reactos/dll/win32/shell32/res/icons/187.ico branches/arty-newcc/dll/win32/shell32/shfldr_admintools.c - copied unchanged from r35355, trunk/reactos/dll/win32/shell32/shfldr_admintools.c branches/arty-newcc/dll/win32/shell32/shfldr_mydocuments.c - copied unchanged from r35355, trunk/reactos/dll/win32/shell32/shfldr_mydocuments.c branches/arty-newcc/dll/win32/shell32/shfldr_recyclebin.c - copied unchanged from r35355, trunk/reactos/dll/win32/shell32/shfldr_recyclebin.c branches/arty-newcc/subsystems/win32/csrss/win32csr/lang/no-NO.rc - copied unchanged from r35355, trunk/reactos/subsystems/win32/csrss/win32csr/lang/no-NO.rc Modified: branches/arty-newcc/ReactOS-arm.rbuild branches/arty-newcc/ReactOS-i386.rbuild branches/arty-newcc/boot/bootdata/hivesft_i386.inf branches/arty-newcc/boot/bootdata/txtsetup.sif branches/arty-newcc/boot/freeldr/freeldr/reactos/reactos.c branches/arty-newcc/boot/freeldr/freeldr/reactos/setupldr.c branches/arty-newcc/dll/3rdparty/dxtn/internal.h branches/arty-newcc/dll/3rdparty/mesa32/mesa32.rbuild branches/arty-newcc/dll/cpl/access/lang/fr-FR.rc branches/arty-newcc/dll/cpl/console/lang/no-NO.rc branches/arty-newcc/dll/cpl/desk/lang/fr-FR.rc branches/arty-newcc/dll/cpl/intl/lang/it-IT.rc branches/arty-newcc/dll/ntdll/ntdll.rbuild branches/arty-newcc/dll/win32/advapi32/advapi32.def branches/arty-newcc/dll/win32/devmgr/lang/no-NO.rc branches/arty-newcc/dll/win32/msgina/lang/it-IT.rc branches/arty-newcc/dll/win32/msvcrt/msvcrt.rbuild branches/arty-newcc/dll/win32/riched20/riched20.rbuild branches/arty-newcc/dll/win32/shell32/classes.c branches/arty-newcc/dll/win32/shell32/drive.c branches/arty-newcc/dll/win32/shell32/icon_res.rc branches/arty-newcc/dll/win32/shell32/lang/bg-BG.rc branches/arty-newcc/dll/win32/shell32/lang/ca-ES.rc branches/arty-newcc/dll/win32/shell32/lang/cs-CZ.rc branches/arty-newcc/dll/win32/shell32/lang/da-DK.rc branches/arty-newcc/dll/win32/shell32/lang/de-DE.rc branches/arty-newcc/dll/win32/shell32/lang/el-GR.rc branches/arty-newcc/dll/win32/shell32/lang/en-GB.rc branches/arty-newcc/dll/win32/shell32/lang/en-US.rc branches/arty-newcc/dll/win32/shell32/lang/es-ES.rc branches/arty-newcc/dll/win32/shell32/lang/fi-FI.rc branches/arty-newcc/dll/win32/shell32/lang/fr-FR.rc branches/arty-newcc/dll/win32/shell32/lang/hu-HU.rc branches/arty-newcc/dll/win32/shell32/lang/it-IT.rc branches/arty-newcc/dll/win32/shell32/lang/ja-JP.rc branches/arty-newcc/dll/win32/shell32/lang/ko-KR.rc branches/arty-newcc/dll/win32/shell32/lang/nl-NL.rc branches/arty-newcc/dll/win32/shell32/lang/no-NO.rc branches/arty-newcc/dll/win32/shell32/lang/pl-PL.rc branches/arty-newcc/dll/win32/shell32/lang/pt-BR.rc branches/arty-newcc/dll/win32/shell32/lang/pt-PT.rc branches/arty-newcc/dll/win32/shell32/lang/ru-RU.rc branches/arty-newcc/dll/win32/shell32/lang/sk-SK.rc branches/arty-newcc/dll/win32/shell32/lang/sl-SI.rc branches/arty-newcc/dll/win32/shell32/lang/sv-SE.rc branches/arty-newcc/dll/win32/shell32/lang/tr-TR.rc branches/arty-newcc/dll/win32/shell32/lang/uk-UA.rc branches/arty-newcc/dll/win32/shell32/lang/zh-CN.rc branches/arty-newcc/dll/win32/shell32/lang/zh-TW.rc branches/arty-newcc/dll/win32/shell32/pidl.c branches/arty-newcc/dll/win32/shell32/pidl.h branches/arty-newcc/dll/win32/shell32/regsvr.c branches/arty-newcc/dll/win32/shell32/shell32.rbuild branches/arty-newcc/dll/win32/shell32/shell32_main.h branches/arty-newcc/dll/win32/shell32/shellole.c branches/arty-newcc/dll/win32/shell32/shellord.c branches/arty-newcc/dll/win32/shell32/shresdef.h branches/arty-newcc/dll/win32/shlwapi/shlwapi_No.rc branches/arty-newcc/dll/win32/syssetup/lang/no-NO.rc branches/arty-newcc/dll/win32/userenv/setup.c branches/arty-newcc/drivers/network/afd/afd/connect.c branches/arty-newcc/drivers/network/afd/afd/listen.c branches/arty-newcc/drivers/network/afd/afd/lock.c branches/arty-newcc/drivers/network/afd/afd/main.c branches/arty-newcc/drivers/network/afd/afd/read.c branches/arty-newcc/drivers/network/afd/afd/select.c branches/arty-newcc/drivers/network/afd/afd/tdi.c branches/arty-newcc/drivers/network/afd/afd/tdiconn.c branches/arty-newcc/drivers/network/afd/afd/write.c branches/arty-newcc/drivers/network/afd/include/afd.h branches/arty-newcc/include/psdk/shellapi.h branches/arty-newcc/include/psdk/shlguid.h branches/arty-newcc/lib/recyclebin/recyclebin.c branches/arty-newcc/lib/recyclebin/recyclebin.h branches/arty-newcc/lib/sdk/crt/crt.rbuild branches/arty-newcc/lib/sdk/crt/stdio/lnx_sprintf.c (contents, props changed) branches/arty-newcc/media/fonts/fonts.rbuild branches/arty-newcc/subsystems/win32/csrss/win32csr/lang/fr-FR.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/arty-newcc/ReactOS-arm.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ReactOS-arm.rbuild?r… Modified: branches/arty-newcc/ReactOS-i386.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ReactOS-i386.rbuild?… Modified: branches/arty-newcc/boot/bootdata/hivesft_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/boot/bootdata/hivesf… Modified: branches/arty-newcc/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/boot/bootdata/txtset… Modified: branches/arty-newcc/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/boot/freeldr/freeldr… Modified: branches/arty-newcc/boot/freeldr/freeldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/boot/freeldr/freeldr… Modified: branches/arty-newcc/dll/3rdparty/dxtn/internal.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/3rdparty/dxtn/in… Modified: branches/arty-newcc/dll/3rdparty/mesa32/mesa32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/3rdparty/mesa32/… Modified: branches/arty-newcc/dll/cpl/access/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/cpl/access/lang/… Modified: branches/arty-newcc/dll/cpl/console/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/cpl/console/lang… Modified: branches/arty-newcc/dll/cpl/desk/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/cpl/desk/lang/fr… Modified: branches/arty-newcc/dll/cpl/intl/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/cpl/intl/lang/it… Modified: branches/arty-newcc/dll/ntdll/ntdll.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/ntdll/ntdll.rbui… Modified: branches/arty-newcc/dll/win32/advapi32/advapi32.def URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/advapi32/a… Modified: branches/arty-newcc/dll/win32/devmgr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/devmgr/lan… Modified: branches/arty-newcc/dll/win32/msgina/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/msgina/lan… Modified: branches/arty-newcc/dll/win32/msvcrt/msvcrt.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/msvcrt/msv… Modified: branches/arty-newcc/dll/win32/riched20/riched20.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/riched20/r… Modified: branches/arty-newcc/dll/win32/shell32/classes.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/cl… Modified: branches/arty-newcc/dll/win32/shell32/drive.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/dr… Modified: branches/arty-newcc/dll/win32/shell32/icon_res.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/ic… Modified: branches/arty-newcc/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/la… Modified: branches/arty-newcc/dll/win32/shell32/pidl.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/pi… Modified: branches/arty-newcc/dll/win32/shell32/pidl.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/pi… Modified: branches/arty-newcc/dll/win32/shell32/regsvr.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/re… Modified: branches/arty-newcc/dll/win32/shell32/shell32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/sh… Modified: branches/arty-newcc/dll/win32/shell32/shell32_main.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/sh… Modified: branches/arty-newcc/dll/win32/shell32/shellole.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/sh… Modified: branches/arty-newcc/dll/win32/shell32/shellord.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/sh… Modified: branches/arty-newcc/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/sh… Modified: branches/arty-newcc/dll/win32/shlwapi/shlwapi_No.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shlwapi/sh… Modified: branches/arty-newcc/dll/win32/syssetup/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/syssetup/l… Modified: branches/arty-newcc/dll/win32/userenv/setup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/userenv/se… Modified: branches/arty-newcc/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/network/afd/… Modified: branches/arty-newcc/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/network/afd/… Modified: branches/arty-newcc/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/network/afd/… Modified: branches/arty-newcc/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/network/afd/… Modified: branches/arty-newcc/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/network/afd/… Modified: branches/arty-newcc/drivers/network/afd/afd/select.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/network/afd/… Modified: branches/arty-newcc/drivers/network/afd/afd/tdi.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/network/afd/… Modified: branches/arty-newcc/drivers/network/afd/afd/tdiconn.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/network/afd/… Modified: branches/arty-newcc/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/network/afd/… Modified: branches/arty-newcc/drivers/network/afd/include/afd.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/network/afd/… Modified: branches/arty-newcc/include/psdk/shellapi.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/psdk/shellap… Modified: branches/arty-newcc/include/psdk/shlguid.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/psdk/shlguid… Modified: branches/arty-newcc/lib/recyclebin/recyclebin.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/lib/recyclebin/recyc… Modified: branches/arty-newcc/lib/recyclebin/recyclebin.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/lib/recyclebin/recyc… Modified: branches/arty-newcc/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/lib/sdk/crt/crt.rbui… Modified: branches/arty-newcc/lib/sdk/crt/stdio/lnx_sprintf.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/lib/sdk/crt/stdio/ln… Modified: branches/arty-newcc/media/fonts/fonts.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/media/fonts/fonts.rb… Modified: branches/arty-newcc/subsystems/win32/csrss/win32csr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/subsystems/win32/csr…

1 0

[arty] 35365: Fix thread and process listing. Quite helpful.
by arty＠svn.reactos.org 16 Aug '08

16 Aug '08

Author: arty Date: Fri Aug 15 22:30:22 2008 New Revision: 35365 URL: http://svn.reactos.org/svn/reactos?rev=35365&view=rev Log: Fix thread and process listing. Quite helpful. Modified: trunk/tools/reactosdbg/DebugProtocol/KDBG.cs Modified: trunk/tools/reactosdbg/DebugProtocol/KDBG.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/DebugProtocol/KDB… ============================================================================== --- trunk/tools/reactosdbg/DebugProtocol/KDBG.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/DebugProtocol/KDBG.cs [iso-8859-1] Fri Aug 15 22:30:22 2008 @@ -251,7 +251,7 @@ else { Match pidEntryMatch = mProcListEntry.Match(cleanedLine); - if (pidEntryMatch.Success) + if (pidEntryMatch.Success && mReceivingProcs) { if (ProcessListEvent != null) ProcessListEvent(this, new ProcessListEventArgs(ulong.Parse(pidEntryMatch.Groups["pid"].ToString(), NumberStyles.HexNumber), pidEntryMatch.Groups["cur"].Length > 0)); @@ -275,7 +275,7 @@ else { Match tidEntryMatch = mThreadListEntry.Match(cleanedLine); - if (tidEntryMatch.Success) + if (tidEntryMatch.Success && mReceivingThreads) { if (ThreadListEvent != null) ThreadListEvent(this, new ThreadListEventArgs(ulong.Parse(tidEntryMatch.Groups["tid"].ToString(), NumberStyles.HexNumber), tidEntryMatch.Groups["cur"].Length > 0));

1 0

[ros-arm-bringup] 35364: Implement InterlockedComparePte and InterlockedCompareExchangePte to: 1) Avoid all the casting currently being done 2) Allow portability with other platforms so that the code can be potentially shared later.
by ros-arm-bringup＠svn.reactos.org 16 Aug '08

16 Aug '08

Author: ros-arm-bringup Date: Fri Aug 15 20:58:59 2008 New Revision: 35364 URL: http://svn.reactos.org/svn/reactos?rev=35364&view=rev Log: Implement InterlockedComparePte and InterlockedCompareExchangePte to: 1) Avoid all the casting currently being done 2) Allow portability with other platforms so that the code can be potentially shared later. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/i386/page.c Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Fri Aug 15 20:58:59 2008 @@ -163,6 +163,13 @@ #define PAGE_IS_WRITECOPY \ (PAGE_WRITECOPY | \ PAGE_EXECUTE_WRITECOPY) + + +#define InterlockedCompareExchangePte(PointerPte, Exchange, Comperand) \ + InterlockedCompareExchange((PLONG)(PointerPte), Exchange, Comperand) + +#define InterlockedExchangePte(PointerPte, Value) \ + InterlockedExchange((PLONG)(PointerPte), Value) typedef struct { Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Fri Aug 15 20:58:59 2008 @@ -331,7 +331,7 @@ { KEBUGCHECK(0); } - if (0 == InterlockedCompareExchangeUL(&PageDir[PdeOffset], 0, 0)) + if (0 == InterlockedCompareExchangePte(&PageDir[PdeOffset], 0, 0)) { if (Create == FALSE) { @@ -343,7 +343,7 @@ { KEBUGCHECK(0); } - Entry = InterlockedCompareExchangeUL(&PageDir[PdeOffset], PFN_TO_PTE(Pfn) | PA_PRESENT | PA_READWRITE | PA_USER, 0); + Entry = InterlockedCompareExchangePte(&PageDir[PdeOffset], PFN_TO_PTE(Pfn) | PA_PRESENT | PA_READWRITE | PA_USER, 0); if (Entry != 0) { MmReleasePageMemoryConsumer(MC_NPPOOL, Pfn); @@ -363,11 +363,11 @@ return Pt + ADDR_TO_PTE_OFFSET(Address); } PageDir = (PULONG)MiAddressToPde(Address); - if (0 == InterlockedCompareExchangeUL(PageDir, 0, 0)) + if (0 == InterlockedCompareExchangePte(PageDir, 0, 0)) { if (Address >= MmSystemRangeStart) { - if (0 == InterlockedCompareExchangeUL(&MmGlobalKernelPageDirectory[PdeOffset], 0, 0)) + if (0 == InterlockedCompareExchangePte(&MmGlobalKernelPageDirectory[PdeOffset], 0, 0)) { if (Create == FALSE) { @@ -383,12 +383,12 @@ { Entry |= PA_GLOBAL; } - if(0 != InterlockedCompareExchangeUL(&MmGlobalKernelPageDirectory[PdeOffset], Entry, 0)) + if(0 != InterlockedCompareExchangePte(&MmGlobalKernelPageDirectory[PdeOffset], Entry, 0)) { MmReleasePageMemoryConsumer(MC_NPPOOL, Pfn); } } - (void)InterlockedExchangeUL(PageDir, MmGlobalKernelPageDirectory[PdeOffset]); + InterlockedExchangePte(PageDir, MmGlobalKernelPageDirectory[PdeOffset]); } else { @@ -401,7 +401,7 @@ { KEBUGCHECK(0); } - Entry = InterlockedCompareExchangeUL(PageDir, PFN_TO_PTE(Pfn) | PA_PRESENT | PA_READWRITE | PA_USER, 0); + Entry = InterlockedCompareExchangePte(PageDir, PFN_TO_PTE(Pfn) | PA_PRESENT | PA_READWRITE | PA_USER, 0); if (Entry != 0) { MmReleasePageMemoryConsumer(MC_NPPOOL, Pfn); @@ -476,7 +476,7 @@ do { Pte = *Pt; - } while (Pte != InterlockedCompareExchangeUL(Pt, Pte & ~PA_PRESENT, Pte)); + } while (Pte != InterlockedCompareExchangePte(Pt, Pte & ~PA_PRESENT, Pte)); MiFlushTlb(Pt, Address); WasValid = (PAGE_MASK(Pte) != 0); @@ -510,7 +510,7 @@ /* * Set the entry to zero */ - (void)InterlockedExchangeUL(Pt, 0); + InterlockedExchangePte(Pt, 0); MiFlushTlb(Pt, Address); } } @@ -549,7 +549,7 @@ /* * Atomically set the entry to zero and get the old value. */ - Pte = InterlockedExchangeUL(Pt, 0); + Pte = InterlockedExchangePte(Pt, 0); MiFlushTlb(Pt, Address); @@ -604,7 +604,7 @@ /* * Atomically set the entry to zero and get the old value. */ - Pte = InterlockedExchangeUL(Pt, 0); + Pte = InterlockedExchangePte(Pt, 0); MiFlushTlb(Pt, Address); @@ -659,7 +659,7 @@ do { Pte = *Pt; - } while (Pte != InterlockedCompareExchangeUL(Pt, Pte & ~PA_ACCESSED, Pte)); + } while (Pte != InterlockedCompareExchangePte(Pt, Pte & ~PA_ACCESSED, Pte)); if (Pte & PA_ACCESSED) { @@ -696,7 +696,7 @@ do { Pte = *Pt; - } while (Pte != InterlockedCompareExchangeUL(Pt, Pte & ~PA_DIRTY, Pte)); + } while (Pte != InterlockedCompareExchangePte(Pt, Pte & ~PA_DIRTY, Pte)); if (Pte & PA_DIRTY) { @@ -730,7 +730,7 @@ do { Pte = *Pt; - } while (Pte != InterlockedCompareExchangeUL(Pt, Pte | PA_DIRTY, Pte)); + } while (Pte != InterlockedCompareExchangePte(Pt, Pte | PA_DIRTY, Pte)); if (!(Pte & PA_DIRTY)) { MiFlushTlb(Pt, Address); @@ -757,7 +757,7 @@ do { Pte = *Pt; - } while (Pte != InterlockedCompareExchangeUL(Pt, Pte | PA_PRESENT, Pte)); + } while (Pte != InterlockedCompareExchangePte(Pt, Pte | PA_PRESENT, Pte)); if (!(Pte & PA_PRESENT)) { MiFlushTlb(Pt, Address); @@ -859,7 +859,7 @@ { KEBUGCHECK(0); } - (void)InterlockedExchangeUL(Pt, PFN_TO_PTE(Pages[i]) | Attributes); + InterlockedExchangePte(Pt, PFN_TO_PTE(Pages[i]) | Attributes); } return(STATUS_SUCCESS); @@ -899,7 +899,7 @@ { MmMarkPageUnmapped(PTE_TO_PFN((Pte))); } - (void)InterlockedExchangeUL(Pt, SwapEntry << 1); + InterlockedExchangePte(Pt, SwapEntry << 1); if (Pte != 0) { MiFlushTlb(Pt, Address); @@ -1018,7 +1018,7 @@ { MmMarkPageUnmapped(PTE_TO_PFN((Pte))); } - (void)InterlockedExchangeUL(Pt, PFN_TO_PTE(Pages[i]) | Attributes); + InterlockedExchangePte(Pt, PFN_TO_PTE(Pages[i]) | Attributes); if (Pte != 0) { if (Address > MmSystemRangeStart || @@ -1138,7 +1138,7 @@ { KEBUGCHECK(0); } - InterlockedExchange((PLONG)Pt, PAGE_MASK(*Pt) | Attributes | (*Pt & (PA_ACCESSED|PA_DIRTY))); + InterlockedExchangePte(Pt, PAGE_MASK(*Pt) | Attributes | (*Pt & (PA_ACCESSED|PA_DIRTY))); MiFlushTlb(Pt, Address); } @@ -1243,7 +1243,7 @@ ASSERT (IS_HYPERSPACE(Address)); - Entry = InterlockedExchange((PLONG)MiAddressToPte(Address), PFN_TO_PTE(NewPage) | PA_PRESENT | PA_READWRITE); + Entry = InterlockedExchangePte(MiAddressToPte(Address), PFN_TO_PTE(NewPage) | PA_PRESENT | PA_READWRITE); Pfn = PTE_TO_PFN(Entry); __invlpg(Address); @@ -1259,7 +1259,7 @@ ASSERT (IS_HYPERSPACE(Address)); - Entry = InterlockedExchange((PLONG)MiAddressToPte(Address), 0); + Entry = InterlockedExchangePte(MiAddressToPte(Address), 0); Pfn = PTE_TO_PFN(Entry); __invlpg(Address); @@ -1293,7 +1293,7 @@ { if (Offset != ADDR_TO_PDE_OFFSET(PAGETABLE_MAP)) { - (void)InterlockedCompareExchangeUL(&Pde[Offset], MmGlobalKernelPageDirectory[Offset], 0); + InterlockedCompareExchangePte(&Pde[Offset], MmGlobalKernelPageDirectory[Offset], 0); } } if (Pde != (PULONG)PAGEDIRECTORY_MAP)

1 0

[cgutman] 35363: - Raise the maximum IRQL that this routine is callable to APC_LEVEL
by cgutman＠svn.reactos.org 16 Aug '08

16 Aug '08

Author: cgutman Date: Fri Aug 15 19:28:33 2008 New Revision: 35363 URL: http://svn.reactos.org/svn/reactos?rev=35363&view=rev Log: - Raise the maximum IRQL that this routine is callable to APC_LEVEL Modified: branches/aicom-network-fixes/drivers/network/afd/afd/lock.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/lock.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/lock.c [iso-8859-1] Fri Aug 15 19:28:33 2008 @@ -167,7 +167,7 @@ NTSTATUS Status = STATUS_SUCCESS; PVOID CurrentThread = KeGetCurrentThread(); - ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); + ASSERT(KeGetCurrentIrql() <= APC_LEVEL); AFD_DbgPrint(MAX_TRACE,("Called on %x, attempting to lock\n", FCB)); @@ -218,7 +218,7 @@ PVOID CurrentThread = KeGetCurrentThread(); #endif ASSERT(FCB->LockCount > 0); - ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); + ASSERT(KeGetCurrentIrql() <= APC_LEVEL); ExAcquireFastMutex( &FCB->Mutex ); FCB->LockCount--;

1 0

[tkreuzer] 35362: - fix pointer to ulong cast
by tkreuzer＠svn.reactos.org 16 Aug '08

16 Aug '08

Author: tkreuzer Date: Fri Aug 15 19:18:27 2008 New Revision: 35362 URL: http://svn.reactos.org/svn/reactos?rev=35362&view=rev Log: - fix pointer to ulong cast Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdio/lnx_sprintf.c Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdio/lnx_sprintf.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdio/lnx_sprintf.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdio/lnx_sprintf.c [iso-8859-1] Fri Aug 15 19:18:27 2008 @@ -544,7 +544,7 @@ flags |= ZEROPAD; } str = number(str, end, - (unsigned long) va_arg(args, void *), 16, + (uintptr_t) va_arg(args, void *), 16, field_width, precision, flags); continue;

1 0

[tkreuzer] 35361: fix KIPCR
by tkreuzer＠svn.reactos.org 16 Aug '08

16 Aug '08

Author: tkreuzer Date: Fri Aug 15 19:17:52 2008 New Revision: 35361 URL: http://svn.reactos.org/svn/reactos?rev=35361&view=rev Log: fix KIPCR Modified: branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h Modified: branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] Fri Aug 15 19:17:52 2008 @@ -784,9 +784,8 @@ PVOID KdVersionBlock; // 0x108 PVOID Unused3; ULONG PcrAlign1[24]; - - ULONG Fill2; // 0x178 - KPRCB Prcb; + ULONG Fill2[2]; // 0x178 + KPRCB Prcb; // 0x180 // hack: ULONG ContextSwitches;

1 0

[tkreuzer] 35360: - comment out ext2.sys in textsetup.sif, as it doesn't load - fix stupid error when creating page directory - fix PtrToPfn() based on updated mm types - some enhancements
by tkreuzer＠svn.reactos.org 16 Aug '08

16 Aug '08

Author: tkreuzer Date: Fri Aug 15 19:16:54 2008 New Revision: 35360 URL: http://svn.reactos.org/svn/reactos?rev=35360&view=rev Log: - comment out ext2.sys in textsetup.sif, as it doesn't load - fix stupid error when creating page directory - fix PtrToPfn() based on updated mm types - some enhancements Modified: branches/ros-amd64-bringup/reactos/boot/bootdata/txtsetup.sif branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h Modified: branches/ros-amd64-bringup/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Fri Aug 15 19:16:54 2008 @@ -33,7 +33,7 @@ scsiport.sys=,,,,,,x,,,,,,4 uniata.sys=,,,,,,,,,,,,4 fastfat.sys=,,,,,,x,,,,,,4 -ext2.sys=,,,,,,x,,,,,,4 +;ext2.sys=,,,,,,x,,,,,,4 [HardwareIdsDatabase] *PNP0C08 = acpi Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c [iso-8859-1] Fri Aug 15 19:16:54 2008 @@ -117,7 +117,7 @@ if (!pSubDir) return NULL; RtlZeroMemory(pSubDir, PAGE_SIZE); - pDir->Pde[Index].PageFrameNumber = (ULONGLONG)pSubDir / PAGE_SIZE; + pDir->Pde[Index].PageFrameNumber = PtrToPfn(pSubDir); pDir->Pde[Index].Valid = 1; pDir->Pde[Index].Write = 1; } @@ -196,7 +196,7 @@ ULONG KernelPages; /* Allocate a Page for the PML4 */ - pPML4 = MmAllocateMemoryWithType(4096, LoaderSpecialMemory); + pPML4 = MmAllocateMemoryWithType(PAGE_SIZE, LoaderSpecialMemory); ASSERT(pPML4); @@ -205,7 +205,7 @@ * virtual address 0xfffff6fb7dbedf68 */ pPML4->Pde[VAtoPXI(PXE_BASE)].Valid = 1; pPML4->Pde[VAtoPXI(PXE_BASE)].Write = 1; - pPML4->Pde[VAtoPXI(PXE_BASE)].PageFrameNumber = PtrToPfn(PXE_BASE); + pPML4->Pde[VAtoPXI(PXE_BASE)].PageFrameNumber = PtrToPfn(pPML4); /* Setup low memory pages */ if (FrLdrMapRangeOfPages(0, 0, 1024) < 1024) Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h [iso-8859-1] Fri Aug 15 19:16:54 2008 @@ -30,7 +30,7 @@ #define VA_MASK 0x0000FFFFFFFFFFFFUL #define PtrToPfn(p) \ - ((((ULONGLONG)p) >> PAGE_SHIFT) & 0xffffffffffULL) + ((((ULONGLONG)p) >> PAGE_SHIFT) & 0xfffffffULL) #define VAtoPXI(va) (((va) >> PXI_SHIFT) & 0x1FF) #define VAtoPPI(va) (((va) >> PPI_SHIFT) & 0x1FF)

1 0

[tkreuzer] 35359: The TEB member is called ClientID not Cid on all Windows versions I could check (XP, 2k3, vista).
by tkreuzer＠svn.reactos.org 15 Aug '08

15 Aug '08

Author: tkreuzer Date: Fri Aug 15 18:40:42 2008 New Revision: 35359 URL: http://svn.reactos.org/svn/reactos?rev=35359&view=rev Log: The TEB member is called ClientID not Cid on all Windows versions I could check (XP, 2k3, vista). Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/csr/api.c branches/ros-amd64-bringup/reactos/dll/ntdll/csr/connect.c branches/ros-amd64-bringup/reactos/dll/win32/gdi32/main/dllmain.c branches/ros-amd64-bringup/reactos/dll/win32/kernel32/file/pipe.c branches/ros-amd64-bringup/reactos/dll/win32/kernel32/process/proc.c branches/ros-amd64-bringup/reactos/dll/win32/kernel32/thread/thread.c branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/window.c branches/ros-amd64-bringup/reactos/include/ndk/pstypes.h branches/ros-amd64-bringup/reactos/lib/rtl/critical.c branches/ros-amd64-bringup/reactos/lib/rtl/dbgbuffer.c branches/ros-amd64-bringup/reactos/lib/rtl/resource.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/procsup.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/event.c Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/csr/api.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/n… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/ntdll/csr/api.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/ntdll/csr/api.c [iso-8859-1] Fri Aug 15 18:40:42 2008 @@ -73,7 +73,7 @@ /* Set up the data for CSR */ DbgBreakPoint(); IdentifyAlertableThread = &ApiMessage.IdentifyAlertableThread; - IdentifyAlertableThread->Cid = NtCurrentTeb()->Cid; + IdentifyAlertableThread->Cid = NtCurrentTeb()->ClientId; /* Call it */ Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/csr/connect.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/n… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/ntdll/csr/connect.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/ntdll/csr/connect.c [iso-8859-1] Fri Aug 15 18:40:42 2008 @@ -152,7 +152,7 @@ { /* This is a server-to-server call. Save our CID and do a direct call */ DbgBreakPoint(); - ApiMessage->Header.ClientId = NtCurrentTeb()->Cid; + ApiMessage->Header.ClientId = NtCurrentTeb()->ClientId; Status = CsrServerApiRoutine(&ApiMessage->Header, &ApiMessage->Header); Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/gdi32/main/dllmain.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/gdi32/main/dllmain.c [iso-8859-1] Fri Aug 15 18:40:42 2008 @@ -48,7 +48,7 @@ GdiHandleTable = NtCurrentTeb()->ProcessEnvironmentBlock->GdiSharedHandleTable; GdiSharedHandleTable = NtCurrentTeb()->ProcessEnvironmentBlock->GdiSharedHandleTable; GdiDevCaps = &GdiSharedHandleTable->DevCaps; - CurrentProcessId = NtCurrentTeb()->Cid.UniqueProcess; + CurrentProcessId = NtCurrentTeb()->ClientId.UniqueProcess; GDI_BatchLimit = (DWORD) NtCurrentTeb()->ProcessEnvironmentBlock->GdiDCAttributeList; GdiHandleCache = (PGDIHANDLECACHE)NtCurrentTeb()->ProcessEnvironmentBlock->GdiHandleBuffer; } Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/file/pipe.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/kernel32/file/pipe.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/kernel32/file/pipe.c [iso-8859-1] Fri Aug 15 18:40:42 2008 @@ -55,7 +55,7 @@ /* Create the pipe name */ swprintf(Buffer, L"\\Device\\NamedPipe\\Win32Pipes.%08x.%08x", - NtCurrentTeb()->Cid.UniqueProcess, + NtCurrentTeb()->ClientId.UniqueProcess, PipeId); RtlInitUnicodeString(&PipeName, Buffer); Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/process/proc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/kernel32/process/proc.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/kernel32/process/proc.c [iso-8859-1] Fri Aug 15 18:40:42 2008 @@ -272,7 +272,7 @@ DWORD STDCALL GetCurrentProcessId(VOID) { - return((DWORD)GetTeb()->Cid.UniqueProcess); + return((DWORD)GetTeb()->ClientId.UniqueProcess); } Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/thread/thread.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/kernel32/thread/thread.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/kernel32/thread/thread.c [iso-8859-1] Fri Aug 15 18:40:42 2008 @@ -319,7 +319,7 @@ WINAPI GetCurrentThreadId(VOID) { - return (DWORD)(NtCurrentTeb()->Cid).UniqueThread; + return (DWORD)(NtCurrentTeb()->ClientId).UniqueThread; } /* Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Fri Aug 15 18:40:42 2008 @@ -1313,8 +1313,8 @@ { // We are current. //FIXME("Current!\n"); if ( lpdwProcessId ) - *lpdwProcessId = (DWORD)NtCurrentTeb()->Cid.UniqueProcess; - Ret = (DWORD)NtCurrentTeb()->Cid.UniqueThread; + *lpdwProcessId = (DWORD)NtCurrentTeb()->ClientId.UniqueProcess; + Ret = (DWORD)NtCurrentTeb()->ClientId.UniqueThread; } else { // Ask kernel for info. Modified: branches/ros-amd64-bringup/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/pstypes.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ndk/pstypes.h [iso-8859-1] Fri Aug 15 18:40:42 2008 @@ -755,7 +755,7 @@ { NT_TIB Tib; PVOID EnvironmentPointer; - CLIENT_ID Cid; + CLIENT_ID ClientId; PVOID ActiveRpcHandle; PVOID ThreadLocalStoragePointer; struct _PEB *ProcessEnvironmentBlock; Modified: branches/ros-amd64-bringup/reactos/lib/rtl/critical.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/critical.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/critical.c [iso-8859-1] Fri Aug 15 18:40:42 2008 @@ -310,7 +310,7 @@ DPRINT("Freeing from Buffer: %p. Entry: %lu inside Process: %p\n", DebugInfo, EntryId, - NtCurrentTeb()->Cid.UniqueProcess); + NtCurrentTeb()->ClientId.UniqueProcess); RtlpDebugInfoFreeList[EntryId] = FALSE; } else { @@ -318,7 +318,7 @@ /* It's a dynamic one, so free from the heap */ DPRINT("Freeing from Heap: %p inside Process: %p\n", DebugInfo, - NtCurrentTeb()->Cid.UniqueProcess); + NtCurrentTeb()->ClientId.UniqueProcess); RtlFreeHeap(NtCurrentPeb()->ProcessHeap, 0, DebugInfo); } @@ -424,7 +424,7 @@ NTAPI RtlEnterCriticalSection(PRTL_CRITICAL_SECTION CriticalSection) { - HANDLE Thread = (HANDLE)NtCurrentTeb()->Cid.UniqueThread; + HANDLE Thread = (HANDLE)NtCurrentTeb()->ClientId.UniqueThread; /* Try to Lock it */ if (_InterlockedIncrement(&CriticalSection->LockCount) != 0) { @@ -522,7 +522,7 @@ CritcalSectionDebugData = RtlpAllocateDebugInfo(); DPRINT("Allocated Debug Data: %p inside Process: %p\n", CritcalSectionDebugData, - NtCurrentTeb()->Cid.UniqueProcess); + NtCurrentTeb()->ClientId.UniqueProcess); if (!CritcalSectionDebugData) { @@ -657,11 +657,11 @@ -1) == -1) { /* It's ours */ - CriticalSection->OwningThread = NtCurrentTeb()->Cid.UniqueThread; + CriticalSection->OwningThread = NtCurrentTeb()->ClientId.UniqueThread; CriticalSection->RecursionCount = 1; return TRUE; - } else if (CriticalSection->OwningThread == NtCurrentTeb()->Cid.UniqueThread) { + } else if (CriticalSection->OwningThread == NtCurrentTeb()->ClientId.UniqueThread) { /* It's already ours */ _InterlockedIncrement(&CriticalSection->LockCount); Modified: branches/ros-amd64-bringup/reactos/lib/rtl/dbgbuffer.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/dbgbuffer.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/dbgbuffer.c [iso-8859-1] Fri Aug 15 18:40:42 2008 @@ -234,7 +234,7 @@ IN OUT PRTL_DEBUG_INFORMATION Buf) { NTSTATUS Status = STATUS_SUCCESS; - ULONG Pid = (ULONG_PTR) NtCurrentTeb()->Cid.UniqueProcess; + ULONG Pid = (ULONG_PTR) NtCurrentTeb()->ClientId.UniqueProcess; Buf->Flags = DebugInfoMask; Buf->OffsetFree = sizeof(RTL_DEBUG_INFORMATION); Modified: branches/ros-amd64-bringup/reactos/lib/rtl/resource.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/resource.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/resource.c [iso-8859-1] Fri Aug 15 18:40:42 2008 @@ -94,7 +94,7 @@ } else if (Resource->NumberActive < 0) /* exclusive lock in progress */ { - if (Resource->OwningThread == NtCurrentTeb()->Cid.UniqueThread) + if (Resource->OwningThread == NtCurrentTeb()->ClientId.UniqueThread) { retVal = TRUE; Resource->NumberActive--; @@ -120,7 +120,7 @@ goto wait; } if (retVal == TRUE) - Resource->OwningThread = NtCurrentTeb()->Cid.UniqueThread; + Resource->OwningThread = NtCurrentTeb()->ClientId.UniqueThread; done: RtlLeaveCriticalSection(&Resource->Lock); return retVal; @@ -141,7 +141,7 @@ RtlEnterCriticalSection(&Resource->Lock); if (Resource->NumberActive < 0) { - if (Resource->OwningThread == NtCurrentTeb()->Cid.UniqueThread) + if (Resource->OwningThread == NtCurrentTeb()->ClientId.UniqueThread) { Resource->NumberActive--; retVal = TRUE; @@ -218,7 +218,7 @@ if (Resource->NumberActive == 1) { - Resource->OwningThread = NtCurrentTeb()->Cid.UniqueThread; + Resource->OwningThread = NtCurrentTeb()->ClientId.UniqueThread; Resource->NumberActive = -1; } else @@ -233,7 +233,7 @@ return; RtlEnterCriticalSection(&Resource->Lock); - Resource->OwningThread = NtCurrentTeb()->Cid.UniqueThread; + Resource->OwningThread = NtCurrentTeb()->ClientId.UniqueThread; Resource->NumberActive = -1; } RtlLeaveCriticalSection(&Resource->Lock); Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/procsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/procsup.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/procsup.c [iso-8859-1] Fri Aug 15 18:40:42 2008 @@ -452,7 +452,7 @@ Teb->Tib.Self = (PNT_TIB)Teb; /* Set TEB Data */ - Teb->Cid = *ClientId; + Teb->ClientId = *ClientId; Teb->RealClientId = *ClientId; Teb->ProcessEnvironmentBlock = Process->Peb; Teb->CurrentLocale = PsDefaultThreadLocaleId; Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/event.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/event.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/event.c [iso-8859-1] Fri Aug 15 18:40:42 2008 @@ -155,7 +155,7 @@ hwnd, pEP->idObject, pEP->idChild, - (DWORD)(NtCurrentTeb()->Cid).UniqueThread, + (DWORD)(NtCurrentTeb()->ClientId).UniqueThread, (DWORD)EngGetTickCount(), pEH->Proc); return Result; @@ -185,14 +185,14 @@ if ((pEH->Thread != PsGetCurrentThread()) && (pEH->Thread != NULL)) { // if all process || all thread || other thread same process if (!(pEH->idProcess) || !(pEH->idThread) || - ((DWORD)(NtCurrentTeb()->Cid).UniqueProcess == pEH->idProcess)) + ((DWORD)(NtCurrentTeb()->ClientId).UniqueProcess == pEH->idProcess)) { Result = IntCallLowLevelEvent(pEH, Event, Window->hSelf, idObject, idChild); } }// if ^skip own thread && ((Pid && CPid == Pid && ^skip own process) || all process) else if ( !(pEH->Flags & WINEVENT_SKIPOWNTHREAD) && ( ((pEH->idProcess && - (DWORD)(NtCurrentTeb()->Cid).UniqueProcess == pEH->idProcess) && + (DWORD)(NtCurrentTeb()->ClientId).UniqueProcess == pEH->idProcess) && !(pEH->Flags & WINEVENT_SKIPOWNPROCESS)) || !pEH->idProcess ) ) { @@ -201,7 +201,7 @@ Window->hSelf, idObject, idChild, - (DWORD)(NtCurrentTeb()->Cid).UniqueThread, + (DWORD)(NtCurrentTeb()->ClientId).UniqueThread, (DWORD)EngGetTickCount(), pEH->Proc); }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs