Ros-diffs December 2015

ros-diffs@reactos.org

12 participants
252 discussions

[tfaber] 70307: [CLASS2] - Fix build CORE-8911

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Dec 8 13:30:06 2015 New Revision: 70307 URL: http://svn.reactos.org/svn/reactos?rev=70307&view=rev Log: [CLASS2] - Fix build CORE-8911 Modified: trunk/reactos/drivers/storage/class/class2/class2.c Modified: trunk/reactos/drivers/storage/class/class2/class2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/clas… ============================================================================== --- trunk/reactos/drivers/storage/class/class2/class2.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/class2/class2.c [iso-8859-1] Tue Dec 8 13:30:06 2015 @@ -347,6 +347,7 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { + PCLASS_DEVICE_INFO DeviceInfo = DeviceObject->DeviceExtension; PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); if (IrpSp->MinorFunction == IRP_MN_START_DEVICE)

9 years

[tfaber] 70306: [CLASS2] - Add a Signature member to make devices created from class2's AddDevice recognizable CORE-8911

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Dec 8 13:25:37 2015 New Revision: 70306 URL: http://svn.reactos.org/svn/reactos?rev=70306&view=rev Log: [CLASS2] - Add a Signature member to make devices created from class2's AddDevice recognizable CORE-8911 Modified: trunk/reactos/drivers/storage/class/class2/class2.c Modified: trunk/reactos/drivers/storage/class/class2/class2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/clas… ============================================================================== --- trunk/reactos/drivers/storage/class/class2/class2.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/class2/class2.c [iso-8859-1] Tue Dec 8 13:25:37 2015 @@ -137,6 +137,7 @@ /* The following hack to assign drive letters with a non-PnP storage stack */ typedef struct _CLASS_DEVICE_INFO { + ULONG Signature; ULONG DeviceType; ULONG Partitions; ULONG DeviceNumber; @@ -350,6 +351,7 @@ if (IrpSp->MinorFunction == IRP_MN_START_DEVICE) { + ASSERT(DeviceInfo->Signature == '2slc'); IoSkipCurrentIrpStackLocation(Irp); return STATUS_SUCCESS; } @@ -357,6 +359,7 @@ { PCLASS_DEVICE_INFO DeviceInfo = DeviceObject->DeviceExtension; + ASSERT(DeviceInfo->Signature == '2slc'); ScsiClassRemoveDriveLetter(DeviceInfo); Irp->IoStatus.Status = STATUS_SUCCESS; @@ -403,6 +406,7 @@ DeviceInfo = DeviceObject->DeviceExtension; RtlZeroMemory(DeviceInfo, sizeof(CLASS_DEVICE_INFO)); + DeviceInfo->Signature = '2slc'; /* Attach it to the PDO */ DeviceInfo->LowerDevice = IoAttachDeviceToDeviceStack(DeviceObject, PhysicalDeviceObject); @@ -624,6 +628,8 @@ { PDEVICE_EXTENSION deviceExtension = DeviceObject->DeviceExtension; + ASSERT(*(PULONG)deviceExtension != '2slc'); + // // Invoke the device-specific routine, if one exists. Otherwise complete // with SUCCESS @@ -677,6 +683,8 @@ ULONG transferByteCount = currentIrpStack->Parameters.Read.Length; ULONG maximumTransferLength = deviceExtension->PortCapabilities->MaximumTransferLength; NTSTATUS status; + + ASSERT(*(PULONG)deviceExtension != '2slc'); if (DeviceObject->Flags & DO_VERIFY_VOLUME && !(currentIrpStack->Flags & SL_OVERRIDE_VERIFY_VOLUME)) { @@ -1041,6 +1049,8 @@ SCSI_REQUEST_BLOCK srb; NTSTATUS status; + ASSERT(*(PULONG)deviceExtension != '2slc'); + // // Allocate read capacity buffer from nonpaged pool. // @@ -1263,6 +1273,8 @@ PCOMPLETION_CONTEXT context; PSCSI_REQUEST_BLOCK srb; KIRQL currentIrql; + + ASSERT(*(PULONG)deviceExtension != '2slc'); // // Allocate context from nonpaged pool. @@ -1408,6 +1420,8 @@ PSCSI_REQUEST_BLOCK srb; PCOMPLETION_CONTEXT context; PCDB cdb; + + ASSERT(*(PULONG)deviceExtension != '2slc'); // // Allocate Srb from nonpaged pool. @@ -1633,6 +1647,8 @@ DebugPrint((2, "ScsiClassSplitRequest: Requires %d IRPs\n", irpCount)); DebugPrint((2, "ScsiClassSplitRequest: Original IRP %lx\n", Irp)); + ASSERT(*(PULONG)deviceExtension != '2slc'); + // // If all partial transfers complete successfully then the status and // bytes transferred are already set up. Failing a partial-transfer IRP @@ -1817,6 +1833,8 @@ NTSTATUS status; BOOLEAN retry; + ASSERT(*(PULONG)deviceExtension != '2slc'); + // // Check SRB status for success of completing request. // @@ -1968,6 +1986,8 @@ LONG irpCount; NTSTATUS status; BOOLEAN retry; + + ASSERT(*(PULONG)deviceExtension != '2slc'); // // Check SRB status for success of completing request. @@ -2189,6 +2209,8 @@ LARGE_INTEGER dummy; PAGED_CODE(); + + ASSERT(*(PULONG)deviceExtension != '2slc'); dummy.QuadPart = 0; @@ -2481,6 +2503,7 @@ ULONG i; #endif + ASSERT(*(PULONG)deviceExtension != '2slc'); // // Check that request sense buffer is valid. @@ -3161,6 +3184,8 @@ PIO_STACK_LOCATION nextIrpStack = IoGetNextIrpStackLocation(Irp); ULONG transferByteCount; + ASSERT(*(PULONG)deviceExtension != '2slc'); + // // Determine the transfer count of the request. If this is a read or a // write then the transfer count is in the Irp stack. Otherwise assume @@ -3291,6 +3316,8 @@ PCDB cdb; ULONG logicalBlockAddress; USHORT transferBlocks; + + ASSERT(*(PULONG)deviceExtension != '2slc'); // // Calculate relative sector address. @@ -3510,6 +3537,8 @@ SCSI_REQUEST_BLOCK srb; ULONG retries = 1; NTSTATUS status; + + ASSERT(*(PULONG)deviceExtension != '2slc'); RtlZeroMemory(&srb, sizeof(SCSI_REQUEST_BLOCK)); @@ -3687,6 +3716,8 @@ PAGED_CODE(); + ASSERT(*(PULONG)deviceExtension != '2slc'); + // // Write length to SRB. // @@ -3860,6 +3891,7 @@ PDEVICE_EXTENSION deviceExtension = DeviceObject->DeviceExtension; + ASSERT(*(PULONG)deviceExtension != '2slc'); // // Call the class specific driver DeviceControl routine. @@ -3908,6 +3940,8 @@ PCDB cdb; NTSTATUS status; ULONG modifiedIoControlCode; + + ASSERT(*(PULONG)deviceExtension != '2slc'); if (irpStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_STORAGE_RESET_DEVICE) { @@ -4456,6 +4490,8 @@ { PDEVICE_EXTENSION deviceExtension = DeviceObject->DeviceExtension; + ASSERT(*(PULONG)deviceExtension != '2slc'); + if (deviceExtension->ClassShutdownFlush) { // @@ -4609,6 +4645,8 @@ PDEVICE_EXTENSION deviceExtension = deviceObject->DeviceExtension; + ASSERT(*(PULONG)deviceExtension != '2slc'); + // // Fill in entry points // @@ -4853,6 +4891,8 @@ PIO_STACK_LOCATION irpStack = IoGetCurrentIrpStackLocation(Irp); PDEVICE_EXTENSION deviceExtension = DeviceObject->DeviceExtension; PSCSI_REQUEST_BLOCK srb; + + ASSERT(*(PULONG)deviceExtension != '2slc'); // // Get a pointer to the SRB. @@ -5108,6 +5148,9 @@ deviceExtension->PhysicalDevice->DeviceExtension; PIRP originalIrp; + ASSERT(*(PULONG)deviceExtension != '2slc'); + ASSERT(*(PULONG)physicalExtension != '2slc'); + originalIrp = irpStack->Parameters.Others.Argument1; //

9 years

[akhaldi] 70305: [WINSPOOL] Properly stub IsValidDevmodeW.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Dec 8 13:01:28 2015 New Revision: 70305 URL: http://svn.reactos.org/svn/reactos?rev=70305&view=rev Log: [WINSPOOL] Properly stub IsValidDevmodeW. Modified: trunk/reactos/dll/win32/winspool/winspool.spec Modified: trunk/reactos/dll/win32/winspool/winspool.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winspool/winspoo… ============================================================================== --- trunk/reactos/dll/win32/winspool/winspool.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winspool/winspool.spec [iso-8859-1] Tue Dec 8 13:01:28 2015 @@ -153,7 +153,7 @@ @ stdcall GetPrintProcessorDirectoryW(wstr wstr long ptr long ptr) @ stub GetSpoolFileHandle @ stub IsValidDevmodeA -@ stub IsValidDevmodeW +@ stdcall -stub IsValidDevmodeW(ptr long) @ stdcall OpenPrinterA(str ptr ptr) @ stdcall OpenPrinterW(wstr ptr ptr) @ stub PlayGdiScriptOnPrinterIC

9 years

[tfaber] 70304: [FASTFAT] - Always use the full path name when looking for FCB hashes CORE-10483 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Dec 8 12:57:45 2015 New Revision: 70304 URL: http://svn.reactos.org/svn/reactos?rev=70304&view=rev Log: [FASTFAT] - Always use the full path name when looking for FCB hashes CORE-10483 #resolve Modified: trunk/reactos/drivers/filesystems/fastfat/fcb.c Modified: trunk/reactos/drivers/filesystems/fastfat/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fcb.c [iso-8859-1] Tue Dec 8 12:57:45 2015 @@ -437,6 +437,7 @@ DPRINT("'%wZ'\n", PathNameU); + ASSERT(PathNameU->Length >= sizeof(WCHAR) && PathNameU->Buffer[0] == L'\\'); Hash = vfatNameHash(0, PathNameU); entry = pVCB->FcbHashTable[Hash % pVCB->HashTableSize]; @@ -812,14 +813,15 @@ DPRINT("vfatGetFCBForFile (%p,%p,%p,%wZ)\n", pVCB, pParentFCB, pFCB, pFileNameU); - FileNameU.Buffer = NameBuffer; - FileNameU.MaximumLength = sizeof(NameBuffer); - RtlCopyUnicodeString(&FileNameU, pFileNameU); + RtlInitEmptyUnicodeString(&FileNameU, NameBuffer, sizeof(NameBuffer)); parentFCB = *pParentFCB; if (parentFCB == NULL) { + /* Passed-in name is the full name */ + RtlCopyUnicodeString(&FileNameU, pFileNameU); + // Trivial case, open of the root directory on volume if (RtlEqualUnicodeString(&FileNameU, &RootNameU, FALSE)) { @@ -888,9 +890,20 @@ } else { + /* Make absolute path */ + RtlCopyUnicodeString(&FileNameU, &parentFCB->PathNameU); + curr = FileNameU.Buffer + FileNameU.Length / sizeof(WCHAR) - 1; + if (*curr != L'\\') + { + RtlAppendUnicodeToString(&FileNameU, L"\\"); + curr++; + } + ASSERT(*curr == L'\\'); + RtlAppendUnicodeStringToString(&FileNameU, pFileNameU); + FCB = parentFCB; parentFCB = NULL; - prev = curr = FileNameU.Buffer - 1; + prev = curr; last = FileNameU.Buffer + FileNameU.Length / sizeof(WCHAR) - 1; }

9 years

[akhaldi] 70303: [QEDIT_WINETEST] Welcome to the green family.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Dec 8 12:43:26 2015 New Revision: 70303 URL: http://svn.reactos.org/svn/reactos?rev=70303&view=rev Log: [QEDIT_WINETEST] Welcome to the green family. Modified: trunk/rostests/winetests/qedit/CMakeLists.txt Modified: trunk/rostests/winetests/qedit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/qedit/CMakeList… ============================================================================== --- trunk/rostests/winetests/qedit/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/qedit/CMakeLists.txt [iso-8859-1] Tue Dec 8 12:43:26 2015 @@ -1,4 +1,5 @@ +add_definitions(-DUSE_WINE_TODOS) add_executable(qedit_winetest mediadet.c testlist.c qedit.rc) set_module_type(qedit_winetest win32cui) add_importlibs(qedit_winetest oleaut32 ole32 msvcrt kernel32)

9 years

[akhaldi] 70302: [PSDK] Update d3dtypes.h. CORE-10536

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Dec 8 12:38:18 2015 New Revision: 70302 URL: http://svn.reactos.org/svn/reactos?rev=70302&view=rev Log: [PSDK] Update d3dtypes.h. CORE-10536 Modified: trunk/reactos/include/psdk/d3dtypes.h Modified: trunk/reactos/include/psdk/d3dtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3dtypes.h?re… ============================================================================== --- trunk/reactos/include/psdk/d3dtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/d3dtypes.h [iso-8859-1] Tue Dec 8 12:38:18 2015 @@ -34,6 +34,10 @@ #include <float.h> #include <ddraw.h> +#ifdef __i386__ +#include <pshpack4.h> +#endif + #define D3DVALP(val, prec) ((float)(val)) #define D3DVAL(val) ((float)(val)) #define D3DDivide(a, b) (float)((double) (a) / (double) (b)) @@ -57,10 +61,10 @@ #define RGBA_MAKE(r, g, b, a) ((D3DCOLOR) (((a) << 24) | ((r) << 16) | ((g) << 8) | (b))) #define D3DRGB(r, g, b) \ - (0xff000000L | ( ((long)((r) * 255)) << 16) | (((long)((g) * 255)) << 8) | (long)((b) * 255)) + (0xff000000 | ( ((LONG)((r) * 255)) << 16) | (((LONG)((g) * 255)) << 8) | (LONG)((b) * 255)) #define D3DRGBA(r, g, b, a) \ - ( (((long)((a) * 255)) << 24) | (((long)((r) * 255)) << 16) \ - | (((long)((g) * 255)) << 8) | (long)((b) * 255) \ + ( (((LONG)((a) * 255)) << 24) | (((LONG)((r) * 255)) << 16) \ + | (((LONG)((g) * 255)) << 8) | (LONG)((b) * 255) \ ) #define RGB_GETRED(rgb) (((rgb) >> 16) & 0xff) @@ -76,9 +80,9 @@ #define D3DENUMRET_CANCEL DDENUMRET_CANCEL #define D3DENUMRET_OK DDENUMRET_OK -typedef HRESULT (CALLBACK *LPD3DVALIDATECALLBACK)(LPVOID lpUserArg, DWORD dwOffset); -typedef HRESULT (CALLBACK *LPD3DENUMTEXTUREFORMATSCALLBACK)(LPDDSURFACEDESC lpDdsd, LPVOID lpContext); -typedef HRESULT (CALLBACK *LPD3DENUMPIXELFORMATSCALLBACK)(LPDDPIXELFORMAT lpDDPixFmt, LPVOID lpContext); +typedef HRESULT (CALLBACK *LPD3DVALIDATECALLBACK)(void *ctx, DWORD offset); +typedef HRESULT (CALLBACK *LPD3DENUMTEXTUREFORMATSCALLBACK)(DDSURFACEDESC *surface_desc, void *ctx); +typedef HRESULT (CALLBACK *LPD3DENUMPIXELFORMATSCALLBACK)(DDPIXELFORMAT *format, void *ctx); #ifndef DX_SHARED_DEFINES @@ -344,9 +348,9 @@ /* This is different from MS, but avoids anonymous structs. */ D3DVALUE &operator () (int r, int c) - { return ((D3DVALUE [4][4])&_11)[r][c]; } + { return (&_11)[r*4 + c]; } const D3DVALUE &operator() (int r, int c) const - { return ((const D3DVALUE [4][4])&_11)[r][c]; } + { return (&_11)[r*4 + c]; } #endif } D3DMATRIX, *LPD3DMATRIX; #endif @@ -480,11 +484,11 @@ typedef struct _D3DTRANSFORMDATA { DWORD dwSize; - LPVOID lpIn; + void *lpIn; DWORD dwInSize; - LPVOID lpOut; + void *lpOut; DWORD dwOutSize; - LPD3DHVERTEX lpHOut; + D3DHVERTEX *lpHOut; DWORD dwClip; DWORD dwClipIntersection; DWORD dwClipUnion; @@ -613,9 +617,9 @@ typedef struct _D3DLIGHTDATA { DWORD dwSize; - LPD3DLIGHTINGELEMENT lpIn; + D3DLIGHTINGELEMENT *lpIn; DWORD dwInSize; - LPD3DTLVERTEX lpOut; + D3DTLVERTEX *lpOut; DWORD dwOutSize; } D3DLIGHTDATA, *LPD3DLIGHTDATA; @@ -1327,9 +1331,10 @@ #define D3DFVF_TLVERTEX ( D3DFVF_XYZRHW | D3DFVF_DIFFUSE | D3DFVF_SPECULAR | \ D3DFVF_TEX1 ) -typedef struct _D3DDP_PTRSTRIDE { - LPVOID lpvData; - DWORD dwStride; +typedef struct _D3DDP_PTRSTRIDE +{ + void *lpvData; + DWORD dwStride; } D3DDP_PTRSTRIDE; #define D3DDP_MAXTEXCOORD 8 @@ -1415,6 +1420,10 @@ #define D3DFVF_TEXCOORDSIZE4(CoordIndex) (D3DFVF_TEXTUREFORMAT4 << (CoordIndex*2 + 16)) #define D3DFVF_TEXCOORDSIZE1(CoordIndex) (D3DFVF_TEXTUREFORMAT1 << (CoordIndex*2 + 16)) +#ifdef __i386__ +#include <poppack.h> +#endif + #endif /* (DIRECT3D_VERSION < 0x0800) */ #endif

9 years

[akhaldi] 70301: [WINSPOOL_WINETEST] Import from Wine Staging 1.7.55. CORE-10536

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Dec 8 12:35:27 2015 New Revision: 70301 URL: http://svn.reactos.org/svn/reactos?rev=70301&view=rev Log: [WINSPOOL_WINETEST] Import from Wine Staging 1.7.55. CORE-10536 Added: trunk/rostests/winetests/winspool/CMakeLists.txt (with props) trunk/rostests/winetests/winspool/info.c (with props) trunk/rostests/winetests/winspool/testlist.c (with props) Modified: trunk/rostests/winetests/CMakeLists.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?… Added: trunk/rostests/winetests/winspool/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winspool/CMakeL… Added: trunk/rostests/winetests/winspool/info.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winspool/info.c… Added: trunk/rostests/winetests/winspool/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winspool/testli…

9 years

[akhaldi] 70300: [QEDIT_WINETEST] Import from Wine Staging 1.7.55. CORE-10536

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Dec 8 11:26:07 2015 New Revision: 70300 URL: http://svn.reactos.org/svn/reactos?rev=70300&view=rev Log: [QEDIT_WINETEST] Import from Wine Staging 1.7.55. CORE-10536 Added: trunk/rostests/winetests/qedit/ trunk/rostests/winetests/qedit/CMakeLists.txt (with props) trunk/rostests/winetests/qedit/mediadet.c (with props) trunk/rostests/winetests/qedit/qedit.rc (with props) trunk/rostests/winetests/qedit/rc.h (with props) trunk/rostests/winetests/qedit/test.avi (with props) trunk/rostests/winetests/qedit/test_sound.avi (with props) trunk/rostests/winetests/qedit/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 Dec 8 11:26:07 2015 @@ -72,6 +72,7 @@ add_subdirectory(pdh) add_subdirectory(propsys) add_subdirectory(psapi) +add_subdirectory(qedit) add_subdirectory(qmgr) add_subdirectory(quartz) add_subdirectory(rasapi32) Added: trunk/rostests/winetests/qedit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/qedit/CMakeList… ============================================================================== --- trunk/rostests/winetests/qedit/CMakeLists.txt (added) +++ trunk/rostests/winetests/qedit/CMakeLists.txt [iso-8859-1] Tue Dec 8 11:26:07 2015 @@ -0,0 +1,5 @@ + +add_executable(qedit_winetest mediadet.c testlist.c qedit.rc) +set_module_type(qedit_winetest win32cui) +add_importlibs(qedit_winetest oleaut32 ole32 msvcrt kernel32) +add_cd_file(TARGET qedit_winetest DESTINATION reactos/bin FOR all) Propchange: trunk/rostests/winetests/qedit/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/qedit/mediadet.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/qedit/mediadet.… ============================================================================== --- trunk/rostests/winetests/qedit/mediadet.c (added) +++ trunk/rostests/winetests/qedit/mediadet.c [iso-8859-1] Tue Dec 8 11:26:07 2015 @@ -0,0 +1,478 @@ +/* + * Unit tests for Media Detector + * + * Copyright (C) 2008 Google (Lei Zhang, Dan Hipschman) + * + * 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 + */ + +#define COBJMACROS +#define CONST_VTABLE + +#include "initguid.h" +#include "ole2.h" +#include "vfwmsgs.h" +#include "uuids.h" +#include "wine/test.h" +#include "qedit.h" +#include "control.h" +#include "rc.h" + +/* Outer IUnknown for COM aggregation tests */ +struct unk_impl { + IUnknown IUnknown_iface; + LONG ref; + IUnknown *inner_unk; +}; + +static inline struct unk_impl *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct unk_impl, IUnknown_iface); +} + +static HRESULT WINAPI unk_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + + return IUnknown_QueryInterface(This->inner_unk, riid, ppv); +} + +static ULONG WINAPI unk_AddRef(IUnknown *iface) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI unk_Release(IUnknown *iface) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + + return InterlockedDecrement(&This->ref); +} + +static const IUnknownVtbl unk_vtbl = +{ + unk_QueryInterface, + unk_AddRef, + unk_Release +}; + + +static WCHAR test_avi_filename[MAX_PATH]; +static WCHAR test_sound_avi_filename[MAX_PATH]; + +static BOOL unpack_avi_file(int id, WCHAR name[MAX_PATH]) +{ + static WCHAR temp_path[MAX_PATH]; + static const WCHAR prefix[] = {'D','E','S',0}; + static const WCHAR avi[] = {'a','v','i',0}; + HRSRC res; + HGLOBAL data; + char *mem; + DWORD size, written; + HANDLE fh; + BOOL ret; + + res = FindResourceW(NULL, MAKEINTRESOURCEW(id), MAKEINTRESOURCEW(AVI_RES_TYPE)); + if (!res) + return FALSE; + + data = LoadResource(NULL, res); + if (!data) + return FALSE; + + mem = LockResource(data); + if (!mem) + return FALSE; + + size = SizeofResource(NULL, res); + if (size == 0) + return FALSE; + + if (!GetTempPathW(MAX_PATH, temp_path)) + return FALSE; + + /* We might end up relying on the extension here, so .TMP is no good. */ + if (!GetTempFileNameW(temp_path, prefix, 0, name)) + return FALSE; + + DeleteFileW(name); + lstrcpyW(name + lstrlenW(name) - 3, avi); + + fh = CreateFileW(name, GENERIC_WRITE, 0, NULL, CREATE_NEW, + FILE_ATTRIBUTE_NORMAL, NULL); + if (fh == INVALID_HANDLE_VALUE) + return FALSE; + + ret = WriteFile(fh, mem, size, &written, NULL); + CloseHandle(fh); + return ret && written == size; +} + +static BOOL init_tests(void) +{ + return unpack_avi_file(TEST_AVI_RES, test_avi_filename) + && unpack_avi_file(TEST_SOUND_AVI_RES, test_sound_avi_filename); +} + +static void test_mediadet(void) +{ + HRESULT hr; + struct unk_impl unk_obj = {{&unk_vtbl}, 19, NULL}; + IMediaDet *pM = NULL; + ULONG refcount; + BSTR filename = NULL; + LONG nstrms = 0; + LONG strm; + AM_MEDIA_TYPE mt; + double fps; + int flags; + int i; + + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_MediaDet, &unk_obj.IUnknown_iface, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&unk_obj.inner_unk); + ok(hr == S_OK, "CoCreateInstance failed: %08x\n", hr); + + hr = IUnknown_QueryInterface(unk_obj.inner_unk, &IID_IMediaDet, (void**)&pM); + ok(hr == S_OK, "QueryInterface for IID_IMediaDet failed: %08x\n", hr); + refcount = IMediaDet_AddRef(pM); + ok(refcount == unk_obj.ref, "MediaDet just pretends to support COM aggregation\n"); + refcount = IMediaDet_Release(pM); + ok(refcount == unk_obj.ref, "MediaDet just pretends to support COM aggregation\n"); + refcount = IMediaDet_Release(pM); + ok(refcount == 19, "Refcount should be back at 19 but is %u\n", refcount); + + IUnknown_Release(unk_obj.inner_unk); + + /* test.avi has one video stream. */ + hr = CoCreateInstance(&CLSID_MediaDet, NULL, CLSCTX_INPROC_SERVER, + &IID_IMediaDet, (LPVOID*)&pM); + ok(hr == S_OK, "CoCreateInstance failed with %x\n", hr); + ok(pM != NULL, "pM is NULL\n"); + + filename = NULL; + hr = IMediaDet_get_Filename(pM, &filename); + /* Despite what MSDN claims, this returns S_OK. */ + ok(hr == S_OK, "IMediaDet_get_Filename failed: %08x\n", hr); + ok(filename == NULL, "IMediaDet_get_Filename\n"); + + filename = (BSTR) -1; + hr = IMediaDet_get_Filename(pM, &filename); + /* Despite what MSDN claims, this returns S_OK. */ + ok(hr == S_OK, "IMediaDet_get_Filename failed: %08x\n", hr); + ok(filename == NULL, "IMediaDet_get_Filename\n"); + + nstrms = -1; + hr = IMediaDet_get_OutputStreams(pM, &nstrms); + ok(hr == E_INVALIDARG, "IMediaDet_get_OutputStreams failed: %08x\n", hr); + ok(nstrms == -1, "IMediaDet_get_OutputStreams: nstrms is %i\n", nstrms); + + strm = -1; + /* The stream defaults to 0, even without a file! */ + hr = IMediaDet_get_CurrentStream(pM, &strm); + ok(hr == S_OK, "IMediaDet_get_CurrentStream failed: %08x\n", hr); + ok(strm == 0, "IMediaDet_get_CurrentStream: strm is %i\n", strm); + + hr = IMediaDet_get_CurrentStream(pM, NULL); + ok(hr == E_POINTER, "IMediaDet_get_CurrentStream failed: %08x\n", hr); + + /* But put_CurrentStream doesn't. */ + hr = IMediaDet_put_CurrentStream(pM, 0); + ok(hr == E_INVALIDARG, "IMediaDet_put_CurrentStream failed: %08x\n", hr); + + hr = IMediaDet_put_CurrentStream(pM, -1); + ok(hr == E_INVALIDARG, "IMediaDet_put_CurrentStream failed: %08x\n", hr); + + hr = IMediaDet_get_StreamMediaType(pM, &mt); + ok(hr == E_INVALIDARG, "IMediaDet_get_StreamMediaType failed: %08x\n", hr); + + hr = IMediaDet_get_StreamMediaType(pM, NULL); + ok(hr == E_POINTER, "IMediaDet_get_StreamMediaType failed: %08x\n", hr); + + filename = SysAllocString(test_avi_filename); + hr = IMediaDet_put_Filename(pM, filename); + ok(hr == S_OK, "IMediaDet_put_Filename failed: %08x\n", hr); + SysFreeString(filename); + + strm = -1; + /* The stream defaults to 0. */ + hr = IMediaDet_get_CurrentStream(pM, &strm); + ok(hr == S_OK, "IMediaDet_get_CurrentStream failed: %08x\n", hr); + ok(strm == 0, "IMediaDet_get_CurrentStream: strm is %i\n", strm); + + ZeroMemory(&mt, sizeof mt); + hr = IMediaDet_get_StreamMediaType(pM, &mt); + ok(hr == S_OK, "IMediaDet_get_StreamMediaType failed: %08x\n", hr); + CoTaskMemFree(mt.pbFormat); + + /* Even before get_OutputStreams. */ + hr = IMediaDet_put_CurrentStream(pM, 1); + ok(hr == E_INVALIDARG, "IMediaDet_put_CurrentStream failed: %08x\n", hr); + + hr = IMediaDet_get_OutputStreams(pM, &nstrms); + ok(hr == S_OK, "IMediaDet_get_OutputStreams failed: %08x\n", hr); + ok(nstrms == 1, "IMediaDet_get_OutputStreams: nstrms is %i\n", nstrms); + + filename = NULL; + hr = IMediaDet_get_Filename(pM, &filename); + ok(hr == S_OK, "IMediaDet_get_Filename failed: %08x\n", hr); + ok(lstrcmpW(filename, test_avi_filename) == 0, + "IMediaDet_get_Filename\n"); + SysFreeString(filename); + + hr = IMediaDet_get_Filename(pM, NULL); + ok(hr == E_POINTER, "IMediaDet_get_Filename failed: %08x\n", hr); + + strm = -1; + hr = IMediaDet_get_CurrentStream(pM, &strm); + ok(hr == S_OK, "IMediaDet_get_CurrentStream failed: %08x\n", hr); + ok(strm == 0, "IMediaDet_get_CurrentStream: strm is %i\n", strm); + + hr = IMediaDet_get_CurrentStream(pM, NULL); + ok(hr == E_POINTER, "IMediaDet_get_CurrentStream failed: %08x\n", hr); + + hr = IMediaDet_put_CurrentStream(pM, -1); + ok(hr == E_INVALIDARG, "IMediaDet_put_CurrentStream failed: %08x\n", hr); + + hr = IMediaDet_put_CurrentStream(pM, 1); + ok(hr == E_INVALIDARG, "IMediaDet_put_CurrentStream failed: %08x\n", hr); + + /* Try again. */ + strm = -1; + hr = IMediaDet_get_CurrentStream(pM, &strm); + ok(hr == S_OK, "IMediaDet_get_CurrentStream failed: %08x\n", hr); + ok(strm == 0, "IMediaDet_get_CurrentStream: strm is %i\n", strm); + + hr = IMediaDet_put_CurrentStream(pM, 0); + ok(hr == S_OK, "IMediaDet_put_CurrentStream failed: %08x\n", hr); + + strm = -1; + hr = IMediaDet_get_CurrentStream(pM, &strm); + ok(hr == S_OK, "IMediaDet_get_CurrentStream failed: %08x\n", hr); + ok(strm == 0, "IMediaDet_get_CurrentStream: strm is %i\n", strm); + + ZeroMemory(&mt, sizeof mt); + hr = IMediaDet_get_StreamMediaType(pM, &mt); + ok(hr == S_OK, "IMediaDet_get_StreamMediaType failed: %08x\n", hr); + ok(IsEqualGUID(&mt.majortype, &MEDIATYPE_Video), + "IMediaDet_get_StreamMediaType\n"); + CoTaskMemFree(mt.pbFormat); + + hr = IMediaDet_get_FrameRate(pM, NULL); + ok(hr == E_POINTER, "IMediaDet_get_FrameRate failed: %08x\n", hr); + + hr = IMediaDet_get_FrameRate(pM, &fps); + ok(hr == S_OK, "IMediaDet_get_FrameRate failed: %08x\n", hr); + ok(fps == 10.0, "IMediaDet_get_FrameRate: fps is %f\n", fps); + + hr = IMediaDet_Release(pM); + ok(hr == 0, "IMediaDet_Release returned: %x\n", hr); + + DeleteFileW(test_avi_filename); + + /* test_sound.avi has one video stream and one audio stream. */ + hr = CoCreateInstance(&CLSID_MediaDet, NULL, CLSCTX_INPROC_SERVER, + &IID_IMediaDet, (LPVOID*)&pM); + ok(hr == S_OK, "CoCreateInstance failed with %x\n", hr); + ok(pM != NULL, "pM is NULL\n"); + + filename = SysAllocString(test_sound_avi_filename); + hr = IMediaDet_put_Filename(pM, filename); + ok(hr == S_OK, "IMediaDet_put_Filename failed: %08x\n", hr); + SysFreeString(filename); + + hr = IMediaDet_get_OutputStreams(pM, &nstrms); + ok(hr == S_OK, "IMediaDet_get_OutputStreams failed: %08x\n", hr); + ok(nstrms == 2, "IMediaDet_get_OutputStreams: nstrms is %i\n", nstrms); + + filename = NULL; + hr = IMediaDet_get_Filename(pM, &filename); + ok(hr == S_OK, "IMediaDet_get_Filename failed: %08x\n", hr); + ok(lstrcmpW(filename, test_sound_avi_filename) == 0, + "IMediaDet_get_Filename\n"); + SysFreeString(filename); + + /* I don't know if the stream order is deterministic. Just check + for both an audio and video stream. */ + flags = 0; + + for (i = 0; i < 2; ++i) + { + hr = IMediaDet_put_CurrentStream(pM, i); + ok(hr == S_OK, "IMediaDet_put_CurrentStream failed: %08x\n", hr); + + strm = -1; + hr = IMediaDet_get_CurrentStream(pM, &strm); + ok(hr == S_OK, "IMediaDet_get_CurrentStream failed: %08x\n", hr); + ok(strm == i, "IMediaDet_get_CurrentStream: strm is %i\n", strm); + + ZeroMemory(&mt, sizeof mt); + hr = IMediaDet_get_StreamMediaType(pM, &mt); + ok(hr == S_OK, "IMediaDet_get_StreamMediaType failed: %08x\n", hr); + flags += (IsEqualGUID(&mt.majortype, &MEDIATYPE_Video) + ? 1 + : (IsEqualGUID(&mt.majortype, &MEDIATYPE_Audio) + ? 2 + : 0)); + + if (IsEqualGUID(&mt.majortype, &MEDIATYPE_Audio)) + { + hr = IMediaDet_get_FrameRate(pM, &fps); + ok(hr == VFW_E_INVALIDMEDIATYPE, "IMediaDet_get_FrameRate failed: %08x\n", hr); + } + + CoTaskMemFree(mt.pbFormat); + } + ok(flags == 3, "IMediaDet_get_StreamMediaType: flags are %i\n", flags); + + hr = IMediaDet_put_CurrentStream(pM, 2); + ok(hr == E_INVALIDARG, "IMediaDet_put_CurrentStream failed: %08x\n", hr); + + strm = -1; + hr = IMediaDet_get_CurrentStream(pM, &strm); + ok(hr == S_OK, "IMediaDet_get_CurrentStream failed: %08x\n", hr); + ok(strm == 1, "IMediaDet_get_CurrentStream: strm is %i\n", strm); + + hr = IMediaDet_Release(pM); + ok(hr == 0, "IMediaDet_Release returned: %x\n", hr); + + DeleteFileW(test_sound_avi_filename); +} + +static void test_samplegrabber(void) +{ + struct unk_impl unk_obj = {{&unk_vtbl}, 19, NULL}; + ISampleGrabber *sg; + IBaseFilter *bf; + IMediaFilter *mf; + IPersist *persist; + IUnknown *unk; + ULONG refcount; + HRESULT hr; + + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_SampleGrabber, &unk_obj.IUnknown_iface, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&unk_obj.inner_unk); + ok(hr == S_OK, "CoCreateInstance failed: %08x\n", hr); + + hr = IUnknown_QueryInterface(unk_obj.inner_unk, &IID_ISampleGrabber, (void**)&sg); + ok(hr == S_OK, "QueryInterface for IID_ISampleGrabber failed: %08x\n", hr); + refcount = ISampleGrabber_AddRef(sg); + ok(refcount == unk_obj.ref, "SampleGrabber just pretends to support COM aggregation\n"); + refcount = ISampleGrabber_Release(sg); + ok(refcount == unk_obj.ref, "SampleGrabber just pretends to support COM aggregation\n"); + refcount = ISampleGrabber_Release(sg); + ok(refcount == 19, "Refcount should be back at 19 but is %u\n", refcount); + IUnknown_Release(unk_obj.inner_unk); + + /* Invalid RIID */ + hr = CoCreateInstance(&CLSID_SampleGrabber, NULL, CLSCTX_INPROC_SERVER, &IID_IClassFactory, + (void**)&sg); + ok(hr == E_NOINTERFACE, "SampleGrabber create failed: %08x, expected E_NOINTERFACE\n", hr); + + /* Same refcount for all SampleGrabber interfaces */ + hr = CoCreateInstance(&CLSID_SampleGrabber, NULL, CLSCTX_INPROC_SERVER, &IID_ISampleGrabber, + (void**)&sg); + ok(hr == S_OK, "SampleGrabber create failed: %08x, expected S_OK\n", hr); + refcount = ISampleGrabber_AddRef(sg); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = ISampleGrabber_QueryInterface(sg, &IID_IBaseFilter, (void**)&bf); + ok(hr == S_OK, "QueryInterface for IID_IBaseFilter failed: %08x\n", hr); + refcount = IBaseFilter_AddRef(bf); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IBaseFilter_Release(bf); + + hr = ISampleGrabber_QueryInterface(sg, &IID_IMediaFilter, (void**)&mf); + ok(hr == S_OK, "QueryInterface for IID_IMediaFilter failed: %08x\n", hr); + refcount = IMediaFilter_AddRef(mf); + ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + refcount = IMediaFilter_Release(mf); + + hr = ISampleGrabber_QueryInterface(sg, &IID_IPersist, (void**)&persist); + ok(hr == S_OK, "QueryInterface for IID_IPersist failed: %08x\n", hr); + refcount = IPersist_AddRef(persist); + ok(refcount == 6, "refcount == %u, expected 6\n", refcount); + refcount = IPersist_Release(persist); + + hr = ISampleGrabber_QueryInterface(sg, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 7, "refcount == %u, expected 7\n", refcount); + refcount = IUnknown_Release(unk); + + /* Interfaces that native does not support */ + hr = ISampleGrabber_QueryInterface(sg, &IID_IMediaPosition, (void**)&unk); + todo_wine ok(hr == E_NOINTERFACE, "QueryInterface for IID_IMediaPosition failed: %08x\n", hr); + hr = ISampleGrabber_QueryInterface(sg, &IID_IMediaSeeking, (void**)&unk); + todo_wine ok(hr == E_NOINTERFACE, "QueryInterface for IID_IMediaSeeking failed: %08x\n", hr); + hr = ISampleGrabber_QueryInterface(sg, &IID_IMemInputPin, (void**)&unk); + ok(hr == E_NOINTERFACE, "QueryInterface for IID_IMemInputPin failed: %08x\n", hr); + hr = ISampleGrabber_QueryInterface(sg, &IID_IQualityControl, (void**)&unk); + ok(hr == E_NOINTERFACE, "QueryInterface for IID_IQualityControl failed: %08x\n", hr); + hr = ISampleGrabber_QueryInterface(sg, &IID_ISeekingPassThru, (void**)&unk); + ok(hr == E_NOINTERFACE, "QueryInterface for IID_ISeekingPassThru failed: %08x\n", hr); + + while (ISampleGrabber_Release(sg)); +} + +static void test_COM_sg_enumpins(void) +{ + IBaseFilter *bf; + IEnumPins *pins, *pins2; + IUnknown *unk; + ULONG refcount; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_SampleGrabber, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, + (void**)&bf); + ok(hr == S_OK, "SampleGrabber create failed: %08x, expected S_OK\n", hr); + hr = IBaseFilter_EnumPins(bf, &pins); + ok(hr == S_OK, "EnumPins create failed: %08x, expected S_OK\n", hr); + + /* Same refcount for all EnumPins interfaces */ + refcount = IEnumPins_AddRef(pins); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + hr = IEnumPins_QueryInterface(pins, &IID_IEnumPins, (void**)&pins2); + ok(hr == S_OK, "QueryInterface for IID_IEnumPins failed: %08x\n", hr); + ok(pins == pins2, "QueryInterface for self failed (%p != %p)\n", pins, pins2); + IEnumPins_Release(pins2); + + hr = IEnumPins_QueryInterface(pins, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IUnknown_Release(unk); + + while (IEnumPins_Release(pins)); + IBaseFilter_Release(bf); +} + +START_TEST(mediadet) +{ + if (!init_tests()) + { + skip("Couldn't initialize tests!\n"); + return; + } + + CoInitialize(NULL); + test_mediadet(); + test_samplegrabber(); + test_COM_sg_enumpins(); + CoUninitialize(); +} Propchange: trunk/rostests/winetests/qedit/mediadet.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/qedit/qedit.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/qedit/qedit.rc?… ============================================================================== --- trunk/rostests/winetests/qedit/qedit.rc (added) +++ trunk/rostests/winetests/qedit/qedit.rc [iso-8859-1] Tue Dec 8 11:26:07 2015 @@ -0,0 +1,26 @@ +/* + * Resource file for qedit tests. + * + * Copyright 2008 Google (Dan Hipschman) + * + * 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 "rc.h" + +/* @makedep: test.avi */ +TEST_AVI_RES AVI_RES_TYPE test.avi +/* @makedep: test_sound.avi */ +TEST_SOUND_AVI_RES AVI_RES_TYPE test_sound.avi Propchange: trunk/rostests/winetests/qedit/qedit.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/qedit/rc.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/qedit/rc.h?rev=… ============================================================================== --- trunk/rostests/winetests/qedit/rc.h (added) +++ trunk/rostests/winetests/qedit/rc.h [iso-8859-1] Tue Dec 8 11:26:07 2015 @@ -0,0 +1,29 @@ +/* + * Resource identifiers for qedit tests. + * + * Copyright 2008 Google (Dan Hipschman) + * + * 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 + */ + +#ifndef QEDIT_TESTS_RC_INCLUDED +#define QEDIT_TESTS_RC_INCLUDED + +#define TEST_AVI_RES 1 +#define TEST_SOUND_AVI_RES 2 + +#define AVI_RES_TYPE 256 + +#endif /* QEDIT_TESTS_RC_INCLUDED */ Propchange: trunk/rostests/winetests/qedit/rc.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/qedit/test.avi URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/qedit/test.avi?… ============================================================================== Binary file - no diff available. Propchange: trunk/rostests/winetests/qedit/test.avi ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rostests/winetests/qedit/test_sound.avi URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/qedit/test_soun… ============================================================================== Binary file - no diff available. Propchange: trunk/rostests/winetests/qedit/test_sound.avi ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rostests/winetests/qedit/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/qedit/testlist.… ============================================================================== --- trunk/rostests/winetests/qedit/testlist.c (added) +++ trunk/rostests/winetests/qedit/testlist.c [iso-8859-1] Tue Dec 8 11:26:07 2015 @@ -0,0 +1,12 @@ +/* Automatically generated by make depend; DO NOT EDIT!! */ + +#define STANDALONE +#include <wine/test.h> + +extern void func_mediadet(void); + +const struct test winetest_testlist[] = +{ + { "mediadet", func_mediadet }, + { 0, 0 } +}; Propchange: trunk/rostests/winetests/qedit/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native

9 years

[akhaldi] 70299: [NETCFGX_WINETEST] Import from Wine Staging 1.7.55. CORE-10536

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Dec 8 11:18:34 2015 New Revision: 70299 URL: http://svn.reactos.org/svn/reactos?rev=70299&view=rev Log: [NETCFGX_WINETEST] Import from Wine Staging 1.7.55. CORE-10536 Added: trunk/rostests/winetests/netcfgx/ trunk/rostests/winetests/netcfgx/CMakeLists.txt (with props) trunk/rostests/winetests/netcfgx/netcfgx.c (with props) trunk/rostests/winetests/netcfgx/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 Dec 8 11:18:34 2015 @@ -59,6 +59,7 @@ add_subdirectory(msvfw32) add_subdirectory(msxml3) add_subdirectory(netapi32) +add_subdirectory(netcfgx) add_subdirectory(ntdll) add_subdirectory(ntdsapi) add_subdirectory(ntprint) Added: trunk/rostests/winetests/netcfgx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/netcfgx/CMakeLi… ============================================================================== --- trunk/rostests/winetests/netcfgx/CMakeLists.txt (added) +++ trunk/rostests/winetests/netcfgx/CMakeLists.txt [iso-8859-1] Tue Dec 8 11:18:34 2015 @@ -0,0 +1,6 @@ + +add_executable(netcfgx_winetest netcfgx.c testlist.c) +target_link_libraries(netcfgx_winetest uuid) +set_module_type(netcfgx_winetest win32cui) +add_importlibs(netcfgx_winetest ole32 msvcrt kernel32) +add_cd_file(TARGET netcfgx_winetest DESTINATION reactos/bin FOR all) Propchange: trunk/rostests/winetests/netcfgx/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/netcfgx/netcfgx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/netcfgx/netcfgx… ============================================================================== --- trunk/rostests/winetests/netcfgx/netcfgx.c (added) +++ trunk/rostests/winetests/netcfgx/netcfgx.c [iso-8859-1] Tue Dec 8 11:18:34 2015 @@ -0,0 +1,95 @@ +/* + * Copyright 2014 Alistair Leslie-Hughes + * + * 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 <stdio.h> + +#define WIN32_LEAN_AND_MEAN +#define COBJMACROS +#include <wine/test.h> +#include <objbase.h> +#include <netcfgx.h> + +static void create_configuration(void) +{ + static const WCHAR tcpipW[] = {'M','S','_','T','C','P','I','P',0}; + static const WCHAR myclient[] = {'M','Y',' ','C','L','I','E','N','T',0}; + HRESULT hr; + INetCfg *config = NULL; + INetCfgLock *netlock = NULL; + INetCfgComponent *component = NULL; + LPWSTR client = NULL; + + hr = CoCreateInstance( &CLSID_CNetCfg, NULL, CLSCTX_ALL, &IID_INetCfg, (LPVOID*)&config); + ok(hr == S_OK, "Failed to create object\n"); + if(SUCCEEDED(hr)) + { + hr = INetCfg_QueryInterface(config, &IID_INetCfgLock, (LPVOID*)&netlock); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = INetCfgLock_AcquireWriteLock(netlock, 5000, myclient, &client); + ok(hr == S_OK || + hr == E_ACCESSDENIED /* Not run as admin */, "got 0x%08x\n", hr); + if(hr == S_OK) + { + trace("Lock value: %s\n", wine_dbgstr_w(client)); + CoTaskMemFree(client); + } + else if(hr == E_ACCESSDENIED) + trace("Not run with Admin permissions\n"); + + hr = INetCfg_Initialize(config, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* AcquireWriteLock needs to be run before Initialize */ + hr = INetCfgLock_AcquireWriteLock(netlock, 5000, myclient, &client); + todo_wine ok(hr == NETCFG_E_ALREADY_INITIALIZED || hr == E_ACCESSDENIED, "got 0x%08x\n", hr); + + hr = INetCfg_FindComponent(config, tcpipW, &component); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if(hr == S_OK) + { + INetCfgComponent_Release(component); + } + + hr = INetCfg_Apply(config); + todo_wine ok(hr == S_OK || hr == NETCFG_E_NO_WRITE_LOCK, "got 0x%08x\n", hr); + + hr = INetCfg_Uninitialize(config); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = INetCfgLock_ReleaseWriteLock(netlock); + ok(hr == S_OK, "got 0x%08x\n", hr); + + INetCfgLock_Release(netlock); + INetCfg_Release(config); + } +} + +START_TEST(netcfgx) +{ + HRESULT hr; + + hr = CoInitialize(0); + ok( hr == S_OK, "failed to init com\n"); + if (hr != S_OK) + return; + + create_configuration(); + + CoUninitialize(); +} Propchange: trunk/rostests/winetests/netcfgx/netcfgx.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/netcfgx/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/netcfgx/testlis… ============================================================================== --- trunk/rostests/winetests/netcfgx/testlist.c (added) +++ trunk/rostests/winetests/netcfgx/testlist.c [iso-8859-1] Tue Dec 8 11:18:34 2015 @@ -0,0 +1,12 @@ +/* Automatically generated by make depend; DO NOT EDIT!! */ + +#define STANDALONE +#include <wine/test.h> + +extern void func_netcfgx(void); + +const struct test winetest_testlist[] = +{ + { "netcfgx", func_netcfgx }, + { 0, 0 } +}; Propchange: trunk/rostests/winetests/netcfgx/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native

9 years

[akhaldi] 70298: [PSDK] Update stdole2.idl. CORE-10536

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Dec 8 11:15:23 2015 New Revision: 70298 URL: http://svn.reactos.org/svn/reactos?rev=70298&view=rev Log: [PSDK] Update stdole2.idl. CORE-10536 Modified: trunk/reactos/include/psdk/stdole2.idl Modified: trunk/reactos/include/psdk/stdole2.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/stdole2.idl?r… ============================================================================== --- trunk/reactos/include/psdk/stdole2.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/stdole2.idl [iso-8859-1] Tue Dec 8 11:15:23 2015 @@ -18,6 +18,13 @@ * */ +#if 0 +#pragma makedep install +#pragma makedep typelib +#endif + +#include <olectl.h> + [ uuid(00020430-0000-0000-C000-000000000046), version(2.0), @@ -61,7 +68,7 @@ void *pfnDeferredFillIn; SCODE scode; } EXCEPINFO; -#ifndef __midl + [ odl, uuid(00000000-0000-0000-C000-000000000046), @@ -139,7 +146,7 @@ HRESULT Clone( [out] IEnumVARIANT **ppenum); } -#endif /* !__midl */ + typedef [uuid(66504301-BE0F-101A-8BBB-00AA00300CAB), public] unsigned long OLE_COLOR; @@ -270,14 +277,14 @@ ] dispinterface Font { properties: - [id(0x0)] BSTR Name; - [id(0x2)] CURRENCY Size; - [id(0x3)] VARIANT_BOOL Bold; - [id(0x4)] VARIANT_BOOL Italic; - [id(0x5)] VARIANT_BOOL Underline; - [id(0x6)] VARIANT_BOOL Strikethrough; - [id(0x7)] short Weight; - [id(0x8)] short Charset; + [id(DISPID_FONT_NAME)] BSTR Name; + [id(DISPID_FONT_SIZE)] CURRENCY Size; + [id(DISPID_FONT_BOLD)] VARIANT_BOOL Bold; + [id(DISPID_FONT_ITALIC)] VARIANT_BOOL Italic; + [id(DISPID_FONT_UNDER)] VARIANT_BOOL Underline; + [id(DISPID_FONT_STRIKE)] VARIANT_BOOL Strikethrough; + [id(DISPID_FONT_WEIGHT)] short Weight; + [id(DISPID_FONT_CHARSET)] short Charset; methods: } @@ -349,13 +356,14 @@ ] dispinterface Picture { properties: - [id(0x0), readonly] OLE_HANDLE Handle; - [id(0x2)] OLE_HANDLE hPal; - [id(0x3), readonly] short Type; - [id(0x4), readonly] OLE_XSIZE_HIMETRIC Width; - [id(0x5), readonly] OLE_YSIZE_HIMETRIC Height; + [id(DISPID_PICT_HANDLE), readonly] OLE_HANDLE Handle; + [id(DISPID_PICT_HPAL)] OLE_HANDLE hPal; + [id(DISPID_PICT_TYPE), readonly] short Type; + [id(DISPID_PICT_WIDTH), readonly] OLE_XSIZE_HIMETRIC Width; + [id(DISPID_PICT_HEIGHT), readonly] OLE_YSIZE_HIMETRIC Height; methods: - [id(0x6)] void Render(int hdc, + [id(DISPID_PICT_RENDER)] + void Render(int hdc, long x, long y, long cx, @@ -400,9 +408,9 @@ helpcontext(0x2775) ] HRESULT LoadPicture([in, optional] VARIANT filename, - [in, optional, defaultvalue(0)] int widthDesired, - [in, optional, defaultvalue(0)] int heightDesired, - [in, optional, defaultvalue(Default)] enum LoadPictureConstants flags, + [in, defaultvalue(0)] int widthDesired, + [in, defaultvalue(0)] int heightDesired, + [in, defaultvalue(Default)] enum LoadPictureConstants flags, [out, retval] IPictureDisp **retval); [ entry("OleSavePictureFile"), @@ -422,7 +430,7 @@ dispinterface FontEvents { properties: methods: - [id(0x9)] void FontChanged([in] BSTR PropertyName); + [id(DISPID_FONT_CHANGED)] void FontChanged([in] BSTR PropertyName); }; typedef [public] FontEvents IFontEventsDisp;

9 years

← Newer
1
...
15
16
17
18
19
20
21
...
26
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 December 2015