March 2008 - Wine-commits - list.winehq.org

Francois Gouget : port/getopt: s/#if/#ifdef/ so it still works if HAVE_STRING_H is not defined.
by Alexandre Julliard 05 Mar '08

05 Mar '08

Module: wine Branch: master Commit: 8d8b44089d714886d891b69db100a3e1b9b88260 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d8b44089d714886d891b69db… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 5 12:07:04 2008 +0100 port/getopt: s/#if/#ifdef/ so it still works if HAVE_STRING_H is not defined. --- libs/port/getopt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libs/port/getopt.c b/libs/port/getopt.c index dae56ec..7bcf279 100644 --- a/libs/port/getopt.c +++ b/libs/port/getopt.c @@ -212,7 +212,7 @@ static char *posixly_correct; # define my_index strchr #else -# if HAVE_STRING_H +# ifdef HAVE_STRING_H # include <string.h> # else # include <strings.h>

1 0

Alexandre Julliard : ntdll: Fixed handling of fake dlls when loading a builtin. Reported by Jacek Caban.
by Alexandre Julliard 05 Mar '08

05 Mar '08

Module: wine Branch: master Commit: 96fc6e317eef050ded00b22ec0191a8ff2def2ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=96fc6e317eef050ded00b22ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 5 12:21:19 2008 +0100 ntdll: Fixed handling of fake dlls when loading a builtin. Reported by Jacek Caban. --- dlls/ntdll/loader.c | 25 ++++++++++++++++--------- 1 files changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 11447eb..811540b 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1244,11 +1244,18 @@ NTSTATUS WINAPI LdrGetProcedureAddress(HMODULE module, const ANSI_STRING *name, * * Check if a loaded native dll is a Wine fake dll. */ -static BOOL is_fake_dll( const void *base ) +static BOOL is_fake_dll( HANDLE handle ) { static const char fakedll_signature[] = "Wine placeholder DLL"; - const IMAGE_DOS_HEADER *dos = base; + char buffer[sizeof(IMAGE_DOS_HEADER) + sizeof(fakedll_signature)]; + const IMAGE_DOS_HEADER *dos = (const IMAGE_DOS_HEADER *)buffer; + IO_STATUS_BLOCK io; + LARGE_INTEGER offset; + offset.QuadPart = 0; + if (NtReadFile( handle, 0, NULL, 0, &io, buffer, sizeof(buffer), &offset, NULL )) return FALSE; + if (io.Information < sizeof(buffer)) return FALSE; + if (dos->e_magic != IMAGE_DOS_SIGNATURE) return FALSE; if (dos->e_lfanew >= sizeof(*dos) + sizeof(fakedll_signature) && !memcmp( dos + 1, fakedll_signature, sizeof(fakedll_signature) )) return TRUE; return FALSE; @@ -1427,13 +1434,6 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, NtClose( mapping ); if (status != STATUS_SUCCESS) return status; - if (is_fake_dll( module )) - { - TRACE( "%s is a fake dll, not loading it\n", debugstr_w(name) ); - NtUnmapViewOfSection( NtCurrentProcess(), module ); - return STATUS_DLL_NOT_FOUND; - } - /* create the MODREF */ if (!(wm = alloc_module( module, name ))) return STATUS_NO_MEMORY; @@ -1870,6 +1870,13 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ main_exe = get_modref( NtCurrentTeb()->Peb->ImageBaseAddress ); loadorder = get_load_order( main_exe ? main_exe->ldr.BaseDllName.Buffer : NULL, filename ); + if (handle && is_fake_dll( handle )) + { + TRACE( "%s is a fake Wine dll\n", debugstr_w(filename) ); + NtClose( handle ); + handle = 0; + } + switch(loadorder) { case LO_INVALID:

1 0

Francois Gouget : msvcmaker: winebuild needs getopt*.c and mkstemps. c when compiled with MSVC.
by Alexandre Julliard 05 Mar '08

05 Mar '08

Module: wine Branch: master Commit: 9a17f38d6cfa5097afc1b0effd10a03b03772578 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a17f38d6cfa5097afc1b0eff… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 5 12:09:32 2008 +0100 msvcmaker: winebuild needs getopt*.c and mkstemps.c when compiled with MSVC. --- tools/winapi/msvcmaker | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker index 50644ac..1502cb7 100755 --- a/tools/winapi/msvcmaker +++ b/tools/winapi/msvcmaker @@ -760,6 +760,16 @@ sub _generate_dsp($$) { print OUT "\r\n"; print OUT "# PROP Default_Filter \"cpp;c;cxx;rc;def;r;odl;idl;hpj;bat\"\r\n"; + if ($project eq "winebuild") { + for my $ source_file ("getopt.c", "getopt1.c", "mkstemps.c") + { + print OUT "# Begin Source File\r\n"; + print OUT "\r\n"; + print OUT "SOURCE=..\\..\\libs\\port\\$source_file\r\n"; + print OUT "# End Source File\r\n"; + } + } + foreach my $source_file (@source_files) { $source_file =~ s%/%\\%g; if($source_file !~ /^\./) {

1 0

Francois Gouget : msvcmaker: We don't build wine.lib so don' t try to copy it.
by Alexandre Julliard 05 Mar '08

05 Mar '08

Module: wine Branch: master Commit: 19a85f3433391025ed746fbca75faa8cfdd0cda7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19a85f3433391025ed746fbca… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 5 12:10:41 2008 +0100 msvcmaker: We don't build wine.lib so don't try to copy it. --- tools/winapi/msvcmaker | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker index 1502cb7..0088ed9 100755 --- a/tools/winapi/msvcmaker +++ b/tools/winapi/msvcmaker @@ -742,14 +742,6 @@ sub _generate_dsp($$) { print OUT "\r\n"; } - if ($project eq "winebuild") { - print OUT "# Begin Special Build Tool\r\n"; - print OUT "SOURCE=\"\$(InputPath)\"\r\n"; - print OUT "PostBuild_Desc=Copying wine.lib ...\r\n"; - print OUT "PostBuild_Cmds="; - print OUT "copy ..\\..\\libs\\wine\\$output_dir\\wine.lib \$(OutDir)\r\n"; - print OUT "# End Special Build Tool\r\n"; - } print OUT "# Begin Target\r\n"; print OUT "\r\n"; foreach my $cfg (@cfgs) {

1 0

Francois Gouget : ntdll/tests: Don't use 0x55/ 0xaa to avoid any confusion when running with +heap.
by Alexandre Julliard 05 Mar '08

05 Mar '08

Module: wine Branch: master Commit: 369f4ccdfee18ee31d1a4a441bde8a1c173753d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=369f4ccdfee18ee31d1a4a441… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 5 12:04:35 2008 +0100 ntdll/tests: Don't use 0x55/0xaa to avoid any confusion when running with +heap. --- dlls/ntdll/tests/atom.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/tests/atom.c b/dlls/ntdll/tests/atom.c index 8dbc9b2..49bf48e 100644 --- a/dlls/ntdll/tests/atom.c +++ b/dlls/ntdll/tests/atom.c @@ -198,13 +198,13 @@ static void test_NtAtom(void) ok((lstrlenW(testAtom2) * sizeof(WCHAR)) == Len, "Returned wrong length %d\n", Len); Len = 8; - Name[0] = Name[1] = Name[2] = Name[3] = Name[4] = 0x55AA; + Name[0] = Name[1] = Name[2] = Name[3] = Name[4] = 0x1337; res = pRtlQueryAtomInAtomTable(AtomTable, Atom2, NULL, NULL, Name, &Len); ok(!res, "query atom %x\n", res); ok(Len == 6, "wrong length %u\n", Len); ok(!memcmp(Name, testAtom2, Len), "wrong atom string\n"); ok(!Name[3], "wrong string termination\n"); - ok(Name[4] == 0x55AA, "buffer overwrite\n"); + ok(Name[4] == 0x1337, "buffer overwrite\n"); Len = lstrlenW(testAtom2) * sizeof(WCHAR); memset(Name, '.', sizeof(Name)); @@ -436,27 +436,27 @@ static void test_Global(void) res = pNtAddAtom(testAtom1, lstrlenW(testAtom1) * sizeof(WCHAR), &atom); ok(!res, "Added atom (%x)\n", res); - memset(abi->Name, 0x55, 255 * sizeof(WCHAR)); + memset(abi->Name, 0xcc, 255 * sizeof(WCHAR)); res = pNtQueryInformationAtom( atom, AtomBasicInformation, (void*)ptr, ptr_size, NULL ); ok(!res, "atom lookup\n"); ok(!lstrcmpW(abi->Name, testAtom1), "ok strings\n"); ok(abi->NameLength == lstrlenW(testAtom1) * sizeof(WCHAR), "wrong string length\n"); ok(abi->Name[lstrlenW(testAtom1)] == 0, "wrong string termination %x\n", abi->Name[lstrlenW(testAtom1)]); - ok(abi->Name[lstrlenW(testAtom1) + 1] == 0x5555, "buffer overwrite %x\n", abi->Name[lstrlenW(testAtom1) + 1]); + ok(abi->Name[lstrlenW(testAtom1) + 1] == 0xcccc, "buffer overwrite %x\n", abi->Name[lstrlenW(testAtom1) + 1]); ptr_size = sizeof(ATOM_BASIC_INFORMATION); res = pNtQueryInformationAtom( atom, AtomBasicInformation, (void*)ptr, ptr_size, NULL ); ok(res == STATUS_BUFFER_TOO_SMALL, "wrong return status (%x)\n", res); ok(abi->NameLength == lstrlenW(testAtom1) * sizeof(WCHAR), "ok string length\n"); - memset(abi->Name, 0x55, lstrlenW(testAtom1) * sizeof(WCHAR)); + memset(abi->Name, 0xcc, lstrlenW(testAtom1) * sizeof(WCHAR)); ptr_size = sizeof(ATOM_BASIC_INFORMATION) + lstrlenW(testAtom1) * sizeof(WCHAR); res = pNtQueryInformationAtom( atom, AtomBasicInformation, (void*)ptr, ptr_size, NULL ); ok(!res, "atom lookup %x\n", res); ok(!lstrcmpW(abi->Name, testAtom1), "strings don't match\n"); ok(abi->NameLength == lstrlenW(testAtom1) * sizeof(WCHAR), "wrong string length\n"); ok(abi->Name[lstrlenW(testAtom1)] == 0, "buffer overwrite %x\n", abi->Name[lstrlenW(testAtom1)]); - ok(abi->Name[lstrlenW(testAtom1) + 1] == 0x5555, "buffer overwrite %x\n", abi->Name[lstrlenW(testAtom1) + 1]); + ok(abi->Name[lstrlenW(testAtom1) + 1] == 0xcccc, "buffer overwrite %x\n", abi->Name[lstrlenW(testAtom1) + 1]); ptr_size = sizeof(ATOM_BASIC_INFORMATION) + 4 * sizeof(WCHAR); abi->Name[0] = abi->Name[1] = abi->Name[2] = abi->Name[3] = '\0';

1 0

Francois Gouget : ddraw/tests: Don' t use 0xaa to avoid any confusion when running with +heap.
by Alexandre Julliard 05 Mar '08

05 Mar '08

Module: wine Branch: master Commit: 9381f22653bb369f3e0f67fa0f42076a66c8e9fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9381f22653bb369f3e0f67fa0… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 5 12:05:58 2008 +0100 ddraw/tests: Don't use 0xaa to avoid any confusion when running with +heap. --- dlls/ddraw/tests/d3d.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 678b1f0..d5177a5 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -1102,7 +1102,7 @@ static void Direct3D1Test(void) ok(hr == D3D_OK, "IDirect3DViewport_TransformVertices returned %08x\n", hr); transformdata.lpHOut = outH; - memset(outH, 0xaa, sizeof(outH)); + memset(outH, 0xcc, sizeof(outH)); hr = IDirect3DViewport_TransformVertices(Viewport, sizeof(testverts) / sizeof(testverts[0]), &transformdata, D3DTRANSFORM_UNCLIPPED, &i); @@ -1122,7 +1122,7 @@ static void Direct3D1Test(void) cmp[i].x, cmp[i].y, cmp[i].z, cmp[i].rhw); } for(i = 0; i < sizeof(outH); i++) { - if(((unsigned char *) outH)[i] != 0xaa) { + if(((unsigned char *) outH)[i] != 0xcc) { ok(FALSE, "Homogeneous output was generated despite UNCLIPPED flag\n"); break; } @@ -1180,7 +1180,7 @@ static void Direct3D1Test(void) cmp[i].x, cmp[i].y, cmp[i].z, cmp[i].rhw); } - memset(out, 0xbb, sizeof(out)); + memset(out, 0xcc, sizeof(out)); hr = IDirect3DViewport_TransformVertices(Viewport, sizeof(testverts) / sizeof(testverts[0]), &transformdata, D3DTRANSFORM_CLIPPED, &i); @@ -1217,7 +1217,7 @@ static void Direct3D1Test(void) } } for(i = 0; i < sizeof(out) / sizeof(DWORD); i++) { - ok(((DWORD *) out)[i] != 0xbbbbbbbb, + ok(((DWORD *) out)[i] != 0xcccccccc, "Regular output DWORD %d remained untouched\n", i); }

1 0

Francois Gouget : comctl32/tests: Don' t use 0xaa to avoid any confusion when running with +heap.
by Alexandre Julliard 05 Mar '08

05 Mar '08

Module: wine Branch: master Commit: 891e3d17fd80ec00dd826ce75ceb2addee732934 URL: http://source.winehq.org/git/wine.git/?a=commit;h=891e3d17fd80ec00dd826ce75… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 5 12:06:08 2008 +0100 comctl32/tests: Don't use 0xaa to avoid any confusion when running with +heap. --- dlls/comctl32/tests/listview.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 6e6f535..f988ab9 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -547,7 +547,7 @@ static void insert_column(HWND hwnd, int idx) LVCOLUMN column; DWORD rc; - memset(&column, 0xaa, sizeof(column)); + memset(&column, 0xcc, sizeof(column)); column.mask = LVCF_SUBITEM; column.iSubItem = idx; @@ -562,7 +562,7 @@ static void insert_item(HWND hwnd, int idx) LVITEMA item; DWORD rc; - memset(&item, 0xaa, sizeof (item)); + memset(&item, 0xcc, sizeof (item)); item.mask = LVIF_TEXT; item.iItem = idx; item.iSubItem = 0; @@ -593,7 +593,7 @@ static void test_items(void) insert_column(hwnd, 1); /* Insert an item with just a param */ - memset (&item, 0xaa, sizeof (item)); + memset (&item, 0xcc, sizeof (item)); item.mask = LVIF_PARAM; item.iItem = 0; item.iSubItem = 0; @@ -602,7 +602,7 @@ static void test_items(void) ok(r == 0, "ret %d\n", r); /* Test getting of the param */ - memset (&item, 0xaa, sizeof (item)); + memset (&item, 0xcc, sizeof (item)); item.mask = LVIF_PARAM; item.iItem = 0; item.iSubItem = 0; @@ -611,7 +611,7 @@ static void test_items(void) ok(item.lParam == lparamTest, "got lParam %lx, expected %lx\n", item.lParam, lparamTest); /* Set up a subitem */ - memset (&item, 0xaa, sizeof (item)); + memset (&item, 0xcc, sizeof (item)); item.mask = LVIF_TEXT; item.iItem = 0; item.iSubItem = 1; @@ -620,7 +620,7 @@ static void test_items(void) ok(r != 0, "ret %d\n", r); /* Query param from subitem: returns main item param */ - memset (&item, 0xaa, sizeof (item)); + memset (&item, 0xcc, sizeof (item)); item.mask = LVIF_PARAM; item.iItem = 0; item.iSubItem = 1; @@ -629,7 +629,7 @@ static void test_items(void) ok(item.lParam == lparamTest, "got lParam %lx, expected %lx\n", item.lParam, lparamTest); /* Set up param on first subitem: no effect */ - memset (&item, 0xaa, sizeof (item)); + memset (&item, 0xcc, sizeof (item)); item.mask = LVIF_PARAM; item.iItem = 0; item.iSubItem = 1; @@ -638,7 +638,7 @@ static void test_items(void) ok(r == 0, "ret %d\n", r); /* Query param from subitem again: should still return main item param */ - memset (&item, 0xaa, sizeof (item)); + memset (&item, 0xcc, sizeof (item)); item.mask = LVIF_PARAM; item.iItem = 0; item.iSubItem = 1; @@ -647,7 +647,7 @@ static void test_items(void) ok(item.lParam == lparamTest, "got lParam %lx, expected %lx\n", item.lParam, lparamTest); /**** Some tests of state highlighting ****/ - memset (&item, 0xaa, sizeof (item)); + memset (&item, 0xcc, sizeof (item)); item.mask = LVIF_STATE; item.iItem = 0; item.iSubItem = 0; @@ -660,7 +660,7 @@ static void test_items(void) r = SendMessage(hwnd, LVM_SETITEM, 0, (LPARAM) &item); ok(r != 0, "ret %d\n", r); - memset (&item, 0xaa, sizeof (item)); + memset (&item, 0xcc, sizeof (item)); item.mask = LVIF_STATE; item.iItem = 0; item.iSubItem = 0; @@ -687,7 +687,7 @@ static void test_columns(void) ok(hwnd != NULL, "failed to create listview window\n"); /* Add a column with no mask */ - memset(&column, 0xaa, sizeof(column)); + memset(&column, 0xcc, sizeof(column)); column.mask = 0; rc = ListView_InsertColumn(hwnd, 0, &column); ok(rc==0, "Inserting column with no mask failed with %d\n", rc);

1 0

Francois Gouget : user32/tests: Add the trailing '\n' to a couple of ok() calls.
by Alexandre Julliard 05 Mar '08

05 Mar '08

Module: wine Branch: master Commit: e27922ddf5e70fc816061eedbfc0eb86d95e53bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e27922ddf5e70fc816061eedb… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 5 12:03:54 2008 +0100 user32/tests: Add the trailing '\n' to a couple of ok() calls. --- dlls/user32/tests/resource.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/resource.c b/dlls/user32/tests/resource.c index 0fd77b7..7be82ad 100644 --- a/dlls/user32/tests/resource.c +++ b/dlls/user32/tests/resource.c @@ -66,11 +66,11 @@ static void test_LoadStringW(void) { /* check that calling LoadStringW with buffer = NULL returns zero */ retvalue = LoadStringW(hInst, 2, NULL, 0); - ok(!retvalue, "LoadStringW returned a non-zero value when called with buffer = NULL, retvalue = %d", + ok(!retvalue, "LoadStringW returned a non-zero value when called with buffer = NULL, retvalue = %d\n", retvalue); /* check again, with a different buflen value, that calling LoadStringW with buffer = NULL returns zero */ retvalue = LoadStringW(hInst, 2, NULL, 128); - ok(!retvalue, "LoadStringW returned a non-zero value when called with buffer = NULL, retvalue = %d", + ok(!retvalue, "LoadStringW returned a non-zero value when called with buffer = NULL, retvalue = %d\n", retvalue); } }

1 0

Francois Gouget : user32/tests: Don' t use 0x55 to avoid any confusion when running with +heap.
by Alexandre Julliard 05 Mar '08

05 Mar '08

Module: wine Branch: master Commit: c099b40509f828a8b835b62fc566740c57f08ce2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c099b40509f828a8b835b62fc… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 5 12:04:12 2008 +0100 user32/tests: Don't use 0x55 to avoid any confusion when running with +heap. --- dlls/user32/tests/menu.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index cb37ac0..99974b0 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -494,7 +494,7 @@ static void test_menu_bmp_and_string(void) return; } - memset( bmfill, 0x55, sizeof( bmfill)); + memset( bmfill, 0xcc, sizeof( bmfill)); hwnd = CreateWindowEx(0, MAKEINTATOM(atomMenuCheckClass), NULL, WS_VISIBLE, CW_USEDEFAULT, CW_USEDEFAULT, 200, 200, NULL, NULL, NULL, NULL);

1 0

Francois Gouget : kernel32/tests: Don' t use 0xaa to avoid any confusion when running with +heap.
by Alexandre Julliard 05 Mar '08

05 Mar '08

Module: wine Branch: master Commit: 508d58c21012eef9b26d3eeea88da9d8127da49b URL: http://source.winehq.org/git/wine.git/?a=commit;h=508d58c21012eef9b26d3eeea… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 5 12:04:43 2008 +0100 kernel32/tests: Don't use 0xaa to avoid any confusion when running with +heap. --- dlls/kernel32/tests/process.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 43d6ac0..fbf13b0 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1369,7 +1369,7 @@ static void test_OpenProcess(void) hproc = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, GetCurrentProcessId()); - memset(&info, 0xaa, sizeof(info)); + memset(&info, 0xcc, sizeof(info)); ok(VirtualQueryEx(hproc, addr1, &info, sizeof(info)) == sizeof(info), "VirtualQueryEx error %d\n", GetLastError());

1 0