Ros-diffs April 2014

ros-diffs@reactos.org

15 participants
492 discussions

[akhaldi] 62878: [INCLUDE/WINE] * Add some missing definitions.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Apr 22 13:25:20 2014 New Revision: 62878 URL: http://svn.reactos.org/svn/reactos?rev=62878&view=rev Log: [INCLUDE/WINE] * Add some missing definitions. Modified: trunk/reactos/include/reactos/wine/commctrl.h Modified: trunk/reactos/include/reactos/wine/commctrl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/commc… ============================================================================== --- trunk/reactos/include/reactos/wine/commctrl.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/commctrl.h [iso-8859-1] Tue Apr 22 13:25:20 2014 @@ -85,6 +85,16 @@ #define TB_UNKWN45D (WM_USER+93) #define TB_UNKWN464 (WM_USER+100) +#define TreeView_GetItemA(hwnd, pitem) \ + (BOOL)SNDMSGA((hwnd), TVM_GETITEMA, 0, (LPARAM) (TVITEMA *)(pitem)) + +#define TreeView_InsertItemA(hwnd, phdi) \ + (HTREEITEM)SNDMSGA((hwnd), TVM_INSERTITEMA, 0, \ + (LPARAM)(LPTVINSERTSTRUCTA)(phdi)) + +#define TreeView_SetItemA(hwnd, pitem) \ + (BOOL)SNDMSGA((hwnd), TVM_SETITEMA, 0, (LPARAM)(const TVITEMA *)(pitem)) + #ifdef __cplusplus } #endif

10 years, 8 months

[akhaldi] 62877: [ACPICA] * Enable PCH again. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Apr 22 13:13:45 2014 New Revision: 62877 URL: http://svn.reactos.org/svn/reactos?rev=62877&view=rev Log: [ACPICA] * Enable PCH again. CORE-7716 Modified: trunk/reactos/drivers/bus/acpi/CMakeLists.txt Modified: trunk/reactos/drivers/bus/acpi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/CMakeList… ============================================================================== --- trunk/reactos/drivers/bus/acpi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/CMakeLists.txt [iso-8859-1] Tue Apr 22 13:13:45 2014 @@ -138,7 +138,6 @@ acpica/utilities/utdelete.c acpica/utilities/uterror.c acpica/utilities/uteval.c - acpica/utilities/utexcep.c acpica/utilities/utids.c acpica/utilities/utinit.c acpica/utilities/utlock.c @@ -161,9 +160,10 @@ add_library(acpica ${ACPICA_SOURCE} + acpica/utilities/utexcep.c acpica/utilities/utglobal.c) -#add_pch(acpica acpica/include/acpi.h ACPICA_SOURCE) +add_pch(acpica acpica/include/acpi.h ACPICA_SOURCE) set_target_properties(acpica PROPERTIES COMPILE_DEFINITIONS "ACPI_USE_LOCAL_CACHE") add_dependencies(acpica bugcodes)

10 years, 8 months

[akhaldi] 62876: [RPCRT4_WINETEST] * Don't define NTSTATUS here.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Apr 22 12:00:14 2014 New Revision: 62876 URL: http://svn.reactos.org/svn/reactos?rev=62876&view=rev Log: [RPCRT4_WINETEST] * Don't define NTSTATUS here. Modified: trunk/rostests/winetests/rpcrt4/rpc.c Modified: trunk/rostests/winetests/rpcrt4/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/rpc.c?re… ============================================================================== --- trunk/rostests/winetests/rpcrt4/rpc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/rpc.c [iso-8859-1] Tue Apr 22 12:00:14 2014 @@ -32,8 +32,6 @@ #include "rpc.h" #include "rpcdce.h" #include "secext.h" - -typedef long NTSTATUS; typedef unsigned int unsigned32; typedef struct twr_t

10 years, 8 months

[akhaldi] 62875: [CABINET_WINETEST] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Apr 22 11:40:41 2014 New Revision: 62875 URL: http://svn.reactos.org/svn/reactos?rev=62875&view=rev Log: [CABINET_WINETEST] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/rostests/winetests/cabinet/CMakeLists.txt trunk/rostests/winetests/cabinet/extract.c trunk/rostests/winetests/cabinet/fdi.c Modified: trunk/rostests/winetests/cabinet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cabinet/CMakeLi… ============================================================================== --- trunk/rostests/winetests/cabinet/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/cabinet/CMakeLists.txt [iso-8859-1] Tue Apr 22 11:40:41 2014 @@ -1,7 +1,6 @@ add_definitions(-DUSE_WINE_TODOS) add_executable(cabinet_winetest extract.c fdi.c testlist.c) -target_link_libraries(cabinet_winetest wine) set_module_type(cabinet_winetest win32cui) -add_importlibs(cabinet_winetest cabinet msvcrt kernel32 ntdll) +add_importlibs(cabinet_winetest cabinet msvcrt kernel32) add_cd_file(TARGET cabinet_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/cabinet/extract.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cabinet/extract… ============================================================================== --- trunk/rostests/winetests/cabinet/extract.c [iso-8859-1] (original) +++ trunk/rostests/winetests/cabinet/extract.c [iso-8859-1] Tue Apr 22 11:40:41 2014 @@ -240,8 +240,8 @@ DWORD attrs; BOOL res; - handle = CreateFile(pszName, GENERIC_READ, FILE_SHARE_READ, NULL, - OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL); + handle = CreateFileA(pszName, GENERIC_READ, FILE_SHARE_READ, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL); ok(handle != INVALID_HANDLE_VALUE, "Failed to CreateFile %s\n", pszName); @@ -251,7 +251,7 @@ FileTimeToLocalFileTime(&finfo.ftLastWriteTime, &filetime); FileTimeToDosDateTime(&filetime, pdate, ptime); - attrs = GetFileAttributes(pszName); + attrs = GetFileAttributesA(pszName); ok(attrs != INVALID_FILE_ATTRIBUTES, "Failed to GetFileAttributes\n"); return (INT_PTR)handle; @@ -623,7 +623,7 @@ /* first file exists */ createTestFile("dest\\a.txt"); - SetFileAttributes("dest\\a.txt", FILE_ATTRIBUTE_READONLY); + SetFileAttributesA("dest\\a.txt", FILE_ATTRIBUTE_READONLY); ZeroMemory(&session, sizeof(SESSION)); lstrcpyA(session.Destination, "dest"); session.Operation = EXTRACT_FILLFILELIST | EXTRACT_EXTRACTFILES; @@ -665,7 +665,7 @@ /* third file exists */ createTestFile("dest\\testdir\\c.txt"); - SetFileAttributes("dest\\testdir\\c.txt", FILE_ATTRIBUTE_READONLY); + SetFileAttributesA("dest\\testdir\\c.txt", FILE_ATTRIBUTE_READONLY); ZeroMemory(&session, sizeof(SESSION)); lstrcpyA(session.Destination, "dest"); session.Operation = EXTRACT_FILLFILELIST | EXTRACT_EXTRACTFILES; Modified: trunk/rostests/winetests/cabinet/fdi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cabinet/fdi.c?r… ============================================================================== --- trunk/rostests/winetests/cabinet/fdi.c [iso-8859-1] (original) +++ trunk/rostests/winetests/cabinet/fdi.c [iso-8859-1] Tue Apr 22 11:40:41 2014 @@ -2,6 +2,7 @@ * Unit tests for the File Decompression Interface * * Copyright (C) 2006 James Hawkins + * Copyright (C) 2013 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include <stdio.h> +#include <stdio.h> //#include <windows.h> #include <wine/test.h> #include <fci.h> @@ -29,6 +30,105 @@ #define FOLDER_THRESHOLD 900000 static CHAR CURR_DIR[MAX_PATH]; + +/* avoid including CRT headers */ +#ifndef _O_BINARY +# define _O_BINARY 0x8000 +#endif + +#ifndef _S_IREAD +# define _S_IREAD 0x0100 +# define _S_IWRITE 0x0080 +#endif + +#include <pshpack1.h> + +struct CFHEADER +{ + UCHAR signature[4]; /* file signature */ + ULONG reserved1; /* reserved */ + ULONG cbCabinet; /* size of this cabinet file in bytes */ + ULONG reserved2; /* reserved */ + ULONG coffFiles; /* offset of the first CFFILE entry */ + ULONG reserved3; /* reserved */ + UCHAR versionMinor; /* cabinet file format version, minor */ + UCHAR versionMajor; /* cabinet file format version, major */ + USHORT cFolders; /* number of CFFOLDER entries in this cabinet */ + USHORT cFiles; /* number of CFFILE entries in this cabinet */ + USHORT flags; /* cabinet file option indicators */ + USHORT setID; /* must be the same for all cabinets in a set */ + USHORT iCabinet; /* number of this cabinet file in a set */ +#if 0 + USHORT cbCFHeader; /* (optional) size of per-cabinet reserved area */ + UCHAR cbCFFolder; /* (optional) size of per-folder reserved area */ + UCHAR cbCFData; /* (optional) size of per-datablock reserved area */ + UCHAR abReserve; /* (optional) per-cabinet reserved area */ + UCHAR szCabinetPrev; /* (optional) name of previous cabinet file */ + UCHAR szDiskPrev; /* (optional) name of previous disk */ + UCHAR szCabinetNext; /* (optional) name of next cabinet file */ + UCHAR szDiskNext; /* (optional) name of next disk */ +#endif +}; + +struct CFFOLDER +{ + ULONG coffCabStart; /* offset of the first CFDATA block in this folder */ + USHORT cCFData; /* number of CFDATA blocks in this folder */ + USHORT typeCompress; /* compression type indicator */ +#if 0 + UCHAR abReserve[]; /* (optional) per-folder reserved area */ +#endif +}; + +struct CFFILE +{ + ULONG cbFile; /* uncompressed size of this file in bytes */ + ULONG uoffFolderStart; /* uncompressed offset of this file in the folder */ + USHORT iFolder; /* index into the CFFOLDER area */ + USHORT date; /* date stamp for this file */ + USHORT time; /* time stamp for this file */ + USHORT attribs; /* attribute flags for this file */ +#if 0 + UCHAR szName[]; /* name of this file */ +#endif +}; + +struct CFDATA +{ + ULONG csum; /* checksum of this CFDATA entry */ + USHORT cbData; /* number of compressed bytes in this block */ + USHORT cbUncomp; /* number of uncompressed bytes in this block */ +#if 0 + UCHAR abReserve[]; /* (optional) per-datablock reserved area */ + UCHAR ab[cbData]; /* compressed data bytes */ +#endif +}; + +static const struct +{ + struct CFHEADER header; + struct CFFOLDER folder; + struct CFFILE file; + UCHAR szName[sizeof("file.dat")]; + struct CFDATA data; + UCHAR ab[sizeof("Hello World!")-1]; +} cab_data = +{ + { {'M','S','C','F'}, 0, 0x59, 0, sizeof(struct CFHEADER) + sizeof(struct CFFOLDER), 0, 3,1, 1, 1, 0, 0x1225, 0x2013 }, + { sizeof(struct CFHEADER) + sizeof(struct CFFOLDER) + sizeof(struct CFFILE) + sizeof("file.dat"), 1, tcompTYPE_NONE }, + { sizeof("Hello World!")-1, 0, 0, 0x1225, 0x2013, 0xa114 }, + { 'f','i','l','e','.','d','a','t',0 }, + { 0, sizeof("Hello World!")-1, sizeof("Hello World!")-1 }, + { 'H','e','l','l','o',' ','W','o','r','l','d','!' } +}; + +#include <poppack.h> + +struct mem_data +{ + const char *base; + LONG size, pos; +}; /* FDI callbacks */ @@ -440,8 +540,8 @@ DWORD attrs; BOOL res; - handle = CreateFile(pszName, GENERIC_READ, FILE_SHARE_READ, NULL, - OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL); + handle = CreateFileA(pszName, GENERIC_READ, FILE_SHARE_READ, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL); ok(handle != INVALID_HANDLE_VALUE, "Failed to CreateFile %s\n", pszName); @@ -451,7 +551,7 @@ FileTimeToLocalFileTime(&finfo.ftLastWriteTime, &filetime); FileTimeToDosDateTime(&filetime, pdate, ptime); - attrs = GetFileAttributes(pszName); + attrs = GetFileAttributesA(pszName); ok(attrs != INVALID_FILE_ATTRIBUTES, "Failed to GetFileAttributes\n"); /* fixme: should convert attrs to *pattribs, make sure * have a test that catches the fact that we don't? @@ -592,6 +692,120 @@ return 0; } +static INT_PTR CDECL fdi_mem_open(char *name, int oflag, int pmode) +{ + static const char expected[] = "memory\\block"; + struct mem_data *data; + + ok(!strcmp(name, expected), "expected %s, got %s\n", expected, name); + ok(oflag == _O_BINARY, "expected _O_BINARY, got %x\n", oflag); + ok(pmode == (_S_IREAD | _S_IWRITE), "expected _S_IREAD | _S_IWRITE, got %x\n", pmode); + + data = HeapAlloc(GetProcessHeap(), 0, sizeof(*data)); + if (!data) return -1; + + data->base = (const char *)&cab_data; + data->size = sizeof(cab_data); + data->pos = 0; + + trace("mem_open(%s,%x,%x) => %p\n", name, oflag, pmode, data); + return (INT_PTR)data; +} + +static UINT CDECL fdi_mem_read(INT_PTR hf, void *pv, UINT cb) +{ + struct mem_data *data = (struct mem_data *)hf; + UINT available, cb_read; + + available = data->size - data->pos; + cb_read = (available >= cb) ? cb : available; + + memcpy(pv, data->base + data->pos, cb_read); + data->pos += cb_read; + + /*trace("mem_read(%p,%p,%u) => %u\n", hf, pv, cb, cb_read);*/ + return cb_read; +} + +static UINT CDECL fdi_mem_write(INT_PTR hf, void *pv, UINT cb) +{ + static const char expected[12] = "Hello World!"; + + trace("mem_write(%#lx,%p,%u)\n", hf, pv, cb); + + ok(hf == 0x12345678, "expected 0x12345678, got %#lx\n", hf); + ok(cb == 12, "expected 12, got %u\n", cb); + ok(!memcmp(pv, expected, 12), "expected %s, got %s\n", expected, (const char *)pv); + + return cb; +} + +static int CDECL fdi_mem_close(INT_PTR hf) +{ + HeapFree(GetProcessHeap(), 0, (void *)hf); + return 0; +} + +static LONG CDECL fdi_mem_seek(INT_PTR hf, LONG dist, int seektype) +{ + struct mem_data *data = (struct mem_data *)hf; + + switch (seektype) + { + case SEEK_SET: + data->pos = dist; + break; + + case SEEK_CUR: + data->pos += dist; + break; + + case SEEK_END: + default: + ok(0, "seek: not expected type %d\n", seektype); + return -1; + } + + if (data->pos < 0) data->pos = 0; + if (data->pos > data->size) data->pos = data->size; + + /*mem_seek(%p,%d,%d) => %u\n", hf, dist, seektype, data->pos);*/ + return data->pos; +} + +static INT_PTR CDECL fdi_mem_notify(FDINOTIFICATIONTYPE fdint, FDINOTIFICATION *info) +{ + static const char expected[9] = "file.dat\0"; + + switch (fdint) + { + case fdintCLOSE_FILE_INFO: + trace("mem_notify: CLOSE_FILE_INFO %s, handle %#lx\n", info->psz1, info->hf); + + ok(!strcmp(info->psz1, expected), "expected %s, got %s\n", expected, info->psz1); + ok(info->date == 0x1225, "expected 0x1225, got %#x\n", info->date); + ok(info->time == 0x2013, "expected 0x2013, got %#x\n", info->time); + ok(info->attribs == 0xa114, "expected 0xa114, got %#x\n", info->attribs); + ok(info->iFolder == 0, "expected 0, got %#x\n", info->iFolder); + return 1; + + case fdintCOPY_FILE: + { + trace("mem_notify: COPY_FILE %s, %d bytes\n", info->psz1, info->cb); + + ok(info->cb == 12, "expected 12, got %u\n", info->cb); + ok(!strcmp(info->psz1, expected), "expected %s, got %s\n", expected, info->psz1); + return 0x12345678; /* call write() callback */ + } + + default: + trace("mem_notify(%d,%p)\n", fdint, info); + return 0; + } + + return 0; +} + static void test_FDICopy(void) { CCAB cabParams; @@ -601,6 +815,11 @@ BOOL ret; char name[] = "extract.cab"; char path[MAX_PATH + 1]; + char memory_block[] = "memory\\block"; + char memory[] = "memory\\"; + char block[] = "block"; + FDICABINETINFO info; + INT_PTR fd; set_cab_parameters(&cabParams); @@ -648,6 +867,30 @@ FDIDestroy(hfdi); DeleteFileA(name); + + /* test extracting from a memory block */ + hfdi = FDICreate(fdi_alloc, fdi_free, fdi_mem_open, fdi_mem_read, + fdi_mem_write, fdi_mem_close, fdi_mem_seek, cpuUNKNOWN, &erf); + ok(hfdi != NULL, "FDICreate error %d\n", erf.erfOper); + + fd = fdi_mem_open(memory_block, _O_BINARY, _S_IREAD | _S_IWRITE); + ok(fd != -1, "fdi_open failed\n"); + + memset(&info, 0, sizeof(info)); + ret = FDIIsCabinet(hfdi, fd, &info); + ok(ret, "FDIIsCabinet error %d\n", erf.erfOper); + ok(info.cbCabinet == 0x59, "expected 0x59, got %#x\n", info.cbCabinet); + ok(info.cFiles == 1, "expected 1, got %d\n", info.cFiles); + ok(info.cFolders == 1, "expected 1, got %d\n", info.cFolders); + ok(info.setID == 0x1225, "expected 0x1225, got %#x\n", info.setID); + ok(info.iCabinet == 0x2013, "expected 0x2013, got %#x\n", info.iCabinet); + + fdi_mem_close(fd); + + ret = FDICopy(hfdi, block, memory, 0, fdi_mem_notify, NULL, 0); + ok(ret, "FDICopy error %d\n", erf.erfOper); + + FDIDestroy(hfdi); }

10 years, 8 months

[akhaldi] 62874: [CABINET] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Apr 22 11:40:28 2014 New Revision: 62874 URL: http://svn.reactos.org/svn/reactos?rev=62874&view=rev Log: [CABINET] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/reactos/dll/win32/cabinet/CMakeLists.txt trunk/reactos/dll/win32/cabinet/fdi.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/cabinet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/cabinet/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cabinet/CMakeLists.txt [iso-8859-1] Tue Apr 22 11:40:28 2014 @@ -24,7 +24,5 @@ set_module_type(cabinet win32dll) target_link_libraries(cabinet wine zlib) add_importlibs(cabinet msvcrt kernel32 ntdll) - add_pch(cabinet cabinet.h SOURCE) -add_dependencies(cabinet psdk) add_cd_file(TARGET cabinet DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/cabinet/fdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/fdi.c?re… ============================================================================== --- trunk/reactos/dll/win32/cabinet/fdi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cabinet/fdi.c [iso-8859-1] Tue Apr 22 11:40:28 2014 @@ -525,70 +525,27 @@ PMORE_ISCAB_INFO pmii) { int num_folders, num_files, header_resv, folder_resv = 0; - LONG base_offset, cabsize; + LONG cabsize; USHORT setid, cabidx, flags; cab_UBYTE buf[64], block_resv; char *prevname = NULL, *previnfo = NULL, *nextname = NULL, *nextinfo = NULL; TRACE("(fdi == ^%p, hf == %ld, pfdici == ^%p)\n", fdi, hf, pfdici); - - /* - * FIXME: I just noticed that I am memorizing the initial file pointer - * offset and restoring it before reading in the rest of the header - * information in the cabinet. Perhaps that's correct -- that is, perhaps - * this API is supposed to support "streaming" cabinets which are embedded - * in other files, or cabinets which begin at file offsets other than zero. - * Otherwise, I should instead go to the absolute beginning of the file. - * (Either way, the semantics of wine's FDICopy require me to leave the - * file pointer where it is afterwards -- If Windows does not do so, we - * ought to duplicate the native behavior in the FDIIsCabinet API, not here. - * - * So, the answer lies in Windows; will native cabinet.dll recognize a - * cabinet "file" embedded in another file? Note that cabextract.c does - * support this, which implies that Microsoft's might. I haven't tried it - * yet so I don't know. ATM, most of wine's FDI cabinet routines (except - * this one) would not work in this way. To fix it, we could just make the - * various references to absolute file positions in the code relative to an - * initial "beginning" offset. Because the FDICopy API doesn't take a - * file-handle like this one, we would therein need to search through the - * file for the beginning of the cabinet (as we also do in cabextract.c). - * Note that this limits us to a maximum of one cabinet per. file: the first. - * - * So, in summary: either the code below is wrong, or the rest of fdi.c is - * wrong... I cannot imagine that both are correct ;) One of these flaws - * should be fixed after determining the behavior on Windows. We ought - * to check both FDIIsCabinet and FDICopy for the right behavior. - * - * -gmt - */ - - /* get basic offset & size info */ - base_offset = FDI_getoffset(fdi, hf); - - if (fdi->seek(hf, 0, SEEK_END) == -1) { - if (pmii) set_error( fdi, FDIERROR_NOT_A_CABINET, 0 ); - return FALSE; - } - - cabsize = FDI_getoffset(fdi, hf); - - if ((cabsize == -1) || (base_offset == -1) || - ( fdi->seek(hf, base_offset, SEEK_SET) == -1 )) { - if (pmii) set_error( fdi, FDIERROR_NOT_A_CABINET, 0 ); - return FALSE; - } /* read in the CFHEADER */ if (fdi->read(hf, buf, cfhead_SIZEOF) != cfhead_SIZEOF) { if (pmii) set_error( fdi, FDIERROR_NOT_A_CABINET, 0 ); return FALSE; } - + /* check basic MSCF signature */ if (EndGetI32(buf+cfhead_Signature) != 0x4643534d) { if (pmii) set_error( fdi, FDIERROR_NOT_A_CABINET, 0 ); return FALSE; } + + /* get the cabinet size */ + cabsize = EndGetI32(buf+cfhead_CabinetSize); /* get the number of folders */ num_folders = EndGetI16(buf+cfhead_NumFolders); @@ -2037,7 +1994,7 @@ FDICABINETINFO fdici; char emptystring = '\0'; cab_UBYTE buf2[64]; - int success = FALSE; + BOOL success = FALSE; struct fdi_folder *fol = NULL, *linkfol = NULL; struct fdi_file *file = NULL, *linkfile = NULL; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue Apr 22 11:40:28 2014 @@ -57,7 +57,7 @@ reactos/dll/win32/avifil32 # Synced to Wine-1.7.17 reactos/dll/win32/bcrypt # Synced to Wine-1.7.17 reactos/dll/win32/browseui # Out of sync -reactos/dll/win32/cabinet # Synced to Wine-1.7.1 +reactos/dll/win32/cabinet # Synced to Wine-1.7.17 reactos/dll/win32/clusapi # Synced to Wine-1.7.1 reactos/dll/win32/comcat # Synced to Wine-1.7.1 reactos/dll/win32/comctl32 # Synced to Wine 1.7.1

10 years, 8 months

[akhaldi] 62873: [BCRYPT_WINETEST] * Import from Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Apr 22 11:36:32 2014 New Revision: 62873 URL: http://svn.reactos.org/svn/reactos?rev=62873&view=rev Log: [BCRYPT_WINETEST] * Import from Wine 1.7.17. CORE-8080 Added: trunk/rostests/winetests/bcrypt/ (with props) trunk/rostests/winetests/bcrypt/CMakeLists.txt (with props) trunk/rostests/winetests/bcrypt/bcrypt.c (with props) trunk/rostests/winetests/bcrypt/testlist.c (with props) Modified: trunk/rostests/winetests/CMakeLists.txt Modified: trunk/rostests/winetests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?… ============================================================================== --- trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] Tue Apr 22 11:36:32 2014 @@ -8,6 +8,7 @@ add_subdirectory(atl100) add_subdirectory(atl80) add_subdirectory(avifil32) +add_subdirectory(bcrypt) add_subdirectory(browseui) add_subdirectory(cabinet) add_subdirectory(cmd) Propchange: trunk/rostests/winetests/bcrypt/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Tue Apr 22 11:36:32 2014 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/rostests/winetests/bcrypt/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/rostests/winetests/bcrypt/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Added: trunk/rostests/winetests/bcrypt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/bcrypt/CMakeLis… ============================================================================== --- trunk/rostests/winetests/bcrypt/CMakeLists.txt (added) +++ trunk/rostests/winetests/bcrypt/CMakeLists.txt [iso-8859-1] Tue Apr 22 11:36:32 2014 @@ -0,0 +1,5 @@ + +add_executable(bcrypt_winetest bcrypt.c testlist.c) +set_module_type(bcrypt_winetest win32cui) +add_importlibs(bcrypt_winetest user32 msvcrt kernel32) +add_cd_file(TARGET bcrypt_winetest DESTINATION reactos/bin FOR all) Propchange: trunk/rostests/winetests/bcrypt/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/bcrypt/bcrypt.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/bcrypt/bcrypt.c… ============================================================================== --- trunk/rostests/winetests/bcrypt/bcrypt.c (added) +++ trunk/rostests/winetests/bcrypt/bcrypt.c [iso-8859-1] Tue Apr 22 11:36:32 2014 @@ -0,0 +1,87 @@ +/* + * Unit test for bcrypt functions + * + * Copyright 2014 Bruno Jesus + * + * 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 <ntstatus.h> +#define WIN32_NO_STATUS +#include <windows.h> +#include <bcrypt.h> + +#include "wine/test.h" + +static NTSTATUS (WINAPI *pBCryptGenRandom)(BCRYPT_ALG_HANDLE hAlgorithm, PUCHAR pbBuffer, + ULONG cbBuffer, ULONG dwFlags); + +static BOOL Init(void) +{ + HMODULE hbcrypt = LoadLibraryA("bcrypt.dll"); + if (!hbcrypt) + { + win_skip("bcrypt library not available\n"); + return FALSE; + } + + pBCryptGenRandom = (void *)GetProcAddress(hbcrypt, "BCryptGenRandom"); + + return TRUE; +} + +static void test_BCryptGenRandom(void) +{ + NTSTATUS ret; + UCHAR buffer[256]; + + if (!pBCryptGenRandom) + { + win_skip("BCryptGenRandom is not available\n"); + return; + } + + ret = pBCryptGenRandom(NULL, NULL, 0, 0); + ok(ret == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got 0x%x\n", ret); + ret = pBCryptGenRandom(NULL, buffer, 0, 0); + ok(ret == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got 0x%x\n", ret); + ret = pBCryptGenRandom(NULL, buffer, sizeof(buffer), 0); + ok(ret == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got 0x%x\n", ret); + ret = pBCryptGenRandom(NULL, buffer, sizeof(buffer), BCRYPT_USE_SYSTEM_PREFERRED_RNG); + ok(ret == STATUS_SUCCESS, "Expected success, got 0x%x\n", ret); + ret = pBCryptGenRandom(NULL, buffer, sizeof(buffer), + BCRYPT_USE_SYSTEM_PREFERRED_RNG|BCRYPT_RNG_USE_ENTROPY_IN_BUFFER); + ok(ret == STATUS_SUCCESS, "Expected success, got 0x%x\n", ret); + ret = pBCryptGenRandom(NULL, NULL, sizeof(buffer), BCRYPT_USE_SYSTEM_PREFERRED_RNG); + ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got 0x%x\n", ret); + + /* Zero sized buffer should work too */ + ret = pBCryptGenRandom(NULL, buffer, 0, BCRYPT_USE_SYSTEM_PREFERRED_RNG); + ok(ret == STATUS_SUCCESS, "Expected success, got 0x%x\n", ret); + + /* Test random number generation - It's impossible for a sane RNG to return 8 zeros */ + memset(buffer, 0, 16); + ret = pBCryptGenRandom(NULL, buffer, 8, BCRYPT_USE_SYSTEM_PREFERRED_RNG); + ok(ret == STATUS_SUCCESS, "Expected success, got 0x%x\n", ret); + ok(memcmp(buffer, buffer + 8, 8), "Expected a random number, got 0\n"); +} + +START_TEST(bcrypt) +{ + if (!Init()) + return; + + test_BCryptGenRandom(); +} Propchange: trunk/rostests/winetests/bcrypt/bcrypt.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/bcrypt/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/bcrypt/testlist… ============================================================================== --- trunk/rostests/winetests/bcrypt/testlist.c (added) +++ trunk/rostests/winetests/bcrypt/testlist.c [iso-8859-1] Tue Apr 22 11:36:32 2014 @@ -0,0 +1,12 @@ +/* Automatically generated; DO NOT EDIT!! */ + +#define STANDALONE +#include <wine/test.h> + +extern void func_bcrypt(void); + +const struct test winetest_testlist[] = +{ + { "bcrypt", func_bcrypt }, + { 0, 0 } +}; Propchange: trunk/rostests/winetests/bcrypt/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native

10 years, 8 months

[akhaldi] 62872: [BCRYPT] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Apr 22 11:36:10 2014 New Revision: 62872 URL: http://svn.reactos.org/svn/reactos?rev=62872&view=rev Log: [BCRYPT] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/reactos/dll/win32/bcrypt/CMakeLists.txt trunk/reactos/dll/win32/bcrypt/bcrypt.spec trunk/reactos/dll/win32/bcrypt/bcrypt_main.c trunk/reactos/include/psdk/bcrypt.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/bcrypt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/bcrypt/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/bcrypt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/bcrypt/CMakeLists.txt [iso-8859-1] Tue Apr 22 11:36:10 2014 @@ -12,5 +12,5 @@ add_library(bcrypt SHARED ${SOURCE}) set_module_type(bcrypt win32dll) target_link_libraries(bcrypt wine) -add_importlibs(bcrypt msvcrt kernel32 ntdll) +add_importlibs(bcrypt advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET bcrypt DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/bcrypt/bcrypt.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/bcrypt/bcrypt.sp… ============================================================================== --- trunk/reactos/dll/win32/bcrypt/bcrypt.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/bcrypt/bcrypt.spec [iso-8859-1] Tue Apr 22 11:36:10 2014 @@ -24,7 +24,7 @@ @ stub BCryptFinalizeKeyPair @ stub BCryptFinishHash @ stub BCryptFreeBuffer -@ stub BCryptGenRandom +@ stdcall BCryptGenRandom(ptr ptr long long) @ stub BCryptGenerateKeyPair @ stub BCryptGenerateSymmetricKey @ stub BCryptGetFipsAlgorithmMode Modified: trunk/reactos/dll/win32/bcrypt/bcrypt_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/bcrypt/bcrypt_ma… ============================================================================== --- trunk/reactos/dll/win32/bcrypt/bcrypt_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/bcrypt/bcrypt_main.c [iso-8859-1] Tue Apr 22 11:36:10 2014 @@ -17,16 +17,16 @@ * */ +#include <wine/config.h> + +#include <ntstatus.h> #define WIN32_NO_STATUS -#include <config.h> -//#include "wine/port.h" #include <wine/debug.h> #include <winbase.h> +#include <ntsecapi.h> #include <bcrypt.h> - -typedef LONG NTSTATUS; WINE_DEFAULT_DEBUG_CHANNEL(bcrypt); @@ -52,5 +52,41 @@ *ppAlgList=NULL; *pAlgCount=0; - return ERROR_CALL_NOT_IMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } + +NTSTATUS WINAPI BCryptGenRandom(BCRYPT_ALG_HANDLE algorithm, UCHAR *buffer, ULONG count, ULONG flags) +{ + const DWORD supported_flags = BCRYPT_USE_SYSTEM_PREFERRED_RNG; + TRACE("%p, %p, %u, %08x - semi-stub\n", algorithm, buffer, count, flags); + + if (!algorithm) + { + /* It's valid to call without an algorithm if BCRYPT_USE_SYSTEM_PREFERRED_RNG + * is set. In this case the preferred system RNG is used. + */ + if (!(flags & BCRYPT_USE_SYSTEM_PREFERRED_RNG)) + return STATUS_INVALID_HANDLE; + } + if (!buffer) + return STATUS_INVALID_PARAMETER; + + if (flags & ~supported_flags) + FIXME("unsupported flags %08x\n", flags & ~supported_flags); + + if (algorithm) + FIXME("ignoring selected algorithm\n"); + + /* When zero bytes are requested the function returns success too. */ + if (!count) + return STATUS_SUCCESS; + + if (flags & BCRYPT_USE_SYSTEM_PREFERRED_RNG) + { + if (RtlGenRandom(buffer, count)) + return STATUS_SUCCESS; + } + + FIXME("called with unsupported parameters, returning error\n"); + return STATUS_NOT_IMPLEMENTED; +} Modified: trunk/reactos/include/psdk/bcrypt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/bcrypt.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/bcrypt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/bcrypt.h [iso-8859-1] Tue Apr 22 11:36:10 2014 @@ -35,6 +35,10 @@ #define OPTIONAL #endif +#ifndef _NTDEF_ +typedef _Return_type_success_(return >= 0) LONG NTSTATUS; +#endif + typedef struct _BCRYPT_ALGORITHM_IDENTIFIER { LPWSTR pszName; @@ -42,4 +46,9 @@ ULONG dwFlags; } BCRYPT_ALGORITHM_IDENTIFIER; +typedef PVOID BCRYPT_ALG_HANDLE; + +#define BCRYPT_RNG_USE_ENTROPY_IN_BUFFER 0x00000001 +#define BCRYPT_USE_SYSTEM_PREFERRED_RNG 0x00000002 + #endif /* __WINE_BCRYPT_H */ Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue Apr 22 11:36:10 2014 @@ -55,7 +55,7 @@ reactos/dll/win32/atl100 # Synced to Wine-1.7.1 reactos/dll/win32/atl80 # Synced to Wine-1.7.1 reactos/dll/win32/avifil32 # Synced to Wine-1.7.17 -reactos/dll/win32/bcrypt # Synced to Wine-1.7.1 +reactos/dll/win32/bcrypt # Synced to Wine-1.7.17 reactos/dll/win32/browseui # Out of sync reactos/dll/win32/cabinet # Synced to Wine-1.7.1 reactos/dll/win32/clusapi # Synced to Wine-1.7.1

10 years, 8 months

[akhaldi] 62871: [AVIFIL32_WINETEST] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Apr 22 11:32:05 2014 New Revision: 62871 URL: http://svn.reactos.org/svn/reactos?rev=62871&view=rev Log: [AVIFIL32_WINETEST] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/rostests/winetests/avifil32/CMakeLists.txt trunk/rostests/winetests/avifil32/api.c Modified: trunk/rostests/winetests/avifil32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/avifil32/CMakeL… ============================================================================== --- trunk/rostests/winetests/avifil32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/avifil32/CMakeLists.txt [iso-8859-1] Tue Apr 22 11:32:05 2014 @@ -1,7 +1,5 @@ -add_definitions(-D__ROS_LONG64__) add_executable(avifil32_winetest api.c testlist.c) -target_link_libraries(avifil32_winetest wine) set_module_type(avifil32_winetest win32cui) add_importlibs(avifil32_winetest avifil32 ole32 msvcrt kernel32) add_cd_file(TARGET avifil32_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/avifil32/api.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/avifil32/api.c?… ============================================================================== --- trunk/rostests/winetests/avifil32/api.c [iso-8859-1] (original) +++ trunk/rostests/winetests/avifil32/api.c [iso-8859-1] Tue Apr 22 11:32:05 2014 @@ -33,6 +33,7 @@ /* ########################### */ +DEFINE_AVIGUID(CLSID_WAVFile, 0x00020003, 0, 0); static const CHAR winetest0[] = "winetest0"; static const CHAR winetest1[] = "winetest1"; static const CHAR testfilename[] = "wine_avifil32_test.avi"; @@ -230,38 +231,38 @@ { PAVISTREAM stream = NULL; HRESULT hres; - AVISTREAMINFO info, info2; + AVISTREAMINFOA info, info2; hres = CreateEditableStream(&stream, NULL); ok(hres == AVIERR_OK, "got 0x%08X, expected AVIERR_OK\n", hres); /* Size parameter is somehow checked (notice the crash with size=-1 below) */ - hres = EditStreamSetInfo(stream, NULL, 0); + hres = EditStreamSetInfoA(stream, NULL, 0); ok( hres == AVIERR_BADSIZE, "got 0x%08X, expected AVIERR_BADSIZE\n", hres); - hres = EditStreamSetInfo(stream, NULL, sizeof(AVISTREAMINFO)-1 ); + hres = EditStreamSetInfoA(stream, NULL, sizeof(AVISTREAMINFOA)-1 ); ok( hres == AVIERR_BADSIZE, "got 0x%08X, expected AVIERR_BADSIZE\n", hres); if(0) { /* Crashing - first parameter not checked */ - EditStreamSetInfo(NULL, &info, sizeof(AVISTREAMINFO) ); + EditStreamSetInfoA(NULL, &info, sizeof(info) ); /* Crashing - second parameter not checked */ - EditStreamSetInfo(stream, NULL, sizeof(AVISTREAMINFO) ); - - EditStreamSetInfo(stream, NULL, -1); + EditStreamSetInfoA(stream, NULL, sizeof(AVISTREAMINFOA) ); + + EditStreamSetInfoA(stream, NULL, -1); } - hres = AVIStreamInfo(stream, &info, sizeof(AVISTREAMINFO) ); + hres = AVIStreamInfoA(stream, &info, sizeof(info) ); ok( hres == 0, "got 0x%08X, expected 0\n", hres); /* Does the function check what's it's updating ? */ #define IS_INFO_UPDATED(m) do { \ - hres = EditStreamSetInfo(stream, &info, sizeof(AVISTREAMINFO) ); \ + hres = EditStreamSetInfoA(stream, &info, sizeof(info) ); \ ok( hres == 0, "got 0x%08X, expected 0\n", hres); \ - hres = AVIStreamInfo(stream, &info2, sizeof(AVISTREAMINFO) ); \ + hres = AVIStreamInfoA(stream, &info2, sizeof(info2) ); \ ok( hres == 0, "got 0x%08X, expected 0\n", hres); \ ok( info2.m == info.m, "EditStreamSetInfo did not update "#m" parameter\n" ); \ } while(0) @@ -336,7 +337,7 @@ HANDLE hFile; DWORD written; - hFile = CreateFile(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + hFile = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); ok(hFile != INVALID_HANDLE_VALUE, "Couldn't create file\n"); @@ -364,17 +365,16 @@ LONG lSize; PAVISTREAM pStream0; PAVISTREAM pStream1; - AVISTREAMINFO asi0; - AVISTREAMINFO asi1; + AVISTREAMINFOA asi0, asi1; WAVEFORMATEX wfx; - GetTempPath(MAX_PATH, filename); + GetTempPathA(MAX_PATH, filename); strcpy(filename+strlen(filename), testfilename); init_test_struct(&cah); create_avi_file(&cah, filename); - res = AVIFileOpen(&pFile, filename, OF_SHARE_DENY_WRITE, 0L); + res = AVIFileOpenA(&pFile, filename, OF_SHARE_DENY_WRITE, 0L); ok(res != AVIERR_BADFORMAT, "Unable to open file: error1=%u\n", AVIERR_BADFORMAT); ok(res != AVIERR_MEMORY, "Unable to open file: error2=%u\n", AVIERR_MEMORY); ok(res != AVIERR_FILEREAD, "Unable to open file: error3=%u\n", AVIERR_FILEREAD); @@ -388,10 +388,10 @@ res = AVIFileGetStream(pFile, &pStream1, 0, 1); ok(res == 0, "Unable to open audio stream: error=%u\n", res); - res = AVIStreamInfo(pStream0, &asi0, sizeof(AVISTREAMINFO)); + res = AVIStreamInfoA(pStream0, &asi0, sizeof(asi0)); ok(res == 0, "Unable to read stream info: error=%u\n", res); - res = AVIStreamInfo(pStream1, &asi1, sizeof(AVISTREAMINFO)); + res = AVIStreamInfoA(pStream1, &asi1, sizeof(asi1)); ok(res == 0, "Unable to read stream info: error=%u\n", res); res = AVIStreamReadFormat(pStream0, AVIStreamStart(pStream1), NULL, &lSize); @@ -450,7 +450,7 @@ AVIStreamRelease(pStream0); AVIStreamRelease(pStream1); AVIFileRelease(pFile); - ok(DeleteFile(filename) !=0, "Deleting file %s failed\n", filename); + ok(DeleteFileA(filename) !=0, "Deleting file %s failed\n", filename); } static void test_amh_corruption(void) @@ -460,7 +460,7 @@ PAVIFILE pFile; int res; - GetTempPath(MAX_PATH, filename); + GetTempPathA(MAX_PATH, filename); strcpy(filename+strlen(filename), testfilename); /* Make sure only AVI files with the proper headers will be loaded */ @@ -468,10 +468,10 @@ cah.fh[3] = mmioFOURCC('A', 'V', 'i', ' '); create_avi_file(&cah, filename); - res = AVIFileOpen(&pFile, filename, OF_SHARE_DENY_WRITE, 0L); + res = AVIFileOpenA(&pFile, filename, OF_SHARE_DENY_WRITE, 0L); ok(res != 0, "Able to open file: error=%u\n", res); - ok(DeleteFile(filename) !=0, "Deleting file %s failed\n", filename); + ok(DeleteFileA(filename) !=0, "Deleting file %s failed\n", filename); } static void test_ash1_corruption(void) @@ -481,9 +481,9 @@ PAVIFILE pFile; int res; PAVISTREAM pStream1; - AVISTREAMINFO asi1; - - GetTempPath(MAX_PATH, filename); + AVISTREAMINFOA asi1; + + GetTempPathA(MAX_PATH, filename); strcpy(filename+strlen(filename), testfilename); /* Corrupt the sample size in the audio stream header */ @@ -492,13 +492,13 @@ create_avi_file(&cah, filename); - res = AVIFileOpen(&pFile, filename, OF_SHARE_DENY_WRITE, 0L); + res = AVIFileOpenA(&pFile, filename, OF_SHARE_DENY_WRITE, 0L); ok(res == 0, "Unable to open file: error=%u\n", res); res = AVIFileGetStream(pFile, &pStream1, 0, 1); ok(res == 0, "Unable to open audio stream: error=%u\n", res); - res = AVIStreamInfo(pStream1, &asi1, sizeof(AVISTREAMINFO)); + res = AVIStreamInfoA(pStream1, &asi1, sizeof(asi1)); ok(res == 0, "Unable to read stream info: error=%u\n", res); /* The result will still be 2, because the value is dynamically replaced with the nBlockAlign @@ -507,7 +507,7 @@ AVIStreamRelease(pStream1); AVIFileRelease(pFile); - ok(DeleteFile(filename) !=0, "Deleting file %s failed\n", filename); + ok(DeleteFileA(filename) !=0, "Deleting file %s failed\n", filename); } static void test_ash1_corruption2(void) @@ -517,9 +517,9 @@ PAVIFILE pFile; int res; PAVISTREAM pStream1; - AVISTREAMINFO asi1; - - GetTempPath(MAX_PATH, filename); + AVISTREAMINFOA asi1; + + GetTempPathA(MAX_PATH, filename); strcpy(filename+strlen(filename), testfilename); /* Corrupt the block alignment in the audio format header */ @@ -528,20 +528,20 @@ create_avi_file(&cah, filename); - res = AVIFileOpen(&pFile, filename, OF_SHARE_DENY_WRITE, 0L); + res = AVIFileOpenA(&pFile, filename, OF_SHARE_DENY_WRITE, 0L); ok(res == 0, "Unable to open file: error=%u\n", res); res = AVIFileGetStream(pFile, &pStream1, 0, 1); ok(res == 0, "Unable to open audio stream: error=%u\n", res); - ok(AVIStreamInfo(pStream1, &asi1, sizeof(AVISTREAMINFO)) == 0, "Unable to read stream info\n"); + ok(AVIStreamInfoA(pStream1, &asi1, sizeof(asi1)) == 0, "Unable to read stream info\n"); /* The result will also be the corrupt value, as explained above. */ ok(asi1.dwSampleSize == 0xdead, "got 0x%x (expected 0xdead)\n", asi1.dwSampleSize); AVIStreamRelease(pStream1); AVIFileRelease(pFile); - ok(DeleteFile(filename) !=0, "Deleting file %s failed\n", filename); + ok(DeleteFileA(filename) !=0, "Deleting file %s failed\n", filename); } /* Outer IUnknown for COM aggregation tests */ @@ -653,6 +653,67 @@ while (IAVIFile_Release(avif)); } +static void test_COM_wavfile(void) +{ + struct unk_impl unk_obj = {{&unk_vtbl}, 19, NULL}; + IAVIFile *avif = NULL; + IPersistFile *pf; + IAVIStream *avis; + IUnknown *unk; + ULONG refcount; + HRESULT hr; + + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_WAVFile, &unk_obj.IUnknown_iface, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&unk_obj.inner_unk); + ok(hr == S_OK, "COM aggregation failed: %08x, expected S_OK\n", hr); + hr = IUnknown_QueryInterface(&unk_obj.IUnknown_iface, &IID_IAVIFile, (void**)&avif); + ok(hr == S_OK, "QueryInterface for IID_IAVIFile failed: %08x\n", hr); + refcount = IAVIFile_AddRef(avif); + ok(refcount == unk_obj.ref, "WAVFile just pretends to support COM aggregation\n"); + refcount = IAVIFile_Release(avif); + ok(refcount == unk_obj.ref, "WAVFile just pretends to support COM aggregation\n"); + hr = IAVIFile_QueryInterface(avif, &IID_IPersistFile, (void**)&pf); + ok(hr == S_OK, "QueryInterface for IID_IPersistFile failed: %08x\n", hr); + refcount = IPersistFile_Release(pf); + ok(refcount == unk_obj.ref, "WAVFile just pretends to support COM aggregation\n"); + refcount = IAVIFile_Release(avif); + ok(refcount == 19, "Outer ref count should be back at 19 but is %d\n", refcount); + refcount = IUnknown_Release(unk_obj.inner_unk); + ok(refcount == 0, "Inner ref count should be 0 but is %u\n", refcount); + + /* Invalid RIID */ + hr = CoCreateInstance(&CLSID_WAVFile, NULL, CLSCTX_INPROC_SERVER, &IID_IAVIStreaming, + (void**)&avif); + ok(hr == E_NOINTERFACE, "WAVFile create failed: %08x, expected E_NOINTERFACE\n", hr); + + /* Same refcount for all WAVFile interfaces */ + hr = CoCreateInstance(&CLSID_WAVFile, NULL, CLSCTX_INPROC_SERVER, &IID_IAVIFile, (void**)&avif); + ok(hr == S_OK, "WAVFile create failed: %08x, expected S_OK\n", hr); + refcount = IAVIFile_AddRef(avif); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = IAVIFile_QueryInterface(avif, &IID_IPersistFile, (void**)&pf); + ok(hr == S_OK, "QueryInterface for IID_IPersistFile failed: %08x\n", hr); + refcount = IPersistFile_AddRef(pf); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IPersistFile_Release(pf); + + hr = IAVIFile_QueryInterface(avif, &IID_IAVIStream, (void**)&avis); + ok(hr == S_OK, "QueryInterface for IID_IAVIStream failed: %08x\n", hr); + refcount = IAVIStream_AddRef(avis); + ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + refcount = IAVIStream_Release(avis); + + hr = IAVIFile_QueryInterface(avif, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 6, "refcount == %u, expected 6\n", refcount); + refcount = IUnknown_Release(unk); + + while (IAVIFile_Release(avif)); +} + START_TEST(api) { @@ -664,6 +725,7 @@ test_ash1_corruption(); test_ash1_corruption2(); test_COM(); + test_COM_wavfile(); AVIFileExit(); }

10 years, 8 months

[akhaldi] 62870: [AVIFIL32] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Apr 22 11:31:44 2014 New Revision: 62870 URL: http://svn.reactos.org/svn/reactos?rev=62870&view=rev Log: [AVIFIL32] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/reactos/dll/win32/avifil32/api.c trunk/reactos/dll/win32/avifil32/avifil32.idl trunk/reactos/dll/win32/avifil32/avifile.c trunk/reactos/dll/win32/avifil32/avifile_private.h trunk/reactos/dll/win32/avifil32/factory.c trunk/reactos/dll/win32/avifil32/icmstream.c trunk/reactos/dll/win32/avifil32/wavfile.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/avifil32/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/api.c?r… ============================================================================== --- trunk/reactos/dll/win32/avifil32/api.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/api.c [iso-8859-1] Tue Apr 22 11:31:44 2014 @@ -1493,7 +1493,7 @@ HRESULT hr; int len; - TRACE("%s,%p,%p,%d,%p,%p)\n", debugstr_a(szFile), pclsidHandler, + TRACE("(%s,%p,%p,%d,%p,%p)\n", debugstr_a(szFile), pclsidHandler, lpfnCallback, nStream, ppavi, plpOptions); if (szFile == NULL || ppavi == NULL || plpOptions == NULL) Modified: trunk/reactos/dll/win32/avifil32/avifil32.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifil3… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifil32.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifil32.idl [iso-8859-1] Tue Apr 22 11:31:44 2014 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#pragma makedep register [ helpstring("Microsoft AVI Files"), Modified: trunk/reactos/dll/win32/avifil32/avifile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile.c [iso-8859-1] Tue Apr 22 11:31:44 2014 @@ -36,46 +36,12 @@ #define IDX_PER_BLOCK 2730 #endif -static HRESULT WINAPI IAVIStream_fnQueryInterface(IAVIStream*iface,REFIID refiid,LPVOID *obj); -static ULONG WINAPI IAVIStream_fnAddRef(IAVIStream*iface); -static ULONG WINAPI IAVIStream_fnRelease(IAVIStream* iface); -static HRESULT WINAPI IAVIStream_fnCreate(IAVIStream*iface,LPARAM lParam1,LPARAM lParam2); -static HRESULT WINAPI IAVIStream_fnInfo(IAVIStream*iface,AVISTREAMINFOW *psi,LONG size); -static LONG WINAPI IAVIStream_fnFindSample(IAVIStream*iface,LONG pos,LONG flags); -static HRESULT WINAPI IAVIStream_fnReadFormat(IAVIStream*iface,LONG pos,LPVOID format,LONG *formatsize); -static HRESULT WINAPI IAVIStream_fnSetFormat(IAVIStream*iface,LONG pos,LPVOID format,LONG formatsize); -static HRESULT WINAPI IAVIStream_fnRead(IAVIStream*iface,LONG start,LONG samples,LPVOID buffer,LONG buffersize,LONG *bytesread,LONG *samplesread); -static HRESULT WINAPI IAVIStream_fnWrite(IAVIStream*iface,LONG start,LONG samples,LPVOID buffer,LONG buffersize,DWORD flags,LONG *sampwritten,LONG *byteswritten); -static HRESULT WINAPI IAVIStream_fnDelete(IAVIStream*iface,LONG start,LONG samples); -static HRESULT WINAPI IAVIStream_fnReadData(IAVIStream*iface,DWORD fcc,LPVOID lp,LONG *lpread); -static HRESULT WINAPI IAVIStream_fnWriteData(IAVIStream*iface,DWORD fcc,LPVOID lp,LONG size); -static HRESULT WINAPI IAVIStream_fnSetInfo(IAVIStream*iface,AVISTREAMINFOW*info,LONG infolen); - -static const struct IAVIStreamVtbl iavist = { - IAVIStream_fnQueryInterface, - IAVIStream_fnAddRef, - IAVIStream_fnRelease, - IAVIStream_fnCreate, - IAVIStream_fnInfo, - IAVIStream_fnFindSample, - IAVIStream_fnReadFormat, - IAVIStream_fnSetFormat, - IAVIStream_fnRead, - IAVIStream_fnWrite, - IAVIStream_fnDelete, - IAVIStream_fnReadData, - IAVIStream_fnWriteData, - IAVIStream_fnSetInfo -}; - typedef struct _IAVIFileImpl IAVIFileImpl; typedef struct _IAVIStreamImpl { - /* IUnknown stuff */ - const IAVIStreamVtbl *lpVtbl; - LONG ref; - - /* IAVIStream stuff */ + IAVIStream IAVIStream_iface; + LONG ref; + IAVIFileImpl *paf; DWORD nStream; /* the n-th stream in file */ AVISTREAMINFOW sInfo; @@ -98,6 +64,11 @@ AVIINDEXENTRY *idxFmtChanges; DWORD nIdxFmtChanges; /* upper index limit of idxFmtChanges */ } IAVIStreamImpl; + +static inline IAVIStreamImpl *impl_from_IAVIStream(IAVIStream *iface) +{ + return CONTAINING_RECORD(iface, IAVIStreamImpl, IAVIStream_iface); +} struct _IAVIFileImpl { IUnknown IUnknown_inner; @@ -319,7 +290,7 @@ /* Does the requested stream exist? */ if (nStream < This->fInfo.dwStreams && This->ppStreams[nStream] != NULL) { - *avis = (PAVISTREAM)This->ppStreams[nStream]; + *avis = &This->ppStreams[nStream]->IAVIStream_iface; IAVIStream_AddRef(*avis); return AVIERR_OK; @@ -376,7 +347,7 @@ AVIFILE_UpdateInfo(This); /* return it */ - *avis = (PAVISTREAM)This->ppStreams[n]; + *avis = &This->ppStreams[n]->IAVIStream_iface; IAVIStream_AddRef(*avis); return AVIERR_OK; @@ -679,31 +650,35 @@ } -static HRESULT WINAPI IAVIStream_fnQueryInterface(IAVIStream *iface, - REFIID refiid, LPVOID *obj) -{ - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; - - TRACE("(%p,%s,%p)\n", iface, debugstr_guid(refiid), obj); - - if (IsEqualGUID(&IID_IUnknown, refiid) || - IsEqualGUID(&IID_IAVIStream, refiid)) { - *obj = This; +static HRESULT WINAPI IAVIStream_fnQueryInterface(IAVIStream *iface, REFIID riid, void **ppv) +{ + IAVIStreamImpl *This = impl_from_IAVIStream(iface); + + TRACE("(%p,%s,%p)\n", This, debugstr_guid(riid), ppv); + + if (!ppv) { + WARN("invalid parameter\n"); + return E_INVALIDARG; + } + *ppv = NULL; + + if (IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IAVIStream, riid)) { + *ppv = iface; IAVIStream_AddRef(iface); return S_OK; } /* FIXME: IAVIStreaming interface */ - return OLE_E_ENUM_NOMORE; + return E_NOINTERFACE; } static ULONG WINAPI IAVIStream_fnAddRef(IAVIStream *iface) { - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + IAVIStreamImpl *This = impl_from_IAVIStream(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) -> %d\n", iface, ref); + TRACE("(%p) ref=%d\n", This, ref); /* also add ref to parent, so that it doesn't kill us */ if (This->paf != NULL) @@ -712,12 +687,12 @@ return ref; } -static ULONG WINAPI IAVIStream_fnRelease(IAVIStream* iface) -{ - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; +static ULONG WINAPI IAVIStream_fnRelease(IAVIStream *iface) +{ + IAVIStreamImpl *This = impl_from_IAVIStream(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) -> %d\n", iface, ref); + TRACE("(%p) ref=%d\n", This, ref); if (This->paf != NULL) IAVIFile_Release(&This->paf->IAVIFile_iface); @@ -725,8 +700,7 @@ return ref; } -static HRESULT WINAPI IAVIStream_fnCreate(IAVIStream *iface, LPARAM lParam1, - LPARAM lParam2) +static HRESULT WINAPI IAVIStream_fnCreate(IAVIStream *iface, LPARAM lParam1, LPARAM lParam2) { TRACE("(%p,0x%08lX,0x%08lX)\n", iface, lParam1, lParam2); @@ -734,10 +708,9 @@ return AVIERR_UNSUPPORTED; } -static HRESULT WINAPI IAVIStream_fnInfo(IAVIStream *iface,LPAVISTREAMINFOW psi, - LONG size) -{ - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; +static HRESULT WINAPI IAVIStream_fnInfo(IAVIStream *iface, AVISTREAMINFOW *psi, LONG size) +{ + IAVIStreamImpl *This = impl_from_IAVIStream(iface); TRACE("(%p,%p,%d)\n", iface, psi, size); @@ -753,11 +726,9 @@ return AVIERR_OK; } -static LONG WINAPI IAVIStream_fnFindSample(IAVIStream *iface, LONG pos, - LONG flags) -{ - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; - +static LONG WINAPI IAVIStream_fnFindSample(IAVIStream *iface, LONG pos, LONG flags) +{ + IAVIStreamImpl *This = impl_from_IAVIStream(iface); LONG offset = 0; TRACE("(%p,%d,0x%08X)\n",iface,pos,flags); @@ -853,10 +824,10 @@ return pos; } -static HRESULT WINAPI IAVIStream_fnReadFormat(IAVIStream *iface, LONG pos, - LPVOID format, LONG *formatsize) -{ - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; +static HRESULT WINAPI IAVIStream_fnReadFormat(IAVIStream *iface, LONG pos, void *format, + LONG *formatsize) +{ + IAVIStreamImpl *This = impl_from_IAVIStream(iface); TRACE("(%p,%d,%p,%p)\n", iface, pos, format, formatsize); @@ -892,12 +863,11 @@ return AVIERR_OK; } -static HRESULT WINAPI IAVIStream_fnSetFormat(IAVIStream *iface, LONG pos, - LPVOID format, LONG formatsize) -{ - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; - - LPBITMAPINFOHEADER lpbiNew = format; +static HRESULT WINAPI IAVIStream_fnSetFormat(IAVIStream *iface, LONG pos, void *format, + LONG formatsize) +{ + IAVIStreamImpl *This = impl_from_IAVIStream(iface); + BITMAPINFOHEADER *lpbiNew = format; TRACE("(%p,%d,%p,%d)\n", iface, pos, format, formatsize); @@ -1001,15 +971,12 @@ } } -static HRESULT WINAPI IAVIStream_fnRead(IAVIStream *iface, LONG start, - LONG samples, LPVOID buffer, - LONG buffersize, LPLONG bytesread, - LPLONG samplesread) -{ - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; - - DWORD size; - HRESULT hr; +static HRESULT WINAPI IAVIStream_fnRead(IAVIStream *iface, LONG start, LONG samples, void *buffer, + LONG buffersize, LONG *bytesread, LONG *samplesread) +{ + IAVIStreamImpl *This = impl_from_IAVIStream(iface); + DWORD size; + HRESULT hr; TRACE("(%p,%d,%d,%p,%d,%p,%p)\n", iface, start, samples, buffer, buffersize, bytesread, samplesread); @@ -1123,15 +1090,11 @@ } } -static HRESULT WINAPI IAVIStream_fnWrite(IAVIStream *iface, LONG start, - LONG samples, LPVOID buffer, - LONG buffersize, DWORD flags, - LPLONG sampwritten, - LPLONG byteswritten) -{ - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; - - FOURCC ckid; +static HRESULT WINAPI IAVIStream_fnWrite(IAVIStream *iface, LONG start, LONG samples, void *buffer, + LONG buffersize, DWORD flags, LONG *sampwritten, LONG *byteswritten) +{ + IAVIStreamImpl *This = impl_from_IAVIStream(iface); + FOURCC ckid; HRESULT hr; TRACE("(%p,%d,%d,%p,%d,0x%08X,%p,%p)\n", iface, start, samples, @@ -1217,10 +1180,9 @@ return hr; } -static HRESULT WINAPI IAVIStream_fnDelete(IAVIStream *iface, LONG start, - LONG samples) -{ - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; +static HRESULT WINAPI IAVIStream_fnDelete(IAVIStream *iface, LONG start, LONG samples) +{ + IAVIStreamImpl *This = impl_from_IAVIStream(iface); FIXME("(%p,%d,%d): stub\n", iface, start, samples); @@ -1256,10 +1218,9 @@ return AVIERR_UNSUPPORTED; } -static HRESULT WINAPI IAVIStream_fnReadData(IAVIStream *iface, DWORD fcc, - LPVOID lp, LPLONG lpread) -{ - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; +static HRESULT WINAPI IAVIStream_fnReadData(IAVIStream *iface, DWORD fcc, void *lp, LONG *lpread) +{ + IAVIStreamImpl *This = impl_from_IAVIStream(iface); TRACE("(%p,0x%08X,%p,%p)\n", iface, fcc, lp, lpread); @@ -1280,10 +1241,9 @@ return ReadExtraChunk(&This->extra, fcc, lp, lpread); } -static HRESULT WINAPI IAVIStream_fnWriteData(IAVIStream *iface, DWORD fcc, - LPVOID lp, LONG size) -{ - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; +static HRESULT WINAPI IAVIStream_fnWriteData(IAVIStream *iface, DWORD fcc, void *lp, LONG size) +{ + IAVIStreamImpl *This = impl_from_IAVIStream(iface); TRACE("(%p,0x%08x,%p,%d)\n", iface, fcc, lp, size); @@ -1313,7 +1273,7 @@ if (fcc == ckidSTREAMHANDLERDATA) { if (This->lpHandlerData != NULL) { - FIXME(": handler data already set -- overwirte?\n"); + FIXME(": handler data already set -- overwrite?\n"); return AVIERR_UNSUPPORTED; } @@ -1328,15 +1288,30 @@ return WriteExtraChunk(&This->extra, fcc, lp, size); } -static HRESULT WINAPI IAVIStream_fnSetInfo(IAVIStream *iface, - LPAVISTREAMINFOW info, LONG infolen) +static HRESULT WINAPI IAVIStream_fnSetInfo(IAVIStream *iface, AVISTREAMINFOW *info, LONG infolen) { FIXME("(%p,%p,%d): stub\n", iface, info, infolen); return E_FAIL; } -/***********************************************************************/ +static const struct IAVIStreamVtbl avist_vt = { + IAVIStream_fnQueryInterface, + IAVIStream_fnAddRef, + IAVIStream_fnRelease, + IAVIStream_fnCreate, + IAVIStream_fnInfo, + IAVIStream_fnFindSample, + IAVIStream_fnReadFormat, + IAVIStream_fnSetFormat, + IAVIStream_fnRead, + IAVIStream_fnWrite, + IAVIStream_fnDelete, + IAVIStream_fnReadData, + IAVIStream_fnWriteData, + IAVIStream_fnSetInfo +}; + static HRESULT AVIFILE_AddFrame(IAVIStreamImpl *This, DWORD ckid, DWORD size, DWORD offset, DWORD flags) { @@ -1495,7 +1470,7 @@ pstream = paf->ppStreams[nr]; - pstream->lpVtbl = &iavist; + pstream->IAVIStream_iface.lpVtbl = &avist_vt; pstream->ref = 0; pstream->paf = paf; pstream->nStream = nr; @@ -2102,7 +2077,7 @@ if (This->dwMoviChunkPos == 0) AVIFILE_ComputeMoviStart(This); - /* written one record to much? */ + /* written one record too much? */ if (This->ckLastRecord.dwFlags & MMIO_DIRTY) { This->dwNextFramePos -= 3 * sizeof(DWORD); if (This->nIdxRecords > 0) @@ -2334,7 +2309,7 @@ if (This->ppStreams[0]->sInfo.dwSampleSize == 0) stepsize = 1; else - stepsize = AVIStreamTimeToSample((PAVISTREAM)This->ppStreams[0], 1000000); + stepsize = AVIStreamTimeToSample(&This->ppStreams[0]->IAVIStream_iface, 1000000); assert(stepsize > 0); @@ -2504,8 +2479,8 @@ This->fInfo.dwRate = psi->dwRate; This->fInfo.dwLength = psi->dwLength; } else { - n = AVIStreamSampleToSample((PAVISTREAM)This->ppStreams[0], - (PAVISTREAM)This->ppStreams[i],psi->dwLength); + n = AVIStreamSampleToSample(&This->ppStreams[0]->IAVIStream_iface, + &This->ppStreams[i]->IAVIStream_iface, psi->dwLength); if (This->fInfo.dwLength < n) This->fInfo.dwLength = n; } Modified: trunk/reactos/dll/win32/avifil32/avifile_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_private.h [iso-8859-1] Tue Apr 22 11:31:44 2014 @@ -62,7 +62,7 @@ extern HMODULE AVIFILE_hModule DECLSPEC_HIDDEN; extern HRESULT AVIFILE_CreateAVIFile(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; -extern HRESULT AVIFILE_CreateWAVFile(REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; +extern HRESULT AVIFILE_CreateWAVFile(IUnknown *outer_unk, REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; extern HRESULT AVIFILE_CreateACMStream(REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; extern HRESULT AVIFILE_CreateICMStream(REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; extern PAVIEDITSTREAM AVIFILE_CreateEditStream(PAVISTREAM pstream) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/win32/avifil32/factory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/factory… ============================================================================== --- trunk/reactos/dll/win32/avifil32/factory.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/factory.c [iso-8859-1] Tue Apr 22 11:31:44 2014 @@ -133,14 +133,14 @@ if (IsEqualGUID(&CLSID_AVIFile, &This->clsid)) return AVIFILE_CreateAVIFile(pOuter, riid, ppobj); + if (IsEqualGUID(&CLSID_WAVFile, &This->clsid)) + return AVIFILE_CreateWAVFile(pOuter, riid, ppobj); if (pOuter) return CLASS_E_NOAGGREGATION; if (IsEqualGUID(&CLSID_ICMStream, &This->clsid)) return AVIFILE_CreateICMStream(riid,ppobj); - if (IsEqualGUID(&CLSID_WAVFile, &This->clsid)) - return AVIFILE_CreateWAVFile(riid,ppobj); if (IsEqualGUID(&CLSID_ACMStream, &This->clsid)) return AVIFILE_CreateACMStream(riid,ppobj); Modified: trunk/reactos/dll/win32/avifil32/icmstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/icmstre… ============================================================================== --- trunk/reactos/dll/win32/avifil32/icmstream.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/icmstream.c [iso-8859-1] Tue Apr 22 11:31:44 2014 @@ -299,7 +299,7 @@ return This->lLastKey; } } else if (flags & FIND_ANY) { - return pos; /* We really don't know, reread is to expensive, so guess. */ + return pos; /* We really don't know, reread is too expensive, so guess. */ } else if (flags & FIND_FORMAT) { if (flags & FIND_PREV) return 0; Modified: trunk/reactos/dll/win32/avifil32/wavfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/wavfile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/wavfile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/wavfile.c [iso-8859-1] Tue Apr 22 11:31:44 2014 @@ -67,111 +67,14 @@ /***********************************************************************/ -static HRESULT WINAPI IAVIFile_fnQueryInterface(IAVIFile* iface,REFIID refiid,LPVOID *obj); -static ULONG WINAPI IAVIFile_fnAddRef(IAVIFile* iface); -static ULONG WINAPI IAVIFile_fnRelease(IAVIFile* iface); -static HRESULT WINAPI IAVIFile_fnInfo(IAVIFile*iface,AVIFILEINFOW*afi,LONG size); -static HRESULT WINAPI IAVIFile_fnGetStream(IAVIFile*iface,PAVISTREAM*avis,DWORD fccType,LONG lParam); -static HRESULT WINAPI IAVIFile_fnCreateStream(IAVIFile*iface,PAVISTREAM*avis,AVISTREAMINFOW*asi); -static HRESULT WINAPI IAVIFile_fnWriteData(IAVIFile*iface,DWORD ckid,LPVOID lpData,LONG size); -static HRESULT WINAPI IAVIFile_fnReadData(IAVIFile*iface,DWORD ckid,LPVOID lpData,LONG *size); -static HRESULT WINAPI IAVIFile_fnEndRecord(IAVIFile*iface); -static HRESULT WINAPI IAVIFile_fnDeleteStream(IAVIFile*iface,DWORD fccType,LONG lParam); - -static const struct IAVIFileVtbl iwavft = { - IAVIFile_fnQueryInterface, - IAVIFile_fnAddRef, - IAVIFile_fnRelease, - IAVIFile_fnInfo, - IAVIFile_fnGetStream, - IAVIFile_fnCreateStream, - IAVIFile_fnWriteData, - IAVIFile_fnReadData, - IAVIFile_fnEndRecord, - IAVIFile_fnDeleteStream -}; - -static HRESULT WINAPI IPersistFile_fnQueryInterface(IPersistFile*iface,REFIID refiid,LPVOID*obj); -static ULONG WINAPI IPersistFile_fnAddRef(IPersistFile*iface); -static ULONG WINAPI IPersistFile_fnRelease(IPersistFile*iface); -static HRESULT WINAPI IPersistFile_fnGetClassID(IPersistFile*iface,CLSID*pClassID); -static HRESULT WINAPI IPersistFile_fnIsDirty(IPersistFile*iface); -static HRESULT WINAPI IPersistFile_fnLoad(IPersistFile*iface,LPCOLESTR pszFileName,DWORD dwMode); -static HRESULT WINAPI IPersistFile_fnSave(IPersistFile*iface,LPCOLESTR pszFileName,BOOL fRemember); -static HRESULT WINAPI IPersistFile_fnSaveCompleted(IPersistFile*iface,LPCOLESTR pszFileName); -static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile*iface,LPOLESTR*ppszFileName); - -static const struct IPersistFileVtbl iwavpft = { - IPersistFile_fnQueryInterface, - IPersistFile_fnAddRef, - IPersistFile_fnRelease, - IPersistFile_fnGetClassID, - IPersistFile_fnIsDirty, - IPersistFile_fnLoad, - IPersistFile_fnSave, - IPersistFile_fnSaveCompleted, - IPersistFile_fnGetCurFile -}; - -static HRESULT WINAPI IAVIStream_fnQueryInterface(IAVIStream*iface,REFIID refiid,LPVOID *obj); -static ULONG WINAPI IAVIStream_fnAddRef(IAVIStream*iface); -static ULONG WINAPI IAVIStream_fnRelease(IAVIStream* iface); -static HRESULT WINAPI IAVIStream_fnCreate(IAVIStream*iface,LPARAM lParam1,LPARAM lParam2); -static HRESULT WINAPI IAVIStream_fnInfo(IAVIStream*iface,AVISTREAMINFOW *psi,LONG size); -static LONG WINAPI IAVIStream_fnFindSample(IAVIStream*iface,LONG pos,LONG flags); -static HRESULT WINAPI IAVIStream_fnReadFormat(IAVIStream*iface,LONG pos,LPVOID format,LONG *formatsize); -static HRESULT WINAPI IAVIStream_fnSetFormat(IAVIStream*iface,LONG pos,LPVOID format,LONG formatsize); -static HRESULT WINAPI IAVIStream_fnRead(IAVIStream*iface,LONG start,LONG samples,LPVOID buffer,LONG buffersize,LONG *bytesread,LONG *samplesread); -static HRESULT WINAPI IAVIStream_fnWrite(IAVIStream*iface,LONG start,LONG samples,LPVOID buffer,LONG buffersize,DWORD flags,LONG *sampwritten,LONG *byteswritten); -static HRESULT WINAPI IAVIStream_fnDelete(IAVIStream*iface,LONG start,LONG samples); -static HRESULT WINAPI IAVIStream_fnReadData(IAVIStream*iface,DWORD fcc,LPVOID lp,LONG *lpread); -static HRESULT WINAPI IAVIStream_fnWriteData(IAVIStream*iface,DWORD fcc,LPVOID lp,LONG size); -static HRESULT WINAPI IAVIStream_fnSetInfo(IAVIStream*iface,AVISTREAMINFOW*info,LONG infolen); - -static const struct IAVIStreamVtbl iwavst = { - IAVIStream_fnQueryInterface, - IAVIStream_fnAddRef, - IAVIStream_fnRelease, - IAVIStream_fnCreate, - IAVIStream_fnInfo, - IAVIStream_fnFindSample, - IAVIStream_fnReadFormat, - IAVIStream_fnSetFormat, - IAVIStream_fnRead, - IAVIStream_fnWrite, - IAVIStream_fnDelete, - IAVIStream_fnReadData, - IAVIStream_fnWriteData, - IAVIStream_fnSetInfo -}; - -typedef struct _IAVIFileImpl IAVIFileImpl; - -typedef struct _IPersistFileImpl { - /* IUnknown stuff */ - const IPersistFileVtbl *lpVtbl; - - /* IPersistFile stuff */ - IAVIFileImpl *paf; -} IPersistFileImpl; - -typedef struct _IAVIStreamImpl { - /* IUnknown stuff */ - const IAVIStreamVtbl *lpVtbl; - - /* IAVIStream stuff */ - IAVIFileImpl *paf; -} IAVIStreamImpl; - -struct _IAVIFileImpl { - /* IUnknown stuff */ - const IAVIFileVtbl *lpVtbl; - LONG ref; - +typedef struct _IAVIFileImpl { + IUnknown IUnknown_inner; + IAVIFile IAVIFile_iface; + IPersistFile IPersistFile_iface; + IAVIStream IAVIStream_iface; + IUnknown *outer_unk; + LONG ref; /* IAVIFile, IAVIStream stuff... */ - IPersistFileImpl iPersistFile; - IAVIStreamImpl iAVIStream; - AVIFILEINFOW fInfo; AVISTREAMINFOW sInfo; @@ -187,7 +90,7 @@ LPWSTR szFileName; UINT uMode; BOOL fDirty; -}; +} IAVIFileImpl; /***********************************************************************/ @@ -195,108 +98,112 @@ static HRESULT AVIFILE_LoadSunFile(IAVIFileImpl *This); static HRESULT AVIFILE_SaveFile(const IAVIFileImpl *This); -HRESULT AVIFILE_CreateWAVFile(REFIID riid, LPVOID *ppv) -{ - IAVIFileImpl *pfile; - HRESULT hr; - - assert(riid != NULL && ppv != NULL); - - *ppv = NULL; - - pfile = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IAVIFileImpl)); - if (pfile == NULL) - return AVIERR_MEMORY; - - pfile->lpVtbl = &iwavft; - pfile->iPersistFile.lpVtbl = &iwavpft; - pfile->iAVIStream.lpVtbl = &iwavst; - pfile->ref = 0; - pfile->iPersistFile.paf = pfile; - pfile->iAVIStream.paf = pfile; - - hr = IAVIFile_QueryInterface((IAVIFile*)pfile, riid, ppv); - if (FAILED(hr)) - HeapFree(GetProcessHeap(), 0, pfile); - - return hr; -} - -static HRESULT WINAPI IAVIFile_fnQueryInterface(IAVIFile *iface, REFIID refiid, - LPVOID *obj) -{ - IAVIFileImpl *This = (IAVIFileImpl *)iface; - - TRACE("(%p,%s,%p)\n", This, debugstr_guid(refiid), obj); - - if (IsEqualGUID(&IID_IUnknown, refiid) || - IsEqualGUID(&IID_IAVIFile, refiid)) { - *obj = iface; - IAVIFile_AddRef(iface); +static inline IAVIFileImpl *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, IAVIFileImpl, IUnknown_inner); +} + +static HRESULT WINAPI IUnknown_fnQueryInterface(IUnknown *iface, REFIID riid, void **ret_iface) +{ + IAVIFileImpl *This = impl_from_IUnknown(iface); + + TRACE("(%p,%s,%p)\n", This, debugstr_guid(riid), ret_iface); + + if (IsEqualGUID(&IID_IUnknown, riid)) + *ret_iface = &This->IUnknown_inner; + else if (IsEqualGUID(&IID_IAVIFile, riid)) + *ret_iface = &This->IAVIFile_iface; + else if (IsEqualGUID(&IID_IAVIStream, riid)) + *ret_iface = &This->IAVIStream_iface; + else if (IsEqualGUID(&IID_IPersistFile, riid)) + *ret_iface = &This->IPersistFile_iface; + else { + WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ret_iface); + *ret_iface = NULL; + return E_NOINTERFACE; + } + + /* Violation of the COM aggregation ref counting rule */ + IUnknown_AddRef(&This->IUnknown_inner); return S_OK; - } else if (This->fInfo.dwStreams == 1 && - IsEqualGUID(&IID_IAVIStream, refiid)) { - *obj = &This->iAVIStream; - IAVIFile_AddRef(iface); - return S_OK; - } else if (IsEqualGUID(&IID_IPersistFile, refiid)) { - *obj = &This->iPersistFile; - IAVIFile_AddRef(iface); - return S_OK; - } - - return OLE_E_ENUM_NOMORE; +} + +static ULONG WINAPI IUnknown_fnAddRef(IUnknown *iface) +{ + IAVIFileImpl *This = impl_from_IUnknown(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI IUnknown_fnRelease(IUnknown *iface) +{ + IAVIFileImpl *This = impl_from_IUnknown(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if (!ref) { + /* need to write headers to file */ + if (This->fDirty) + AVIFILE_SaveFile(This); + + HeapFree(GetProcessHeap(), 0, This->lpFormat); + This->lpFormat = NULL; + This->cbFormat = 0; + HeapFree(GetProcessHeap(), 0, This->extra.lp); + This->extra.lp = NULL; + This->extra.cb = 0; + HeapFree(GetProcessHeap(), 0, This->szFileName); + This->szFileName = NULL; + if (This->hmmio) { + mmioClose(This->hmmio, 0); + This->hmmio = NULL; + } + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static const IUnknownVtbl unk_vtbl = +{ + IUnknown_fnQueryInterface, + IUnknown_fnAddRef, + IUnknown_fnRelease +}; + +static inline IAVIFileImpl *impl_from_IAVIFile(IAVIFile *iface) +{ + return CONTAINING_RECORD(iface, IAVIFileImpl, IAVIFile_iface); +} + +static HRESULT WINAPI IAVIFile_fnQueryInterface(IAVIFile *iface, REFIID riid, void **ret_iface) +{ + IAVIFileImpl *This = impl_from_IAVIFile(iface); + + return IUnknown_QueryInterface(This->outer_unk, riid, ret_iface); } static ULONG WINAPI IAVIFile_fnAddRef(IAVIFile *iface) { - IAVIFileImpl *This = (IAVIFileImpl *)iface; - - TRACE("(%p)\n",iface); - - return InterlockedIncrement(&This->ref); + IAVIFileImpl *This = impl_from_IAVIFile(iface); + + return IUnknown_AddRef(This->outer_unk); } static ULONG WINAPI IAVIFile_fnRelease(IAVIFile *iface) { - IAVIFileImpl *This = (IAVIFileImpl *)iface; - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p)\n",iface); - - if (!ref) { - if (This->fDirty) { - /* need to write headers to file */ - AVIFILE_SaveFile(This); - } - - if (This->lpFormat != NULL) { - HeapFree(GetProcessHeap(), 0, This->lpFormat); - This->lpFormat = NULL; - This->cbFormat = 0; - } - if (This->extra.lp != NULL) { - HeapFree(GetProcessHeap(), 0, This->extra.lp); - This->extra.lp = NULL; - This->extra.cb = 0; - } - HeapFree(GetProcessHeap(), 0, This->szFileName); - This->szFileName = NULL; - if (This->hmmio != NULL) { - mmioClose(This->hmmio, 0); - This->hmmio = NULL; - } - - HeapFree(GetProcessHeap(), 0, This); - return 0; - } - return ref; -} - -static HRESULT WINAPI IAVIFile_fnInfo(IAVIFile *iface, LPAVIFILEINFOW afi, - LONG size) -{ - IAVIFileImpl *This = (IAVIFileImpl *)iface; + IAVIFileImpl *This = impl_from_IAVIFile(iface); + + return IUnknown_Release(This->outer_unk); +} + +static HRESULT WINAPI IAVIFile_fnInfo(IAVIFile *iface, AVIFILEINFOW *afi, LONG size) +{ + IAVIFileImpl *This = impl_from_IAVIFile(iface); TRACE("(%p,%p,%d)\n",iface,afi,size); @@ -327,10 +234,10 @@ return AVIERR_OK; } -static HRESULT WINAPI IAVIFile_fnGetStream(IAVIFile *iface, PAVISTREAM *avis, - DWORD fccType, LONG lParam) -{ - IAVIFileImpl *This = (IAVIFileImpl *)iface; +static HRESULT WINAPI IAVIFile_fnGetStream(IAVIFile *iface, IAVIStream **avis, DWORD fccType, + LONG lParam) +{ + IAVIFileImpl *This = impl_from_IAVIFile(iface); TRACE("(%p,%p,0x%08X,%d)\n", iface, avis, fccType, lParam); @@ -346,16 +253,16 @@ if (fccType != 0 && fccType != streamtypeAUDIO) return AVIERR_NODATA; - *avis = (PAVISTREAM)&This->iAVIStream; - IAVIFile_AddRef(iface); - - return AVIERR_OK; -} - -static HRESULT WINAPI IAVIFile_fnCreateStream(IAVIFile *iface,PAVISTREAM *avis, - LPAVISTREAMINFOW asi) -{ - IAVIFileImpl *This = (IAVIFileImpl *)iface; + *avis = &This->IAVIStream_iface; + IAVIStream_AddRef(*avis); + + return AVIERR_OK; +} + +static HRESULT WINAPI IAVIFile_fnCreateStream(IAVIFile *iface, IAVIStream **avis, + AVISTREAMINFOW *asi) +{ + IAVIFileImpl *This = impl_from_IAVIFile(iface); TRACE("(%p,%p,%p)\n", iface, avis, asi); @@ -397,16 +304,15 @@ This->ckData.dwDataOffset = 0; This->ckData.cksize = 0; - *avis = (PAVISTREAM)&This->iAVIStream; - IAVIFile_AddRef(iface); - - return AVIERR_OK; -} - -static HRESULT WINAPI IAVIFile_fnWriteData(IAVIFile *iface, DWORD ckid, - LPVOID lpData, LONG size) -{ - IAVIFileImpl *This = (IAVIFileImpl *)iface; + *avis = &This->IAVIStream_iface; + IAVIStream_AddRef(*avis); + + return AVIERR_OK; +} + +static HRESULT WINAPI IAVIFile_fnWriteData(IAVIFile *iface, DWORD ckid, void *lpData, LONG size) +{ + IAVIFileImpl *This = impl_from_IAVIFile(iface); TRACE("(%p,0x%08X,%p,%d)\n", iface, ckid, lpData, size); @@ -425,10 +331,9 @@ return WriteExtraChunk(&This->extra, ckid, lpData, size); } -static HRESULT WINAPI IAVIFile_fnReadData(IAVIFile *iface, DWORD ckid, - LPVOID lpData, LONG *size) -{ - IAVIFileImpl *This = (IAVIFileImpl *)iface; +static HRESULT WINAPI IAVIFile_fnReadData(IAVIFile *iface, DWORD ckid, void *lpData, LONG *size) +{ + IAVIFileImpl *This = impl_from_IAVIFile(iface); TRACE("(%p,0x%08X,%p,%p)\n", iface, ckid, lpData, size); @@ -445,10 +350,9 @@ return AVIERR_OK; } -static HRESULT WINAPI IAVIFile_fnDeleteStream(IAVIFile *iface, DWORD fccType, - LONG lParam) -{ - IAVIFileImpl *This = (IAVIFileImpl *)iface; +static HRESULT WINAPI IAVIFile_fnDeleteStream(IAVIFile *iface, DWORD fccType, LONG lParam) +{ + IAVIFileImpl *This = impl_from_IAVIFile(iface); TRACE("(%p,0x%08X,%d)\n", iface, fccType, lParam); @@ -486,34 +390,46 @@ return AVIERR_OK; } +static const struct IAVIFileVtbl iwavft = { + IAVIFile_fnQueryInterface, + IAVIFile_fnAddRef, + IAVIFile_fnRelease, + IAVIFile_fnInfo, + IAVIFile_fnGetStream, + IAVIFile_fnCreateStream, + IAVIFile_fnWriteData, + IAVIFile_fnReadData, + IAVIFile_fnEndRecord, + IAVIFile_fnDeleteStream +}; + /***********************************************************************/ -static HRESULT WINAPI IPersistFile_fnQueryInterface(IPersistFile *iface, - REFIID refiid, LPVOID *obj) -{ - IPersistFileImpl *This = (IPersistFileImpl *)iface; - - assert(This->paf != NULL); - - return IAVIFile_QueryInterface((PAVIFILE)This->paf, refiid, obj); +static inline IAVIFileImpl *impl_from_IPersistFile(IPersistFile *iface) +{ + return CONTAINING_RECORD(iface, IAVIFileImpl, IPersistFile_iface); +} + +static HRESULT WINAPI IPersistFile_fnQueryInterface(IPersistFile *iface, REFIID riid, + void **ret_iface) +{ + IAVIFileImpl *This = impl_from_IPersistFile(iface); + + return IUnknown_QueryInterface(This->outer_unk, riid, ret_iface); } static ULONG WINAPI IPersistFile_fnAddRef(IPersistFile *iface) { - IPersistFileImpl *This = (IPersistFileImpl *)iface; - - assert(This->paf != NULL); - - return IAVIFile_AddRef((PAVIFILE)This->paf); + IAVIFileImpl *This = impl_from_IPersistFile(iface); + + return IUnknown_AddRef(This->outer_unk); } static ULONG WINAPI IPersistFile_fnRelease(IPersistFile *iface) { - IPersistFileImpl *This = (IPersistFileImpl *)iface; - - assert(This->paf != NULL); - - return IAVIFile_Release((PAVIFILE)This->paf); + IAVIFileImpl *This = impl_from_IPersistFile(iface); + + return IUnknown_Release(This->outer_unk); } static HRESULT WINAPI IPersistFile_fnGetClassID(IPersistFile *iface, @@ -531,20 +447,16 @@ static HRESULT WINAPI IPersistFile_fnIsDirty(IPersistFile *iface) { - IPersistFileImpl *This = (IPersistFileImpl *)iface; - - TRACE("(%p)\n", iface); - - assert(This->paf != NULL); - - return (This->paf->fDirty ? S_OK : S_FALSE); -} - -static HRESULT WINAPI IPersistFile_fnLoad(IPersistFile *iface, - LPCOLESTR pszFileName, DWORD dwMode) -{ - IAVIFileImpl *This = ((IPersistFileImpl*)iface)->paf; - + IAVIFileImpl *This = impl_from_IPersistFile(iface); + + TRACE("(%p)\n", iface); + + return (This->fDirty ? S_OK : S_FALSE); +} + +static HRESULT WINAPI IPersistFile_fnLoad(IPersistFile *iface, LPCOLESTR pszFileName, DWORD dwMode) +{ + IAVIFileImpl *This = impl_from_IPersistFile(iface); WCHAR wszStreamFmt[50]; INT len; @@ -554,7 +466,6 @@ if (pszFileName == NULL) return AVIERR_BADPARAM; - assert(This != NULL); if (This->hmmio != NULL) return AVIERR_ERROR; /* No reuse of this object for another file! */ @@ -626,10 +537,9 @@ return AVIERR_OK; } -static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile *iface, - LPOLESTR *ppszFileName) -{ - IPersistFileImpl *This = (IPersistFileImpl *)iface; +static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile *iface, LPOLESTR *ppszFileName) +{ + IAVIFileImpl *This = impl_from_IPersistFile(iface); TRACE("(%p,%p)\n", iface, ppszFileName); @@ -638,49 +548,57 @@ *ppszFileName = NULL; - assert(This->paf != NULL); - - if (This->paf->szFileName != NULL) { - int len = lstrlenW(This->paf->szFileName) + 1; + if (This->szFileName) { + int len = lstrlenW(This->szFileName) + 1; *ppszFileName = CoTaskMemAlloc(len * sizeof(WCHAR)); if (*ppszFileName == NULL) return AVIERR_MEMORY; - strcpyW(*ppszFileName, This->paf->szFileName); - } - - return AVIERR_OK; -} + strcpyW(*ppszFileName, This->szFileName); + } + + return AVIERR_OK; +} + +static const struct IPersistFileVtbl iwavpft = { + IPersistFile_fnQueryInterface, + IPersistFile_fnAddRef, + IPersistFile_fnRelease, + IPersistFile_fnGetClassID, + IPersistFile_fnIsDirty, + IPersistFile_fnLoad, + IPersistFile_fnSave, + IPersistFile_fnSaveCompleted, + IPersistFile_fnGetCurFile +}; /***********************************************************************/ -static HRESULT WINAPI IAVIStream_fnQueryInterface(IAVIStream *iface, - REFIID refiid, LPVOID *obj) -{ - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; - - assert(This->paf != NULL); - - return IAVIFile_QueryInterface((PAVIFILE)This->paf, refiid, obj); +static inline IAVIFileImpl *impl_from_IAVIStream(IAVIStream *iface) +{ + return CONTAINING_RECORD(iface, IAVIFileImpl, IAVIStream_iface); +} + +static HRESULT WINAPI IAVIStream_fnQueryInterface(IAVIStream *iface, REFIID riid, void **ret_iface) +{ + IAVIFileImpl *This = impl_from_IAVIStream(iface); + + return IUnknown_QueryInterface(This->outer_unk, riid, ret_iface); } static ULONG WINAPI IAVIStream_fnAddRef(IAVIStream *iface) { - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; - - assert(This->paf != NULL); - - return IAVIFile_AddRef((PAVIFILE)This->paf); + IAVIFileImpl *This = impl_from_IAVIStream(iface); + + return IUnknown_AddRef(This->outer_unk); } static ULONG WINAPI IAVIStream_fnRelease(IAVIStream* iface) { - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; - - assert(This->paf != NULL); - - return IAVIFile_Release((PAVIFILE)This->paf); + IAVIFileImpl *This = impl_from_IAVIStream(iface); + + return IUnknown_Release(This->outer_unk); } static HRESULT WINAPI IAVIStream_fnCreate(IAVIStream *iface, LPARAM lParam1, @@ -692,10 +610,9 @@ return AVIERR_UNSUPPORTED; } -static HRESULT WINAPI IAVIStream_fnInfo(IAVIStream *iface,LPAVISTREAMINFOW psi, - LONG size) -{ - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; +static HRESULT WINAPI IAVIStream_fnInfo(IAVIStream *iface, AVISTREAMINFOW *psi, LONG size) +{ + IAVIFileImpl *This = impl_from_IAVIStream(iface); TRACE("(%p,%p,%d)\n", iface, psi, size); @@ -704,17 +621,16 @@ if (size < 0) return AVIERR_BADSIZE; - memcpy(psi, &This->paf->sInfo, min((DWORD)size, sizeof(This->paf->sInfo))); - - if ((DWORD)size < sizeof(This->paf->sInfo)) + memcpy(psi, &This->sInfo, min((DWORD)size, sizeof(This->sInfo))); + + if ((DWORD)size < sizeof(This->sInfo)) return AVIERR_BUFFERTOOSMALL; return AVIERR_OK; } -static LONG WINAPI IAVIStream_fnFindSample(IAVIStream *iface, LONG pos, - LONG flags) -{ - IAVIFileImpl *This = ((IAVIStreamImpl*)iface)->paf; +static LONG WINAPI IAVIStream_fnFindSample(IAVIStream *iface, LONG pos, LONG flags) +{ + IAVIFileImpl *This = impl_from_IAVIStream(iface); TRACE("(%p,%d,0x%08X)\n",iface,pos,flags); @@ -748,10 +664,10 @@ return pos; } -static HRESULT WINAPI IAVIStream_fnReadFormat(IAVIStream *iface, LONG pos, - LPVOID format, LONG *formatsize) -{ - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; +static HRESULT WINAPI IAVIStream_fnReadFormat(IAVIStream *iface, LONG pos, void *format, + LONG *formatsize) +{ + IAVIFileImpl *This = impl_from_IAVIStream(iface); TRACE("(%p,%d,%p,%p)\n", iface, pos, format, formatsize); @@ -760,26 +676,26 @@ /* only interested in needed buffersize? */ if (format == NULL || *formatsize <= 0) { - *formatsize = This->paf->cbFormat; + *formatsize = This->cbFormat; return AVIERR_OK; } /* copy initial format (only as much as will fit) */ - memcpy(format, This->paf->lpFormat, min(*formatsize, This->paf->cbFormat)); - if (*formatsize < This->paf->cbFormat) { - *formatsize = This->paf->cbFormat; + memcpy(format, This->lpFormat, min(*formatsize, This->cbFormat)); + if (*formatsize < This->cbFormat) { + *formatsize = This->cbFormat; return AVIERR_BUFFERTOOSMALL; } - *formatsize = This->paf->cbFormat; - return AVIERR_OK; -} - -static HRESULT WINAPI IAVIStream_fnSetFormat(IAVIStream *iface, LONG pos, - LPVOID format, LONG formatsize) -{ - IAVIFileImpl *This = ((IAVIStreamImpl*)iface)->paf; + *formatsize = This->cbFormat; + return AVIERR_OK; +} + +static HRESULT WINAPI IAVIStream_fnSetFormat(IAVIStream *iface, LONG pos, void *format, + LONG formatsize) +{ + IAVIFileImpl *This = impl_from_IAVIStream(iface); TRACE("(%p,%d,%p,%d)\n", iface, pos, format, formatsize); @@ -831,12 +747,10 @@ return AVIERR_OK; } -static HRESULT WINAPI IAVIStream_fnRead(IAVIStream *iface, LONG start, - LONG samples, LPVOID buffer, - LONG buffersize, LPLONG bytesread, - LPLONG samplesread) -{ - IAVIFileImpl *This = ((IAVIStreamImpl*)iface)->paf; +static HRESULT WINAPI IAVIStream_fnRead(IAVIStream *iface, LONG start, LONG samples, void *buffer, + LONG buffersize, LONG *bytesread, LONG *samplesread) +{ + IAVIFileImpl *This = impl_from_IAVIStream(iface); TRACE("(%p,%d,%d,%p,%d,%p,%p)\n", iface, start, samples, buffer, buffersize, bytesread, samplesread); @@ -904,13 +818,10 @@ return AVIERR_OK; } -static HRESULT WINAPI IAVIStream_fnWrite(IAVIStream *iface, LONG start, - LONG samples, LPVOID buffer, - LONG buffersize, DWORD flags, - LPLONG sampwritten, - LPLONG byteswritten) -{ - IAVIFileImpl *This = ((IAVIStreamImpl*)iface)->paf; +static HRESULT WINAPI IAVIStream_fnWrite(IAVIStream *iface, LONG start, LONG samples, void *buffer, + LONG buffersize, DWORD flags, LONG *sampwritten, LONG *byteswritten) +{ + IAVIFileImpl *This = impl_from_IAVIStream(iface); TRACE("(%p,%d,%d,%p,%d,0x%08X,%p,%p)\n", iface, start, samples, buffer, buffersize, flags, sampwritten, byteswritten); @@ -939,7 +850,7 @@ /* do we have anything to write? */ if (buffer != NULL && buffersize > 0) { - This->fDirty = 1; + This->fDirty = TRUE; if (mmioSeek(This->hmmio, This->ckData.dwDataOffset + start * This->sInfo.dwSampleSize, SEEK_SET) == -1) @@ -961,10 +872,9 @@ return AVIERR_OK; } -static HRESULT WINAPI IAVIStream_fnDelete(IAVIStream *iface, LONG start, - LONG samples) -{ - IAVIFileImpl *This = ((IAVIStreamImpl*)iface)->paf; +static HRESULT WINAPI IAVIStream_fnDelete(IAVIStream *iface, LONG start, LONG samples) +{ + IAVIFileImpl *This = impl_from_IAVIStream(iface); TRACE("(%p,%d,%d)\n", iface, start, samples); @@ -1002,27 +912,23 @@ return AVIERR_UNSUPPORTED; } - This->fDirty = 1; - - return AVIERR_OK; -} - -static HRESULT WINAPI IAVIStream_fnReadData(IAVIStream *iface, DWORD fcc, - LPVOID lp, LPLONG lpread) -{ - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; - - assert(This->paf != NULL); - - return IAVIFile_ReadData((PAVIFILE)This->paf, fcc, lp, lpread); -} - -static HRESULT WINAPI IAVIStream_fnWriteData(IAVIStream *iface, DWORD fcc, - LPVOID lp, LONG size) -{ - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; - - return IAVIFile_WriteData((PAVIFILE)This->paf, fcc, lp, size); + This->fDirty = TRUE; + + return AVIERR_OK; +} + +static HRESULT WINAPI IAVIStream_fnReadData(IAVIStream *iface, DWORD fcc, void *lp, LONG *lpread) +{ + IAVIFileImpl *This = impl_from_IAVIStream(iface); + + return IAVIFile_ReadData(&This->IAVIFile_iface, fcc, lp, lpread); +} + +static HRESULT WINAPI IAVIStream_fnWriteData(IAVIStream *iface, DWORD fcc, void *lp, LONG size) +{ + IAVIFileImpl *This = impl_from_IAVIStream(iface); + + return IAVIFile_WriteData(&This->IAVIFile_iface, fcc, lp, size); } static HRESULT WINAPI IAVIStream_fnSetInfo(IAVIStream *iface, @@ -1031,6 +937,50 @@ FIXME("(%p,%p,%d): stub\n", iface, info, infolen); return E_FAIL; +} + +static const struct IAVIStreamVtbl iwavst = { + IAVIStream_fnQueryInterface, + IAVIStream_fnAddRef, + IAVIStream_fnRelease, + IAVIStream_fnCreate, + IAVIStream_fnInfo, + IAVIStream_fnFindSample, + IAVIStream_fnReadFormat, + IAVIStream_fnSetFormat, + IAVIStream_fnRead, + IAVIStream_fnWrite, + IAVIStream_fnDelete, + IAVIStream_fnReadData, + IAVIStream_fnWriteData, + IAVIStream_fnSetInfo +}; + +HRESULT AVIFILE_CreateWAVFile(IUnknown *outer_unk, REFIID riid, void **ret_iface) +{ + IAVIFileImpl *pfile; + HRESULT hr; + + *ret_iface = NULL; + + pfile = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*pfile)); + if (!pfile) + return AVIERR_MEMORY; + + pfile->IUnknown_inner.lpVtbl = &unk_vtbl; + pfile->IAVIFile_iface.lpVtbl = &iwavft; + pfile->IPersistFile_iface.lpVtbl = &iwavpft; + pfile->IAVIStream_iface.lpVtbl = &iwavst; + pfile->ref = 1; + if (outer_unk) + pfile->outer_unk = outer_unk; + else + pfile->outer_unk = &pfile->IUnknown_inner; + + hr = IUnknown_QueryInterface(&pfile->IUnknown_inner, riid, ret_iface); + IUnknown_Release(&pfile->IUnknown_inner); + + return hr; } /***********************************************************************/ @@ -1206,7 +1156,7 @@ This->lpFormat->nAvgBytesPerSec = This->lpFormat->nBlockAlign * This->lpFormat->nSamplesPerSec; - This->fDirty = 0; + This->fDirty = FALSE; This->sInfo.fccType = streamtypeAUDIO; This->sInfo.fccHandler = 0; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue Apr 22 11:31:44 2014 @@ -54,7 +54,7 @@ reactos/dll/win32/atl # Synced to Wine-1.7.1 reactos/dll/win32/atl100 # Synced to Wine-1.7.1 reactos/dll/win32/atl80 # Synced to Wine-1.7.1 -reactos/dll/win32/avifil32 # Synced to Wine-1.7.1 +reactos/dll/win32/avifil32 # Synced to Wine-1.7.17 reactos/dll/win32/bcrypt # Synced to Wine-1.7.1 reactos/dll/win32/browseui # Out of sync reactos/dll/win32/cabinet # Synced to Wine-1.7.1

10 years, 8 months

[akhaldi] 62869: [XMLLITE_WINETEST] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Apr 22 11:25:33 2014 New Revision: 62869 URL: http://svn.reactos.org/svn/reactos?rev=62869&view=rev Log: [XMLLITE_WINETEST] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/rostests/winetests/xmllite/reader.c trunk/rostests/winetests/xmllite/writer.c Modified: trunk/rostests/winetests/xmllite/reader.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/xmllite/reader.… ============================================================================== --- trunk/rostests/winetests/xmllite/reader.c [iso-8859-1] (original) +++ trunk/rostests/winetests/xmllite/reader.c [iso-8859-1] Tue Apr 22 11:25:33 2014 @@ -45,17 +45,6 @@ BOOL hint, LPCWSTR base_uri, IXmlReaderInput **ppInput); -static const char *debugstr_guid(REFIID riid) -{ - static char buf[50]; - - sprintf(buf, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", - riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], - riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], - riid->Data4[5], riid->Data4[6], riid->Data4[7]); - - return buf; -} static WCHAR *a2w(const char *str) { @@ -71,6 +60,7 @@ } static const char xmldecl_full[] = "\xef\xbb\xbf<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"; +static const char xmldecl_short[] = "<?xml version=\"1.0\"?><RegistrationInfo/>"; static IStream *create_stream_on_data(const char *data, int size) { @@ -94,11 +84,11 @@ } static void ok_pos_(IXmlReader *reader, int line, int pos, int line_broken, - int pos_broken, int todo, int _line_) + int pos_broken, BOOL todo, int _line_) { UINT l, p; HRESULT hr; - int broken_state; + BOOL broken_state; hr = IXmlReader_GetLineNumber(reader, &l); ok_(__FILE__, _line_)(hr == S_OK, "Expected S_OK, got %08x\n", hr); @@ -106,7 +96,7 @@ ok_(__FILE__, _line_)(hr == S_OK, "Expected S_OK, got %08x\n", hr); if (line_broken == -1 && pos_broken == -1) - broken_state = 0; + broken_state = FALSE; else broken_state = broken((line_broken == -1 ? line : line_broken) == l && (pos_broken == -1 ? pos : pos_broken) == p); @@ -156,7 +146,7 @@ static input_iids_t input_iids; -static void ok_iids_(const input_iids_t *iids, const IID **expected, const IID **exp_broken, int todo, int line) +static void ok_iids_(const input_iids_t *iids, const IID **expected, const IID **exp_broken, BOOL todo, int line) { int i = 0, size = 0; @@ -174,7 +164,7 @@ for (i = 0; i < size; i++) { ok_(__FILE__, line)(IsEqualGUID(&iids->iids[i], expected[i]) || (exp_broken ? broken(IsEqualGUID(&iids->iids[i], exp_broken[i])) : FALSE), - "Wrong IID(%d), got (%s)\n", i, debugstr_guid(&iids->iids[i])); + "Wrong IID(%d), got %s\n", i, wine_dbgstr_guid(&iids->iids[i])); } } #define ok_iids(got, exp, brk, todo) ok_iids_(got, exp, brk, todo, __LINE__) @@ -247,18 +237,18 @@ } static void test_read_state_(IXmlReader *reader, XmlReadState expected, - XmlReadState exp_broken, int todo, int line) -{ - XmlReadState state; + XmlReadState exp_broken, BOOL todo, int line) +{ + LONG_PTR state; HRESULT hr; - int broken_state; + BOOL broken_state; state = -1; /* invalid value */ - hr = IXmlReader_GetProperty(reader, XmlReaderProperty_ReadState, (LONG_PTR*)&state); + hr = IXmlReader_GetProperty(reader, XmlReaderProperty_ReadState, &state); ok_(__FILE__, line)(hr == S_OK, "Expected S_OK, got %08x\n", hr); if (exp_broken == -1) - broken_state = 0; + broken_state = FALSE; else broken_state = broken(exp_broken == state); @@ -647,7 +637,7 @@ ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); /* attempt to read on closed reader */ - test_read_state(reader, XmlReadState_Closed, -1, 0); + test_read_state(reader, XmlReadState_Closed, -1, FALSE); if (0) { /* newer versions crash here, probably cause no input was set */ @@ -659,11 +649,24 @@ static void test_read_xmldeclaration(void) { + static const WCHAR xmlW[] = {'x','m','l',0}; + static const WCHAR RegistrationInfoW[] = {'R','e','g','i','s','t','r','a','t','i','o','n','I','n','f','o',0}; + static const struct + { + WCHAR name[12]; + WCHAR val[12]; + } name_val[] = + { + { {'v','e','r','s','i','o','n',0}, {'1','.','0',0} }, + { {'e','n','c','o','d','i','n','g',0}, {'U','T','F','-','8',0} }, + { {'s','t','a','n','d','a','l','o','n','e',0}, {'y','e','s',0} } + }; IXmlReader *reader; IStream *stream; HRESULT hr; XmlNodeType type; - UINT count = 0; + UINT count = 0, len, i; + BOOL ret; const WCHAR *val; hr = pCreateXmlReader(&IID_IXmlReader, (LPVOID*)&reader, NULL); @@ -704,7 +707,7 @@ "Expected XmlNodeType_XmlDeclaration, got %s\n", type_to_str(type)); /* new version 1.2.x and 1.3.x properly update position for <?xml ?> */ ok_pos(reader, 1, 3, -1, 55, TRUE); - test_read_state(reader, XmlReadState_Interactive, -1, 0); + test_read_state(reader, XmlReadState_Interactive, -1, FALSE); hr = IXmlReader_GetValue(reader, &val, NULL); ok(hr == S_OK, "got %08x\n", hr); @@ -744,6 +747,24 @@ hr = IXmlReader_GetAttributeCount(reader, &count); ok(hr == S_OK, "got %08x\n", hr); ok(count == 3, "Expected 3, got %d\n", count); + + for (i = 0; i < count; i++) + { + len = 0; + hr = IXmlReader_GetLocalName(reader, &val, &len); + ok(hr == S_OK, "got %08x\n", hr); + ok(len == lstrlenW(name_val[i].name), "expected %u, got %u\n", lstrlenW(name_val[i].name), len); + ok(!lstrcmpW(name_val[i].name, val), "expected %s, got %s\n", wine_dbgstr_w(name_val[i].name), wine_dbgstr_w(val)); + + len = 0; + hr = IXmlReader_GetValue(reader, &val, &len); + ok(hr == S_OK, "got %08x\n", hr); + ok(len == lstrlenW(name_val[i].val), "expected %u, got %u\n", lstrlenW(name_val[i].val), len); + ok(!lstrcmpW(name_val[i].val, val), "expected %s, got %s\n", wine_dbgstr_w(name_val[i].val), wine_dbgstr_w(val)); + + hr = IXmlReader_MoveToNextAttribute(reader); + ok(hr == (i < count - 1) ? S_OK : S_FALSE, "got %08x\n", hr); + } hr = IXmlReader_GetDepth(reader, &count); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); @@ -766,6 +787,83 @@ ok(type == XmlNodeType_None, "got %d\n", type); } IStream_Release(stream); + + /* test short variant */ + stream = create_stream_on_data(xmldecl_short, sizeof(xmldecl_short)); + + hr = IXmlReader_SetInput(reader, (IUnknown *)stream); + ok(hr == S_OK, "expected S_OK, got %08x\n", hr); + + type = -1; + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK, "expected S_OK, got %08x\n", hr); + ok(type == XmlNodeType_XmlDeclaration, "expected XmlDeclaration, got %s\n", type_to_str(type)); + ok_pos(reader, 1, 3, 1, 21, TRUE); + test_read_state(reader, XmlReadState_Interactive, -1, TRUE); + + hr = IXmlReader_GetAttributeCount(reader, &count); + ok(hr == S_OK, "expected S_OK, got %08x\n", hr); + ok(count == 1, "expected 1, got %d\n", count); + + ret = IXmlReader_IsEmptyElement(reader); + ok(!ret, "element should not be empty\n"); + + hr = IXmlReader_GetValue(reader, &val, NULL); + ok(hr == S_OK, "expected S_OK, got %08x\n", hr); + ok(*val == 0, "got %s\n", wine_dbgstr_w(val)); + + hr = IXmlReader_GetLocalName(reader, &val, NULL); + ok(hr == S_OK, "expected S_OK, got %08x\n", hr); +todo_wine + ok(!lstrcmpW(val, xmlW), "got %s\n", wine_dbgstr_w(val)); + + /* check attributes */ + hr = IXmlReader_MoveToNextAttribute(reader); + ok(hr == S_OK, "expected S_OK, got %08x\n", hr); + + type = -1; + hr = IXmlReader_GetNodeType(reader, &type); + ok(hr == S_OK, "expected S_OK, got %08x\n", hr); + ok(type == XmlNodeType_Attribute, "got %d\n", type); + ok_pos(reader, 1, 7, 1, 21, TRUE); + + /* try to move from last attribute */ + hr = IXmlReader_MoveToNextAttribute(reader); + ok(hr == S_FALSE, "expected S_FALSE, got %08x\n", hr); + + type = -1; + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK, "expected S_OK, got %08x\n", hr); + ok(type == XmlNodeType_Element, "expected Element, got %s\n", type_to_str(type)); + ok_pos(reader, 1, 23, 1, 40, TRUE); + test_read_state(reader, XmlReadState_Interactive, -1, TRUE); + + hr = IXmlReader_GetAttributeCount(reader, &count); + ok(hr == S_OK, "expected S_OK, got %08x\n", hr); + ok(count == 0, "expected 0, got %d\n", count); + + ret = IXmlReader_IsEmptyElement(reader); + ok(ret, "element should be empty\n"); + + hr = IXmlReader_GetValue(reader, &val, NULL); + ok(hr == S_OK, "expected S_OK, got %08x\n", hr); +todo_wine + ok(*val == 0, "got %s\n", wine_dbgstr_w(val)); + + hr = IXmlReader_GetLocalName(reader, &val, NULL); + ok(hr == S_OK, "expected S_OK, got %08x\n", hr); + ok(!lstrcmpW(val, RegistrationInfoW), "got %s\n", wine_dbgstr_w(val)); + + type = -1; + hr = IXmlReader_Read(reader, &type); +todo_wine + ok(hr == WC_E_SYNTAX || hr == WC_E_XMLCHARACTER /* XP */, "expected WC_E_SYNTAX, got %08x\n", hr); +todo_wine + ok(type == XmlNodeType_None, "expected None, got %s\n", type_to_str(type)); + ok_pos(reader, 1, 41, -1, -1, TRUE); + test_read_state(reader, XmlReadState_Error, -1, TRUE); + + IStream_Release(stream); IXmlReader_Release(reader); } @@ -775,7 +873,7 @@ const char *value; HRESULT hr; HRESULT hr_broken; /* this is set to older version results */ - int todo : 1; + BOOL todo; }; static struct test_entry comment_tests[] = { @@ -860,6 +958,7 @@ { "<?pi ?>", "pi", "", S_OK }, { "<?pi pi data?>", "pi", "pi data", S_OK }, { "<?pi pi data ?>", "pi", "pi data ", S_OK }, + { "<?pi data ?>", "pi", "data ", S_OK }, { "<?pi:pi?>", NULL, NULL, NC_E_NAMECOLON, WC_E_NAMECHARACTER }, { "<?:pi ?>", NULL, NULL, WC_E_PI, WC_E_NAMECHARACTER }, { "<?-pi ?>", NULL, NULL, WC_E_PI, WC_E_NAMECHARACTER }, @@ -948,9 +1047,13 @@ " \t \r \n" "" "<a>" + "\r\n\t" "<b/>" + "text" "" + "text2" "<?pi pibody ?>" + "\r\n" "</a>" ; @@ -964,9 +1067,13 @@ XmlNodeType_Whitespace, XmlNodeType_Comment, XmlNodeType_Element, + XmlNodeType_Whitespace, XmlNodeType_Element, + XmlNodeType_Text, XmlNodeType_Comment, + XmlNodeType_Text, XmlNodeType_ProcessingInstruction, + XmlNodeType_Whitespace, XmlNodeType_EndElement, XmlNodeType_None } @@ -996,6 +1103,15 @@ ok(test->types[i] != XmlNodeType_None, "%d: unexpected end of test data\n", i); if (test->types[i] == XmlNodeType_None) break; ok(type == test->types[i], "%d: got wrong type %d, expected %d\n", i, type, test->types[i]); + if (type == XmlNodeType_Whitespace) + { + const WCHAR *ptr; + UINT len = 0; + + hr = IXmlReader_GetValue(reader, &ptr, &len); + ok(hr == S_OK, "%d: GetValue failed 0x%08x\n", i, hr); + ok(len > 0, "%d: wrong value length %d\n", i, len); + } hr = IXmlReader_Read(reader, &type); i++; } @@ -1325,8 +1441,8 @@ static struct test_entry cdata_tests[] = { { "<a><![CDATA[ ]]data ]]></a>", "", " ]]data ", S_OK }, { "<a><![CDATA[<![CDATA[ data ]]]]></a>", "", "<![CDATA[ data ]]", S_OK }, - { "<a><![CDATA[\n \r\n \n\n ]]></a>", "", "\n \n \n\n ", S_OK, S_OK, 1 }, - { "<a><![CDATA[\r \r\r\n \n\n ]]></a>", "", "\n \n\n \n\n ", S_OK, S_OK, 1 }, + { "<a><![CDATA[\n \r\n \n\n ]]></a>", "", "\n \n \n\n ", S_OK, S_OK, TRUE }, + { "<a><![CDATA[\r \r\r\n \n\n ]]></a>", "", "\n \n\n \n\n ", S_OK, S_OK, TRUE }, { "<a><![CDATA[\r\r \n\r \r \n\n ]]></a>", "", "\n\n \n\n \n \n\n ", S_OK }, { NULL } }; @@ -1669,16 +1785,8 @@ START_TEST(reader) { - HRESULT r; - - r = CoInitialize( NULL ); - ok( r == S_OK, "failed to init com\n"); - if (!init_pointers()) - { - CoUninitialize(); return; - } test_reader_create(); test_readerinput(); @@ -1695,6 +1803,4 @@ test_read_pending(); test_readvaluechunk(); test_read_xmldeclaration(); - - CoUninitialize(); -} +} Modified: trunk/rostests/winetests/xmllite/writer.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/xmllite/writer.… ============================================================================== --- trunk/rostests/winetests/xmllite/writer.c [iso-8859-1] (original) +++ trunk/rostests/winetests/xmllite/writer.c [iso-8859-1] Tue Apr 22 11:25:33 2014 @@ -22,6 +22,7 @@ #define _INC_WINDOWS #define COM_NO_WINDOWS_H +#define CONST_VTABLE #define COBJMACROS #include <stdarg.h> @@ -34,7 +35,44 @@ #include <xmllite.h> #include <wine/test.h> +#include <initguid.h> +DEFINE_GUID(IID_IXmlWriterOutput, 0xc1131708, 0x0f59, 0x477f, 0x93, 0x59, 0x7d, 0x33, 0x24, 0x51, 0xbc, 0x1a); + static HRESULT (WINAPI *pCreateXmlWriter)(REFIID riid, void **ppvObject, IMalloc *pMalloc); +static HRESULT (WINAPI *pCreateXmlWriterOutputWithEncodingName)(IUnknown *stream, + IMalloc *imalloc, + LPCWSTR encoding_name, + IXmlWriterOutput **output); + +static HRESULT WINAPI testoutput_QueryInterface(IUnknown *iface, REFIID riid, void **obj) +{ + if (IsEqualGUID(riid, &IID_IUnknown)) { + *obj = iface; + return S_OK; + } + else { + ok(0, "unknown riid=%s\n", wine_dbgstr_guid(riid)); + return E_NOINTERFACE; + } +} + +static ULONG WINAPI testoutput_AddRef(IUnknown *iface) +{ + return 2; +} + +static ULONG WINAPI testoutput_Release(IUnknown *iface) +{ + return 1; +} + +static const IUnknownVtbl testoutputvtbl = { + testoutput_QueryInterface, + testoutput_AddRef, + testoutput_Release +}; + +static IUnknown testoutput = { &testoutputvtbl }; static void test_writer_create(void) { @@ -50,10 +88,7 @@ hr = pCreateXmlWriter(&IID_IXmlWriter, (LPVOID*)&writer, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - if(hr == S_OK) - { - IXmlWriter_Release(writer); - } + IXmlWriter_Release(writer); } static BOOL init_pointers(void) @@ -69,25 +104,34 @@ #define MAKEFUNC(f) if (!(p##f = (void*)GetProcAddress(mod, #f))) return FALSE; MAKEFUNC(CreateXmlWriter); + MAKEFUNC(CreateXmlWriterOutputWithEncodingName); #undef MAKEFUNC return TRUE; } +static void test_writeroutput(void) +{ + static const WCHAR utf16W[] = {'u','t','f','-','1','6',0}; + IXmlWriterOutput *output; + IUnknown *unk; + HRESULT hr; + + hr = pCreateXmlWriterOutputWithEncodingName(&testoutput, NULL, utf16W, &output); + ok(hr == S_OK, "got %08x\n", hr); + unk = NULL; + hr = IUnknown_QueryInterface(output, &IID_IXmlWriterOutput, (void**)&unk); + ok(hr == S_OK, "got %08x\n", hr); + ok(unk != NULL, "got %p\n", unk); + /* releasing 'unk' crashes on native */ + IUnknown_Release(output); +} + START_TEST(writer) { - HRESULT r; - - r = CoInitialize( NULL ); - ok( r == S_OK, "failed to init com\n"); - if (!init_pointers()) - { - CoUninitialize(); return; - } test_writer_create(); - - CoUninitialize(); + test_writeroutput(); }

10 years, 8 months

← Newer
1
...
19
20
21
22
23
24
25
...
50
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2014