Francois Gouget : testbot/TestLauncher: Constify some variables.

Alexandre Julliard julliard at winehq.org
Thu Jun 15 05:10:22 CDT 2017


Module: tools
Branch: master
Commit: 97048a6013c588651cc36cdf4ad2c9268f350979
URL:    http://source.winehq.org/git/tools.git/?a=commit;h=97048a6013c588651cc36cdf4ad2c9268f350979

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Thu Jun 15 01:46:42 2017 +0200

testbot/TestLauncher: Constify some variables.

Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 testbot/src/TestLauncher/TestLauncher.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c
index 53590f8..2e9a62f 100644
--- a/testbot/src/TestLauncher/TestLauncher.c
+++ b/testbot/src/TestLauncher/TestLauncher.c
@@ -53,9 +53,9 @@ static void _ReportError(const char *Format, ...)
    Failures++;
 }
 
-static DWORD ConvertRVAToDiskOffset(DWORD RVA, DWORD SectionHeaderCount, PIMAGE_SECTION_HEADER SectionHeaders)
+static DWORD ConvertRVAToDiskOffset(DWORD RVA, DWORD SectionHeaderCount, const IMAGE_SECTION_HEADER *SectionHeaders)
 {
-   PIMAGE_SECTION_HEADER SectionHeader;
+   const IMAGE_SECTION_HEADER *SectionHeader;
 
    for (SectionHeader = SectionHeaders; SectionHeader < SectionHeaders + SectionHeaderCount; SectionHeader++)
    {
@@ -66,7 +66,7 @@ static DWORD ConvertRVAToDiskOffset(DWORD RVA, DWORD SectionHeaderCount, PIMAGE_
    return 0;
 }
 
-static BOOL DllPresent(char *DllName)
+static BOOL DllPresent(const char *DllName)
 {
    HMODULE DllModule;
 
@@ -91,15 +91,15 @@ static BOOL DllPresent(char *DllName)
  * So instead we just dive into the executable's import table, determine which modules are being
  * imported and check if they are present.
  */
-static BOOL AllImportedDllsPresent(char *TestExeName)
+static BOOL AllImportedDllsPresent(const char *TestExeName)
 {
    HANDLE TestExe;
    IMAGE_DOS_HEADER DosHeader;
    IMAGE_NT_HEADERS NTHeaders;
-   PIMAGE_DATA_DIRECTORY DataDirectoryImportTable;
-   PIMAGE_SECTION_HEADER SectionHeaders;
-   PIMAGE_IMPORT_DESCRIPTOR ImportDescriptors;
-   PIMAGE_IMPORT_DESCRIPTOR ImportDescriptor;
+   const IMAGE_DATA_DIRECTORY *DataDirectoryImportTable;
+   IMAGE_SECTION_HEADER *SectionHeaders;
+   IMAGE_IMPORT_DESCRIPTOR *ImportDescriptors;
+   const IMAGE_IMPORT_DESCRIPTOR *ImportDescriptor;
    DWORD NR;
    DWORD NewPos;
    DWORD FileOffset;
@@ -157,7 +157,7 @@ static BOOL AllImportedDllsPresent(char *TestExeName)
       return FALSE;
    }
 
-   SectionHeaders = (PIMAGE_SECTION_HEADER) malloc(NTHeaders.FileHeader.NumberOfSections * sizeof(IMAGE_SECTION_HEADER));
+   SectionHeaders = (IMAGE_SECTION_HEADER*) malloc(NTHeaders.FileHeader.NumberOfSections * sizeof(IMAGE_SECTION_HEADER));
    if (SectionHeaders == NULL)
    {
       CloseHandle(TestExe);
@@ -173,7 +173,7 @@ static BOOL AllImportedDllsPresent(char *TestExeName)
       return FALSE;
    }
 
-   ImportDescriptors = (PIMAGE_IMPORT_DESCRIPTOR) malloc(DataDirectoryImportTable->Size);
+   ImportDescriptors = (IMAGE_IMPORT_DESCRIPTOR*) malloc(DataDirectoryImportTable->Size);
    if (ImportDescriptors == NULL)
    {
       free(SectionHeaders);
@@ -287,8 +287,8 @@ int main(int argc, char *argv[])
    BOOL UsageError;
    char TestExeFullName[_MAX_PATH];
    char *TestExeFileName;
-   char *Suffix;
-   char *Subtest;
+   const char *Suffix;
+   const char *Subtest;
    int TestArg;
    char *CommandLine;
    int CommandLen;




More information about the wine-cvs mailing list