December 2011 - Wine-commits

Dmitry Timoshkov : ntdll: Setting WRITECOPY protection on a memory-mapped file is allowed.
by Alexandre Julliard 16 Dec '11

16 Dec '11

Module: wine Branch: master Commit: eed406e028102e40a8d33cfd319884015c4496f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eed406e028102e40a8d33cfd3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Dec 16 14:44:35 2011 +0800 ntdll: Setting WRITECOPY protection on a memory-mapped file is allowed. --- dlls/kernel32/tests/virtual.c | 21 +++++---------------- dlls/ntdll/virtual.c | 24 ++++++++++++++---------- 2 files changed, 19 insertions(+), 26 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 3812cb2..336fd87 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1787,13 +1787,6 @@ static void test_CreateFileMapping_protection(void) { if (!ret) { - /* FIXME: completely remove the condition below once Wine is fixed */ - if (td[i].prot == PAGE_WRITECOPY) - { - todo_wine - ok(ret, "%d: VirtualProtect error %d\n", i, GetLastError()); - continue; - } /* win2k and XP don't support EXEC on file mappings */ if (td[i].prot == PAGE_EXECUTE) { @@ -1809,7 +1802,6 @@ static void test_CreateFileMapping_protection(void) /* Vista+ supports PAGE_EXECUTE_WRITECOPY, earlier versions don't */ if (td[i].prot == PAGE_EXECUTE_WRITECOPY) { - todo_wine ok(broken(!ret), "%d: VirtualProtect doesn't support PAGE_EXECUTE_WRITECOPY\n", i); continue; } @@ -1827,7 +1819,11 @@ static void test_CreateFileMapping_protection(void) ok(ret, "VirtualQuery failed %d\n", GetLastError()); ok(info.BaseAddress == base, "%d: got %p != expected %p\n", i, info.BaseAddress, base); ok(info.RegionSize == si.dwPageSize, "%d: got %#lx != expected %#x\n", i, info.RegionSize, si.dwPageSize); - ok(info.Protect == prot, "%d: got %#x != expected %#x\n", i, info.Protect, prot); + /* FIXME: remove the condition below once Wine is fixed */ + if (td[i].prot == PAGE_EXECUTE_WRITECOPY) + todo_wine ok(info.Protect == prot, "%d: got %#x != expected %#x\n", i, info.Protect, prot); + else + ok(info.Protect == prot, "%d: got %#x != expected %#x\n", i, info.Protect, prot); ok(info.AllocationBase == base, "%d: %p != %p\n", i, info.AllocationBase, base); ok(info.AllocationProtect == alloc_prot, "%d: %#x != %#x\n", i, info.AllocationProtect, alloc_prot); ok(info.State == MEM_COMMIT, "%d: %#x != MEM_COMMIT\n", i, info.State); @@ -2122,13 +2118,6 @@ static void test_mapping(void) ok(broken(!ret), "VirtualProtect doesn't support PAGE_EXECUTE_WRITECOPY view properly\n"); continue; } - /* FIXME: completely remove the condition below once Wine is fixed */ - if (!ret && page_prot[k] == PAGE_WRITECOPY) - { - todo_wine - ok(ret, "VirtualProtect error %d\n", GetLastError()); - continue; - } ok(ret, "VirtualProtect error %d, map %#x, view %#x, requested prot %#x\n", GetLastError(), page_prot[i], view[j].prot, page_prot[k]); ok(old_prot == prev_prot, "got %#x, expected %#x\n", old_prot, prev_prot); diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index e6ca21a..ee56e71 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2079,26 +2079,30 @@ NTSTATUS WINAPI NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T size = ROUND_SIZE( addr, size ); base = ROUND_ADDR( addr, page_mask ); - if ((status = get_vprot_flags( new_prot, &new_vprot ))) return status; - if (new_vprot & VPROT_WRITECOPY) return STATUS_INVALID_PAGE_PROTECTION; - new_vprot |= VPROT_COMMITTED; server_enter_uninterrupted_section( &csVirtual, &sigset ); - if (!(view = VIRTUAL_FindView( base, size ))) - { - status = STATUS_INVALID_PARAMETER; - } - else + if ((view = VIRTUAL_FindView( base, size ))) { /* Make sure all the pages are committed */ if (get_committed_size( view, base, &vprot ) >= size && (vprot & VPROT_COMMITTED)) { - if (old_prot) *old_prot = VIRTUAL_GetWin32Prot( vprot ); - if (!VIRTUAL_SetProt( view, base, size, new_vprot )) status = STATUS_ACCESS_DENIED; + if (!(status = get_vprot_flags( new_prot, &new_vprot ))) + { + if ((new_vprot & VPROT_WRITECOPY) && (view->protect & VPROT_VALLOC)) + status = STATUS_INVALID_PAGE_PROTECTION; + else + { + new_vprot |= VPROT_COMMITTED; + if (old_prot) *old_prot = VIRTUAL_GetWin32Prot( vprot ); + if (!VIRTUAL_SetProt( view, base, size, new_vprot )) status = STATUS_ACCESS_DENIED; + } + } } else status = STATUS_NOT_COMMITTED; } + else status = STATUS_INVALID_PARAMETER; + server_leave_uninterrupted_section( &csVirtual, &sigset ); if (status == STATUS_SUCCESS)

1 0

Dmitry Timoshkov : kernel32: Add a bunch of VirtualProtect tests on an image section.
by Alexandre Julliard 16 Dec '11

16 Dec '11

Module: wine Branch: master Commit: bb8d47bd30db5d64e632d0a2becd56532dcd4156 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb8d47bd30db5d64e632d0a2b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Dec 16 14:45:01 2011 +0800 kernel32: Add a bunch of VirtualProtect tests on an image section. --- dlls/kernel32/tests/loader.c | 142 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 142 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 2af7cc5..536bda9 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -568,6 +568,146 @@ static BOOL is_mem_writable(DWORD prot) } } +static void test_VirtualProtect(void *base, void *section) +{ + static const struct test_data + { + DWORD prot_set, prot_get; + } td[] = + { + { 0, 0 }, /* 0x00 */ + { PAGE_NOACCESS, PAGE_NOACCESS }, /* 0x01 */ + { PAGE_READONLY, PAGE_READONLY }, /* 0x02 */ + { PAGE_READONLY | PAGE_NOACCESS, 0 }, /* 0x03 */ + { PAGE_READWRITE, PAGE_WRITECOPY }, /* 0x04 */ + { PAGE_READWRITE | PAGE_NOACCESS, 0 }, /* 0x05 */ + { PAGE_READWRITE | PAGE_READONLY, 0 }, /* 0x06 */ + { PAGE_READWRITE | PAGE_READONLY | PAGE_NOACCESS, 0 }, /* 0x07 */ + { PAGE_WRITECOPY, PAGE_WRITECOPY }, /* 0x08 */ + { PAGE_WRITECOPY | PAGE_NOACCESS, 0 }, /* 0x09 */ + { PAGE_WRITECOPY | PAGE_READONLY, 0 }, /* 0x0a */ + { PAGE_WRITECOPY | PAGE_NOACCESS | PAGE_READONLY, 0 }, /* 0x0b */ + { PAGE_WRITECOPY | PAGE_READWRITE, 0 }, /* 0x0c */ + { PAGE_WRITECOPY | PAGE_READWRITE | PAGE_NOACCESS, 0 }, /* 0x0d */ + { PAGE_WRITECOPY | PAGE_READWRITE | PAGE_READONLY, 0 }, /* 0x0e */ + { PAGE_WRITECOPY | PAGE_READWRITE | PAGE_READONLY | PAGE_NOACCESS, 0 }, /* 0x0f */ + + { PAGE_EXECUTE, PAGE_EXECUTE }, /* 0x10 */ + { PAGE_EXECUTE_READ, PAGE_EXECUTE_READ }, /* 0x20 */ + { PAGE_EXECUTE_READ | PAGE_EXECUTE, 0 }, /* 0x30 */ + { PAGE_EXECUTE_READWRITE, PAGE_EXECUTE_WRITECOPY }, /* 0x40 */ + { PAGE_EXECUTE_READWRITE | PAGE_EXECUTE, 0 }, /* 0x50 */ + { PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_READ, 0 }, /* 0x60 */ + { PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_READ | PAGE_EXECUTE, 0 }, /* 0x70 */ + { PAGE_EXECUTE_WRITECOPY, PAGE_EXECUTE_WRITECOPY }, /* 0x80 */ + { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE, 0 }, /* 0x90 */ + { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READ, 0 }, /* 0xa0 */ + { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READ | PAGE_EXECUTE, 0 }, /* 0xb0 */ + { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READWRITE, 0 }, /* 0xc0 */ + { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE, 0 }, /* 0xd0 */ + { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_READ, 0 }, /* 0xe0 */ + { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_READ | PAGE_EXECUTE, 0 } /* 0xf0 */ + }; + DWORD ret, orig_prot, old_prot, rw_prot, exec_prot, i, j; + MEMORY_BASIC_INFORMATION info; + SYSTEM_INFO si; + + GetSystemInfo(&si); + trace("system page size %#x\n", si.dwPageSize); + + SetLastError(0xdeadbeef); + ret = VirtualProtect(section, si.dwPageSize, PAGE_NOACCESS, &old_prot); + ok(ret, "VirtualProtect error %d\n", GetLastError()); + + orig_prot = old_prot; + + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + { + SetLastError(0xdeadbeef); + ret = VirtualQuery(section, &info, sizeof(info)); + ok(ret, "VirtualQuery failed %d\n", GetLastError()); + ok(info.BaseAddress == section, "%d: got %p != expected %p\n", i, info.BaseAddress, section); + ok(info.RegionSize == si.dwPageSize, "%d: got %#lx != expected %#x\n", i, info.RegionSize, si.dwPageSize); + ok(info.Protect == PAGE_NOACCESS, "%d: got %#x != expected PAGE_NOACCESS\n", i, info.Protect); + ok(info.AllocationBase == base, "%d: %p != %p\n", i, info.AllocationBase, base); + ok(info.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "%d: %#x != PAGE_EXECUTE_WRITECOPY\n", i, info.AllocationProtect); + ok(info.State == MEM_COMMIT, "%d: %#x != MEM_COMMIT\n", i, info.State); + ok(info.Type == SEC_IMAGE, "%d: %#x != SEC_IMAGE\n", i, info.Type); + + old_prot = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = VirtualProtect(section, si.dwPageSize, td[i].prot_set, &old_prot); + if (td[i].prot_get) + { + ok(ret, "%d: VirtualProtect error %d\n", i, GetLastError()); + ok(old_prot == PAGE_NOACCESS, "%d: got %#x != expected PAGE_NOACCESS\n", i, old_prot); + + SetLastError(0xdeadbeef); + ret = VirtualQuery(section, &info, sizeof(info)); + ok(ret, "VirtualQuery failed %d\n", GetLastError()); + ok(info.BaseAddress == section, "%d: got %p != expected %p\n", i, info.BaseAddress, section); + ok(info.RegionSize == si.dwPageSize, "%d: got %#lx != expected %#x\n", i, info.RegionSize, si.dwPageSize); + if (info.Protect != td[i].prot_get) + todo_wine ok(info.Protect == td[i].prot_get, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].prot_get); + else + ok(info.Protect == td[i].prot_get, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].prot_get); + ok(info.AllocationBase == base, "%d: %p != %p\n", i, info.AllocationBase, base); + ok(info.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "%d: %#x != PAGE_EXECUTE_WRITECOPY\n", i, info.AllocationProtect); + ok(info.State == MEM_COMMIT, "%d: %#x != MEM_COMMIT\n", i, info.State); + ok(info.Type == SEC_IMAGE, "%d: %#x != SEC_IMAGE\n", i, info.Type); + } + else + { + ok(!ret, "%d: VirtualProtect should fail\n", i); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "%d: expected ERROR_INVALID_PARAMETER, got %d\n", i, GetLastError()); + } + + old_prot = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = VirtualProtect(section, si.dwPageSize, PAGE_NOACCESS, &old_prot); + ok(ret, "%d: VirtualProtect error %d\n", i, GetLastError()); + if (td[i].prot_get) + { + if (old_prot != td[i].prot_get) + todo_wine ok(old_prot == td[i].prot_get, "%d: got %#x != expected %#x\n", i, old_prot, td[i].prot_get); + else + ok(old_prot == td[i].prot_get, "%d: got %#x != expected %#x\n", i, old_prot, td[i].prot_get); + } + else + ok(old_prot == PAGE_NOACCESS, "%d: got %#x != expected PAGE_NOACCESS\n", i, old_prot); + } + + exec_prot = 0; + + for (i = 0; i <= 4; i++) + { + rw_prot = 0; + + for (j = 0; j <= 4; j++) + { + DWORD prot = exec_prot | rw_prot; + + SetLastError(0xdeadbeef); + ret = VirtualProtect(section, si.dwPageSize, prot, &old_prot); + if ((rw_prot && exec_prot) || (!rw_prot && !exec_prot)) + { + ok(!ret, "VirtualProtect(%02x) should fail\n", prot); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + } + else + ok(ret, "VirtualProtect(%02x) error %d\n", prot, GetLastError()); + + rw_prot = 1 << j; + } + + exec_prot = 1 << (i + 4); + } + + SetLastError(0xdeadbeef); + ret = VirtualProtect(section, si.dwPageSize, orig_prot, &old_prot); + ok(ret, "VirtualProtect error %d\n", GetLastError()); +} + static void test_section_access(void) { static const struct test_data @@ -699,6 +839,8 @@ static void test_section_access(void) if (info.Protect != PAGE_NOACCESS) ok(!memcmp((const char *)info.BaseAddress, section_data, section.SizeOfRawData), "wrong section data\n"); + test_VirtualProtect(hlib, (char *)hlib + section.VirtualAddress); + /* Windows changes the WRITECOPY to WRITE protection on an image section write (for a changed page only) */ if (is_mem_writable(info.Protect)) {

1 0

Dmitry Timoshkov : ntdll: Replace WRITE by WRITECOPY protection on an image section as Windows does.
by Alexandre Julliard 16 Dec '11

16 Dec '11

Module: wine Branch: master Commit: 332eee40530f698c74f16d27c9833ccccb25bfa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=332eee40530f698c74f16d27c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Dec 16 14:45:23 2011 +0800 ntdll: Replace WRITE by WRITECOPY protection on an image section as Windows does. --- dlls/kernel32/tests/loader.c | 8 -------- dlls/ntdll/virtual.c | 20 +++++++++++++------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 536bda9..398e5f5 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -647,9 +647,6 @@ static void test_VirtualProtect(void *base, void *section) ok(ret, "VirtualQuery failed %d\n", GetLastError()); ok(info.BaseAddress == section, "%d: got %p != expected %p\n", i, info.BaseAddress, section); ok(info.RegionSize == si.dwPageSize, "%d: got %#lx != expected %#x\n", i, info.RegionSize, si.dwPageSize); - if (info.Protect != td[i].prot_get) - todo_wine ok(info.Protect == td[i].prot_get, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].prot_get); - else ok(info.Protect == td[i].prot_get, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].prot_get); ok(info.AllocationBase == base, "%d: %p != %p\n", i, info.AllocationBase, base); ok(info.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "%d: %#x != PAGE_EXECUTE_WRITECOPY\n", i, info.AllocationProtect); @@ -667,12 +664,7 @@ static void test_VirtualProtect(void *base, void *section) ret = VirtualProtect(section, si.dwPageSize, PAGE_NOACCESS, &old_prot); ok(ret, "%d: VirtualProtect error %d\n", i, GetLastError()); if (td[i].prot_get) - { - if (old_prot != td[i].prot_get) - todo_wine ok(old_prot == td[i].prot_get, "%d: got %#x != expected %#x\n", i, old_prot, td[i].prot_get); - else ok(old_prot == td[i].prot_get, "%d: got %#x != expected %#x\n", i, old_prot, td[i].prot_get); - } else ok(old_prot == PAGE_NOACCESS, "%d: got %#x != expected PAGE_NOACCESS\n", i, old_prot); } diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index ee56e71..6ee3444 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -552,7 +552,7 @@ static DWORD VIRTUAL_GetWin32Prot( BYTE vprot ) * RETURNS * Value of page protection flags */ -static NTSTATUS get_vprot_flags( DWORD protect, unsigned int *vprot ) +static NTSTATUS get_vprot_flags( DWORD protect, unsigned int *vprot, BOOL image ) { switch(protect & 0xff) { @@ -560,7 +560,10 @@ static NTSTATUS get_vprot_flags( DWORD protect, unsigned int *vprot ) *vprot = VPROT_READ; break; case PAGE_READWRITE: - *vprot = VPROT_READ | VPROT_WRITE; + if (image) + *vprot = VPROT_READ | VPROT_WRITECOPY; + else + *vprot = VPROT_READ | VPROT_WRITE; break; case PAGE_WRITECOPY: *vprot = VPROT_READ | VPROT_WRITECOPY; @@ -572,7 +575,10 @@ static NTSTATUS get_vprot_flags( DWORD protect, unsigned int *vprot ) *vprot = VPROT_EXEC | VPROT_READ; break; case PAGE_EXECUTE_READWRITE: - *vprot = VPROT_EXEC | VPROT_READ | VPROT_WRITE; + if (image) + *vprot = VPROT_EXEC | VPROT_READ | VPROT_WRITECOPY; + else + *vprot = VPROT_EXEC | VPROT_READ | VPROT_WRITE; break; case PAGE_EXECUTE_WRITECOPY: *vprot = VPROT_EXEC | VPROT_READ | VPROT_WRITECOPY; @@ -1860,7 +1866,7 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG zero_ if (is_beyond_limit( 0, size, working_set_limit )) return STATUS_WORKING_SET_LIMIT_RANGE; - if ((status = get_vprot_flags( protect, &vprot ))) return status; + if ((status = get_vprot_flags( protect, &vprot, FALSE ))) return status; if (vprot & VPROT_WRITECOPY) return STATUS_INVALID_PAGE_PROTECTION; vprot |= VPROT_VALLOC; if (type & MEM_COMMIT) vprot |= VPROT_COMMITTED; @@ -2087,7 +2093,7 @@ NTSTATUS WINAPI NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T /* Make sure all the pages are committed */ if (get_committed_size( view, base, &vprot ) >= size && (vprot & VPROT_COMMITTED)) { - if (!(status = get_vprot_flags( new_prot, &new_vprot ))) + if (!(status = get_vprot_flags( new_prot, &new_vprot, view->protect & VPROT_IMAGE ))) { if ((new_vprot & VPROT_WRITECOPY) && (view->protect & VPROT_VALLOC)) status = STATUS_INVALID_PAGE_PROTECTION; @@ -2392,7 +2398,7 @@ NTSTATUS WINAPI NtCreateSection( HANDLE *handle, ACCESS_MASK access, const OBJEC if (len > MAX_PATH*sizeof(WCHAR)) return STATUS_NAME_TOO_LONG; - if ((ret = get_vprot_flags( protect, &vprot ))) return ret; + if ((ret = get_vprot_flags( protect, &vprot, sec_flags & SEC_IMAGE ))) return ret; objattr.rootdir = wine_server_obj_handle( attr ? attr->RootDirectory : 0 ); objattr.sd_len = 0; @@ -2602,7 +2608,7 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p server_enter_uninterrupted_section( &csVirtual, &sigset ); - get_vprot_flags( protect, &vprot ); + get_vprot_flags( protect, &vprot, map_vprot & VPROT_IMAGE ); vprot |= (map_vprot & VPROT_COMMITTED); res = map_view( &view, *addr_ptr, size, mask, FALSE, vprot ); if (res)

1 0

Alexandre Julliard : comctl32/tests: Add some more tests for ImageList_Write.
by Alexandre Julliard 16 Dec '11

16 Dec '11

Module: wine Branch: master Commit: 65b7eb26359110959692db7c0c3cebd263fe21ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=65b7eb26359110959692db7c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 16 13:07:45 2011 +0100 comctl32/tests: Add some more tests for ImageList_Write. --- dlls/comctl32/imagelist.c | 14 ++--- dlls/comctl32/tests/imagelist.c | 130 +++++++++++++++++++++++++++++---------- 2 files changed, 102 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=65b7eb26359110959692d…

1 0

Francois Gouget : include: Add missing include directives.
by Alexandre Julliard 16 Dec '11

16 Dec '11

Module: wine Branch: master Commit: 4ed257665ccb1e78efcff70306499cd7d33f0f96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ed257665ccb1e78efcff7030… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Dec 15 20:19:31 2011 +0100 include: Add missing include directives. --- include/dmusbuff.h | 2 ++ include/dpnathlp.h | 2 ++ include/fdi.h | 2 ++ include/lmwksta.h | 1 + include/ntddndis.h | 4 ++-- include/propvarutil.h | 1 - include/setupapi.h | 1 + include/winineti.h | 1 + 8 files changed, 11 insertions(+), 3 deletions(-) diff --git a/include/dmusbuff.h b/include/dmusbuff.h index ba5b776..7632b1a 100644 --- a/include/dmusbuff.h +++ b/include/dmusbuff.h @@ -20,6 +20,8 @@ #ifndef __WINE_DMUSIC_BUFFER_H #define __WINE_DMUSIC_BUFFER_H +#include <dmdls.h> + /***************************************************************************** * Misc. definitions */ diff --git a/include/dpnathlp.h b/include/dpnathlp.h index c1fa3c9..81d32b3 100644 --- a/include/dpnathlp.h +++ b/include/dpnathlp.h @@ -19,6 +19,8 @@ #ifndef __DPNATHLP_H__ #define __DPNATHLP_H__ +#include <ole2.h> + #ifdef __cplusplus extern "C" { #endif diff --git a/include/fdi.h b/include/fdi.h index b77cd48..f36baaf 100644 --- a/include/fdi.h +++ b/include/fdi.h @@ -19,6 +19,8 @@ #ifndef __WINE_FDI_H #define __WINE_FDI_H +#include <basetsd.h> + #ifdef __cplusplus extern "C" { #endif /* defined(__cplusplus) */ diff --git a/include/lmwksta.h b/include/lmwksta.h index 6bc2faf..b35f28a 100644 --- a/include/lmwksta.h +++ b/include/lmwksta.h @@ -20,6 +20,7 @@ #define __WINE_LMWKSTA_H #include <lmcons.h> +#include <lmuseflg.h> #ifdef __cplusplus extern "C" { diff --git a/include/ntddndis.h b/include/ntddndis.h index 44566e8..5085f25 100644 --- a/include/ntddndis.h +++ b/include/ntddndis.h @@ -23,8 +23,8 @@ extern "C" { #endif -/* #include <ifdef.h>*/ -/* #include <devpkey.h> */ +#include <ifdef.h> +#include <devpkey.h> /* #include <pciprop.h> */ #define _NDIS_CONTROL_CODE(request, method) \ diff --git a/include/propvarutil.h b/include/propvarutil.h index fe7ab94..96265a5 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -19,7 +19,6 @@ #ifndef __WINE_PROPVARUTIL_H #define __WINE_PROPVARUTIL_H -#include <propidl.h> #include <shtypes.h> #include <shlwapi.h> diff --git a/include/setupapi.h b/include/setupapi.h index baa5787..04ddc75 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -21,6 +21,7 @@ #define _INC_SETUPAPI #include <commctrl.h> +#include <devpropdef.h> #ifdef _WIN64 #include <pshpack8.h> diff --git a/include/winineti.h b/include/winineti.h index 6419204..8029155 100644 --- a/include/winineti.h +++ b/include/winineti.h @@ -21,6 +21,7 @@ /* FIXME: #include <iedial.h> */ #include <schannel.h> +#include <sspi.h> typedef struct _INTERNET_CACHE_CONFIG_PATH_ENTRYA {

1 0

Francois Gouget : include: Include windef. h and packing directives in rpcasync.h when needed.
by Alexandre Julliard 16 Dec '11

16 Dec '11

Module: wine Branch: master Commit: b831594b501876105f88fa5dab85242737fd3594 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b831594b501876105f88fa5da… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Dec 15 20:20:22 2011 +0100 include: Include windef.h and packing directives in rpcasync.h when needed. --- include/rpcasync.h | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/include/rpcasync.h b/include/rpcasync.h index d4bf4f8..f0bcb6d 100644 --- a/include/rpcasync.h +++ b/include/rpcasync.h @@ -18,6 +18,13 @@ #ifndef __WINE_RPCASYNC_H #define __WINE_RPCASYNC_H +#ifdef RPC_NO_WINDOWS_H +# include <windef.h> +#endif + +#ifdef __RPC_WIN64__ +# include <pshpack8.h> +#endif typedef struct tagRPC_ERROR_ENUM_HANDLE { @@ -154,6 +161,10 @@ typedef struct _RPC_ASYNC_STATE #define RpcAsyncGetCallHandle(async) (((PRPC_ASYNC_STATE)async)->RuntimeInfo) +#ifdef __RPC_WIN64__ +# include <poppack.h> +#endif + #ifdef __cplusplus extern "C" { #endif

1 0

Francois Gouget : include: shldisp.idl should only import ocidl.idl.
by Alexandre Julliard 16 Dec '11

16 Dec '11

Module: wine Branch: master Commit: af52a7a6aca65d5314fb405da6162e7386f8f0d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af52a7a6aca65d5314fb405da… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Dec 15 20:32:28 2011 +0100 include: shldisp.idl should only import ocidl.idl. --- include/shldisp.idl | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/include/shldisp.idl b/include/shldisp.idl index 5c04f71..3e7fc45 100644 --- a/include/shldisp.idl +++ b/include/shldisp.idl @@ -18,12 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -import "objidl.idl"; -import "oleidl.idl"; -import "oaidl.idl"; -import "shtypes.idl"; -import "servprov.idl"; -import "comcat.idl"; +import "ocidl.idl"; #include <shdispid.h>

1 0

Francois Gouget : view: Remove unneeded RC files.
by Alexandre Julliard 16 Dec '11

16 Dec '11

Module: wine Branch: master Commit: 70af45c51cd9566ba8a5ccba4072c63a058078d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70af45c51cd9566ba8a5ccba4… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Dec 15 22:37:10 2011 +0100 view: Remove unneeded RC files. --- programs/view/Cs.rc | 32 -------------------------------- programs/view/Cy.rc | 29 ----------------------------- programs/view/Da.rc | 29 ----------------------------- programs/view/De.rc | 31 ------------------------------- programs/view/En.rc | 30 ------------------------------ programs/view/Eo.rc | 29 ----------------------------- programs/view/Es.rc | 29 ----------------------------- programs/view/Fr.rc | 35 ----------------------------------- programs/view/He.rc | 33 --------------------------------- programs/view/It.rc | 34 ---------------------------------- programs/view/Ja.rc | 33 --------------------------------- programs/view/Ko.rc | 33 --------------------------------- programs/view/Lt.rc | 32 -------------------------------- programs/view/Makefile.in | 28 +--------------------------- programs/view/Nl.rc | 28 ---------------------------- programs/view/No.rc | 29 ----------------------------- programs/view/Pl.rc | 30 ------------------------------ programs/view/Pt.rc | 33 --------------------------------- programs/view/Ro.rc | 30 ------------------------------ programs/view/Ru.rc | 31 ------------------------------- programs/view/Si.rc | 31 ------------------------------- programs/view/Sv.rc | 29 ----------------------------- programs/view/Tr.rc | 29 ----------------------------- programs/view/Uk.rc | 34 ---------------------------------- programs/view/Zh.rc | 39 --------------------------------------- programs/view/view.rc | 5 +++++ 26 files changed, 6 insertions(+), 779 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=70af45c51cd9566ba8a5c…

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 16 Dec '11

16 Dec '11

Module: wine Branch: master Commit: a02e2c4f600f857bae2bb21defab93c52423bb74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a02e2c4f600f857bae2bb21de… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Dec 15 21:35:06 2011 +0100 po: Update French translation. --- po/fr.po | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/po/fr.po b/po/fr.po index c07d761..deb9e69 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-12-13 22:35+0100\n" +"PO-Revision-Date: 2011-12-15 21:33+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -3566,9 +3566,8 @@ msgid "Boolean object expected" msgstr "Objet booléen attendu" #: jscript.rc:46 -#, fuzzy msgid "Cannot delete '|'" -msgstr "Ne peut terminer cette opération\n" +msgstr "Impossible de supprimer « | »" #: jscript.rc:47 msgid "VBArray object expected" @@ -10091,13 +10090,11 @@ msgid "Parameter error\n" msgstr "Erreur de paramètre\n" #: cmd.rc:318 -#, fuzzy msgid "" "Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" -"Le volume dans le lecteur %1!c! est %2\n" -"Le numéro de série du volume est %3!04x!-%4!04x!\n" +"Le numéro de série du volume est %1!04x!-%2!04x!\n" "\n" #: cmd.rc:319 @@ -10130,11 +10127,11 @@ msgstr "La ligne d'entrée est trop longue.\n" #: cmd.rc:326 msgid "Volume in drive %1!c! is %2\n" -msgstr "" +msgstr "Le volume dans le lecteur %1!c! est %2\n" #: cmd.rc:327 msgid "Volume in drive %1!c! has no label.\n" -msgstr "" +msgstr "Le volume dans le lecteur %1!c! n'a pas de label.\n" #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool"

1 0

Alex Henrie : po: Update Catalan translation.
by Alexandre Julliard 16 Dec '11

16 Dec '11

Module: wine Branch: master Commit: 7a2a3b746fdfd6c197baff3dc15150eea7b4481d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a2a3b746fdfd6c197baff3dc… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Dec 16 00:47:51 2011 -0700 po: Update Catalan translation. --- po/ca.po | 308 ++++++++++++++++++++++++++++--------------------------------- 1 files changed, 141 insertions(+), 167 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7a2a3b746fdfd6c197baf…

1 0