November 2013 - Wine-Commits

Alexandre Julliard : kernel32/tests: Add some tests for invalid image section mappings.
by Alexandre Julliard Nov. 21, 2013

Nov. 21, 2013

Module: wine Branch: master Commit: 55eb7e56e8cf8c6bb00d01efa8f39f3cae39a4db URL: http://source.winehq.org/git/wine.git/?a=commit;h=55eb7e56e8cf8c6bb00d01efa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 21 16:14:11 2013 +0100 kernel32/tests: Add some tests for invalid image section mappings. --- dlls/kernel32/tests/loader.c | 128 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 128 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 6698fce..d44c052 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -47,6 +47,8 @@ static LONG *child_failures; static WORD cb_count; static DWORD page_size; +static NTSTATUS (WINAPI *pNtCreateSection)(HANDLE *, ACCESS_MASK, const OBJECT_ATTRIBUTES *, + const LARGE_INTEGER *, ULONG, ULONG, HANDLE ); static NTSTATUS (WINAPI *pNtMapViewOfSection)(HANDLE, HANDLE, PVOID *, ULONG, SIZE_T, const LARGE_INTEGER *, SIZE_T *, ULONG, ULONG, ULONG); static NTSTATUS (WINAPI *pNtUnmapViewOfSection)(HANDLE, PVOID); static NTSTATUS (WINAPI *pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); @@ -216,6 +218,33 @@ static DWORD create_test_dll( const IMAGE_DOS_HEADER *dos_header, UINT dos_size, return size; } +/* helper to test image section mapping */ +static NTSTATUS map_image_section( const IMAGE_NT_HEADERS *nt_header ) +{ + char temp_path[MAX_PATH]; + char dll_name[MAX_PATH]; + LARGE_INTEGER size; + HANDLE file, map; + NTSTATUS status; + + GetTempPathA(MAX_PATH, temp_path); + GetTempFileNameA(temp_path, "ldr", 0, dll_name); + + size.u.LowPart = create_test_dll( &dos_header, sizeof(dos_header), nt_header, dll_name ); + ok( size.u.LowPart, "could not create %s\n", dll_name); + size.u.HighPart = 0; + + file = CreateFileA(dll_name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + + status = pNtCreateSection(&map, STANDARD_RIGHTS_REQUIRED | SECTION_MAP_READ, NULL, &size, + PAGE_READONLY, SEC_IMAGE, file ); + if (map) CloseHandle( map ); + CloseHandle( file ); + DeleteFileA( dll_name ); + return status; +} + static void test_Loader(void) { @@ -351,6 +380,8 @@ static void test_Loader(void) char dll_name[MAX_PATH]; SIZE_T size; BOOL ret; + NTSTATUS status; + WORD orig_machine = nt_header.FileHeader.Machine; /* prevent displaying of the "Unable to load this DLL" message box */ SetErrorMode(SEM_FAILCRITICALERRORS); @@ -554,6 +585,102 @@ todo_wine ret = DeleteFileA(dll_name); ok(ret, "DeleteFile error %d\n", GetLastError()); } + + nt_header.FileHeader.NumberOfSections = 1; + nt_header.FileHeader.SizeOfOptionalHeader = sizeof(IMAGE_OPTIONAL_HEADER); + + nt_header.OptionalHeader.SectionAlignment = page_size; + nt_header.OptionalHeader.FileAlignment = page_size; + nt_header.OptionalHeader.SizeOfHeaders = sizeof(dos_header) + sizeof(nt_header) + sizeof(IMAGE_SECTION_HEADER); + nt_header.OptionalHeader.SizeOfImage = nt_header.OptionalHeader.SizeOfImage + page_size; + + status = map_image_section( &nt_header ); + ok( status == STATUS_SUCCESS, "NtCreateSection error %08x\n", status ); + + dos_header.e_magic = 0; + status = map_image_section( &nt_header ); + todo_wine ok( status == STATUS_INVALID_IMAGE_NOT_MZ, "NtCreateSection error %08x\n", status ); + + dos_header.e_magic = IMAGE_DOS_SIGNATURE; + nt_header.Signature = IMAGE_OS2_SIGNATURE; + status = map_image_section( &nt_header ); + todo_wine ok( status == STATUS_INVALID_IMAGE_NE_FORMAT, "NtCreateSection error %08x\n", status ); + + nt_header.Signature = 0xdeadbeef; + status = map_image_section( &nt_header ); + todo_wine ok( status == STATUS_INVALID_IMAGE_PROTECT, "NtCreateSection error %08x\n", status ); + + nt_header.Signature = IMAGE_NT_SIGNATURE; + nt_header.OptionalHeader.Magic = 0xdead; + status = map_image_section( &nt_header ); + todo_wine ok( status == STATUS_INVALID_IMAGE_FORMAT, "NtCreateSection error %08x\n", status ); + + nt_header.OptionalHeader.Magic = IMAGE_NT_OPTIONAL_HDR_MAGIC; + nt_header.FileHeader.Machine = 0xdead; + status = map_image_section( &nt_header ); + todo_wine ok( status == STATUS_INVALID_IMAGE_FORMAT || broken(status == STATUS_SUCCESS), /* win2k */ + "NtCreateSection error %08x\n", status ); + + nt_header.FileHeader.Machine = IMAGE_FILE_MACHINE_UNKNOWN; + status = map_image_section( &nt_header ); + todo_wine ok( status == STATUS_INVALID_IMAGE_FORMAT || broken(status == STATUS_SUCCESS), /* win2k */ + "NtCreateSection error %08x\n", status ); + + switch (orig_machine) + { + case IMAGE_FILE_MACHINE_I386: nt_header.FileHeader.Machine = IMAGE_FILE_MACHINE_AMD64; break; + case IMAGE_FILE_MACHINE_AMD64: nt_header.FileHeader.Machine = IMAGE_FILE_MACHINE_I386; break; + case IMAGE_FILE_MACHINE_ARMNT: nt_header.FileHeader.Machine = IMAGE_FILE_MACHINE_ARM64; break; + case IMAGE_FILE_MACHINE_ARM64: nt_header.FileHeader.Machine = IMAGE_FILE_MACHINE_ARMNT; break; + } + status = map_image_section( &nt_header ); + todo_wine ok( status == STATUS_INVALID_IMAGE_FORMAT || broken(status == STATUS_SUCCESS), /* win2k */ + "NtCreateSection error %08x\n", status ); + + if (nt_header.OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC) + { + IMAGE_NT_HEADERS64 nt64; + + memset( &nt64, 0, sizeof(nt64) ); + nt64.Signature = IMAGE_NT_SIGNATURE; + nt64.FileHeader.Machine = orig_machine; + nt64.FileHeader.NumberOfSections = 1; + nt64.FileHeader.SizeOfOptionalHeader = sizeof(IMAGE_OPTIONAL_HEADER64); + nt64.OptionalHeader.Magic = IMAGE_NT_OPTIONAL_HDR64_MAGIC; + nt64.OptionalHeader.MajorLinkerVersion = 1; + nt64.OptionalHeader.ImageBase = 0x10000000; + nt64.OptionalHeader.MajorOperatingSystemVersion = 4; + nt64.OptionalHeader.MajorImageVersion = 1; + nt64.OptionalHeader.MajorSubsystemVersion = 4; + nt64.OptionalHeader.SizeOfHeaders = sizeof(dos_header) + sizeof(nt64) + sizeof(IMAGE_SECTION_HEADER); + nt64.OptionalHeader.SizeOfImage = nt64.OptionalHeader.SizeOfHeaders + 0x1000; + nt64.OptionalHeader.Subsystem = IMAGE_SUBSYSTEM_WINDOWS_CUI; + status = map_image_section( (IMAGE_NT_HEADERS *)&nt64 ); + todo_wine ok( status == STATUS_INVALID_IMAGE_FORMAT, "NtCreateSection error %08x\n", status ); + } + else + { + IMAGE_NT_HEADERS32 nt32; + + memset( &nt32, 0, sizeof(nt32) ); + nt32.Signature = IMAGE_NT_SIGNATURE; + nt32.FileHeader.Machine = orig_machine; + nt32.FileHeader.NumberOfSections = 1; + nt32.FileHeader.SizeOfOptionalHeader = sizeof(IMAGE_OPTIONAL_HEADER32); + nt32.OptionalHeader.Magic = IMAGE_NT_OPTIONAL_HDR32_MAGIC; + nt32.OptionalHeader.MajorLinkerVersion = 1; + nt32.OptionalHeader.ImageBase = 0x10000000; + nt32.OptionalHeader.MajorOperatingSystemVersion = 4; + nt32.OptionalHeader.MajorImageVersion = 1; + nt32.OptionalHeader.MajorSubsystemVersion = 4; + nt32.OptionalHeader.SizeOfHeaders = sizeof(dos_header) + sizeof(nt32) + sizeof(IMAGE_SECTION_HEADER); + nt32.OptionalHeader.SizeOfImage = nt32.OptionalHeader.SizeOfHeaders + 0x1000; + nt32.OptionalHeader.Subsystem = IMAGE_SUBSYSTEM_WINDOWS_CUI; + status = map_image_section( (IMAGE_NT_HEADERS *)&nt32 ); + todo_wine ok( status == STATUS_INVALID_IMAGE_FORMAT, "NtCreateSection error %08x\n", status ); + } + + nt_header.FileHeader.Machine = orig_machine; /* restore it for the next tests */ } /* Verify linking style of import descriptors */ @@ -2496,6 +2623,7 @@ START_TEST(loader) SYSTEM_INFO si; ntdll = GetModuleHandleA("ntdll.dll"); + pNtCreateSection = (void *)GetProcAddress(ntdll, "NtCreateSection"); pNtMapViewOfSection = (void *)GetProcAddress(ntdll, "NtMapViewOfSection"); pNtUnmapViewOfSection = (void *)GetProcAddress(ntdll, "NtUnmapViewOfSection"); pNtTerminateProcess = (void *)GetProcAddress(ntdll, "NtTerminateProcess");

1 0

Frédéric Delanoy : Assorted spelling fixes.
by Alexandre Julliard Nov. 21, 2013

Nov. 21, 2013

Module: wine Branch: master Commit: 57d7f74d34f2ce0968af2eb14c7e866d6d7c39a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57d7f74d34f2ce0968af2eb14… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Nov 20 23:39:28 2013 +0100 Assorted spelling fixes. --- dlls/comctl32/commctrl.c | 2 +- dlls/comctl32/datetime.c | 2 +- dlls/comctl32/header.c | 2 +- dlls/comctl32/propsheet.c | 2 +- dlls/comctl32/tests/toolbar.c | 2 +- dlls/d3dx9_36/sprite.c | 2 +- dlls/msi/dialog.c | 2 +- dlls/msi/sql.y | 2 +- dlls/msi/table.c | 6 +++--- dlls/ntdll/printf.c | 4 ++-- dlls/ole32/antimoniker.c | 2 +- dlls/ole32/classmoniker.c | 2 +- dlls/ole32/compositemoniker.c | 4 ++-- dlls/ole32/filemoniker.c | 2 +- dlls/ole32/itemmoniker.c | 2 +- dlls/ole32/moniker.c | 4 ++-- dlls/ole32/stg_prop.c | 4 ++-- dlls/oleaut32/typelib.c | 2 +- dlls/riched20/tests/editor.c | 2 +- dlls/urlmon/bindprot.c | 2 +- dlls/user32/nonclient.c | 6 +++--- dlls/wined3d/directx.c | 2 +- dlls/winhttp/request.c | 2 +- dlls/wininet/utility.c | 2 +- dlls/wintrust/register.c | 6 +++--- programs/winedbg/gdbproxy.c | 2 +- programs/winedbg/tgt_active.c | 4 ++-- tools/winedump/msmangle.c | 2 +- 28 files changed, 39 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=57d7f74d34f2ce0968af2…

1 0

Henri Verbeet : wined3d: Merge surface_bind_and_dirtify() and volume_bind_and_dirtify() into wined3d_texture_bind_and_dirtify().
by Alexandre Julliard Nov. 21, 2013

Nov. 21, 2013

Module: wine Branch: master Commit: f91eab6d3e4462357709080a4c9cbb74d93320a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f91eab6d3e4462357709080a4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 21 00:10:20 2013 +0100 wined3d: Merge surface_bind_and_dirtify() and volume_bind_and_dirtify() into wined3d_texture_bind_and_dirtify(). --- dlls/wined3d/surface.c | 34 ++++++---------------------------- dlls/wined3d/texture.c | 22 ++++++++++++++++++++++ dlls/wined3d/volume.c | 36 +++++++----------------------------- dlls/wined3d/wined3d_private.h | 2 ++ 4 files changed, 37 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f91eab6d3e44623577090…

1 0

Henri Verbeet : wined3d: Get rid of surface_bind().
by Alexandre Julliard Nov. 21, 2013

Nov. 21, 2013

Module: wine Branch: master Commit: 2e63e8f9cca29ffbdf418cca6e137c5b5c110418 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e63e8f9cca29ffbdf418cca6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 21 00:10:19 2013 +0100 wined3d: Get rid of surface_bind(). --- dlls/wined3d/surface.c | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a339f02..a3877ce 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -595,14 +595,6 @@ static void surface_evict_sysmem(struct wined3d_surface *surface) } /* Context activation is done by the caller. */ -static void surface_bind(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) -{ - TRACE("surface %p, context %p, srgb %#x.\n", surface, context, srgb); - - wined3d_texture_bind(surface->container, context, srgb); -} - -/* Context activation is done by the caller. */ static void surface_bind_and_dirtify(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) { @@ -621,7 +613,7 @@ static void surface_bind_and_dirtify(struct wined3d_surface *surface, if (active_sampler != WINED3D_UNMAPPED_STAGE) context_invalidate_state(context, STATE_SAMPLER(active_sampler)); - surface_bind(surface, context, srgb); + wined3d_texture_bind(surface->container, context, srgb); } static void surface_force_reload(struct wined3d_surface *surface) @@ -2083,7 +2075,7 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P surface_prepare_texture(dst_surface, context, FALSE); else surface_load_location(dst_surface, SFLAG_INTEXTURE); - surface_bind(dst_surface, context, FALSE); + wined3d_texture_bind(dst_surface->container, context, FALSE); data.buffer_object = src_surface->pbo; data.addr = src_surface->resource.allocatedMemory;

1 0

Henri Verbeet : wined3d: Return early in wined3d_texture_bind() if the GL texture already has a name.
by Alexandre Julliard Nov. 21, 2013

Nov. 21, 2013

Module: wine Branch: master Commit: 2ca86bcab61a1be851dd2d5cedf1cce6d7f50663 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ca86bcab61a1be851dd2d5ce… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 21 00:10:18 2013 +0100 wined3d: Return early in wined3d_texture_bind() if the GL texture already has a name. --- dlls/wined3d/texture.c | 172 +++++++++++++++++++++++------------------------ 1 files changed, 84 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2ca86bcab61a1be851dd2…

1 0

Henri Verbeet : wined3d: Merge texture2d_bind() and texture3d_bind() into wined3d_texture_bind().
by Alexandre Julliard Nov. 21, 2013

Nov. 21, 2013

Module: wine Branch: master Commit: 6b90248aec898b232feb1a90b7af084b4af04dc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b90248aec898b232feb1a90b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 21 00:10:17 2013 +0100 wined3d: Merge texture2d_bind() and texture3d_bind() into wined3d_texture_bind(). --- dlls/wined3d/state.c | 2 +- dlls/wined3d/surface.c | 5 +-- dlls/wined3d/texture.c | 86 ++++++++++++---------------------------- dlls/wined3d/volume.c | 3 +- dlls/wined3d/wined3d_private.h | 4 +- 5 files changed, 30 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6b90248aec898b232feb1…

1 0

Frédéric Delanoy : scrrun: Use BOOL type where appropriate.
by Alexandre Julliard Nov. 21, 2013

Nov. 21, 2013

Module: wine Branch: master Commit: cfe12f96665233060eea9f914ed33b836eababea URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfe12f96665233060eea9f914… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Nov 20 23:39:32 2013 +0100 scrrun: Use BOOL type where appropriate. --- dlls/scrrun/filesystem.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index ee89b76..0d360d3 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -89,12 +89,12 @@ static inline HRESULT create_error(DWORD err) } } -static int textstream_check_iomode(struct textstream *This, enum iotype type) +static BOOL textstream_check_iomode(struct textstream *This, enum iotype type) { if (type == IORead) return This->mode == ForWriting || This->mode == ForAppending; else - return 1; + return TRUE; } static HRESULT WINAPI textstream_QueryInterface(ITextStream *iface, REFIID riid, void **obj)

1 0

Frédéric Delanoy : propsys: Use BOOL type where appropriate.
by Alexandre Julliard Nov. 21, 2013

Nov. 21, 2013

Module: wine Branch: master Commit: bb9d1986a957c934431e69608c0ff994fc2bd1c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb9d1986a957c934431e69608… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Nov 20 23:39:31 2013 +0100 propsys: Use BOOL type where appropriate. --- dlls/propsys/propvar.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 69b2e60..fd22c9d 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -69,46 +69,46 @@ static HRESULT PROPVAR_ConvertFILETIME(PROPVARIANT *ppropvarDest, } static HRESULT PROPVAR_ConvertNumber(REFPROPVARIANT pv, int dest_bits, - int dest_signed, LONGLONG *res) + BOOL dest_signed, LONGLONG *res) { - int src_signed; + BOOL src_signed; switch (pv->vt) { case VT_I1: - src_signed = 1; + src_signed = TRUE; *res = pv->u.cVal; break; case VT_UI1: - src_signed = 0; + src_signed = FALSE; *res = pv->u.bVal; break; case VT_I2: - src_signed = 1; + src_signed = TRUE; *res = pv->u.iVal; break; case VT_UI2: - src_signed = 0; + src_signed = FALSE; *res = pv->u.uiVal; break; case VT_I4: - src_signed = 1; + src_signed = TRUE; *res = pv->u.lVal; break; case VT_UI4: - src_signed = 0; + src_signed = FALSE; *res = pv->u.ulVal; break; case VT_I8: - src_signed = 1; + src_signed = TRUE; *res = pv->u.hVal.QuadPart; break; case VT_UI8: - src_signed = 0; + src_signed = FALSE; *res = pv->u.uhVal.QuadPart; break; case VT_EMPTY: - src_signed = 0; + src_signed = FALSE; *res = 0; break; default: @@ -144,7 +144,7 @@ HRESULT WINAPI PropVariantToInt16(REFPROPVARIANT propvarIn, SHORT *ret) TRACE("%p,%p\n", propvarIn, ret); - hr = PROPVAR_ConvertNumber(propvarIn, 16, 1, &res); + hr = PROPVAR_ConvertNumber(propvarIn, 16, TRUE, &res); if (SUCCEEDED(hr)) *ret = (SHORT)res; return hr; } @@ -156,7 +156,7 @@ HRESULT WINAPI PropVariantToInt32(REFPROPVARIANT propvarIn, LONG *ret) TRACE("%p,%p\n", propvarIn, ret); - hr = PROPVAR_ConvertNumber(propvarIn, 32, 1, &res); + hr = PROPVAR_ConvertNumber(propvarIn, 32, TRUE, &res); if (SUCCEEDED(hr)) *ret = (LONG)res; return hr; } @@ -168,7 +168,7 @@ HRESULT WINAPI PropVariantToInt64(REFPROPVARIANT propvarIn, LONGLONG *ret) TRACE("%p,%p\n", propvarIn, ret); - hr = PROPVAR_ConvertNumber(propvarIn, 64, 1, &res); + hr = PROPVAR_ConvertNumber(propvarIn, 64, TRUE, &res); if (SUCCEEDED(hr)) *ret = (LONGLONG)res; return hr; } @@ -180,7 +180,7 @@ HRESULT WINAPI PropVariantToUInt16(REFPROPVARIANT propvarIn, USHORT *ret) TRACE("%p,%p\n", propvarIn, ret); - hr = PROPVAR_ConvertNumber(propvarIn, 16, 0, &res); + hr = PROPVAR_ConvertNumber(propvarIn, 16, FALSE, &res); if (SUCCEEDED(hr)) *ret = (USHORT)res; return hr; } @@ -192,7 +192,7 @@ HRESULT WINAPI PropVariantToUInt32(REFPROPVARIANT propvarIn, ULONG *ret) TRACE("%p,%p\n", propvarIn, ret); - hr = PROPVAR_ConvertNumber(propvarIn, 32, 0, &res); + hr = PROPVAR_ConvertNumber(propvarIn, 32, FALSE, &res); if (SUCCEEDED(hr)) *ret = (ULONG)res; return hr; } @@ -204,7 +204,7 @@ HRESULT WINAPI PropVariantToUInt64(REFPROPVARIANT propvarIn, ULONGLONG *ret) TRACE("%p,%p\n", propvarIn, ret); - hr = PROPVAR_ConvertNumber(propvarIn, 64, 0, &res); + hr = PROPVAR_ConvertNumber(propvarIn, 64, FALSE, &res); if (SUCCEEDED(hr)) *ret = (ULONGLONG)res; return hr; } @@ -497,10 +497,10 @@ HRESULT WINAPI VariantToGUID(const VARIANT *pvar, GUID *guid) } } -static int isemptyornull(const PROPVARIANT *propvar) +static BOOL isemptyornull(const PROPVARIANT *propvar) { if (propvar->vt == VT_EMPTY || propvar->vt == VT_NULL) - return 1; + return TRUE; if ((propvar->vt & VT_ARRAY) == VT_ARRAY) { int i; @@ -512,7 +512,7 @@ static int isemptyornull(const PROPVARIANT *propvar) return i == propvar->u.parray->cDims; } /* FIXME: vectors, byrefs, errors? */ - return 0; + return FALSE; } INT WINAPI PropVariantCompareEx(REFPROPVARIANT propvar1, REFPROPVARIANT propvar2,

1 0

Frédéric Delanoy : propsys/tests: Use BOOL type where appropriate.
by Alexandre Julliard Nov. 21, 2013

Nov. 21, 2013

Module: wine Branch: master Commit: d51e50cbaf1c321f2b3800ddda8cf20ecbbc5712 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d51e50cbaf1c321f2b3800ddd… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Nov 20 23:39:30 2013 +0100 propsys/tests: Use BOOL type where appropriate. --- dlls/propsys/tests/propsys.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index df4b8d7..0a81779 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -115,9 +115,9 @@ static void test_PSStringFromPropertyKey(void) UINT cch; HRESULT hr_expect; const WCHAR *buf_expect; - int hr_broken; + BOOL hr_broken; HRESULT hr2; - int buf_broken; + BOOL buf_broken; const WCHAR *buf2; } testcases[] = { @@ -125,15 +125,15 @@ static void test_PSStringFromPropertyKey(void) {&prop, NULL, 0, E_POINTER}, {&prop, NULL, PKEYSTR_MAX, E_POINTER}, {NULL, out, 0, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), fillerW}, - {NULL, out, PKEYSTR_MAX, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_fillerW, 0, 0, 1, fillerW}, + {NULL, out, PKEYSTR_MAX, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_fillerW, FALSE, 0, TRUE, fillerW}, {&prop, out, 0, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), fillerW}, {&prop, out, GUIDSTRING_MAX, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), fillerW}, {&prop, out, GUIDSTRING_MAX + 1, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), fillerW}, - {&prop, out, GUIDSTRING_MAX + 2, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncatedW, 1, S_OK, 1, truncatedW}, - {&prop, out, PKEYSTR_MAX - 2, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncated2W, 1, S_OK, 1, truncated2W}, - {&prop, out, PKEYSTR_MAX - 1, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncated3W, 1, S_OK, 1, truncated3W}, + {&prop, out, GUIDSTRING_MAX + 2, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncatedW, TRUE, S_OK, TRUE, truncatedW}, + {&prop, out, PKEYSTR_MAX - 2, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncated2W, TRUE, S_OK, TRUE, truncated2W}, + {&prop, out, PKEYSTR_MAX - 1, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncated3W, TRUE, S_OK, TRUE, truncated3W}, {&prop, out, PKEYSTR_MAX, S_OK, expectedW}, - {&prop2, out, GUIDSTRING_MAX + 2, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncated4W, 1, S_OK, 1, truncated4W}, + {&prop2, out, GUIDSTRING_MAX + 2, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncated4W, TRUE, S_OK, TRUE, truncated4W}, {&prop2, out, GUIDSTRING_MAX + 6, S_OK, expected2W}, {&prop2, out, PKEYSTR_MAX, S_OK, expected2W}, {&prop3, out, GUIDSTRING_MAX + 1, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), fillerW},

1 0

Piotr Caban : qcap: Add AVI Mux filter stub.
by Alexandre Julliard Nov. 21, 2013

Nov. 21, 2013

Module: wine Branch: master Commit: ed858386e5ff671c9f69925f9d4978caccbbe48f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed858386e5ff671c9f69925f9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 20 22:48:04 2013 +0100 qcap: Add AVI Mux filter stub. --- dlls/qcap/Makefile.in | 1 + dlls/qcap/avimux.c | 626 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/qcap/qcap_main.c | 6 +- dlls/qcap/qcap_main.h | 6 +- 4 files changed, 633 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ed858386e5ff671c9f699…

1 0