December 2006 - Wine-commits

Mike McCormack : msi: Add tests for comparison to empty strings.
by Alexandre Julliard 07 Dec '06

07 Dec '06

Module: wine Branch: master Commit: c8898f6bba7a6a9eb7c77835a368d42c94cefc4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8898f6bba7a6a9eb7c77835a… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Dec 6 22:29:34 2006 +0900 msi: Add tests for comparison to empty strings. --- dlls/msi/tests/package.c | 133 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 133 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 5a6a7a8..112655d 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -1196,6 +1196,139 @@ static void test_condition(void) r = MsiEvaluateCondition(hpkg, "one >> two"); ok( r == MSICONDITION_TRUE, "wrong return val\n"); + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"1.1.4322\""); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport > \"1.1.4322\""); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport >= \"1.1.4322\""); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport <= \"1.1.4322\""); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport <> \"1.1.4322\""); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport ~< \"1.1.4322\""); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"abcd\""); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"a1.1.4322\""); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"1.1.4322a\""); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"0000001.1.4322\""); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"1.1.4322.1\""); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"1.1.4322.1.1\""); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "\"2\" < \"1.1"); + ok( r == MSICONDITION_ERROR, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "\"2\" < \"1.1\""); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "\"2\" < \"12.1\""); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "\"02.1\" < \"2.11\""); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "\"02.1.1\" < \"2.1\""); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"1.1\""); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"1\""); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"0\""); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"-1\""); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"a\""); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"!\""); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"!\""); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"/\""); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \" \""); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"azAZ_\""); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"a[a]\""); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"a[a]a\""); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + + todo_wine { + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"[a]\""); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"[a]a\""); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"{a}\""); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"{a\""); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"[a\""); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + } + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"a{\""); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"a]\""); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"A\""); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + + MsiSetProperty(hpkg, "MsiNetAssemblySupport", "1.1.4322"); + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"1.1.4322\""); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"1.1.14322\""); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"1.1.5\""); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"1.1\""); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"1\""); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + + MsiSetProperty(hpkg, "one", "1"); + r = MsiEvaluateCondition(hpkg, "one < \"1\""); + ok( r == MSICONDITION_FALSE, "wrong return val\n"); + MsiCloseHandle( hpkg ); DeleteFile(msifile); }

1 0

Dmitry Timoshkov : winedump: IMAGE_SCN_ALIGN_??? are not the bit fields, but the values masked by IMAGE_SCN_ALIGN_MASK.
by Alexandre Julliard 07 Dec '06

07 Dec '06

Module: wine Branch: master Commit: cb7453ff4d7125063e582d05839d5f23ecaf8541 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb7453ff4d7125063e582d058… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Dec 7 21:43:04 2006 +0800 winedump: IMAGE_SCN_ALIGN_??? are not the bit fields, but the values masked by IMAGE_SCN_ALIGN_MASK. --- tools/winedump/pe.c | 31 +++++++++++++++++++++---------- 1 files changed, 21 insertions(+), 10 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 8365432..a5bba57 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -365,8 +365,8 @@ static void dump_sections(const void* ad printf(" line # offs: %-8u line #'s: %-8u\n", sectHead->PointerToLinenumbers, sectHead->NumberOfLinenumbers); printf(" characteristics: 0x%08x\n", sectHead->Characteristics); - printf(" "); -#define X(b,s) if (sectHead->Characteristics & b) printf(s " ") + printf(" "); +#define X(b,s) if (sectHead->Characteristics & b) printf(" " s) /* #define IMAGE_SCN_TYPE_REG 0x00000000 - Reserved */ /* #define IMAGE_SCN_TYPE_DSECT 0x00000001 - Reserved */ /* #define IMAGE_SCN_TYPE_NOLOAD 0x00000002 - Reserved */ @@ -394,14 +394,25 @@ static void dump_sections(const void* ad X(IMAGE_SCN_MEM_LOCKED, "MEM_LOCKED"); X(IMAGE_SCN_MEM_PRELOAD, "MEM_PRELOAD"); - X(IMAGE_SCN_ALIGN_1BYTES, "ALIGN_1BYTES"); - X(IMAGE_SCN_ALIGN_2BYTES, "ALIGN_2BYTES"); - X(IMAGE_SCN_ALIGN_4BYTES, "ALIGN_4BYTES"); - X(IMAGE_SCN_ALIGN_8BYTES, "ALIGN_8BYTES"); - X(IMAGE_SCN_ALIGN_16BYTES, "ALIGN_16BYTES"); - X(IMAGE_SCN_ALIGN_32BYTES, "ALIGN_32BYTES"); - X(IMAGE_SCN_ALIGN_64BYTES, "ALIGN_64BYTES"); -/* 0x00800000 - Unused */ + switch (sectHead->Characteristics & IMAGE_SCN_ALIGN_MASK) + { +#define X2(b,s) case b: printf(" " s); break; + X2(IMAGE_SCN_ALIGN_1BYTES, "ALIGN_1BYTES"); + X2(IMAGE_SCN_ALIGN_2BYTES, "ALIGN_2BYTES"); + X2(IMAGE_SCN_ALIGN_4BYTES, "ALIGN_4BYTES"); + X2(IMAGE_SCN_ALIGN_8BYTES, "ALIGN_8BYTES"); + X2(IMAGE_SCN_ALIGN_16BYTES, "ALIGN_16BYTES"); + X2(IMAGE_SCN_ALIGN_32BYTES, "ALIGN_32BYTES"); + X2(IMAGE_SCN_ALIGN_64BYTES, "ALIGN_64BYTES"); + X2(IMAGE_SCN_ALIGN_128BYTES, "ALIGN_128BYTES"); + X2(IMAGE_SCN_ALIGN_256BYTES, "ALIGN_256BYTES"); + X2(IMAGE_SCN_ALIGN_512BYTES, "ALIGN_512BYTES"); + X2(IMAGE_SCN_ALIGN_1024BYTES, "ALIGN_1024BYTES"); + X2(IMAGE_SCN_ALIGN_2048BYTES, "ALIGN_2048BYTES"); + X2(IMAGE_SCN_ALIGN_4096BYTES, "ALIGN_4096BYTES"); + X2(IMAGE_SCN_ALIGN_8192BYTES, "ALIGN_8192BYTES"); +#undef X2 + } X(IMAGE_SCN_LNK_NRELOC_OVFL, "LNK_NRELOC_OVFL");

1 0

Dmitry Timoshkov : winedump: Handle properly partial optional COFF headers.
by Alexandre Julliard 07 Dec '06

07 Dec '06

Module: wine Branch: master Commit: 7928f5460fd4c9799baaf461b93e17870d95f722 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7928f5460fd4c9799baaf461b… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Dec 7 21:43:15 2006 +0800 winedump: Handle properly partial optional COFF headers. Export dump_file_header() and dump_optional_header() for use outside of pe.c. --- tools/winedump/pe.c | 63 ++++++++++++++++++++++++++++++-------------- tools/winedump/winedump.h | 7 +++++ 2 files changed, 50 insertions(+), 20 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index a5bba57..b3360f4 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -91,7 +91,7 @@ static const IMAGE_NT_HEADERS32 *get_nt_ const IMAGE_DOS_HEADER *dos; dos = PRD(0, sizeof(*dos)); if (!dos) return NULL; - return PRD(dos->e_lfanew, sizeof(IMAGE_NT_HEADERS32)); + return PRD(dos->e_lfanew, sizeof(DWORD) + sizeof(IMAGE_FILE_HEADER)); } static int is_fake_dll( void ) @@ -223,8 +223,16 @@ static inline void print_datadirectory(D } } -static void dump_optional_header32(const IMAGE_OPTIONAL_HEADER32 *optionalHeader) +static void dump_optional_header32(const IMAGE_OPTIONAL_HEADER32 *image_oh, UINT header_size) { + IMAGE_OPTIONAL_HEADER32 oh; + const IMAGE_OPTIONAL_HEADER32 *optionalHeader; + + /* in case optional header is missing or partial */ + memset(&oh, 0, sizeof(oh)); + memcpy(&oh, image_oh, min(header_size, sizeof(oh))); + optionalHeader = &oh; + print_word("Magic", optionalHeader->Magic); print_ver("linker version", optionalHeader->MajorLinkerVersion, optionalHeader->MinorLinkerVersion); @@ -257,10 +265,19 @@ static void dump_optional_header32(const print_dword("RVAs & sizes", optionalHeader->NumberOfRvaAndSizes); printf("\n"); print_datadirectory(optionalHeader->NumberOfRvaAndSizes, optionalHeader->DataDirectory); + printf("\n"); } -static void dump_optional_header64(const IMAGE_OPTIONAL_HEADER64 *optionalHeader) +static void dump_optional_header64(const IMAGE_OPTIONAL_HEADER64 *image_oh, UINT header_size) { + IMAGE_OPTIONAL_HEADER64 oh; + const IMAGE_OPTIONAL_HEADER64 *optionalHeader; + + /* in case optional header is missing or partial */ + memset(&oh, 0, sizeof(oh)); + memcpy(&oh, image_oh, min(header_size, sizeof(oh))); + optionalHeader = &oh; + print_word("Magic", optionalHeader->Magic); print_ver("linker version", optionalHeader->MajorLinkerVersion, optionalHeader->MinorLinkerVersion); @@ -292,14 +309,29 @@ static void dump_optional_header64(const print_dword("RVAs & sizes", optionalHeader->NumberOfRvaAndSizes); printf("\n"); print_datadirectory(optionalHeader->NumberOfRvaAndSizes, optionalHeader->DataDirectory); + printf("\n"); } -static void dump_pe_header(void) +void dump_optional_header(const IMAGE_OPTIONAL_HEADER32 *optionalHeader, UINT header_size) { - const IMAGE_FILE_HEADER *fileHeader; + printf("Optional Header (%s)\n", get_magic_type(optionalHeader->Magic)); + + switch(optionalHeader->Magic) { + case IMAGE_NT_OPTIONAL_HDR32_MAGIC: + dump_optional_header32(optionalHeader, header_size); + break; + case IMAGE_NT_OPTIONAL_HDR64_MAGIC: + dump_optional_header64((const IMAGE_OPTIONAL_HEADER64 *)optionalHeader, header_size); + break; + default: + printf(" Unknown optional header magic: 0x%-4X\n", optionalHeader->Magic); + break; + } +} +void dump_file_header(const IMAGE_FILE_HEADER *fileHeader) +{ printf("File Header\n"); - fileHeader = &PE_nt_headers->FileHeader; printf(" Machine: %04X (%s)\n", fileHeader->Machine, get_machine_str(fileHeader->Machine)); @@ -330,21 +362,12 @@ static void dump_pe_header(void) X(IMAGE_FILE_BYTES_REVERSED_HI, "BYTES_REVERSED_HI"); #undef X printf("\n"); +} - /* hope we have the right size */ - printf("Optional Header (%s)\n", get_magic_type(PE_nt_headers->OptionalHeader.Magic)); - switch(PE_nt_headers->OptionalHeader.Magic) { - case IMAGE_NT_OPTIONAL_HDR32_MAGIC: - dump_optional_header32((const IMAGE_OPTIONAL_HEADER32*)&PE_nt_headers->OptionalHeader); - break; - case IMAGE_NT_OPTIONAL_HDR64_MAGIC: - dump_optional_header64((const IMAGE_OPTIONAL_HEADER64*)&PE_nt_headers->OptionalHeader); - break; - default: - printf(" Unknown header magic: 0x%-4X\n", PE_nt_headers->OptionalHeader.Magic); - break; - } - printf("\n"); +static void dump_pe_header(void) +{ + dump_file_header(&PE_nt_headers->FileHeader); + dump_optional_header((const IMAGE_OPTIONAL_HEADER32*)&PE_nt_headers->OptionalHeader, PE_nt_headers->FileHeader.SizeOfOptionalHeader); } static void dump_sections(const void* addr, unsigned num_sect) diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index 0d2a051..e48f252 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -47,6 +47,11 @@ #include <assert.h> #include <stdarg.h> +#define NONAMELESSUNION +#define NONAMELESSSTRUCT +#include "windef.h" +#include "winbase.h" + /* Argument type constants */ #define MAX_FUNCTION_ARGS 32 @@ -230,6 +235,8 @@ void dump_data( const unsigne const char* get_time_str( unsigned long ); unsigned int strlenW( const unsigned short *str ); void dump_unicode_str( const unsigned short *str, int len ); +void dump_file_header(const IMAGE_FILE_HEADER *); +void dump_optional_header(const IMAGE_OPTIONAL_HEADER32 *, UINT); enum FileSig get_kind_exec(void); void pe_dump( void );

1 0

Dmitry Timoshkov : winedump: Export dump_section() for use outside of pe.c.
by Alexandre Julliard 07 Dec '06

07 Dec '06

Module: wine Branch: master Commit: 1542722121130f9651109a84bea62ef27f36082b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1542722121130f9651109a84b… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Dec 7 21:43:25 2006 +0800 winedump: Export dump_section() for use outside of pe.c. --- tools/winedump/pe.c | 28 ++++++++++++++++------------ tools/winedump/winedump.h | 1 + 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index b3360f4..54bc6fb 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -370,16 +370,10 @@ static void dump_pe_header(void) dump_optional_header((const IMAGE_OPTIONAL_HEADER32*)&PE_nt_headers->OptionalHeader, PE_nt_headers->FileHeader.SizeOfOptionalHeader); } -static void dump_sections(const void* addr, unsigned num_sect) +void dump_section(const IMAGE_SECTION_HEADER *sectHead) { - const IMAGE_SECTION_HEADER* sectHead = addr; - unsigned i; - - printf("Section Table\n"); - for (i = 0; i < num_sect; i++, sectHead++) - { - printf(" %02d %-8.8s VirtSize: %-8u VirtAddr: %-8u 0x%08x\n", - i + 1, sectHead->Name, sectHead->Misc.VirtualSize, sectHead->VirtualAddress, + printf(" %-8.8s VirtSize: %-8u VirtAddr: %-8u 0x%08x\n", + sectHead->Name, sectHead->Misc.VirtualSize, sectHead->VirtualAddress, sectHead->VirtualAddress); printf(" raw data offs: %-8u raw data size: %-8u\n", sectHead->PointerToRawData, sectHead->SizeOfRawData); @@ -448,8 +442,18 @@ static void dump_sections(const void* ad X(IMAGE_SCN_MEM_WRITE, "MEM_WRITE"); #undef X printf("\n\n"); +} + +static void dump_sections(const void *base, const void* addr, unsigned num_sect) +{ + const IMAGE_SECTION_HEADER* sectHead = addr; + unsigned i; + + printf("Section Table\n"); + for (i = 0; i < num_sect; i++, sectHead++) + { + dump_section(sectHead); } - printf("\n"); } static void dump_dir_exported_functions(void) @@ -858,7 +862,7 @@ void dbg_dump(void) separateDebugHead->NumberOfSections * sizeof(IMAGE_SECTION_HEADER))) {printf("Can't get the sections, aborting\n"); return;} - dump_sections(separateDebugHead + 1, separateDebugHead->NumberOfSections); + dump_sections(separateDebugHead, separateDebugHead + 1, separateDebugHead->NumberOfSections); nb_dbg = separateDebugHead->DebugDirectorySize / sizeof(IMAGE_DEBUG_DIRECTORY); debugDir = PRD(sizeof(IMAGE_SEPARATE_DEBUG_HEADER) + @@ -1193,7 +1197,7 @@ void pe_dump(void) { dump_pe_header(); /* FIXME: should check ptr */ - dump_sections((const char*)PE_nt_headers + sizeof(DWORD) + + dump_sections(PRD(0, 1), (const char*)PE_nt_headers + sizeof(DWORD) + sizeof(IMAGE_FILE_HEADER) + PE_nt_headers->FileHeader.SizeOfOptionalHeader, PE_nt_headers->FileHeader.NumberOfSections); } diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index e48f252..5b1c68e 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -237,6 +237,7 @@ unsigned int strlenW( const unsigned void dump_unicode_str( const unsigned short *str, int len ); void dump_file_header(const IMAGE_FILE_HEADER *); void dump_optional_header(const IMAGE_OPTIONAL_HEADER32 *, UINT); +void dump_section(const IMAGE_SECTION_HEADER *); enum FileSig get_kind_exec(void); void pe_dump( void );

1 0

Dmitry Timoshkov : winedump: Add a possibility to dump raw section data.
by Alexandre Julliard 07 Dec '06

07 Dec '06

Module: wine Branch: master Commit: e0518a9d884d649d6ff51d50c2a9509e05406815 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0518a9d884d649d6ff51d50c… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Dec 7 21:43:37 2006 +0800 winedump: Add a possibility to dump raw section data. --- tools/winedump/main.c | 1 + tools/winedump/pe.c | 8 +++++++- tools/winedump/winedump.h | 1 + 3 files changed, 9 insertions(+), 1 deletions(-) diff --git a/tools/winedump/main.c b/tools/winedump/main.c index f0ea281..ad24379 100644 --- a/tools/winedump/main.c +++ b/tools/winedump/main.c @@ -186,6 +186,7 @@ static void do_rawdebug (void) static void do_dumpall(void) { globals.do_dumpheader = 1; + globals.do_dump_rawdata = 1; globals.dumpsect = "ALL"; } diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 54bc6fb..e9ec8f8 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -375,7 +375,7 @@ void dump_section(const IMAGE_SECTION_HE printf(" %-8.8s VirtSize: %-8u VirtAddr: %-8u 0x%08x\n", sectHead->Name, sectHead->Misc.VirtualSize, sectHead->VirtualAddress, sectHead->VirtualAddress); - printf(" raw data offs: %-8u raw data size: %-8u\n", + printf(" raw data offs: %-8u raw data size: %-8u\n", sectHead->PointerToRawData, sectHead->SizeOfRawData); printf(" relocation offs: %-8u relocations: %-8u\n", sectHead->PointerToRelocations, sectHead->NumberOfRelocations); @@ -453,6 +453,12 @@ static void dump_sections(const void *ba for (i = 0; i < num_sect; i++, sectHead++) { dump_section(sectHead); + + if (globals.do_dump_rawdata) + { + dump_data((const unsigned char *)base + sectHead->PointerToRawData, sectHead->SizeOfRawData, " " ); + printf("\n"); + } } } diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index 5b1c68e..1da28d7 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -128,6 +128,7 @@ typedef struct __globals /* Options: dump mode */ int do_demangle; /* -d */ int do_dumpheader; /* -f */ + int do_dump_rawdata; /* -x */ int do_debug; /* -G == 1, -g == 2 */ /* Option arguments: spec mode */

1 0

Alexandre Julliard : ntdll: Fix the failing loader tests.
by Alexandre Julliard 07 Dec '06

07 Dec '06

Module: wine Branch: master Commit: 94ac9895341d6a8544690ea63ff4655ecd61496c URL: http://source.winehq.org/git/wine.git/?a=commit;h=94ac9895341d6a8544690ea63… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 7 15:34:36 2006 +0100 ntdll: Fix the failing loader tests. --- dlls/kernel32/tests/loader.c | 12 ------------ dlls/ntdll/virtual.c | 8 +++++--- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 50dbfb8..fbf1b6a 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -294,16 +294,12 @@ START_TEST(loader) { ok(info.BaseAddress == (char *)hlib + ALIGN_SIZE(nt_header.OptionalHeader.SizeOfImage, si.dwPageSize), "%d: %p != %p\n", i, info.BaseAddress, (char *)hlib + ALIGN_SIZE(nt_header.OptionalHeader.SizeOfImage, si.dwPageSize)); -todo_wine { ok(info.AllocationBase == 0, "%d: %p != 0\n", i, info.AllocationBase); -} ok(info.AllocationProtect == 0, "%d: %x != 0\n", i, info.AllocationProtect); /*ok(info.RegionSize == not_practical_value, "%d: %lx != not_practical_value\n", i, info.RegionSize);*/ ok(info.State == MEM_FREE, "%d: %x != MEM_FREE\n", i, info.State); ok(info.Type == 0, "%d: %x != 0\n", i, info.Type); -todo_wine { ok(info.Protect == PAGE_NOACCESS, "%d: %x != PAGE_NOACCESS\n", i, info.Protect); -} } else { @@ -322,14 +318,6 @@ todo_wine { } else { /* LoadLibrary has failed */ - if (hlib) /* remove completely once Wine is fixed */ - { - todo_wine ok(!hlib, "%d: LoadLibrary should fail\n", i); - FreeLibrary(hlib); - DeleteFile(dll_name); - continue; - } - ok(!hlib, "%d: LoadLibrary should fail\n", i); if (GetLastError() == ERROR_GEN_FAILURE) /* Win9x, broken behaviour */ diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 54193ff..2b1ff24 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1021,6 +1021,7 @@ static NTSTATUS map_image( HANDLE hmappi removable ) != STATUS_SUCCESS) goto error; /* check that all sections are loaded at the right offset */ + if (nt->OptionalHeader.FileAlignment != nt->OptionalHeader.SectionAlignment) goto error; for (i = 0; i < nt->FileHeader.NumberOfSections; i++) { if (sec[i].VirtualAddress != sec[i].PointerToRawData) @@ -1710,7 +1711,8 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HA if (!view) { info->State = MEM_FREE; - info->Protect = 0; + info->Protect = PAGE_NOACCESS; + info->AllocationBase = 0; info->AllocationProtect = 0; info->Type = 0; } @@ -1719,6 +1721,7 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HA BYTE vprot = view->prot[(base - alloc_base) >> page_shift]; info->State = (vprot & VPROT_COMMITTED) ? MEM_COMMIT : MEM_RESERVE; info->Protect = VIRTUAL_GetWin32Prot( vprot ); + info->AllocationBase = alloc_base; info->AllocationProtect = VIRTUAL_GetWin32Prot( view->protect ); if (view->protect & VPROT_IMAGE) info->Type = MEM_IMAGE; else if (view->flags & VFLAG_VALLOC) info->Type = MEM_PRIVATE; @@ -1728,8 +1731,7 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HA } RtlLeaveCriticalSection(&csVirtual); - info->BaseAddress = (LPVOID)base; - info->AllocationBase = (LPVOID)alloc_base; + info->BaseAddress = base; info->RegionSize = size - (base - alloc_base); if (res_len) *res_len = sizeof(*info); return STATUS_SUCCESS;

1 0

Dmitry Timoshkov : kernel32: Add PE images with section alignment 1 and 2 to the loader test.
by Alexandre Julliard 07 Dec '06

07 Dec '06

Module: wine Branch: master Commit: 046814701eda99f7b77bf46b03e3209b04a0ded3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=046814701eda99f7b77bf46b0… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Dec 7 21:39:16 2006 +0800 kernel32: Add PE images with section alignment 1 and 2 to the loader test. --- dlls/kernel32/tests/loader.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index fbf1b6a..ed3f7a5 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -171,6 +171,16 @@ START_TEST(loader) 0, ERROR_SUCCESS }, + { 0, FIELD_OFFSET(IMAGE_OPTIONAL_HEADER, CheckSum), 4, 4, + 1, + 0, + ERROR_SUCCESS + }, + { 0, FIELD_OFFSET(IMAGE_OPTIONAL_HEADER, CheckSum), 1, 1, + 1, + 0, + ERROR_SUCCESS + }, { 0, FIELD_OFFSET(IMAGE_OPTIONAL_HEADER, CheckSum), 0x200, 0x200, 0, 0, @@ -192,10 +202,11 @@ START_TEST(loader) SetErrorMode(SEM_FAILCRITICALERRORS); GetTempPath(MAX_PATH, temp_path); - GetTempFileName(temp_path, "ldr", 0, dll_name); for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) { + GetTempFileName(temp_path, "ldr", 0, dll_name); + /*trace("creating %s\n", dll_name);*/ hfile = CreateFileA(dll_name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); if (hfile == INVALID_HANDLE_VALUE)

1 0

Dmitry Timoshkov : winedump: Make output of dump_data fit into 80 columns.
by Alexandre Julliard 07 Dec '06

07 Dec '06

Module: wine Branch: master Commit: 53e89174c0da98723a1fbfb41432b3163396ef28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53e89174c0da98723a1fbfb41… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Dec 7 21:42:44 2006 +0800 winedump: Make output of dump_data fit into 80 columns. --- tools/winedump/pdb.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index 0310ab7..93df303 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -145,7 +145,7 @@ static void pdb_exit(struct pdb_reader* size = pdb_get_file_size(reader, i); printf("File --unused-- #%d (%x)\n", i, size); - dump_data(file, size, "\t"); + dump_data(file, size, " "); free((char*)file); } #endif @@ -204,7 +204,7 @@ static void pdb_dump_symbols(struct pdb_ printf("\t----------offsets------------\n"); src = (const BYTE*)((const char*)symbols + sizeof(PDB_SYMBOLS) + symbols->module_size); - dump_data(src, symbols->offset_size, "\t\t"); + dump_data(src, symbols->offset_size, " "); } if (symbols->srcmodule_size) @@ -396,13 +396,13 @@ static void pdb_dump_symbols(struct pdb_ if (symbol_size) codeview_dump_symbols((const char*)modimage + sizeof(DWORD), symbol_size); - + /* what's that part ??? */ if (0) - dump_data(modimage + symbol_size + lineno_size, total_size - (symbol_size + lineno_size), "\t\t\t"); + dump_data(modimage + symbol_size + lineno_size, total_size - (symbol_size + lineno_size), " "); free((char*)modimage); } - + file_name += strlen(file_name) + 1; file = (char*)((DWORD)(file_name + strlen(file_name) + 1 + 3) & ~3); }

1 0

Dmitry Timoshkov : winedump: Avoid returning void from a void function.
by Alexandre Julliard 07 Dec '06

07 Dec '06

Module: wine Branch: master Commit: 2d9046e209a90963663375da6d38b01b3514c410 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d9046e209a90963663375da6… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Dec 7 21:42:54 2006 +0800 winedump: Avoid returning void from a void function. --- tools/winedump/pdb.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index 93df303..9dd9c2c 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -671,9 +671,15 @@ void pdb_dump(void) /* init_types(); */ head = PRD(0, sizeof(pdb2) - 1); if (head && !memcmp(head, pdb2, sizeof(pdb2) - 1)) - return pdb_jg_dump(); + { + pdb_jg_dump(); + return; + } head = PRD(0, sizeof(pdb7) - 1); if (head && !memcmp(head, pdb7, sizeof(pdb7) - 1)) - return pdb_ds_dump(); + { + pdb_ds_dump(); + return; + } printf("Unrecognized header %s\n", head); }

1 0

Chris Robinson : wgl: Implement wglGetPixelFormatAttribfvARB.
by Alexandre Julliard 07 Dec '06

07 Dec '06

Module: wine Branch: master Commit: 34c40097a51509447c7078313421a38a8514dfc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34c40097a51509447c7078313… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Tue Dec 5 17:46:30 2006 -0800 wgl: Implement wglGetPixelFormatAttribfvARB. --- dlls/winex11.drv/opengl.c | 45 ++++++++++++++++++++++++++++++++++----------- 1 files changed, 34 insertions(+), 11 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 9178152..9d42019 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -2228,17 +2228,6 @@ static GLboolean WINAPI X11DRV_wglChoose } /** - * X11DRV_wglGetPixelFormatAttribfvARB - * - * WGL_ARB_pixel_format: wglGetPixelFormatAttribfvARB - */ -static GLboolean WINAPI X11DRV_wglGetPixelFormatAttribfvARB(HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, FLOAT *pfValues) -{ - FIXME("(%p, %d, %d, %d, %p, %p): stub\n", hdc, iPixelFormat, iLayerPlane, nAttributes, piAttributes, pfValues); - return GL_FALSE; -} - -/** * X11DRV_wglGetPixelFormatAttribivARB * * WGL_ARB_pixel_format: wglGetPixelFormatAttribivARB @@ -2462,6 +2451,40 @@ pix_error: } /** + * X11DRV_wglGetPixelFormatAttribfvARB + * + * WGL_ARB_pixel_format: wglGetPixelFormatAttribfvARB + */ +static GLboolean WINAPI X11DRV_wglGetPixelFormatAttribfvARB(HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, FLOAT *pfValues) +{ + int *attr; + int ret; + int i; + + TRACE("(%p, %d, %d, %d, %p, %p)\n", hdc, iPixelFormat, iLayerPlane, nAttributes, piAttributes, pfValues); + + /* Allocate a temporary array to store integer values */ + attr = HeapAlloc(GetProcessHeap(), 0, nAttributes * sizeof(int)); + if (!attr) { + ERR("couldn't allocate %d array\n", nAttributes); + return GL_FALSE; + } + + /* Piggy-back on wglGetPixelFormatAttribivARB */ + ret = X11DRV_wglGetPixelFormatAttribivARB(hdc, iPixelFormat, iLayerPlane, nAttributes, piAttributes, attr); + if (ret) { + /* Convert integer values to float. Should also check for attributes + that can give decimal values here */ + for (i=0; i<nAttributes;i++) { + pfValues[i] = attr[i]; + } + } + + HeapFree(GetProcessHeap(), 0, attr); + return ret; +} + +/** * X11DRV_wglBindTexImageARB * * WGL_ARB_render_texture: wglBindTexImageARB

1 0