Ros-diffs October 2005

ros-diffs@reactos.org

26 participants
737 discussions

[hbirr] 18679: Fixed the mapping for low alignment images.

by hbirr＠svn.reactos.com

Fixed the mapping for low alignment images. Modified: trunk/reactos/ntoskrnl/mm/section.c _____ Modified: trunk/reactos/ntoskrnl/mm/section.c --- trunk/reactos/ntoskrnl/mm/section.c 2005-10-22 15:10:03 UTC (rev 18678) +++ trunk/reactos/ntoskrnl/mm/section.c 2005-10-22 15:11:55 UTC (rev 18679) @@ -1747,7 +1747,7 @@ * memory area was mapped at an offset in the file which is page aligned * then note this is a direct mapped page. */ - if ((Offset + MemoryArea->Data.SectionData.ViewOffset % PAGE_SIZE) == 0 && + if (((Offset + Segment->FileOffset) % PAGE_SIZE) == 0 && (Offset + PAGE_SIZE <= Segment->RawLength || !IsImageSection)) { DirectMapped = TRUE; @@ -2813,6 +2813,7 @@ ULONG i; ULONG LastSegment; BOOLEAN Initialized; + PMM_SECTION_SEGMENT EffectiveSegment; if (Flags & EXEFMT_LOAD_ASSUME_SEGMENTS_PAGE_ALIGNED) { @@ -2822,11 +2823,10 @@ Initialized = FALSE; LastSegment = 0; + EffectiveSegment = &ImageSectionObject->Segments[LastSegment]; for ( i = 0; i < ImageSectionObject->NrSegments; ++ i ) { - PMM_SECTION_SEGMENT EffectiveSegment = &ImageSectionObject->Segments[LastSegment]; - /* * The first segment requires special handling */ @@ -2880,11 +2880,14 @@ EffectiveSegment = &ImageSectionObject->Segments[LastSegment]; - /* - * Copy the current segment. If necessary, the effective segment - * will be expanded later - */ - *EffectiveSegment = *Segment; + if (LastSegment != i) + { + /* + * Copy the current segment. If necessary, the effective segment + * will be expanded later + */ + *EffectiveSegment = *Segment; + } /* * Page-align the virtual size. We know for sure the virtual address @@ -2937,7 +2940,7 @@ /* * Extend the virtual size */ - ASSERT(PAGE_ROUND_UP(Segment->VirtualAddress + Segment->Length) > EndOfEffectiveSegment); + ASSERT(PAGE_ROUND_UP(Segment->VirtualAddress + Segment->Length) >= EndOfEffectiveSegment); EffectiveSegment->Length = PAGE_ROUND_UP(Segment->VirtualAddress + Segment->Length) - EffectiveSegment->VirtualAddress; @@ -2981,6 +2984,7 @@ } } } + ImageSectionObject->NrSegments = LastSegment + 1; return TRUE; }

19 years, 2 months

[gvg] 18678: Use MaxPos instead of MaxTrackingPos when "restoring" a window which was

by gvg＠svn.reactos.com

Use MaxPos instead of MaxTrackingPos when "restoring" a window which was previously maximized. Fixes bug 925. Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c --- trunk/reactos/subsys/win32k/ntuser/winpos.c 2005-10-22 14:35:07 UTC (rev 18677) +++ trunk/reactos/subsys/win32k/ntuser/winpos.c 2005-10-22 15:10:03 UTC (rev 18678) @@ -374,8 +374,8 @@ Window->Style &= ~WS_MINIMIZE; if (Window->Flags & WINDOWOBJECT_RESTOREMAX) { - co_WinPosGetMinMaxInfo(Window, NULL, - &InternalPos->MaxPos, NULL, &Size); + co_WinPosGetMinMaxInfo(Window, &Size, + &InternalPos->MaxPos, NULL, NULL); Window->Style |= WS_MAXIMIZE; IntGdiSetRect(NewPos, InternalPos->MaxPos.x, InternalPos->MaxPos.y, Size.x, Size.y); @@ -1359,7 +1359,6 @@ case SW_SHOWMAXIMIZED: { -//__asm__("int $3\n"); Swp |= SWP_SHOWWINDOW; if (!(Window->Style & WS_MAXIMIZE)) {

19 years, 2 months

[weiden] 18677: don't forget to adjust the stack pointer

by weiden＠svn.reactos.com

don't forget to adjust the stack pointer Modified: trunk/reactos/lib/ntdll/main/i386/dispatch.S _____ Modified: trunk/reactos/lib/ntdll/main/i386/dispatch.S --- trunk/reactos/lib/ntdll/main/i386/dispatch.S 2005-10-22 14:05:20 UTC (rev 18676) +++ trunk/reactos/lib/ntdll/main/i386/dispatch.S 2005-10-22 14:35:07 UTC (rev 18677) @@ -141,10 +141,9 @@ mov ecx, [esp+4] mov ebx, [esp] + /* Call the vectored exception handler */ push ecx push ebx - - /* Call the vectored exception handler */ call _RtlpExecuteVectoredExceptionHandlers@8 /* Check for success */ @@ -152,6 +151,7 @@ jnz ContinueExecution /* Dispatch the exception */ + sub esp, 8 call _RtlDispatchException@8 /* Check for success */

19 years, 2 months

[weiden] 18676: - re-add support for vectored exception handling which was removed by the major refactoring patch (r17811)

by weiden＠svn.reactos.com

- re-add support for vectored exception handling which was removed by the major refactoring patch (r17811) - make vmwinst depend on vectored exception handling so this doesn't happen again Modified: trunk/reactos/lib/ntdll/main/dispatch.c Modified: trunk/reactos/lib/ntdll/main/i386/dispatch.S Modified: trunk/reactos/lib/rtl/vectoreh.c Modified: trunk/reactos/subsys/system/vmwinst/vmwinst.c _____ Modified: trunk/reactos/lib/ntdll/main/dispatch.c --- trunk/reactos/lib/ntdll/main/dispatch.c 2005-10-22 13:37:48 UTC (rev 18675) +++ trunk/reactos/lib/ntdll/main/dispatch.c 2005-10-22 14:05:20 UTC (rev 18676) @@ -14,6 +14,10 @@ typedef NTSTATUS (NTAPI *USER_CALL)(PVOID Argument, ULONG ArgumentLength); +EXCEPTION_DISPOSITION NTAPI +RtlpExecuteVectoredExceptionHandlers(IN PEXCEPTION_RECORD ExceptionRecord, + IN PCONTEXT Context); + /* FUNCTIONS ****************************************************************/ /* @@ -27,16 +31,26 @@ EXCEPTION_RECORD NestedExceptionRecord; NTSTATUS Status; - /* Dispatch the exception and check the result */ - if(RtlDispatchException(ExceptionRecord, Context)) + /* call the vectored exception handlers */ + if(RtlpExecuteVectoredExceptionHandlers(ExceptionRecord, + Context) != ExceptionContinueExecution) { - /* Continue executing */ - Status = NtContinue(Context, FALSE); + goto ContinueExecution; } else { - /* Raise an exception */ - Status = NtRaiseException(ExceptionRecord, Context, FALSE); + /* Dispatch the exception and check the result */ + if(RtlDispatchException(ExceptionRecord, Context)) + { +ContinueExecution: + /* Continue executing */ + Status = NtContinue(Context, FALSE); + } + else + { + /* Raise an exception */ + Status = NtRaiseException(ExceptionRecord, Context, FALSE); + } } /* Setup the Exception record */ _____ Modified: trunk/reactos/lib/ntdll/main/i386/dispatch.S --- trunk/reactos/lib/ntdll/main/i386/dispatch.S 2005-10-22 13:37:48 UTC (rev 18675) +++ trunk/reactos/lib/ntdll/main/i386/dispatch.S 2005-10-22 14:05:20 UTC (rev 18676) @@ -141,15 +141,24 @@ mov ecx, [esp+4] mov ebx, [esp] - /* Dispatch the exception */ push ecx push ebx + + /* Call the vectored exception handler */ + call _RtlpExecuteVectoredExceptionHandlers@8 + + /* Check for success */ + or al, al + jnz ContinueExecution + + /* Dispatch the exception */ call _RtlDispatchException@8 /* Check for success */ or al, al jz RaiseException +ContinueExecution: /* Pop off the records */ pop ebx pop ecx _____ Modified: trunk/reactos/lib/rtl/vectoreh.c --- trunk/reactos/lib/rtl/vectoreh.c 2005-10-22 13:37:48 UTC (rev 18675) +++ trunk/reactos/lib/rtl/vectoreh.c 2005-10-22 14:05:20 UTC (rev 18676) @@ -28,7 +28,7 @@ /* FUNCTIONS ***************************************************************/ -EXCEPTION_DISPOSITION +EXCEPTION_DISPOSITION NTAPI RtlpExecuteVectoredExceptionHandlers(IN PEXCEPTION_RECORD ExceptionRecord, IN PCONTEXT Context) { _____ Modified: trunk/reactos/subsys/system/vmwinst/vmwinst.c --- trunk/reactos/subsys/system/vmwinst/vmwinst.c 2005-10-22 13:37:48 UTC (rev 18675) +++ trunk/reactos/subsys/system/vmwinst/vmwinst.c 2005-10-22 14:05:20 UTC (rev 18676) @@ -60,10 +60,9 @@ /* Helper functions */ -LONG WINAPI ExceptionHandler(LPEXCEPTION_POINTERS ExceptionInfo) +LONG CALLBACK VectoredExceptionHandler(PEXCEPTION_POINTERS ExceptionInfo) { - /* This is rude, but i don't know how to continue execution properly, that's why - we just exit here when we're not running inside of VMware */ + /* we're not running in VMware, just terminate the process */ ExitProcess(ExceptionInfo->ExceptionRecord->ExceptionCode == EXCEPTION_PRIV_INSTRUCTION); return EXCEPTION_CONTINUE_EXECUTION; } @@ -1196,23 +1195,28 @@ int nCmdShow) { - LPTOP_LEVEL_EXCEPTION_FILTER OldHandler; + PVOID ExceptionHandler; int Version; WCHAR *lc; hAppInstance = hInstance; - /* Setup our exception "handler" ;-) */ - OldHandler = SetUnhandledExceptionFilter(ExceptionHandler); + /* Setup a vectored exception handler to protect the detection. Don't use SEH + here so we notice the next time someone removes support for vectored + exception handling from ros... */ + if (!(ExceptionHandler = AddVectoredExceptionHandler(0, + VectoredExceptionHandler))) + { + return 1; + } if(!DetectVMware(&Version)) { - ExitProcess(1); return 1; } - /* restore the exception handler */ - SetUnhandledExceptionFilter(OldHandler); + /* unregister the handler */ + RemoveVectoredExceptionHandler(ExceptionHandler); lc = DestinationPath; lc += GetSystemDirectory(DestinationPath, MAX_PATH) - 1;

19 years, 2 months

[royce] 18675: add raddr2line back to build

by royce＠svn.reactos.com

add raddr2line back to build Added: trunk/reactos/tools/raddr2line.mak Modified: trunk/reactos/tools/tools.mak _____ Added: trunk/reactos/tools/raddr2line.mak --- trunk/reactos/tools/raddr2line.mak 2005-10-22 12:11:42 UTC (rev 18674) +++ trunk/reactos/tools/raddr2line.mak 2005-10-22 13:37:48 UTC (rev 18675) @@ -0,0 +1,41 @@ +RADDR2LINE_BASE = $(TOOLS_BASE) +RADDR2LINE_BASE_ = $(RADDR2LINE_BASE)$(SEP) + +RADDR2LINE_INT = $(INTERMEDIATE_)$(RADDR2LINE_BASE) +RADDR2LINE_INT_ = $(RADDR2LINE_INT)$(SEP) +RADDR2LINE_OUT = $(OUTPUT_)$(RADDR2LINE_BASE) +RADDR2LINE_OUT_ = $(RADDR2LINE_OUT)$(SEP) + +RADDR2LINE_TARGET = \ + $(EXEPREFIX)$(RADDR2LINE_OUT_)raddr2line$(EXEPOSTFIX) + +RADDR2LINE_SOURCES = \ + $(RADDR2LINE_BASE_)raddr2line.c \ + $(RADDR2LINE_BASE_)rsym_common.c + +RADDR2LINE_OBJECTS = \ + $(addprefix $(INTERMEDIATE_), $(RADDR2LINE_SOURCES:.c=.o)) + +RADDR2LINE_HOST_CFLAGS = $(TOOLS_CFLAGS) + +RADDR2LINE_HOST_LFLAGS = $(TOOLS_LFLAGS) + +.PHONY: raddr2line +raddr2line: $(RADDR2LINE_TARGET) + +$(RADDR2LINE_TARGET): $(RADDR2LINE_OBJECTS) | $(RADDR2LINE_OUT) + $(ECHO_LD) + ${host_gcc} $(RADDR2LINE_OBJECTS) $(RADDR2LINE_HOST_LFLAGS) -o $@ + +$(RADDR2LINE_INT_)raddr2line.o: $(RADDR2LINE_BASE_)raddr2line.c | $(RADDR2LINE_INT) + $(ECHO_CC) + ${host_gcc} $(RADDR2LINE_HOST_CFLAGS) -c $< -o $@ + +#$(RADDR2LINE_INT_)rsym_common.o: $(RADDR2LINE_BASE_)rsym_common.c | $(RADDR2LINE_INT) +# $(ECHO_CC) +# ${host_gcc} $(RADDR2LINE_HOST_CFLAGS) -c $< -o $@ + +.PHONY: raddr2line_clean +raddr2line_clean: + -@$(rm) $(RADDR2LINE_TARGET) $(RADDR2LINE_OBJECTS) 2>$(NUL) +clean: raddr2line_clean _____ Modified: trunk/reactos/tools/tools.mak --- trunk/reactos/tools/tools.mak 2005-10-22 12:11:42 UTC (rev 18674) +++ trunk/reactos/tools/tools.mak 2005-10-22 13:37:48 UTC (rev 18675) @@ -22,6 +22,7 @@ include tools/bin2c.mak include tools/rsym.mak +include tools/raddr2line.mak include tools/pefixup.mak include tools/bin2res/bin2res.mak include tools/buildno/buildno.mak

19 years, 2 months

[gvg] 18674: Merge from trunk.

by gvg＠svn.reactos.com

Merge from trunk. Fix icon alignment when the screen width is not a multiple of the icon spacing. Fixes bug 912. Modified: branches/ros-branch-0_2_8/reactos/subsys/system/explorer/desktop/desktop .cpp _____ Modified: branches/ros-branch-0_2_8/reactos/subsys/system/explorer/desktop/desktop .cpp --- branches/ros-branch-0_2_8/reactos/subsys/system/explorer/desktop/desktop .cpp 2005-10-22 12:01:29 UTC (rev 18673) +++ branches/ros-branch-0_2_8/reactos/subsys/system/explorer/desktop/desktop .cpp 2005-10-22 12:11:42 UTC (rev 18674) @@ -730,15 +730,12 @@ int dx2 = dir_x2 * cx; int dy2 = dir_y2 * cy; - int start_x = (start_pos.x * work_area.right)/cx*cx + (cx-32)/2; - int start_y = (start_pos.y * work_area.bottom)/cy*cy + 4/*(cy-32)/2*/; + int xoffset = (cx-32)/2; + int yoffset = 4/*(cy-32)/2*/; - if (start_x >= work_area.right) - start_x -= cx; + int start_x = start_pos.x * (work_area.right - cx) + xoffset; + int start_y = start_pos.y * (work_area.bottom - cy) + yoffset; - if (start_y >= work_area.bottom) - start_y -= cy; - int x = start_x; int y = start_y; @@ -755,19 +752,22 @@ IconMap pos_idx; int cnt = 0; + int xhv = start_x; + int yhv = start_y; for(int idx=i1; idx!=i2; idx+=dir) { pos_idx[IconPos(y, x)] = idx; if (_icon_algo == ARRANGE_BORDER_DOWN) { if (++cnt & 1) - x = work_area.right - x; + x = work_area.right - x - cx + 2*xoffset; else { y += dy1; - if (y >= work_area.bottom) { + if (y + cy - 2 * yoffset > work_area.bottom) { y = start_y; - x += dx2; + start_x += dx2; + x = start_x; } } @@ -775,20 +775,32 @@ } else if (_icon_algo == ARRANGE_BORDER_HV) { if (++cnt & 1) - x = work_area.right - x; + x = work_area.right - x - cx + 2*xoffset; else if (cnt & 2) { - y += dy1; + yhv += cy; + y = yhv; + x = start_x; - if (y >= work_area.bottom) { - y = start_y; - x += dx2; + if (y + cy - 2 * yoffset > work_area.bottom) { + start_x += cx; + xhv = start_x; + x = xhv; + start_y += cy; + yhv = start_y; + y = yhv; } } else { - x += dx1; + xhv += cx; + x = xhv; + y = start_y; - if (x >= work_area.right) { - x = start_x; - y += dy2; + if (x + cx - 2 * xoffset > work_area.right) { + start_x += cx; + xhv = start_x; + x = xhv; + start_y += cy; + yhv = start_y; + y = yhv; } } @@ -803,10 +815,10 @@ x += dx1; y += dy1; - if (x<0 || x>=work_area.right) { + if (x<0 || x+cx-2*xoffset>work_area.right) { x = start_x; y += dy2; - } else if (y<0 || y>=work_area.bottom) { + } else if (y<0 || y+cy-2*yoffset>work_area.bottom) { y = start_y; x += dx2; }

19 years, 2 months

[gvg] 18673: Fix icon alignment when the screen width is not a multiple of the icon spacing.

by gvg＠svn.reactos.com

Fix icon alignment when the screen width is not a multiple of the icon spacing. Fixes bug 912. Modified: trunk/reactos/subsys/system/explorer/desktop/desktop.cpp _____ Modified: trunk/reactos/subsys/system/explorer/desktop/desktop.cpp --- trunk/reactos/subsys/system/explorer/desktop/desktop.cpp 2005-10-22 11:51:52 UTC (rev 18672) +++ trunk/reactos/subsys/system/explorer/desktop/desktop.cpp 2005-10-22 12:01:29 UTC (rev 18673) @@ -730,15 +730,12 @@ int dx2 = dir_x2 * cx; int dy2 = dir_y2 * cy; - int start_x = (start_pos.x * work_area.right)/cx*cx + (cx-32)/2; - int start_y = (start_pos.y * work_area.bottom)/cy*cy + 4/*(cy-32)/2*/; + int xoffset = (cx-32)/2; + int yoffset = 4/*(cy-32)/2*/; - if (start_x >= work_area.right) - start_x -= cx; + int start_x = start_pos.x * (work_area.right - cx) + xoffset; + int start_y = start_pos.y * (work_area.bottom - cy) + yoffset; - if (start_y >= work_area.bottom) - start_y -= cy; - int x = start_x; int y = start_y; @@ -755,19 +752,22 @@ IconMap pos_idx; int cnt = 0; + int xhv = start_x; + int yhv = start_y; for(int idx=i1; idx!=i2; idx+=dir) { pos_idx[IconPos(y, x)] = idx; if (_icon_algo == ARRANGE_BORDER_DOWN) { if (++cnt & 1) - x = work_area.right - x; + x = work_area.right - x - cx + 2*xoffset; else { y += dy1; - if (y >= work_area.bottom) { + if (y + cy - 2 * yoffset > work_area.bottom) { y = start_y; - x += dx2; + start_x += dx2; + x = start_x; } } @@ -775,20 +775,32 @@ } else if (_icon_algo == ARRANGE_BORDER_HV) { if (++cnt & 1) - x = work_area.right - x; + x = work_area.right - x - cx + 2*xoffset; else if (cnt & 2) { - y += dy1; + yhv += cy; + y = yhv; + x = start_x; - if (y >= work_area.bottom) { - y = start_y; - x += dx2; + if (y + cy - 2 * yoffset > work_area.bottom) { + start_x += cx; + xhv = start_x; + x = xhv; + start_y += cy; + yhv = start_y; + y = yhv; } } else { - x += dx1; + xhv += cx; + x = xhv; + y = start_y; - if (x >= work_area.right) { - x = start_x; - y += dy2; + if (x + cx - 2 * xoffset > work_area.right) { + start_x += cx; + xhv = start_x; + x = xhv; + start_y += cy; + yhv = start_y; + y = yhv; } } @@ -803,10 +815,10 @@ x += dx1; y += dy1; - if (x<0 || x>=work_area.right) { + if (x<0 || x+cx-2*xoffset>work_area.right) { x = start_x; y += dy2; - } else if (y<0 || y>=work_area.bottom) { + } else if (y<0 || y+cy-2*yoffset>work_area.bottom) { y = start_y; x += dx2; }

19 years, 2 months

[cwittich] 18672: fix bug in user32_winetest

by cwittich＠svn.reactos.com

fix bug in user32_winetest now it runs 43 clipboard tests instead of 39 Modified: trunk/reactos/regtests/winetests/user32/clipboard.c _____ Modified: trunk/reactos/regtests/winetests/user32/clipboard.c --- trunk/reactos/regtests/winetests/user32/clipboard.c 2005-10-22 02:27:37 UTC (rev 18671) +++ trunk/reactos/regtests/winetests/user32/clipboard.c 2005-10-22 11:51:52 UTC (rev 18672) @@ -30,8 +30,8 @@ { \ if (!is_win9x) \ ok(GetLastError() == expected_error, \ - "Last error should be set to %d, not %ld\n", \ - expected_error, GetLastError()); \ + "Last error should be set to %ld, not %ld\n", \ + (DWORD) expected_error, (DWORD) GetLastError()); \ } while (0) static void test_ClipboardOwner(void)

19 years, 2 months

[cwittich] 18671: adding gccasm.rules to vcproj files

by cwittich＠svn.reactos.com

adding gccasm.rules to vcproj files now it is possible to compile .s files with msvc Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.h Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp --- trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp 2005-10-22 01:46:46 UTC (rev 18670) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp 2005-10-22 02:27:37 UTC (rev 18671) @@ -54,10 +54,21 @@ void MSVCBackend::Process() { string filename_sln ( ProjectNode.name ); + string filename_rules = "gccasm.rules"; + if ( configuration.VSProjectVersion == "6.00" ) filename_sln += ".dsw"; - else + else { filename_sln += ".sln"; + + m_rulesFile = fopen ( filename_rules.c_str(), "wb" ); + if ( m_rulesFile ) + { + _generate_rules_file ( m_rulesFile ); + } + fclose ( m_rulesFile ); + } + printf ( "Creating MSVC workspace: %s\n", filename_sln.c_str() ); ProcessModules(); _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.h --- trunk/reactos/tools/rbuild/backend/msvc/msvc.h 2005-10-22 01:46:46 UTC (rev 18670) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.h 2005-10-22 02:27:37 UTC (rev 18671) @@ -63,6 +63,7 @@ FILE* m_dswFile; FILE* m_slnFile; + FILE* m_rulesFile; // functions in msvcmaker.cpp: @@ -79,6 +80,7 @@ // functions in vcprojmaker.cpp: + std::string _get_solution_verion ( void ); std::string _gen_guid(); std::string _replace_str( std::string string1, @@ -90,10 +92,11 @@ void _generate_sln_header ( FILE* OUT ); void _generate_sln_footer ( FILE* OUT ); void _generate_sln ( FILE* OUT ); + void _generate_rules_file ( FILE* OUT ); void _generate_sln_project ( FILE* OUT, const Module& module, - std::string dsp_file, + std::string vcproj_file, std::string sln_guid, std::string vcproj_guid, const std::vector<Dependency*>& dependencies ); _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2005-10-22 01:46:46 UTC (rev 18670) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2005-10-22 02:27:37 UTC (rev 18671) @@ -190,6 +190,15 @@ fprintf ( OUT, "\t\t\tName=\"Win32\"/>\r\n" ); fprintf ( OUT, "\t</Platforms>\r\n" ); + fprintf ( OUT, "\t<ToolFiles>\r\n" ); + fprintf ( OUT, "\t\t<ToolFile\r\n" ); + + string path = Path::RelativeFromDirectory ( ProjectNode.name, module.GetBasePath() ); + path.erase(path.find(ProjectNode.name, 0), ProjectNode.name.size() + 1); + + fprintf ( OUT, "\t\t\tRelativePath=\"%s/gccasm.rules\"/>\r\n", path.c_str() ); + fprintf ( OUT, "\t</ToolFiles>\r\n" ); + int n = 0; std::string output_dir; @@ -352,7 +361,7 @@ // Source files fprintf ( OUT, "\t\t<Filter\r\n" ); fprintf ( OUT, "\t\t\tName=\"Source Files\"\r\n" ); - fprintf ( OUT, "\t\t\tFilter=\"cpp;c;cxx;rc;def;r;odl;idl;hpj;bat\">\r\n" ); + fprintf ( OUT, "\t\t\tFilter=\"cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;S\">\r\n" ); for ( size_t isrcfile = 0; isrcfile < source_files.size(); isrcfile++ ) { const string& source_file = DosSeparator(source_files[isrcfile]); @@ -410,14 +419,13 @@ return string1; } -void -MSVCBackend::_generate_sln_header ( FILE* OUT ) -{ +std::string +MSVCBackend::_get_solution_verion ( void ) { + string version; + if (configuration.VSProjectVersion.empty()) configuration.VSProjectVersion = MS_VS_DEF_VERSION; - string version; - if (configuration.VSProjectVersion == "7.00") version = "7.00"; @@ -427,7 +435,38 @@ if (configuration.VSProjectVersion == "8.00") version = "9.00"; - fprintf ( OUT, "Microsoft Visual Studio Solution File, Format Version %s\r\n", version.c_str() ); + return version; +} + + +void +MSVCBackend::_generate_rules_file ( FILE* OUT ) +{ + fprintf ( OUT, "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" ); + fprintf ( OUT, "<VisualStudioToolFile\r\n" ); + fprintf ( OUT, "\tName=\"GCC Assembler\"\r\n" ); + fprintf ( OUT, "\tVersion=\"%s\"\r\n", _get_solution_verion().c_str() ); + fprintf ( OUT, "\t>\r\n" ); + fprintf ( OUT, "\t<Rules>\r\n" ); + fprintf ( OUT, "\t\t<CustomBuildRule\r\n" ); + fprintf ( OUT, "\t\t\tName=\"Assembler\"\r\n" ); + fprintf ( OUT, "\t\t\tDisplayName=\"Assembler Files\"\r\n" ); + fprintf ( OUT, "\t\t\tCommandLine=\"cl /E "$(InputPath)" | as -o "$(OutDir)\\$(InputName).obj"\"\r\n" ); + fprintf ( OUT, "\t\t\tOutputs=\"$(OutDir)\\$(InputName).obj\"\r\n" ); + fprintf ( OUT, "\t\t\tFileExtensions=\"*.S\"\r\n" ); + fprintf ( OUT, "\t\t\tExecutionDescription=\"asm\"\r\n" ); + fprintf ( OUT, "\t\t\t>\r\n" ); + fprintf ( OUT, "\t\t\t<Properties>\r\n" ); + fprintf ( OUT, "\t\t\t</Properties>\r\n" ); + fprintf ( OUT, "\t\t</CustomBuildRule>\r\n" ); + fprintf ( OUT, "\t</Rules>\r\n" ); + fprintf ( OUT, "</VisualStudioToolFile>\r\n" ); +} + +void +MSVCBackend::_generate_sln_header ( FILE* OUT ) +{ + fprintf ( OUT, "Microsoft Visual Studio Solution File, Format Version %s\r\n", _get_solution_verion().c_str() ); fprintf ( OUT, "# Visual Studio 2005\r\n" ); fprintf ( OUT, "\r\n" ); }

19 years, 2 months

[cwittich] 18670: fix warnings

by cwittich＠svn.reactos.com

fix warnings Modified: trunk/reactos/services/dhcp/alloc.c Modified: trunk/reactos/services/dhcp/dhclient.c Modified: trunk/reactos/services/dhcp/include/dhcpd.h Modified: trunk/reactos/services/dhcp/options.c Modified: trunk/reactos/services/dhcp/util.c _____ Modified: trunk/reactos/services/dhcp/alloc.c --- trunk/reactos/services/dhcp/alloc.c 2005-10-21 23:44:43 UTC (rev 18669) +++ trunk/reactos/services/dhcp/alloc.c 2005-10-22 01:46:46 UTC (rev 18670) @@ -76,4 +76,18 @@ return (rval); } -void free_hash_bucket(struct hash_bucket *hb) { free(hb); } +void +dfree(void *ptr, char *name) +{ + if (!ptr) { + warning("dfree %s: free on null pointer.", name); + return; + } + free(ptr); +} + +void +free_hash_bucket(struct hash_bucket *ptr, char *name) +{ + dfree(ptr, name); +} _____ Modified: trunk/reactos/services/dhcp/dhclient.c --- trunk/reactos/services/dhcp/dhclient.c 2005-10-21 23:44:43 UTC (rev 18669) +++ trunk/reactos/services/dhcp/dhclient.c 2005-10-22 01:46:46 UTC (rev 18670) @@ -234,7 +234,7 @@ /* make_request doesn't initialize xid because it normally comes from the DHCPDISCOVER, but we haven't sent a DHCPDISCOVER, so pick an xid now. */ - ip->client->xid = arc4random(); + ip->client->xid = rand(); /* Make a DHCPREQUEST packet, and set appropriate per-interface flags. */ @@ -940,7 +940,7 @@ ip->client->interval = ip->client->config->initial_interval; else { - ip->client->interval += (arc4random() >> 2) % + ip->client->interval += (rand() >> 2) % (2 * ip->client->interval); } @@ -949,7 +949,7 @@ ip->client->config->backoff_cutoff) ip->client->interval = ((ip->client->config->backoff_cutoff / 2) - + ((arc4random() >> 2) % + + ((rand() >> 2) % ip->client->config->backoff_cutoff)); } else if (!ip->client->interval) ip->client->interval = @@ -1142,7 +1142,7 @@ if (!ip->client->interval) ip->client->interval = ip->client->config->initial_interval; else - ip->client->interval += ((arc4random() >> 2) % + ip->client->interval += ((rand() >> 2) % (2 * ip->client->interval)); /* Don't backoff past cutoff. */ @@ -1150,7 +1150,7 @@ ip->client->config->backoff_cutoff) ip->client->interval = ((ip->client->config->backoff_cutoff / 2) + - ((arc4random() >> 2) % ip->client->interval)); + ((rand() >> 2) % ip->client->interval)); /* If the backoff would take us to the expiry time, just set the timeout to the expiry time. */ @@ -1280,7 +1280,7 @@ ip->client->packet.htype = ip->hw_address.htype; ip->client->packet.hlen = ip->hw_address.hlen; ip->client->packet.hops = 0; - ip->client->packet.xid = arc4random(); + ip->client->packet.xid = rand(); ip->client->packet.secs = 0; /* filled in by send_discover. */ ip->client->packet.flags = 0; @@ -1986,7 +1986,7 @@ ipv4addrs(char * buf) { char *tmp; - struct in_addr jnk; + unsigned long jnk; int i = 0; note("Input: %s\n", buf); @@ -1994,7 +1994,8 @@ do { tmp = strtok(buf, " "); note("got %s\n", tmp); - if( tmp && inet_aton(tmp, &jnk) ) i++; + jnk = inet_addr( tmp ); + if( tmp ) i++; buf = NULL; } while( tmp ); _____ Modified: trunk/reactos/services/dhcp/include/dhcpd.h --- trunk/reactos/services/dhcp/include/dhcpd.h 2005-10-21 23:44:43 UTC (rev 18669) +++ trunk/reactos/services/dhcp/include/dhcpd.h 2005-10-22 01:46:46 UTC (rev 18670) @@ -322,7 +322,10 @@ struct string_list *new_string_list(size_t size); struct hash_table *new_hash_table(int); struct hash_bucket *new_hash_bucket(void); +void dfree(void *, char *); +void free_hash_bucket(struct hash_bucket *, char *); + /* bpf.c */ int if_register_bpf(struct interface_info *); void if_register_send(struct interface_info *); _____ Modified: trunk/reactos/services/dhcp/options.c --- trunk/reactos/services/dhcp/options.c 2005-10-21 23:44:43 UTC (rev 18669) +++ trunk/reactos/services/dhcp/options.c 2005-10-22 01:46:46 UTC (rev 18670) @@ -41,6 +41,7 @@ */ #include <ctype.h> +#include <string.h> #define DHCP_OPTION_DATA #include "rosdhcp.h" @@ -592,7 +593,8 @@ break; case 'I': foo.s_addr = htonl(getULong(dp)); - opcount = strlcpy(op, inet_ntoa(foo), opleft); + strncpy(op, inet_ntoa(foo), opleft - 1); + op[opleft - 1] = ANSI_NULL; if (opcount >= opleft) goto toobig; opleft -= opcount; @@ -650,8 +652,8 @@ opleft -= opcount; break; case 'f': - opcount = strlcpy(op, - *dp++ ? "true" : "false", opleft); + opcount = (size_t) strncpy(op, *dp++ ? "true" : "false", opleft - 1); + op[opleft - 1] = ANSI_NULL; if (opcount >= opleft) goto toobig; opleft -= opcount; _____ Modified: trunk/reactos/services/dhcp/util.c --- trunk/reactos/services/dhcp/util.c 2005-10-21 23:44:43 UTC (rev 18669) +++ trunk/reactos/services/dhcp/util.c 2005-10-22 01:46:46 UTC (rev 18670) @@ -93,7 +93,6 @@ } void *dmalloc( int size, char *name ) { return malloc( size ); } -void dfree( void *v, char *name ) { free( v ); } int read_client_conf(void) { error("util.c read_client_conf not implemented!");

19 years, 2 months

← Newer
1
...
22
23
24
25
26
27
28
...
74
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 October 2005