February 2012 - Wine-commits

Alexandre Julliard : gdi32: Paint everything in ExtFloodFill when the DIB doesn't have a clip region.
by Alexandre Julliard 20 Feb '12

20 Feb '12

Module: wine Branch: master Commit: 21498d6c1115d18e4e070aa6ce33ae54c7cb16b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21498d6c1115d18e4e070aa6c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Feb 19 20:30:51 2012 +0100 gdi32: Paint everything in ExtFloodFill when the DIB doesn't have a clip region. --- dlls/gdi32/dibdrv/graphics.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 17d6994..3251f36 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -681,7 +681,7 @@ BOOL dibdrv_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) static inline BOOL is_interior( dib_info *dib, HRGN clip, int x, int y, DWORD pixel, UINT type) { /* the clip rgn stops the flooding */ - if (!PtInRegion( clip, x, y )) return FALSE; + if (clip && !PtInRegion( clip, x, y )) return FALSE; if (type == FLOODFILLBORDER) return dib->funcs->get_pixel( dib, x, y ) != pixel; @@ -734,7 +734,7 @@ BOOL dibdrv_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT type ) RECT row; HRGN rgn; - TRACE( "(%p, %d, %d, %08x, %d\n", pdev, x, y, color, type ); + TRACE( "(%p, %d, %d, %08x, %d)\n", pdev, x, y, color, type ); if (!is_interior( &pdev->dib, pdev->clip, x, y, pixel, type )) return FALSE;

1 0

Eric Pouech : kernel32: Enhance bare fd check by checking that the handle is a real console handle .
by Alexandre Julliard 20 Feb '12

20 Feb '12

Module: wine Branch: master Commit: 945e16c281fc8bc3d6ead7ba95b34b24af39d1d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=945e16c281fc8bc3d6ead7ba9… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Feb 17 21:57:38 2012 +0100 kernel32: Enhance bare fd check by checking that the handle is a real console handle. --- dlls/kernel32/console.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 6d429f0..4410a31 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -160,7 +160,8 @@ static int get_console_bare_fd(HANDLE hin) { int fd; - if (wine_server_handle_to_fd(wine_server_ptr_handle(console_handle_unmap(hin)), + if (is_console_handle(hin) && + wine_server_handle_to_fd(wine_server_ptr_handle(console_handle_unmap(hin)), 0, &fd, NULL) == STATUS_SUCCESS) return fd; return -1;

1 0

Nikolay Sivov : wpp: Properly use va_start/va_end around vsnprintf().
by Alexandre Julliard 20 Feb '12

20 Feb '12

Module: wine Branch: master Commit: fdcf7cc9afa99ba120298dafaa5b5907ee781fa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdcf7cc9afa99ba120298dafa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Feb 18 14:06:36 2012 +0300 wpp: Properly use va_start/va_end around vsnprintf(). --- libs/wpp/ppl.l | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/libs/wpp/ppl.l b/libs/wpp/ppl.l index 98f3e1a..2718fd0 100644 --- a/libs/wpp/ppl.l +++ b/libs/wpp/ppl.l @@ -329,6 +329,7 @@ void pp_writestring(const char *format, ...) va_start(valist, format); len = vsnprintf(buffer, buffercapacity, format, valist); + va_end(valist); /* If the string is longer than buffersize, vsnprintf returns * the string length with glibc >= 2.1, -1 with glibc < 2.1 */ while(len > buffercapacity || len < 0) @@ -345,10 +346,11 @@ void pp_writestring(const char *format, ...) return; } buffer = new_buffer; + va_start(valist, format); len = vsnprintf(buffer, buffercapacity, format, valist); + va_end(valist); } - va_end(valist); wpp_callbacks->write(buffer, len); }

1 0

Frédéric Delanoy : comctl32/tests: Use initialized window handle when rebuilding toolbar (Coverity).
by Alexandre Julliard 20 Feb '12

20 Feb '12

Module: wine Branch: master Commit: 3c13f991e43215ba08badce5a5bba99c93ed102a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c13f991e43215ba08badce5a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Feb 18 13:46:08 2012 +0100 comctl32/tests: Use initialized window handle when rebuilding toolbar (Coverity). --- dlls/comctl32/tests/toolbar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 474e5ef..2444975 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -1881,7 +1881,7 @@ static void test_TB_GET_SET_EXTENDEDSTYLE(void) { DWORD style, oldstyle, oldstyle2; const extended_style_t *ptr; - HWND hwnd; + HWND hwnd = NULL; int i; rebuild_toolbar(&hwnd);

1 0

Marcus Meissner : user32: Remove duplicated call to GetSystemMenu (Coverity ).
by Alexandre Julliard 20 Feb '12

20 Feb '12

Module: wine Branch: master Commit: 626d0b75ba77edb1efdb0a99a3f099f36daec128 URL: http://source.winehq.org/git/wine.git/?a=commit;h=626d0b75ba77edb1efdb0a99a… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Feb 18 15:33:56 2012 +0100 user32: Remove duplicated call to GetSystemMenu (Coverity). --- dlls/user32/nonclient.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 5ca0a8d..82a571d 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -1470,14 +1470,12 @@ LRESULT NC_HandleNCRButtonDown( HWND hwnd, WPARAM wParam, LPARAM lParam ) { MSG msg; INT hittest = wParam; - HMENU hSysMenu = GetSystemMenu(hwnd, FALSE); switch (hittest) { case HTCAPTION: case HTSYSMENU: - hSysMenu = GetSystemMenu(hwnd, FALSE); - if (!hSysMenu) break; + if (!GetSystemMenu( hwnd, FALSE )) break; SetCapture( hwnd ); for (;;)

1 0

Marcus Meissner : quartz: Fixed sizeof()s to IsBadReadPtr (Coverity).
by Alexandre Julliard 20 Feb '12

20 Feb '12

Module: wine Branch: master Commit: 90dd4ea9a66816a651683f13b576eb77ab42682b URL: http://source.winehq.org/git/wine.git/?a=commit;h=90dd4ea9a66816a651683f13b… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Feb 18 16:12:12 2012 +0100 quartz: Fixed sizeof()s to IsBadReadPtr (Coverity). --- dlls/quartz/tests/filtermapper.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/filtermapper.c b/dlls/quartz/tests/filtermapper.c index 2209af4..68918f2 100644 --- a/dlls/quartz/tests/filtermapper.c +++ b/dlls/quartz/tests/filtermapper.c @@ -517,8 +517,8 @@ static void test_parse_filter_data(void) pRegFilter =((REGFILTER2**)prgbRegFilter2)[0]; ok (hr==S_OK,"Failed to Parse filter Data\n"); - ok(IsBadReadPtr(prgbRegFilter2,sizeof(REGFILTER2**))==0,"Bad read pointer returned\n"); - ok(IsBadReadPtr(pRegFilter,sizeof(REGFILTER2*))==0,"Bad read pointer for FilterData\n"); + ok(IsBadReadPtr(prgbRegFilter2,sizeof(REGFILTER2*))==0,"Bad read pointer returned\n"); + ok(IsBadReadPtr(pRegFilter,sizeof(REGFILTER2))==0,"Bad read pointer for FilterData\n"); ok(pRegFilter->dwMerit == 0x5fffff,"Incorrect merit returned\n"); out:

1 0

Dmitry Timoshkov : kernel32: Add a test to show that NtMapViewOfSection should not perform an image relocation .
by Alexandre Julliard 20 Feb '12

20 Feb '12

Module: wine Branch: master Commit: 20093556f92fbced66761526b8801bcd94ec484d URL: http://source.winehq.org/git/wine.git/?a=commit;h=20093556f92fbced66761526b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 20 16:01:25 2012 +0800 kernel32: Add a test to show that NtMapViewOfSection should not perform an image relocation. --- dlls/kernel32/tests/loader.c | 127 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 124 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 0b67bb6..9c969c2 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -21,12 +21,18 @@ #include <stdarg.h> #include <assert.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "wine/test.h" #define ALIGN_SIZE(size, alignment) (((size) + (alignment - 1)) & ~((alignment - 1))) +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 PVOID RVAToAddr(DWORD_PTR rva, HMODULE module) { if (rva == 0) @@ -553,6 +559,105 @@ static void test_ImportDescriptors(void) } } +static void test_image_mapping(const char *dll_name, DWORD scn_page_access) +{ + HANDLE hfile, hmap; + NTSTATUS status; + LARGE_INTEGER offset; + SIZE_T size; + void *addr1, *addr2; + MEMORY_BASIC_INFORMATION info; + SYSTEM_INFO si; + + if (!pNtMapViewOfSection) return; + + GetSystemInfo(&si); + + SetLastError(0xdeadbeef); + hfile = CreateFile(dll_name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); + ok(hfile != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + hmap = CreateFileMapping(hfile, NULL, PAGE_READONLY | SEC_IMAGE, 0, 0, 0); + ok(hmap != 0, "CreateFileMapping error %d\n", GetLastError()); + + offset.u.LowPart = 0; + offset.u.HighPart = 0; + + addr1 = NULL; + size = 0; + status = pNtMapViewOfSection(hmap, GetCurrentProcess(), &addr1, 0, 0, &offset, + &size, 1 /* ViewShare */, 0, PAGE_READONLY); + ok(status == STATUS_SUCCESS, "NtMapViewOfSection error %x\n", status); + ok(addr1 != 0, "mapped address should be valid\n"); + + SetLastError(0xdeadbeef); + size = VirtualQuery((char *)addr1 + section.VirtualAddress, &info, sizeof(info)); + ok(size == sizeof(info), "VirtualQuery error %d\n", GetLastError()); + ok(info.BaseAddress == (char *)addr1 + section.VirtualAddress, "got %p != expected %p\n", info.BaseAddress, (char *)addr1 + section.VirtualAddress); + ok(info.RegionSize == si.dwPageSize, "got %#lx != expected %#x\n", info.RegionSize, si.dwPageSize); + ok(info.Protect == scn_page_access, "got %#x != expected %#x\n", info.Protect, scn_page_access); + ok(info.AllocationBase == addr1, "%p != %p\n", info.AllocationBase, addr1); + ok(info.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "%#x != PAGE_EXECUTE_WRITECOPY\n", info.AllocationProtect); + ok(info.State == MEM_COMMIT, "%#x != MEM_COMMIT\n", info.State); + ok(info.Type == SEC_IMAGE, "%#x != SEC_IMAGE\n", info.Type); + + addr2 = NULL; + size = 0; + status = pNtMapViewOfSection(hmap, GetCurrentProcess(), &addr2, 0, 0, &offset, + &size, 1 /* ViewShare */, 0, PAGE_READONLY); + /* FIXME: remove once Wine is fixed */ + if (status != STATUS_IMAGE_NOT_AT_BASE) + { + todo_wine { + ok(status == STATUS_IMAGE_NOT_AT_BASE, "expected STATUS_IMAGE_NOT_AT_BASE, got %x\n", status); + ok(addr2 != 0, "mapped address should be valid\n"); + } + goto wine_is_broken; + } + ok(status == STATUS_IMAGE_NOT_AT_BASE, "expected STATUS_IMAGE_NOT_AT_BASE, got %x\n", status); + ok(addr2 != 0, "mapped address should be valid\n"); + + ok(addr2 != addr1, "mapped addresses should be different\n"); + + SetLastError(0xdeadbeef); + size = VirtualQuery((char *)addr2 + section.VirtualAddress, &info, sizeof(info)); + ok(size == sizeof(info), "VirtualQuery error %d\n", GetLastError()); + ok(info.BaseAddress == (char *)addr2 + section.VirtualAddress, "got %p != expected %p\n", info.BaseAddress, (char *)addr2 + section.VirtualAddress); + ok(info.RegionSize == si.dwPageSize, "got %#lx != expected %#x\n", info.RegionSize, si.dwPageSize); + ok(info.Protect == scn_page_access, "got %#x != expected %#x\n", info.Protect, scn_page_access); + ok(info.AllocationBase == addr2, "%p != %p\n", info.AllocationBase, addr2); + ok(info.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "%#x != PAGE_EXECUTE_WRITECOPY\n", info.AllocationProtect); + ok(info.State == MEM_COMMIT, "%#x != MEM_COMMIT\n", info.State); + ok(info.Type == SEC_IMAGE, "%#x != SEC_IMAGE\n", info.Type); + + status = pNtUnmapViewOfSection(GetCurrentProcess(), addr2); + ok(status == STATUS_SUCCESS, "NtUnmapViewOfSection error %x\n", status); + + addr2 = MapViewOfFile(hmap, 0, 0, 0, 0); + ok(addr2 != addr1, "mapped addresses should be different\n"); + + SetLastError(0xdeadbeef); + size = VirtualQuery((char *)addr2 + section.VirtualAddress, &info, sizeof(info)); + ok(size == sizeof(info), "VirtualQuery error %d\n", GetLastError()); + ok(info.BaseAddress == (char *)addr2 + section.VirtualAddress, "got %p != expected %p\n", info.BaseAddress, (char *)addr2 + section.VirtualAddress); + ok(info.RegionSize == si.dwPageSize, "got %#lx != expected %#x\n", info.RegionSize, si.dwPageSize); + ok(info.Protect == scn_page_access, "got %#x != expected %#x\n", info.Protect, scn_page_access); + ok(info.AllocationBase == addr2, "%p != %p\n", info.AllocationBase, addr2); + ok(info.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "%#x != PAGE_EXECUTE_WRITECOPY\n", info.AllocationProtect); + ok(info.State == MEM_COMMIT, "%#x != MEM_COMMIT\n", info.State); + ok(info.Type == SEC_IMAGE, "%#x != SEC_IMAGE\n", info.Type); + + UnmapViewOfFile(addr2); + +wine_is_broken: + status = pNtUnmapViewOfSection(GetCurrentProcess(), addr1); + ok(status == STATUS_SUCCESS, "NtUnmapViewOfSection error %x\n", status); + + CloseHandle(hmap); + CloseHandle(hfile); +} + static BOOL is_mem_writable(DWORD prot) { switch (prot & 0xff) @@ -776,9 +881,7 @@ static void test_section_access(void) nt_header.FileHeader.NumberOfSections = 1; nt_header.FileHeader.SizeOfOptionalHeader = sizeof(IMAGE_OPTIONAL_HEADER); - - /* don't set IMAGE_FILE_DLL to show that it doesn't change anything for a DLL or a process image */ - nt_header.FileHeader.Characteristics = IMAGE_FILE_EXECUTABLE_IMAGE; + nt_header.FileHeader.Characteristics = IMAGE_FILE_EXECUTABLE_IMAGE | IMAGE_FILE_DLL | IMAGE_FILE_RELOCS_STRIPPED; nt_header.OptionalHeader.SectionAlignment = si.dwPageSize; nt_header.OptionalHeader.FileAlignment = 0x200; @@ -852,6 +955,19 @@ static void test_section_access(void) ret = FreeLibrary(hlib); ok(ret, "FreeLibrary error %d\n", GetLastError()); + test_image_mapping(dll_name, td[i].scn_page_access); + + /* reset IMAGE_FILE_DLL otherwise CreateProcess fails */ + nt_header.FileHeader.Characteristics = IMAGE_FILE_EXECUTABLE_IMAGE | IMAGE_FILE_RELOCS_STRIPPED; + SetLastError(0xdeadbeef); + hfile = CreateFile(dll_name, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); + ok (hfile != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + SetFilePointer(hfile, sizeof(dos_header), NULL, FILE_BEGIN); + SetLastError(0xdeadbeef); + ret = WriteFile(hfile, &nt_header, sizeof(DWORD) + sizeof(IMAGE_FILE_HEADER), &dummy, NULL); + ok(ret, "WriteFile error %d\n", GetLastError()); + CloseHandle(hfile); + memset(&sti, 0, sizeof(sti)); sti.cb = sizeof(sti); SetLastError(0xdeadbeef); @@ -886,6 +1002,8 @@ static void test_section_access(void) CloseHandle(pi.hThread); CloseHandle(pi.hProcess); + test_image_mapping(dll_name, td[i].scn_page_access); + SetLastError(0xdeadbeef); ret = DeleteFile(dll_name); ok(ret, "DeleteFile error %d\n", GetLastError()); @@ -894,6 +1012,9 @@ static void test_section_access(void) START_TEST(loader) { + pNtMapViewOfSection = (void *)GetProcAddress(GetModuleHandle("ntdll.dll"), "NtMapViewOfSection"); + pNtUnmapViewOfSection = (void *)GetProcAddress(GetModuleHandle("ntdll.dll"), "NtUnmapViewOfSection"); + test_Loader(); test_ImportDescriptors(); test_section_access();

1 0

Juan Lang : cryptnet: Don' t call HttpEndRequest on a request that was never sent.
by Alexandre Julliard 20 Feb '12

20 Feb '12

Module: wine Branch: master Commit: eee39b12abc92cffdfbc6923a01cb174b4631b60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eee39b12abc92cffdfbc6923a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Feb 18 19:08:45 2012 -0800 cryptnet: Don't call HttpEndRequest on a request that was never sent. --- dlls/cryptnet/cryptnet_main.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 5d06396..3143604 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -967,7 +967,8 @@ static BOOL WINAPI HTTP_RetrieveEncodedObjectW(LPCWSTR pszURL, /* We don't set ret to TRUE in this block to avoid masking * an error from HttpSendRequestExW. */ - if (!HttpEndRequestW(hHttp, NULL, 0, (DWORD_PTR)context) && + if (ret && + !HttpEndRequestW(hHttp, NULL, 0, (DWORD_PTR)context) && GetLastError() == ERROR_IO_PENDING) { if (WaitForSingleObject(context->event,

1 0

Maarten Lankhorst : mmdevapi: Fix exclusive test.
by Alexandre Julliard 20 Feb '12

20 Feb '12

Module: wine Branch: master Commit: 14b765aca538a43b57a989b28acc1656928113c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14b765aca538a43b57a989b28… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Feb 19 13:18:28 2012 +0100 mmdevapi: Fix exclusive test. --- dlls/mmdevapi/tests/render.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index e2b281e..127f558 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -878,6 +878,7 @@ static void test_clock(int share) period = defp; } else { pwfx->wFormatTag = WAVE_FORMAT_PCM; + pwfx->nChannels = 2; pwfx->cbSize = 0; pwfx->wBitsPerSample = 16; /* no floating point */ pwfx->nBlockAlign = pwfx->nChannels * pwfx->wBitsPerSample / 8;

1 0

Christian Costa : d3dxof: Add tests for IDirectXFileData_GetName.
by Alexandre Julliard 20 Feb '12

20 Feb '12

Module: wine Branch: master Commit: ddecb6aae5d61fad0b95a76fe3e4ae178b4af8d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddecb6aae5d61fad0b95a76fe… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Feb 19 21:02:42 2012 +0100 d3dxof: Add tests for IDirectXFileData_GetName. --- dlls/d3dxof/tests/d3dxof.c | 95 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 92 insertions(+), 3 deletions(-) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 5c6315a..40ad10c 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -84,6 +84,13 @@ static char empty_bzip_file[] = "xof 0302bzip0064\x11\x00\x00\x00\x01\x00\x05\x0 static char empty_cmp_file[] = "xof 0302cmp 0064"; static char empty_xxxx_file[] = "xof 0302xxxx0064"; +static char object_noname[] = +"xof 0302txt 0064\n" +"Header\n" +"{\n" +"1; 2; 3;\n" +"}\n"; + static void init_function_pointers(void) { /* We have to use LoadLibrary as no d3dxof functions are referenced directly */ @@ -115,7 +122,7 @@ static void test_refcount(void) hr = pDirectXFileCreate(&lpDirectXFile); ok(hr == DXFILE_OK, "DirectXFileCreate: %x\n", hr); - if(!lpDirectXFile) + if (!lpDirectXFile) { skip("Couldn't create DirectXFile interface\n"); return; @@ -187,7 +194,7 @@ static void test_CreateEnumObject(void) hr = pDirectXFileCreate(&lpDirectXFile); ok(hr == DXFILE_OK, "DirectXFileCreate: %x\n", hr); - if(!lpDirectXFile) + if (!lpDirectXFile) { skip("Couldn't create DirectXFile interface\n"); return; @@ -369,6 +376,87 @@ static void test_compressed_files(void) IDirectXFile_Release(dxfile); } +static void test_getname(void) +{ + HRESULT hr; + ULONG ref; + LPDIRECTXFILE lpDirectXFile = NULL; + LPDIRECTXFILEENUMOBJECT lpdxfeo; + LPDIRECTXFILEDATA lpdxfd; + DXFILELOADMEMORY dxflm; + char name[100]; + DWORD length; + + if (!pDirectXFileCreate) + { + win_skip("DirectXFileCreate is not available\n"); + return; + } + + hr = pDirectXFileCreate(&lpDirectXFile); + ok(hr == DXFILE_OK, "DirectXFileCreate: %x\n", hr); + if (!lpDirectXFile) + { + skip("Couldn't create DirectXFile interface\n"); + return; + } + + hr = IDirectXFile_RegisterTemplates(lpDirectXFile, template, sizeof(template) - 1); + ok(hr == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); + + /* Check object with name */ + dxflm.lpMemory = &object; + dxflm.dSize = sizeof(object) - 1; + hr = IDirectXFile_CreateEnumObject(lpDirectXFile, &dxflm, DXFILELOAD_FROMMEMORY, &lpdxfeo); + ok(hr == DXFILE_OK, "IDirectXFile_CreateEnumObject: %x\n", hr); + hr = IDirectXFileEnumObject_GetNextDataObject(lpdxfeo, &lpdxfd); + ok(hr == DXFILE_OK, "IDirectXFileEnumObject_GetNextDataObject: %x\n", hr); + + hr = IDirectXFileData_GetName(lpdxfd, NULL, NULL); + ok(hr == DXFILEERR_BADVALUE, "IDirectXFileData_GetName: %x\n", hr); + hr = IDirectXFileData_GetName(lpdxfd, name, NULL); + ok(hr == DXFILEERR_BADVALUE, "IDirectXFileData_GetName: %x\n", hr); + hr = IDirectXFileData_GetName(lpdxfd, NULL, &length); + ok(hr == DXFILE_OK, "IDirectXFileData_GetName: %x\n", hr); + ok(length == 7, "Returned length should be 7 instead of %u\n", length); + length = sizeof(name); + hr = IDirectXFileData_GetName(lpdxfd, name, &length); + ok(hr == DXFILE_OK, "IDirectXFileData_GetName: %x\n", hr); + ok(length == 7, "Returned length should be 7 instead of %u\n", length); + ok(!strcmp(name, "Object"), "Returned string should be 'Object' intead of '%s'\n", name); + length = 3; + hr = IDirectXFileData_GetName(lpdxfd, name, &length); + ok(hr == DXFILEERR_BADVALUE, "IDirectXFileData_GetName: %x\n", hr); + + ref = IDirectXFileEnumObject_Release(lpdxfeo); + ok(ref == 0, "Got refcount %d, expected 0\n", ref); + ref = IDirectXFileData_Release(lpdxfd); + ok(ref == 0, "Got refcount %d, expected 0\n", ref); + + /* Check object without name */ + dxflm.lpMemory = &object_noname; + dxflm.dSize = sizeof(object_noname) - 1; + hr = IDirectXFile_CreateEnumObject(lpDirectXFile, &dxflm, DXFILELOAD_FROMMEMORY, &lpdxfeo); + ok(hr == DXFILE_OK, "IDirectXFile_CreateEnumObject: %x\n", hr); + hr = IDirectXFileEnumObject_GetNextDataObject(lpdxfeo, &lpdxfd); + ok(hr == DXFILE_OK, "IDirectXFileEnumObject_GetNextDataObject: %x\n", hr); + + hr = IDirectXFileData_GetName(lpdxfd, NULL, &length); + ok(hr == DXFILE_OK, "IDirectXFileData_GetName: %x\n", hr); + ok(length == 0, "Returned length should be 0 instead of %u\n", length); + length = sizeof(name); + hr = IDirectXFileData_GetName(lpdxfd, name, &length); + ok(hr == DXFILE_OK, "IDirectXFileData_GetName: %x\n", hr); + ok(length == 0, "Returned length should be 0 instead of %u\n", length); + + ref = IDirectXFileEnumObject_Release(lpdxfeo); + ok(ref == 0, "Got refcount %d, expected 0\n", ref); + ref = IDirectXFileData_Release(lpdxfd); + ok(ref == 0, "Got refcount %d, expected 0\n", ref); + ref = IDirectXFile_Release(lpDirectXFile); + ok(ref == 0, "Got refcount %d, expected 0\n", ref); +} + /* Set it to 1 to expand the string when dumping the object. This is useful when there is * only one string in a sub-object (very common). Use with care, this may lead to a crash. */ #define EXPAND_STRING 0 @@ -381,7 +469,7 @@ static void process_data(LPDIRECTXFILEDATA lpDirectXFileData, int* plevel) CONST GUID* clsid_type = NULL; char str_clsid[40]; char str_clsid_type[40]; - DWORD len= 100; + DWORD len = 100; LPDIRECTXFILEOBJECT pChildObj; int i; int j = 0; @@ -545,6 +633,7 @@ START_TEST(d3dxof) test_CreateEnumObject(); test_file_types(); test_compressed_files(); + test_getname(); test_dump(); FreeLibrary(hd3dxof);

1 0