[ros-diffs] [cwittich] 50922: [imagehlp_winetest] -add imagehlp_winetest

Author: cwittich
Date: Sun Feb 27 18:30:50 2011
New Revision: 50922

URL: http://svn.reactos.org/svn/reactos?rev=50922&view=rev
Log:
[imagehlp_winetest]
-add imagehlp_winetest

Added:
    trunk/rostests/winetests/imagehlp/   (with props)
    trunk/rostests/winetests/imagehlp/image.c   (with props)
    trunk/rostests/winetests/imagehlp/imagehlp.rbuild   (with props)
    trunk/rostests/winetests/imagehlp/integrity.c   (with props)
    trunk/rostests/winetests/imagehlp/testlist.c   (with props)
Modified:
    trunk/rostests/winetests/directory.rbuild

Modified: trunk/rostests/winetests/directory.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/directory.rbuil…
==============================================================================
--- trunk/rostests/winetests/directory.rbuild [iso-8859-1] (original)
+++ trunk/rostests/winetests/directory.rbuild [iso-8859-1] Sun Feb 27 18:30:50 2011
@@ -67,6 +67,9 @@
 	<directory name="icmp">
 		<xi:include href="icmp/icmp.rbuild" />
 	</directory>
+	<directory name="imagehlp">
+		<xi:include href="imagehlp/imagehlp.rbuild" />
+	</directory>
 	<directory name="imm32">
 		<xi:include href="imm32/imm32.rbuild" />
 	</directory>

Propchange: trunk/rostests/winetests/imagehlp/
------------------------------------------------------------------------------
--- bugtraq:logregex (added)
+++ bugtraq:logregex Sun Feb 27 18:30:50 2011
@@ -1,0 +1,2 @@
+([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))?
+(\d+)

Propchange: trunk/rostests/winetests/imagehlp/
------------------------------------------------------------------------------
    bugtraq:message = See issue #%BUGID% for more details.

Propchange: trunk/rostests/winetests/imagehlp/
------------------------------------------------------------------------------
    bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID%

Propchange: trunk/rostests/winetests/imagehlp/
------------------------------------------------------------------------------
    tsvn:logminsize = 10

Added: trunk/rostests/winetests/imagehlp/image.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/imagehlp/image.…
==============================================================================
--- trunk/rostests/winetests/imagehlp/image.c (added)
+++ trunk/rostests/winetests/imagehlp/image.c [iso-8859-1] Sun Feb 27 18:30:50 2011
@@ -1,0 +1,353 @@
+/*
+ * Copyright 2008 Juan Lang
+ * Copyright 2010 Andrey Turkin
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+#include <stdio.h>
+#include <stdarg.h>
+
+#define NONAMELESSUNION
+#include <windef.h>
+#include <winbase.h>
+#include <winver.h>
+#include <winnt.h>
+#include <imagehlp.h>
+
+#include "wine/test.h"
+
+static HMODULE hImageHlp;
+
+static BOOL (WINAPI *pImageGetDigestStream)(HANDLE, DWORD, DIGEST_FUNCTION,
DIGEST_HANDLE);
+
+/* minimal PE file image */
+#define VA_START 0x400000
+#define FILE_PE_START 0x50
+#define NUM_SECTIONS 3
+#define FILE_TEXT 0x200
+#define RVA_TEXT 0x1000
+#define RVA_BSS 0x2000
+#define FILE_IDATA 0x400
+#define RVA_IDATA 0x3000
+#define FILE_TOTAL 0x600
+#define RVA_TOTAL 0x4000
+#include <pshpack1.h>
+struct Imports {
+    IMAGE_IMPORT_DESCRIPTOR descriptors[2];
+    IMAGE_THUNK_DATA32 original_thunks[2];
+    IMAGE_THUNK_DATA32 thunks[2];
+    struct __IMPORT_BY_NAME {
+        WORD hint;
+        char funcname[0x20];
+    } ibn;
+    char dllname[0x10];
+};
+#define EXIT_PROCESS (VA_START+RVA_IDATA+FIELD_OFFSET(struct Imports, thunks[0]))
+
+static struct _PeImage {
+    IMAGE_DOS_HEADER dos_header;
+    char __alignment1[FILE_PE_START - sizeof(IMAGE_DOS_HEADER)];
+    IMAGE_NT_HEADERS32 nt_headers;
+    IMAGE_SECTION_HEADER sections[NUM_SECTIONS];
+    char __alignment2[FILE_TEXT - FILE_PE_START - sizeof(IMAGE_NT_HEADERS32) -
+        NUM_SECTIONS * sizeof(IMAGE_SECTION_HEADER)];
+    unsigned char text_section[FILE_IDATA-FILE_TEXT];
+    struct Imports idata_section;
+    char __alignment3[FILE_TOTAL-FILE_IDATA-sizeof(struct Imports)];
+} bin = {
+    /* dos header */
+    {IMAGE_DOS_SIGNATURE, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, 0, 0, {},
FILE_PE_START},
+    /* alignment before PE header */
+    {},
+    /* nt headers */
+    {IMAGE_NT_SIGNATURE,
+        /* basic headers - 3 sections, no symbols, EXE file */
+        {IMAGE_FILE_MACHINE_I386, NUM_SECTIONS, 0, 0, 0,
sizeof(IMAGE_OPTIONAL_HEADER32),
+            IMAGE_FILE_32BIT_MACHINE | IMAGE_FILE_EXECUTABLE_IMAGE},
+        /* optional header */
+        {IMAGE_NT_OPTIONAL_HDR32_MAGIC, 4, 0, FILE_IDATA-FILE_TEXT,
+            FILE_TOTAL-FILE_IDATA + FILE_IDATA-FILE_TEXT, 0x400,
+            RVA_TEXT, RVA_TEXT, RVA_BSS, VA_START, 0x1000, 0x200, 4, 0, 1, 0, 4, 0, 0,
+            RVA_TOTAL, FILE_TEXT, 0, IMAGE_SUBSYSTEM_WINDOWS_GUI, 0,
+            0x200000, 0x1000, 0x100000, 0x1000, 0, 0x10,
+            {{0, 0},
+             {RVA_IDATA, sizeof(struct Imports)}
+            }
+        }
+    },
+    /* sections */
+    {
+        {".text", {0x100}, RVA_TEXT, FILE_IDATA-FILE_TEXT, FILE_TEXT,
+            0, 0, 0, 0, IMAGE_SCN_CNT_CODE | IMAGE_SCN_MEM_EXECUTE |
IMAGE_SCN_MEM_READ},
+        {".bss", {0x400}, RVA_BSS, 0, 0, 0, 0, 0, 0,
+            IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_READ |
IMAGE_SCN_MEM_WRITE},
+        {".idata", {sizeof(struct Imports)}, RVA_IDATA, FILE_TOTAL-FILE_IDATA,
FILE_IDATA, 0,
+            0, 0, 0, IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ |
IMAGE_SCN_MEM_WRITE}
+    },
+    /* alignment before first section */
+    {},
+    /* .text section */
+    {
+        0x31, 0xC0, /* xor eax, eax */
+        0xFF, 0x25, EXIT_PROCESS&0xFF, (EXIT_PROCESS>>8)&0xFF,
(EXIT_PROCESS>>16)&0xFF,
+            (EXIT_PROCESS>>24)&0xFF, /* jmp ExitProcess */
+        0
+    },
+    /* .idata section */
+    {
+        {
+            {{RVA_IDATA + FIELD_OFFSET(struct Imports, original_thunks)}, 0, 0,
+            RVA_IDATA + FIELD_OFFSET(struct Imports, dllname),
+            RVA_IDATA + FIELD_OFFSET(struct Imports, thunks)
+            },
+            {{0}, 0, 0, 0, 0}
+        },
+        {{{RVA_IDATA+FIELD_OFFSET(struct Imports, ibn)}}, {{0}}},
+        {{{RVA_IDATA+FIELD_OFFSET(struct Imports, ibn)}}, {{0}}},
+        {0,"ExitProcess"},
+        "KERNEL32.DLL"
+    },
+    /* final alignment */
+    {}
+};
+#include <poppack.h>
+
+struct blob
+{
+    DWORD cb;
+    BYTE *pb;
+};
+
+struct expected_blob
+{
+    DWORD cb;
+    const void *pb;
+};
+
+struct update_accum
+{
+    DWORD cUpdates;
+    struct blob *updates;
+};
+
+struct expected_update_accum
+{
+    DWORD cUpdates;
+    const struct expected_blob *updates;
+    BOOL  todo;
+};
+
+static BOOL WINAPI accumulating_stream_output(DIGEST_HANDLE handle, BYTE *pb,
+ DWORD cb)
+{
+    struct update_accum *accum = (struct update_accum *)handle;
+    BOOL ret = FALSE;
+
+    if (accum->cUpdates)
+        accum->updates = HeapReAlloc(GetProcessHeap(), 0, accum->updates,
+         (accum->cUpdates + 1) * sizeof(struct blob));
+    else
+        accum->updates = HeapAlloc(GetProcessHeap(), 0, sizeof(struct blob));
+    if (accum->updates)
+    {
+        struct blob *blob = &accum->updates[accum->cUpdates];
+
+        blob->pb = HeapAlloc(GetProcessHeap(), 0, cb);
+        if (blob->pb)
+        {
+            memcpy(blob->pb, pb, cb);
+            blob->cb = cb;
+            ret = TRUE;
+        }
+        accum->cUpdates++;
+    }
+    return ret;
+}
+
+static void check_updates(LPCSTR header, const struct expected_update_accum *expected,
+        const struct update_accum *got)
+{
+    DWORD i;
+
+    if (expected->todo)
+        todo_wine ok(expected->cUpdates == got->cUpdates, "%s: expected %d
updates, got %d\n",
+            header, expected->cUpdates, got->cUpdates);
+    else
+        ok(expected->cUpdates == got->cUpdates, "%s: expected %d updates, got
%d\n",
+            header, expected->cUpdates, got->cUpdates);
+    for (i = 0; i < min(expected->cUpdates, got->cUpdates); i++)
+    {
+        ok(expected->updates[i].cb == got->updates[i].cb, "%s, update %d:
expected %d bytes, got %d\n",
+                header, i, expected->updates[i].cb, got->updates[i].cb);
+        if (expected->updates[i].cb && expected->updates[i].cb ==
got->updates[i].cb)
+            ok(!memcmp(expected->updates[i].pb, got->updates[i].pb,
got->updates[i].cb),
+                    "%s, update %d: unexpected value\n", header, i);
+    }
+}
+
+/* Frees the updates stored in accum */
+static void free_updates(struct update_accum *accum)
+{
+    DWORD i;
+
+    for (i = 0; i < accum->cUpdates; i++)
+        HeapFree(GetProcessHeap(), 0, accum->updates[i].pb);
+    HeapFree(GetProcessHeap(), 0, accum->updates);
+    accum->updates = NULL;
+    accum->cUpdates = 0;
+}
+
+static const struct expected_blob b1[] = {
+    {FILE_PE_START,  &bin},
+    /* with zeroed Checksum/SizeOfInitializedData/SizeOfImage fields */
+    {sizeof(bin.nt_headers), &bin.nt_headers},
+    {sizeof(bin.sections),  &bin.sections},
+    {FILE_IDATA-FILE_TEXT, &bin.text_section},
+    {sizeof(bin.idata_section.descriptors[0].u.OriginalFirstThunk),
+        &bin.idata_section.descriptors[0].u.OriginalFirstThunk},
+    {FIELD_OFFSET(struct Imports, thunks)-FIELD_OFFSET(struct Imports,
descriptors[0].Name),
+        &bin.idata_section.descriptors[0].Name},
+    {FILE_TOTAL-FILE_IDATA-FIELD_OFFSET(struct Imports, ibn),
+        &bin.idata_section.ibn}
+};
+static const struct expected_update_accum a1 = { sizeof(b1) / sizeof(b1[0]), b1, TRUE };
+
+static const struct expected_blob b2[] = {
+    {FILE_PE_START,  &bin},
+    /* with zeroed Checksum/SizeOfInitializedData/SizeOfImage fields */
+    {sizeof(bin.nt_headers), &bin.nt_headers},
+    {sizeof(bin.sections),  &bin.sections},
+    {FILE_IDATA-FILE_TEXT, &bin.text_section},
+    {FILE_TOTAL-FILE_IDATA, &bin.idata_section}
+};
+static const struct expected_update_accum a2 = { sizeof(b2) / sizeof(b2[0]), b2, FALSE
};
+
+/* Creates a test file and returns a handle to it.  The file's path is returned
+ * in temp_file, which must be at least MAX_PATH characters in length.
+ */
+static HANDLE create_temp_file(char *temp_file)
+{
+    HANDLE file = INVALID_HANDLE_VALUE;
+    char temp_path[MAX_PATH];
+
+    if (GetTempPathA(sizeof(temp_path), temp_path))
+    {
+        if (GetTempFileNameA(temp_path, "img", 0, temp_file))
+            file = CreateFileA(temp_file, GENERIC_READ | GENERIC_WRITE, 0, NULL,
+             CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+    }
+    return file;
+}
+
+static void update_checksum(void)
+{
+    WORD const * ptr;
+    DWORD size;
+    DWORD sum = 0;
+
+    bin.nt_headers.OptionalHeader.CheckSum = 0;
+
+    for(ptr = (WORD const *)&bin, size = (sizeof(bin)+1)/sizeof(WORD); size > 0;
ptr++, size--)
+    {
+        sum += *ptr;
+        if (HIWORD(sum) != 0)
+        {
+            sum = LOWORD(sum) + HIWORD(sum);
+        }
+    }
+    sum = (WORD)(LOWORD(sum) + HIWORD(sum));
+    sum += sizeof(bin);
+
+    bin.nt_headers.OptionalHeader.CheckSum = sum;
+}
+
+static void test_get_digest_stream(void)
+{
+    BOOL ret;
+    HANDLE file;
+    char temp_file[MAX_PATH];
+    DWORD count;
+    struct update_accum accum = { 0, NULL };
+
+    SetLastError(0xdeadbeef);
+    ret = pImageGetDigestStream(NULL, 0, NULL, NULL);
+    ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER,
+     "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError());
+    file = create_temp_file(temp_file);
+    if (file == INVALID_HANDLE_VALUE)
+    {
+        skip("couldn't create temp file\n");
+        return;
+    }
+    SetLastError(0xdeadbeef);
+    ret = pImageGetDigestStream(file, 0, NULL, NULL);
+    ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER,
+     "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError());
+    SetLastError(0xdeadbeef);
+    ret = pImageGetDigestStream(NULL, 0, accumulating_stream_output, &accum);
+    ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER,
+     "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError());
+    /* Even with "valid" parameters, it fails with an empty file */
+    SetLastError(0xdeadbeef);
+    ret = pImageGetDigestStream(file, 0, accumulating_stream_output, &accum);
+    ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER,
+     "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError());
+    /* Finally, with a valid executable in the file, it succeeds.  Note that
+     * the file pointer need not be positioned at the beginning.
+     */
+    update_checksum();
+    WriteFile(file, &bin, sizeof(bin), &count, NULL);
+    FlushFileBuffers(file);
+
+    /* zero out some fields ImageGetDigestStream would zero out */
+    bin.nt_headers.OptionalHeader.CheckSum = 0;
+    bin.nt_headers.OptionalHeader.SizeOfInitializedData = 0;
+    bin.nt_headers.OptionalHeader.SizeOfImage = 0;
+
+    ret = pImageGetDigestStream(file, 0, accumulating_stream_output, &accum);
+    ok(ret, "ImageGetDigestStream failed: %d\n", GetLastError());
+    check_updates("flags = 0", &a1, &accum);
+    free_updates(&accum);
+    ret = pImageGetDigestStream(file, CERT_PE_IMAGE_DIGEST_ALL_IMPORT_INFO,
+     accumulating_stream_output, &accum);
+    ok(ret, "ImageGetDigestStream failed: %d\n", GetLastError());
+    check_updates("flags = CERT_PE_IMAGE_DIGEST_ALL_IMPORT_INFO", &a2,
&accum);
+    free_updates(&accum);
+    CloseHandle(file);
+    DeleteFileA(temp_file);
+}
+
+START_TEST(image)
+{
+    hImageHlp = LoadLibraryA("imagehlp.dll");
+
+    if (!hImageHlp)
+    {
+        win_skip("ImageHlp unavailable\n");
+        return;
+    }
+
+    pImageGetDigestStream = (void *) GetProcAddress(hImageHlp,
"ImageGetDigestStream");
+
+    if (!pImageGetDigestStream)
+    {
+        win_skip("ImageGetDigestStream function is not available\n");
+    } else
+    {
+        test_get_digest_stream();
+    }
+
+    FreeLibrary(hImageHlp);
+}

Propchange: trunk/rostests/winetests/imagehlp/image.c
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/rostests/winetests/imagehlp/imagehlp.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/imagehlp/imageh…
==============================================================================
--- trunk/rostests/winetests/imagehlp/imagehlp.rbuild (added)
+++ trunk/rostests/winetests/imagehlp/imagehlp.rbuild [iso-8859-1] Sun Feb 27 18:30:50
2011
@@ -1,0 +1,16 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<group>
+<module name="imagehlp_winetest" type="win32cui"
installbase="bin" installname="imagehlp_winetest.exe"
allowwarnings="true">
+	<include base="imagehlp_winetest">.</include>
+	<define name="__ROS_LONG64__" />
+	<file>image.c</file>
+	<file>integrity.c</file>
+	<file>testlist.c</file>
+	<library>wine</library>
+	<library>user32</library>
+	<library>ole32</library>
+	<library>oleaut32</library>
+	<library>ntdll</library>
+</module>
+</group>

Propchange: trunk/rostests/winetests/imagehlp/imagehlp.rbuild
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/rostests/winetests/imagehlp/integrity.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/imagehlp/integr…
==============================================================================
--- trunk/rostests/winetests/imagehlp/integrity.c (added)
+++ trunk/rostests/winetests/imagehlp/integrity.c [iso-8859-1] Sun Feb 27 18:30:50 2011
@@ -1,0 +1,294 @@
+/*
+ * Test suite for imagehlp integrity functions
+ *
+ * Copyright 2009 Owen Rudge for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#define COBJMACROS
+#include "wine/test.h"
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "winerror.h"
+#include "winnt.h"
+#include "imagehlp.h"
+
+static HMODULE hImageHlp;
+static char test_dll_path[MAX_PATH];
+
+static BOOL (WINAPI *pImageAddCertificate)(HANDLE, LPWIN_CERTIFICATE, PDWORD);
+static BOOL (WINAPI *pImageEnumerateCertificates)(HANDLE, WORD, PDWORD, PDWORD, DWORD);
+static BOOL (WINAPI *pImageGetCertificateData)(HANDLE, DWORD, LPWIN_CERTIFICATE,
PDWORD);
+static BOOL (WINAPI *pImageGetCertificateHeader)(HANDLE, DWORD, LPWIN_CERTIFICATE);
+static BOOL (WINAPI *pImageRemoveCertificate)(HANDLE, DWORD);
+
+static char test_cert_data[] =
+{0x30,0x82,0x02,0xE1,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x07,0x02
+,0xA0,0x82,0x02,0xD2,0x30,0x82,0x02,0xCE,0x02,0x01,0x01,0x31,0x00,0x30,0x0B
+,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x07,0x01,0xA0,0x82,0x02,0xB4
+,0x30,0x82,0x02,0xB0,0x30,0x82,0x02,0x19,0xA0,0x03,0x02,0x01,0x02,0x02,0x09
+,0x00,0xE2,0x59,0x17,0xA5,0x87,0x0F,0x88,0x89,0x30,0x0D,0x06,0x09,0x2A,0x86
+,0x48,0x86,0xF7,0x0D,0x01,0x01,0x05,0x05,0x00,0x30,0x45,0x31,0x0B,0x30,0x09
+,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x41,0x55,0x31,0x13,0x30,0x11,0x06,0x03
+,0x55,0x04,0x08,0x13,0x0A,0x53,0x6F,0x6D,0x65,0x2D,0x53,0x74,0x61,0x74,0x65
+,0x31,0x21,0x30,0x1F,0x06,0x03,0x55,0x04,0x0A,0x13,0x18,0x49,0x6E,0x74,0x65
+,0x72,0x6E,0x65,0x74,0x20,0x57,0x69,0x64,0x67,0x69,0x74,0x73,0x20,0x50,0x74
+,0x79,0x20,0x4C,0x74,0x64,0x30,0x1E,0x17,0x0D,0x30,0x39,0x31,0x31,0x32,0x30
+,0x31,0x37,0x33,0x38,0x31,0x32,0x5A,0x17,0x0D,0x31,0x30,0x31,0x31,0x32,0x30
+,0x31,0x37,0x33,0x38,0x31,0x32,0x5A,0x30,0x45,0x31,0x0B,0x30,0x09,0x06,0x03
+,0x55,0x04,0x06,0x13,0x02,0x41,0x55,0x31,0x13,0x30,0x11,0x06,0x03,0x55,0x04
+,0x08,0x13,0x0A,0x53,0x6F,0x6D,0x65,0x2D,0x53,0x74,0x61,0x74,0x65,0x31,0x21
+,0x30,0x1F,0x06,0x03,0x55,0x04,0x0A,0x13,0x18,0x49,0x6E,0x74,0x65,0x72,0x6E
+,0x65,0x74,0x20,0x57,0x69,0x64,0x67,0x69,0x74,0x73,0x20,0x50,0x74,0x79,0x20
+,0x4C,0x74,0x64,0x30,0x81,0x9F,0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7
+,0x0D,0x01,0x01,0x01,0x05,0x00,0x03,0x81,0x8D,0x00,0x30,0x81,0x89,0x02,0x81
+,0x81,0x00,0x9B,0xC1,0x5E,0x28,0x70,0x32,0x81,0xEF,0x41,0x5C,0xCA,0x29,0x4A
+,0xB0,0x12,0xF7,0xAE,0x1E,0x30,0x93,0x14,0x3E,0x54,0x7C,0xC3,0x60,0x8C,0xB2
+,0x2F,0xC4,0x1F,0x20,0xEE,0x76,0xAC,0x83,0xD9,0xD4,0xC0,0x3C,0x78,0x6B,0xAA
+,0xA2,0x35,0x08,0x72,0x4A,0x5F,0xAE,0xD6,0x7D,0x5A,0xD8,0x27,0xEC,0xE0,0x24
+,0xBE,0xBE,0x62,0x86,0xF9,0x83,0x66,0x20,0xBC,0xF6,0x4B,0xC8,0x2D,0x1B,0x4C
+,0x5C,0xFA,0x0C,0x42,0x9F,0x57,0x49,0xDC,0xB9,0xC7,0x88,0x53,0xFA,0x26,0x21
+,0xC3,0xAB,0x4D,0x93,0x83,0x48,0x88,0xF1,0x14,0xB8,0x64,0x03,0x46,0x58,0x35
+,0xAC,0xD2,0xD2,0x9C,0xD4,0x6F,0xA4,0xE4,0x88,0x83,0x1C,0xD8,0x98,0xEE,0x2C
+,0xA3,0xEC,0x0C,0x4B,0xFB,0x1D,0x6E,0xBE,0xD9,0x77,0x02,0x03,0x01,0x00,0x01
+,0xA3,0x81,0xA7,0x30,0x81,0xA4,0x30,0x1D,0x06,0x03,0x55,0x1D,0x0E,0x04,0x16
+,0x04,0x14,0x3F,0xB3,0xC8,0x15,0x12,0xC7,0xD8,0xC0,0x13,0x3D,0xBE,0xF1,0x2F
+,0x5A,0xB3,0x51,0x59,0x79,0x89,0xF8,0x30,0x75,0x06,0x03,0x55,0x1D,0x23,0x04
+,0x6E,0x30,0x6C,0x80,0x14,0x3F,0xB3,0xC8,0x15,0x12,0xC7,0xD8,0xC0,0x13,0x3D
+,0xBE,0xF1,0x2F,0x5A,0xB3,0x51,0x59,0x79,0x89,0xF8,0xA1,0x49,0xA4,0x47,0x30
+,0x45,0x31,0x0B,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x41,0x55,0x31
+,0x13,0x30,0x11,0x06,0x03,0x55,0x04,0x08,0x13,0x0A,0x53,0x6F,0x6D,0x65,0x2D
+,0x53,0x74,0x61,0x74,0x65,0x31,0x21,0x30,0x1F,0x06,0x03,0x55,0x04,0x0A,0x13
+,0x18,0x49,0x6E,0x74,0x65,0x72,0x6E,0x65,0x74,0x20,0x57,0x69,0x64,0x67,0x69
+,0x74,0x73,0x20,0x50,0x74,0x79,0x20,0x4C,0x74,0x64,0x82,0x09,0x00,0xE2,0x59
+,0x17,0xA5,0x87,0x0F,0x88,0x89,0x30,0x0C,0x06,0x03,0x55,0x1D,0x13,0x04,0x05
+,0x30,0x03,0x01,0x01,0xFF,0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D
+,0x01,0x01,0x05,0x05,0x00,0x03,0x81,0x81,0x00,0x52,0x09,0xA5,0x81,0x63,0xEF
+,0xF7,0x76,0x65,0x2B,0xA5,0x48,0xC1,0xC5,0xE0,0x73,0x60,0x9B,0x66,0x2E,0x21
+,0xCF,0xF2,0xBD,0xFF,0x81,0xC4,0x99,0x39,0xD0,0x5D,0x1B,0x12,0xFD,0xAE,0x30
+,0x5D,0x9C,0x1A,0xD4,0x76,0x8A,0x25,0x10,0x0A,0x7E,0x5D,0x78,0xB5,0x94,0xD8
+,0x97,0xBD,0x9A,0x5A,0xD6,0x23,0xCA,0x5C,0x46,0x8C,0xC7,0x30,0x45,0xB4,0x77
+,0x44,0x6F,0x16,0xDD,0xC6,0x58,0xFE,0x16,0x15,0xAD,0xB8,0x58,0x49,0x9A,0xFE
+,0x6B,0x87,0x78,0xEE,0x13,0xFF,0x29,0x26,0x8E,0x13,0x83,0x0D,0x18,0xCA,0x9F
+,0xA9,0x3E,0x6E,0x3C,0xA6,0x50,0x4A,0x04,0x71,0x9F,0x2E,0xCF,0x25,0xA6,0x03
+,0x46,0xCA,0xEB,0xEA,0x67,0x89,0x49,0x7C,0x43,0xA2,0x52,0xD9,0x41,0xCC,0x65
+,0xED,0x2D,0xA1,0x00,0x31,0x00};
+
+static char test_cert_data_2[] = {0xDE,0xAD,0xBE,0xEF,0x01,0x02,0x03};
+
+static BOOL copy_dll_file(void)
+{
+    char sys_dir[MAX_PATH+15];
+    char temp_path[MAX_PATH];
+
+    if (GetSystemDirectoryA(sys_dir, MAX_PATH) == 0)
+    {
+        skip("Failed to get system directory. Skipping certificate/PE image
tests.\n");
+        return FALSE;
+    }
+
+    if (sys_dir[lstrlenA(sys_dir) - 1] != '\\')
+        lstrcatA(sys_dir, "\\");
+
+    lstrcatA(sys_dir, "imagehlp.dll");
+
+    /* Copy DLL to a temp file */
+    GetTempPath(MAX_PATH, temp_path);
+    GetTempFileName(temp_path, "img", 0, test_dll_path);
+
+    if (CopyFile(sys_dir, test_dll_path, FALSE) == 0)
+    {
+        skip("Unable to create copy of imagehlp.dll for tests.\n");
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
+static DWORD get_file_size(void)
+{
+    HANDLE file;
+    DWORD filesize = 0;
+
+    file = CreateFileA(test_dll_path, GENERIC_READ, FILE_SHARE_READ, NULL,
+                       OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+    if (file == INVALID_HANDLE_VALUE)
+        return 0;
+
+    filesize = GetFileSize(file, NULL);
+    CloseHandle(file);
+
+    return filesize;
+}
+
+static void test_add_certificate(char *cert_data, int len)
+{
+    HANDLE hFile;
+    LPWIN_CERTIFICATE cert;
+    DWORD cert_len;
+    DWORD index;
+
+    hFile = CreateFileA(test_dll_path, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ,
NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+
+    if (hFile == INVALID_HANDLE_VALUE)
+    {
+        skip("Unable to open %s, skipping test\n", test_dll_path);
+        return;
+    }
+
+    cert_len = sizeof(WIN_CERTIFICATE) + len;
+    cert = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cert_len);
+
+    if (!cert)
+    {
+        skip("Unable to allocate memory, skipping test\n");
+        CloseHandle(hFile);
+        return;
+    }
+
+    cert->dwLength = cert_len;
+    cert->wRevision = WIN_CERT_REVISION_1_0;
+    cert->wCertificateType = WIN_CERT_TYPE_PKCS_SIGNED_DATA;
+    CopyMemory(cert->bCertificate, cert_data, len);
+
+    ok(pImageAddCertificate(hFile, cert, &index), "Unable to add certificate to
image, error %x\n", GetLastError());
+
+    HeapFree(GetProcessHeap(), 0, cert);
+    CloseHandle(hFile);
+}
+
+static void test_get_certificate(char *cert_data, int index)
+{
+    HANDLE hFile;
+    LPWIN_CERTIFICATE cert;
+    DWORD cert_len = 0;
+    DWORD err, ret;
+
+    hFile = CreateFileA(test_dll_path, GENERIC_READ, FILE_SHARE_READ, NULL,
OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+
+    if (hFile == INVALID_HANDLE_VALUE)
+    {
+        skip("Unable to open %s, skipping test\n", test_dll_path);
+        return;
+    }
+
+    ret = pImageGetCertificateData(hFile, index, NULL, &cert_len);
+    err = GetLastError();
+
+    ok ((ret == FALSE) && (err == ERROR_INSUFFICIENT_BUFFER),
"ImageGetCertificateData gave unexpected result; ret=%d / err=%x\n", ret, err);
+
+    cert = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cert_len);
+
+    if (!cert)
+    {
+        skip("Unable to allocate memory, skipping test\n");
+        CloseHandle(hFile);
+        return;
+    }
+
+    ok(ret = pImageGetCertificateData(hFile, index, cert, &cert_len), "Unable to
retrieve certificate; err=%x\n", GetLastError());
+    ok(memcmp(cert->bCertificate, cert_data, cert_len - sizeof(WIN_CERTIFICATE)) == 0,
"Certificate retrieved did not match original\n");
+
+    HeapFree(GetProcessHeap(), 0, cert);
+    CloseHandle(hFile);
+}
+
+static void test_remove_certificate(int index)
+{
+    DWORD orig_count = 0, count = 0;
+    HANDLE hFile;
+
+    hFile = CreateFileA(test_dll_path, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ,
NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+
+    if (hFile == INVALID_HANDLE_VALUE)
+    {
+        skip("Unable to open %s, skipping test\n", test_dll_path);
+        return;
+    }
+
+    ok (pImageEnumerateCertificates(hFile, CERT_SECTION_TYPE_ANY, &orig_count, NULL,
0), "Unable to enumerate certificates in file; err=%x\n", GetLastError());
+
+    ok (pImageRemoveCertificate(hFile, index), "Unable to remove certificate from
file; err=%x\n", GetLastError());
+
+    /* Test to see if the certificate has actually been removed */
+    pImageEnumerateCertificates(hFile, CERT_SECTION_TYPE_ANY, &count, NULL, 0);
+    ok (count == orig_count - 1, "Certificate count mismatch; orig=%d
new=%d\n", orig_count, count);
+
+    CloseHandle(hFile);
+}
+
+START_TEST(integrity)
+{
+    DWORD file_size, file_size_orig;
+
+    hImageHlp = LoadLibraryA("imagehlp.dll");
+
+    if (!hImageHlp)
+    {
+        win_skip("ImageHlp unavailable\n");
+        return;
+    }
+
+    if (!copy_dll_file())
+    {
+        FreeLibrary(hImageHlp);
+        return;
+    }
+
+    file_size_orig = get_file_size();
+    /*
+     * Align file_size_orig to an 8-byte boundary. This avoids tests failures where
+     * the original dll is not correctly aligned (but when written to it will be).
+     */
+    if (file_size_orig % 8 != 0)
+    {
+        skip("We need to align to an 8-byte boundary\n");
+        file_size_orig = (file_size_orig + 7) & ~7;
+    }
+
+    pImageAddCertificate = (void *) GetProcAddress(hImageHlp,
"ImageAddCertificate");
+    pImageEnumerateCertificates = (void *) GetProcAddress(hImageHlp,
"ImageEnumerateCertificates");
+    pImageGetCertificateData = (void *) GetProcAddress(hImageHlp,
"ImageGetCertificateData");
+    pImageGetCertificateHeader = (void *) GetProcAddress(hImageHlp,
"ImageGetCertificateHeader");
+    pImageRemoveCertificate = (void *) GetProcAddress(hImageHlp,
"ImageRemoveCertificate");
+
+    test_add_certificate(test_cert_data, sizeof(test_cert_data));
+    test_get_certificate(test_cert_data, 0);
+    test_remove_certificate(0);
+
+    file_size = get_file_size();
+    ok(file_size == file_size_orig, "File size different after add and remove (old:
%d; new: %d)\n", file_size_orig, file_size);
+
+    /* Try adding multiple certificates */
+    test_add_certificate(test_cert_data, sizeof(test_cert_data));
+    test_add_certificate(test_cert_data_2, sizeof(test_cert_data_2));
+
+    test_get_certificate(test_cert_data, 0);
+    test_get_certificate(test_cert_data_2, 1);
+
+    /* Remove the first one and verify the second certificate is intact */
+    test_remove_certificate(0);
+    test_get_certificate(test_cert_data_2, 0);
+
+    test_remove_certificate(0);
+
+    file_size = get_file_size();
+    ok(file_size == file_size_orig, "File size different after add and remove (old:
%d; new: %d)\n", file_size_orig, file_size);
+
+    FreeLibrary(hImageHlp);
+    DeleteFile(test_dll_path);
+}

Propchange: trunk/rostests/winetests/imagehlp/integrity.c
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/rostests/winetests/imagehlp/testlist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/imagehlp/testli…
==============================================================================
--- trunk/rostests/winetests/imagehlp/testlist.c (added)
+++ trunk/rostests/winetests/imagehlp/testlist.c [iso-8859-1] Sun Feb 27 18:30:50 2011
@@ -1,0 +1,17 @@
+/* Automatically generated file; DO NOT EDIT!! */
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+#define STANDALONE
+#include "wine/test.h"
+
+extern void func_image(void);
+extern void func_integrity(void);
+
+const struct test winetest_testlist[] =
+{
+    { "image", func_image },
+	{ "integrity", func_integrity },
+    { 0, 0 }
+};

Propchange: trunk/rostests/winetests/imagehlp/testlist.c
------------------------------------------------------------------------------
    svn:eol-style = native