Ros-diffs June 2008

ros-diffs@reactos.org

23 participants
435 discussions

[jmorlan] 34227: - Don't use ntdll's RtlDuplicateUnicodeString in kmode; it allocates from the process heap. Instead, allocate from pool and copy the string manually. - Get rid of other ntdll imports (memcmp in freetype, tan in win32k) and instead link the functions statically, so ntdll is no longer loaded at all in kmode. Saves about 550kB of memory. - Also remove unused <library>hal</library> in freetype.

by jmorlan＠svn.reactos.org

Author: jmorlan Date: Mon Jun 30 18:58:48 2008 New Revision: 34227 URL: http://svn.reactos.org/svn/reactos?rev=34227&view=rev Log: - Don't use ntdll's RtlDuplicateUnicodeString in kmode; it allocates from the process heap. Instead, allocate from pool and copy the string manually. - Get rid of other ntdll imports (memcmp in freetype, tan in win32k) and instead link the functions statically, so ntdll is no longer loaded at all in kmode. Saves about 550kB of memory. - Also remove unused <library>hal</library> in freetype. Modified: trunk/reactos/dll/3rdparty/freetype/freetype.rbuild trunk/reactos/subsystems/win32/win32k/eng/objects.h trunk/reactos/subsystems/win32/win32k/objects/text.c trunk/reactos/subsystems/win32/win32k/win32k.rbuild Modified: trunk/reactos/dll/3rdparty/freetype/freetype.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/freetype/free… ============================================================================== --- trunk/reactos/dll/3rdparty/freetype/freetype.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/freetype/freetype.rbuild [iso-8859-1] Mon Jun 30 18:58:48 2008 @@ -14,8 +14,7 @@ <define name="TT_CONFIG_OPTION_BYTECODE_INTERPRETER" /> </if> <library>ntoskrnl</library> - <library>ntdll</library> - <library>hal</library> + <library>libcntpr</library> <directory name="i386"> <file>setjmplongjmp.s</file> </directory> Modified: trunk/reactos/subsystems/win32/win32k/eng/objects.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/objects.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/objects.h [iso-8859-1] Mon Jun 30 18:58:48 2008 @@ -70,7 +70,7 @@ typedef struct _FONTGDI { FONTOBJ FontObj; - LPCWSTR Filename; + LPWSTR Filename; FT_Face face; TEXTMETRICW TextMetric; } FONTGDI, *PFONTGDI; Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] Mon Jun 30 18:58:48 2008 @@ -279,7 +279,6 @@ PSECTION_OBJECT SectionObject; ULONG ViewSize = 0; FT_Fixed XScale, YScale; - UNICODE_STRING FileNameCopy; /* Open the font file */ @@ -355,8 +354,18 @@ return 0; } - RtlDuplicateUnicodeString(RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, FileName, &FileNameCopy); - FontGDI->Filename = FileNameCopy.Buffer; + FontGDI->Filename = ExAllocatePool(PagedPool, FileName->Length + sizeof(WCHAR)); + if (FontGDI->Filename == NULL) + { + EngFreeMem(FontGDI); + FT_Done_Face(Face); + ObDereferenceObject(SectionObject); + ExFreePool(Entry); + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } + memcpy(FontGDI->Filename, FileName->Buffer, FileName->Length); + FontGDI->Filename[FileName->Length / sizeof(WCHAR)] = L'\0'; FontGDI->face = Face; /* FIXME: Complete text metrics */ Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] Mon Jun 30 18:58:48 2008 @@ -182,7 +182,7 @@ <library>win32k_base</library> <library>pseh</library> <library>ntoskrnl</library> - <library>ntdll</library> + <library>libcntpr</library> <library>hal</library> <library>freetype</library> <library>dxguid</library>

16 years, 5 months

[cfinck] 34226: Change the code page to 1252 in the Swedish translation to fix some characters (discovered by Harteex on IRC)

by cfinck＠svn.reactos.org

Author: cfinck Date: Mon Jun 30 16:22:33 2008 New Revision: 34226 URL: http://svn.reactos.org/svn/reactos?rev=34226&view=rev Log: Change the code page to 1252 in the Swedish translation to fix some characters (discovered by Harteex on IRC) Modified: trunk/reactos/base/applications/taskmgr/lang/sv-SE.rc Modified: trunk/reactos/base/applications/taskmgr/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/sv-SE.rc [iso-8859-1] Mon Jun 30 16:22:33 2008 @@ -21,7 +21,7 @@ #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_SWE) #ifdef _WIN32 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL -#pragma code_page(850) +#pragma code_page(1252) #endif //_WIN32 /////////////////////////////////////////////////////////////////////////////

16 years, 5 months

[mpiulachs] 34225: - Fix a bug in cdfile that was preventing to use the 'nameoncd' attribute

by mpiulachs＠svn.reactos.org

Author: mpiulachs Date: Mon Jun 30 14:12:16 2008 New Revision: 34225 URL: http://svn.reactos.org/svn/reactos?rev=34225&view=rev Log: - Fix a bug in cdfile that was preventing to use the 'nameoncd' attribute Modified: trunk/reactos/boot/bootdata/bootdata.rbuild trunk/reactos/tools/rbuild/cdfile.cpp Modified: trunk/reactos/boot/bootdata/bootdata.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootdata.rbu… ============================================================================== --- trunk/reactos/boot/bootdata/bootdata.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/bootdata.rbuild [iso-8859-1] Mon Jun 30 14:12:16 2008 @@ -5,10 +5,10 @@ <cdfile>icon.ico</cdfile> <cdfile>readme.txt</cdfile> - <cdfile installbase="$(CDOUTPUT)">hivecls_$(ARCH).inf</cdfile> - <cdfile installbase="$(CDOUTPUT)">hivedef_$(ARCH).inf</cdfile> - <cdfile installbase="$(CDOUTPUT)">hivesft_$(ARCH).inf</cdfile> - <cdfile installbase="$(CDOUTPUT)">hivesys_$(ARCH).inf</cdfile> + <cdfile installbase="$(CDOUTPUT)" nameoncd="hivecls.inf">hivecls_$(ARCH).inf</cdfile> + <cdfile installbase="$(CDOUTPUT)" nameoncd="hivedef.inf">hivedef_$(ARCH).inf</cdfile> + <cdfile installbase="$(CDOUTPUT)" nameoncd="hivesft.inf">hivesft_$(ARCH).inf</cdfile> + <cdfile installbase="$(CDOUTPUT)" nameoncd="hivesys.inf">hivesys_$(ARCH).inf</cdfile> <cdfile installbase="$(CDOUTPUT)">txtsetup.sif</cdfile> <cdfile installbase="$(CDOUTPUT)">unattend.inf</cdfile> Modified: trunk/reactos/tools/rbuild/cdfile.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/cdfile.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/cdfile.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/cdfile.cpp [iso-8859-1] Mon Jun 30 14:12:16 2008 @@ -60,6 +60,6 @@ &cdfileNode ); target = new FileLocation ( OutputDirectory, target_relative_directory, - nameoncd ? att->value : cdfileNode.value, + nameoncd ? nameoncd->value : cdfileNode.value, &cdfileNode ); }

16 years, 5 months

[mpiulachs] 34224: - hackfix unbootable image (part 2/2)

by mpiulachs＠svn.reactos.org

Author: mpiulachs Date: Mon Jun 30 13:33:13 2008 New Revision: 34224 URL: http://svn.reactos.org/svn/reactos?rev=34224&view=rev Log: - hackfix unbootable image (part 2/2) Added: trunk/reactos/boot/bootdata/hivecls_arm.inf - copied unchanged from r34223, trunk/reactos/boot/bootdata/arm/hivecls_arm.inf trunk/reactos/boot/bootdata/hivecls_i386.inf - copied unchanged from r34223, trunk/reactos/boot/bootdata/i386/hivecls_i386.inf trunk/reactos/boot/bootdata/hivedef_arm.inf - copied unchanged from r34223, trunk/reactos/boot/bootdata/arm/hivedef_arm.inf trunk/reactos/boot/bootdata/hivedef_i386.inf - copied unchanged from r34223, trunk/reactos/boot/bootdata/i386/hivedef_i386.inf trunk/reactos/boot/bootdata/hiveinst_arm.inf - copied unchanged from r34223, trunk/reactos/boot/bootdata/arm/hiveinst_arm.inf trunk/reactos/boot/bootdata/hiveinst_i386.inf - copied unchanged from r34223, trunk/reactos/boot/bootdata/i386/hiveinst_i386.inf trunk/reactos/boot/bootdata/hivesft_arm.inf - copied unchanged from r34223, trunk/reactos/boot/bootdata/arm/hivesft_arm.inf trunk/reactos/boot/bootdata/hivesft_i386.inf - copied unchanged from r34223, trunk/reactos/boot/bootdata/i386/hivesft_i386.inf trunk/reactos/boot/bootdata/hivesys_arm.inf - copied unchanged from r34223, trunk/reactos/boot/bootdata/arm/hivesys_arm.inf trunk/reactos/boot/bootdata/hivesys_i386.inf - copied unchanged from r34223, trunk/reactos/boot/bootdata/i386/hivesys_i386.inf Removed: trunk/reactos/boot/bootdata/arm/ trunk/reactos/boot/bootdata/i386/

16 years, 5 months

[mpiulachs] 34223: - hackfix unbootable image (part 1/2)

by mpiulachs＠svn.reactos.org

Author: mpiulachs Date: Mon Jun 30 13:27:31 2008 New Revision: 34223 URL: http://svn.reactos.org/svn/reactos?rev=34223&view=rev Log: - hackfix unbootable image (part 1/2) Added: trunk/reactos/boot/bootdata/arm/hivecls_arm.inf - copied unchanged from r34222, trunk/reactos/boot/bootdata/arm/hivecls.inf trunk/reactos/boot/bootdata/arm/hivedef_arm.inf - copied unchanged from r34222, trunk/reactos/boot/bootdata/arm/hivedef.inf trunk/reactos/boot/bootdata/arm/hiveinst_arm.inf - copied unchanged from r34222, trunk/reactos/boot/bootdata/arm/hiveinst.inf trunk/reactos/boot/bootdata/arm/hivesft_arm.inf - copied unchanged from r34222, trunk/reactos/boot/bootdata/arm/hivesft.inf trunk/reactos/boot/bootdata/arm/hivesys_arm.inf - copied unchanged from r34222, trunk/reactos/boot/bootdata/arm/hivesys.inf trunk/reactos/boot/bootdata/i386/hivecls_i386.inf - copied unchanged from r34222, trunk/reactos/boot/bootdata/i386/hivecls.inf trunk/reactos/boot/bootdata/i386/hivedef_i386.inf - copied unchanged from r34222, trunk/reactos/boot/bootdata/i386/hivedef.inf trunk/reactos/boot/bootdata/i386/hiveinst_i386.inf - copied unchanged from r34222, trunk/reactos/boot/bootdata/i386/hiveinst.inf trunk/reactos/boot/bootdata/i386/hivesft_i386.inf - copied unchanged from r34222, trunk/reactos/boot/bootdata/i386/hivesft.inf trunk/reactos/boot/bootdata/i386/hivesys_i386.inf - copied unchanged from r34222, trunk/reactos/boot/bootdata/i386/hivesys.inf Removed: trunk/reactos/boot/bootdata/arm/hivecls.inf trunk/reactos/boot/bootdata/arm/hivedef.inf trunk/reactos/boot/bootdata/arm/hiveinst.inf trunk/reactos/boot/bootdata/arm/hivesft.inf trunk/reactos/boot/bootdata/arm/hivesys.inf trunk/reactos/boot/bootdata/i386/hivecls.inf trunk/reactos/boot/bootdata/i386/hivedef.inf trunk/reactos/boot/bootdata/i386/hiveinst.inf trunk/reactos/boot/bootdata/i386/hivesft.inf trunk/reactos/boot/bootdata/i386/hivesys.inf Modified: trunk/reactos/boot/bootdata/bootdata.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Removed: trunk/reactos/boot/bootdata/arm/hivecls.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/arm/hivecls.… Removed: trunk/reactos/boot/bootdata/arm/hivedef.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/arm/hivedef.… Removed: trunk/reactos/boot/bootdata/arm/hiveinst.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/arm/hiveinst… Removed: trunk/reactos/boot/bootdata/arm/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/arm/hivesft.… Removed: trunk/reactos/boot/bootdata/arm/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/arm/hivesys.… Modified: trunk/reactos/boot/bootdata/bootdata.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootdata.rbu… Removed: trunk/reactos/boot/bootdata/i386/hivecls.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/i386/hivecls… Removed: trunk/reactos/boot/bootdata/i386/hivedef.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/i386/hivedef… Removed: trunk/reactos/boot/bootdata/i386/hiveinst.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/i386/hiveins… Removed: trunk/reactos/boot/bootdata/i386/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/i386/hivesft… Removed: trunk/reactos/boot/bootdata/i386/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/i386/hivesys…

16 years, 5 months

[jmorlan] 34222: Get explorer working again, by making wmain explicitly call the C++ initialization function __main. gcc only adds the call automatically in a function called main.

by jmorlan＠svn.reactos.org

Author: jmorlan Date: Mon Jun 30 11:18:46 2008 New Revision: 34222 URL: http://svn.reactos.org/svn/reactos?rev=34222&view=rev Log: Get explorer working again, by making wmain explicitly call the C++ initialization function __main. gcc only adds the call automatically in a function called main. Modified: trunk/reactos/lib/3rdparty/mingw/wmain.c Modified: trunk/reactos/lib/3rdparty/mingw/wmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/wmain.c… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/wmain.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/wmain.c [iso-8859-1] Mon Jun 30 11:18:46 2008 @@ -16,6 +16,7 @@ #define ISSPACE(a) (a == ' ' || a == '\t') +extern void __main(); extern int PASCAL wWinMain (HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR szCmdLine, int nShow); @@ -25,6 +26,12 @@ wchar_t *szCmd; STARTUPINFOW startinfo; int nRet; + +#ifdef __GNUC__ + /* C++ initialization. (gcc inserts this call automatically for + * a function called "main", but not for "wmain") */ + __main(); +#endif /* Get the command line passed to the process. */ szCmd = GetCommandLineW ();

16 years, 5 months

[tkreuzer] 34221: fix normaliz build

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jun 30 09:52:30 2008 New Revision: 34221 URL: http://svn.reactos.org/svn/reactos?rev=34221&view=rev Log: fix normaliz build Modified: trunk/reactos/nls/dll/normaliz_redist/normaliz_redist.rbuild Modified: trunk/reactos/nls/dll/normaliz_redist/normaliz_redist.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/nls/dll/normaliz_redist/no… ============================================================================== --- trunk/reactos/nls/dll/normaliz_redist/normaliz_redist.rbuild [iso-8859-1] (original) +++ trunk/reactos/nls/dll/normaliz_redist/normaliz_redist.rbuild [iso-8859-1] Mon Jun 30 09:52:30 2008 @@ -3,6 +3,7 @@ <module name="normaliz_redist" type="win32dll" installname="normaliz.dll"> <library>normalize</library> <library>icu4ros</library> + <library>kernel32</library> <compilerflag>-fno-exceptions</compilerflag> <compilerflag>-fno-rtti</compilerflag> <importlibrary definition="normaliz.def" />

16 years, 5 months

[dreimer] 34220: Update ROSCalc to version 1.09 to fix some bugs. * Fixed bug with Conversion function: "Category" type must be found like "from" and "to" because the combobox sorts its items alphabetically. * Fixed bug with memory function and GNU multi-precision libraries: the memory must be initialized to zero when the calculator starts, otherwise "MP" will crash. * Fixed bug when closing an expression with right parentheses.

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon Jun 30 08:47:42 2008 New Revision: 34220 URL: http://svn.reactos.org/svn/reactos?rev=34220&view=rev Log: Update ROSCalc to version 1.09 to fix some bugs. * Fixed bug with Conversion function: "Category" type must be found like "from" and "to" because the combobox sorts its items alphabetically. * Fixed bug with memory function and GNU multi-precision libraries: the memory must be initialized to zero when the calculator starts, otherwise "MP" will crash. * Fixed bug when closing an expression with right parentheses. Modified: trunk/reactos/base/applications/calc/calc.h trunk/reactos/base/applications/calc/convert.c trunk/reactos/base/applications/calc/rpn_mpfr.c trunk/reactos/base/applications/calc/whatsnew.txt 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] Mon Jun 30 08:47:42 2008 @@ -42,7 +42,7 @@ #define IDC_STATIC ((DWORD)-1) #endif -#define CALC_VERSION TEXT("1.08") +#define CALC_VERSION TEXT("1.09") /*#define USE_KEYBOARD_HOOK*/ 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] Mon Jun 30 08:47:42 2008 @@ -467,7 +467,7 @@ void ConvExecute(HWND hWnd) { DWORD c_cat = (DWORD)SendDlgItemMessage(hWnd, IDC_COMBO_CATEGORY, CB_GETCURSEL, 0, 0); - const conv_t *items = conv_table[c_cat].items; + const conv_t *items = NULL; DWORD from = SendDlgItemMessage(hWnd, IDC_COMBO_FROM, CB_GETCURSEL, 0, 0); DWORD to = SendDlgItemMessage(hWnd, IDC_COMBO_TO, CB_GETCURSEL, 0, 0); TCHAR txt_cb[128]; @@ -478,6 +478,16 @@ if (from == to) return; + /* Search correct category, since it can be sorted too */ + SendDlgItemMessage(hWnd, IDC_COMBO_CATEGORY, CB_GETLBTEXT, c_cat, (LPARAM)txt_cb); + for (c_cat=0; c_cat < SIZEOF(conv_table); c_cat++) { + LoadString(calc.hInstance, conv_table[c_cat].category, txt, SIZEOF(txt)); + if (!_tcscmp(txt_cb, txt)) { + items = conv_table[c_cat].items; + break; + } + } + /* The units can be sorted, so I must search the exact match */ item = items; SendDlgItemMessage(hWnd, IDC_COMBO_FROM, CB_GETLBTEXT, from, (LPARAM)txt_cb); @@ -551,3 +561,4 @@ ConvAdjust(hWnd, 0); } + 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] Mon Jun 30 08:47:42 2008 @@ -387,6 +387,7 @@ { stack_node_t *op, ip; + rpn_alloc(&ip.node.number); rpn_copy(&ip.node.number, number); while (!is_stack_empty()) { op = pop(); @@ -401,6 +402,7 @@ } } rpn_copy(number, &ip.node.number); + rpn_free(&ip.node.number); } int eval_parent_count(void) @@ -434,6 +436,7 @@ mpfr_init(calc.prev.mf); mpfr_init(calc.memory.number.mf); mpfr_init(temp.node.number.mf); + rpn_zero(&calc.memory.number); } void stop_rpn_engine(void) 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] Mon Jun 30 08:47:42 2008 @@ -1,3 +1,9 @@ +1.09 (20080630) +======================= +* Fixed bug with Conversion function: "Category" type must be found like "from" and "to" because the combobox sorts its items alphabetically. +* Fixed bug with memory function and GNU multi-precision libraries: the memory must be initialized to zero when the calculator starts, otherwise "MP" will crash. +* Fixed bug when closing an expression with right parentheses. + 1.08 (20080520) ======================= * Added macro DISABLE_HTMLHELP_SUPPORT for disabling the compilation of htmlhelp support.

16 years, 5 months

[cfinck] 34219: Fix a typo

by cfinck＠svn.reactos.org

Author: cfinck Date: Mon Jun 30 08:07:25 2008 New Revision: 34219 URL: http://svn.reactos.org/svn/reactos?rev=34219&view=rev Log: Fix a typo Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Mon Jun 30 08:07:25 2008 @@ -1608,7 +1608,7 @@ if ( !module.HasImportLibrary() ) { fprintf ( fMakefile, - "\t%s %s%s %s %s%s%s %s -o %s\n", + "\t%s %s%s %s %s%s %s %s -o %s\n", linker.c_str (), linkerParameters.c_str (), linkerScriptArgument.c_str (), @@ -1635,7 +1635,7 @@ module.underscoreSymbols ? " --add-underscore" : "" ); fprintf ( fMakefile, - "\t%s %s%s %s %s %s%s%s %s -o %s\n", + "\t%s %s%s %s %s %s%s %s %s -o %s\n", linker.c_str (), linkerParameters.c_str (), linkerScriptArgument.c_str (),

16 years, 5 months

[pschweitzer] 34217: Partly reverted r34166: there's no need to use SEH with CcInitializeCacheMap, it doesn't raise exceptions.

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon Jun 30 05:51:29 2008 New Revision: 34217 URL: http://svn.reactos.org/svn/reactos?rev=34217&view=rev Log: Partly reverted r34166: there's no need to use SEH with CcInitializeCacheMap, it doesn't raise exceptions. Modified: branches/pierre-fsd/drivers/filesystems/fastfat/fsctl.c Modified: branches/pierre-fsd/drivers/filesystems/fastfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] Mon Jun 30 05:51:29 2008 @@ -537,21 +537,11 @@ Fcb->RFCB.ValidDataLength = Fcb->RFCB.FileSize; Fcb->RFCB.AllocationSize = Fcb->RFCB.FileSize; - _SEH_TRY - { - CcInitializeCacheMap(DeviceExt->FATFileObject, - (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), - FALSE, - &VfatGlobalData->CacheMgrCallbacks, - Fcb); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - if (!NT_SUCCESS(Status)) - goto ByeBye; + CcInitializeCacheMap(DeviceExt->FATFileObject, + (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), + FALSE, + &VfatGlobalData->CacheMgrCallbacks, + Fcb); DeviceExt->LastAvailableCluster = 2; ExInitializeResourceLite(&DeviceExt->FatResource);

16 years, 5 months

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 June 2008