From fa0680030a2969e1085563da633713e1c321637c Mon Sep 17 00:00:00 2001 From: Lv Zheng Date: Mon, 5 Dec 2016 16:24:03 +0800 Subject: MSVC: Fix MSVC6 build issues Build environment has changed because of new improvements: 1. New files are split 2. New inclusion order This patch updates MSVC project files accordingly. Signed-off-by: Lv Zheng --- generate/msvc/AcpiDump.dsp | 8 ++++++++ generate/msvc/AcpiExec.dsp | 4 ++++ generate/msvc/AcpiHelp.dsp | 4 ++++ generate/msvc/AcpiNames.dsp | 4 ++++ generate/msvc/AcpiSubsystem.dsp | 8 ++++++++ generate/msvc/AslCompiler.dsp | 12 ++++++++++-- generate/msvc/Examples.dsp | 4 ++++ source/include/platform/acenv.h | 2 +- 8 files changed, 43 insertions(+), 3 deletions(-) diff --git a/generate/msvc/AcpiDump.dsp b/generate/msvc/AcpiDump.dsp index 508006fff..690008244 100755 --- a/generate/msvc/AcpiDump.dsp +++ b/generate/msvc/AcpiDump.dsp @@ -168,6 +168,10 @@ SOURCE=..\..\source\components\utilities\utglobal.c # End Source File # Begin Source File +SOURCE=..\..\source\components\utilities\uthex.c +# End Source File +# Begin Source File + SOURCE=..\..\source\components\utilities\utmath.c # End Source File # Begin Source File @@ -180,6 +184,10 @@ SOURCE=..\..\source\components\utilities\utstring.c # End Source File # Begin Source File +SOURCE=..\..\source\components\utilities\utstrtoul64.c +# End Source File +# Begin Source File + SOURCE=..\..\source\components\utilities\utxferror.c # End Source File # End Group diff --git a/generate/msvc/AcpiExec.dsp b/generate/msvc/AcpiExec.dsp index 856652303..b9302ac70 100755 --- a/generate/msvc/AcpiExec.dsp +++ b/generate/msvc/AcpiExec.dsp @@ -230,6 +230,10 @@ SOURCE=..\..\source\components\utilities\utstring.c # End Source File # Begin Source File +SOURCE=..\..\source\components\utilities\utstrtoul64.c +# End Source File +# Begin Source File + SOURCE=..\..\source\components\utilities\uttrack.c # End Source File # Begin Source File diff --git a/generate/msvc/AcpiHelp.dsp b/generate/msvc/AcpiHelp.dsp index 99ac56650..828ae48f5 100755 --- a/generate/msvc/AcpiHelp.dsp +++ b/generate/msvc/AcpiHelp.dsp @@ -128,6 +128,10 @@ SOURCE=..\..\source\tools\acpihelp\ahdecode.c # End Source File # Begin Source File +SOURCE=..\..\source\tools\acpihelp\ahgrammar.c +# End Source File +# Begin Source File + SOURCE=..\..\source\tools\acpihelp\ahmain.c # End Source File # End Group diff --git a/generate/msvc/AcpiNames.dsp b/generate/msvc/AcpiNames.dsp index 298e484a5..626be2a29 100755 --- a/generate/msvc/AcpiNames.dsp +++ b/generate/msvc/AcpiNames.dsp @@ -236,6 +236,10 @@ SOURCE=..\..\source\components\utilities\utstring.c # End Source File # Begin Source File +SOURCE=..\..\source\components\utilities\utstrtoul64.c +# End Source File +# Begin Source File + SOURCE=..\..\source\components\utilities\utuuid.c # End Source File # Begin Source File diff --git a/generate/msvc/AcpiSubsystem.dsp b/generate/msvc/AcpiSubsystem.dsp index 4976dbeb7..03d58ec4e 100755 --- a/generate/msvc/AcpiSubsystem.dsp +++ b/generate/msvc/AcpiSubsystem.dsp @@ -155,6 +155,10 @@ SOURCE=..\..\source\components\utilities\utglobal.c # End Source File # Begin Source File +SOURCE=..\..\source\components\utilities\uthex.c +# End Source File +# Begin Source File + SOURCE=..\..\source\components\utilities\utids.c # End Source File # Begin Source File @@ -212,6 +216,10 @@ SOURCE=..\..\source\components\utilities\utstring.c # End Source File # Begin Source File +SOURCE=..\..\source\components\utilities\utstrtoul64.c +# End Source File +# Begin Source File + SOURCE=..\..\source\components\utilities\uttrack.c # End Source File # Begin Source File diff --git a/generate/msvc/AslCompiler.dsp b/generate/msvc/AslCompiler.dsp index 350c3f8ca..31c4c1e16 100755 --- a/generate/msvc/AslCompiler.dsp +++ b/generate/msvc/AslCompiler.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /YX /FD /c -# ADD CPP /nologo /W3 /Gi /Ob1 /Gf /I "..\..\source\include" /I "..\..\source\compiler" /I "." /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_CONSOLE" /D "__STDC__" /D "YY_NEVER_INTERACTIVE" /D "ACPI_ASL_COMPILER" /FD /c +# ADD CPP /nologo /W3 /Gi /Ob1 /Gf /I "..\..\source\include" /I "..\..\source\compiler" /I "." /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_CONSOLE" /D "__STDC__" /D "YY_NEVER_INTERACTIVE" /D "YY_NO_UNISTD_H" /D "ACPI_ASL_COMPILER" /FD /c # SUBTRACT CPP /X /Fr /YX # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 @@ -78,7 +78,7 @@ PostBuild_Cmds=copy aslcompiler\aslcompiler.exe ..\..\libraries\iasl.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /Gi /Zi /Od /Oy /Ob1 /Gf /I "..\..\source\include" /I "..\..\source\compiler" /I "." /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_CONSOLE" /D "__STDC__" /D "YY_NEVER_INTERACTIVE" /D "ACPI_ASL_COMPILER" /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /Gi /Zi /Od /Oy /Ob1 /Gf /I "..\..\source\include" /I "..\..\source\compiler" /I "." /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_CONSOLE" /D "__STDC__" /D "YY_NEVER_INTERACTIVE" /D "YY_NO_UNISTD_H" /D "ACPI_ASL_COMPILER" /FD /GZ /c # SUBTRACT CPP /Fr # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 @@ -212,6 +212,10 @@ SOURCE=..\..\source\components\utilities\utstring.c # End Source File # Begin Source File +SOURCE=..\..\source\components\utilities\utstrtoul64.c +# End Source File +# Begin Source File + SOURCE=..\..\source\components\utilities\utuuid.c # End Source File # Begin Source File @@ -316,6 +320,10 @@ SOURCE=..\..\source\compiler\aslfold.c # End Source File # Begin Source File +SOURCE=..\..\source\compiler\aslhelp.c +# End Source File +# Begin Source File + SOURCE=..\..\source\compiler\aslhex.c # End Source File # Begin Source File diff --git a/generate/msvc/Examples.dsp b/generate/msvc/Examples.dsp index 502a9d97f..cc625bcb8 100755 --- a/generate/msvc/Examples.dsp +++ b/generate/msvc/Examples.dsp @@ -589,6 +589,10 @@ SOURCE=..\..\source\components\utilities\utstring.c # End Source File # Begin Source File +SOURCE=..\..\source\components\utilities\utstrtoul64.c +# End Source File +# Begin Source File + SOURCE=..\..\source\components\utilities\uttrack.c # End Source File # Begin Source File diff --git a/source/include/platform/acenv.h b/source/include/platform/acenv.h index 4982c8760..02c9af1d0 100644 --- a/source/include/platform/acenv.h +++ b/source/include/platform/acenv.h @@ -433,7 +433,7 @@ #include #include #include -#ifdef ACPI_APPLICATION +#if defined (ACPI_APPLICATION) || defined(ACPI_LIBRARY) #include #include #include -- cgit v1.2.1 From 09fdea4f117b34cf7ef538da54837a344f1cfdd3 Mon Sep 17 00:00:00 2001 From: Lv Zheng Date: Mon, 5 Dec 2016 16:24:16 +0800 Subject: Debugger: Improve code quality Use safer strncpy() instead of strcpy() in AcpiDbRunRemoteDebugger(). Detected by Coverity tools. Signed-off-by: Lv Zheng --- source/os_specific/service_layers/osgendbg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/os_specific/service_layers/osgendbg.c b/source/os_specific/service_layers/osgendbg.c index 10791d871..b8e2e3cf9 100644 --- a/source/os_specific/service_layers/osgendbg.c +++ b/source/os_specific/service_layers/osgendbg.c @@ -177,7 +177,7 @@ AcpiDbRunRemoteDebugger ( Ptr++; } - strcpy (AcpiGbl_DbLineBuf, Cmd); + strncpy (AcpiGbl_DbLineBuf, Cmd, ACPI_DB_LINE_BUFFER_SIZE); Ptr++; Cmd = Ptr; } -- cgit v1.2.1