Ros-diffs January 2005

ros-diffs@reactos.org

28 participants
703 discussions

[navaraf] 12954: Herve Poussineau <poussine@freesurf.fr>

by navaraf＠svn.reactos.com

Herve Poussineau <poussine(a)freesurf.fr> Use DDK types instead of Win32 types (BOOL, WORD, DWORD). Modified: trunk/reactos/drivers/fs/vfat/blockdev.c Modified: trunk/reactos/drivers/fs/vfat/dir.c Modified: trunk/reactos/drivers/fs/vfat/direntry.c Modified: trunk/reactos/drivers/fs/vfat/dirwr.c Modified: trunk/reactos/drivers/fs/vfat/fcb.c Modified: trunk/reactos/drivers/fs/vfat/finfo.c Modified: trunk/reactos/drivers/fs/vfat/fsctl.c Modified: trunk/reactos/drivers/fs/vfat/iface.c Modified: trunk/reactos/drivers/fs/vfat/rw.c Modified: trunk/reactos/drivers/fs/vfat/vfat.h Modified: trunk/reactos/drivers/fs/vfat/volume.c _____ Modified: trunk/reactos/drivers/fs/vfat/blockdev.c --- trunk/reactos/drivers/fs/vfat/blockdev.c 2005-01-12 10:24:56 UTC (rev 12953) +++ trunk/reactos/drivers/fs/vfat/blockdev.c 2005-01-12 10:46:13 UTC (rev 12954) @@ -71,7 +71,7 @@ KeInitializeEvent (&event, NotificationEvent, FALSE); - DPRINT ("VfatReadSectors(pDeviceObject %x, Offset %I64x, Length %d, Buffer %x)\n", + DPRINT ("VfatReadDisk(pDeviceObject %x, Offset %I64x, Length %d, Buffer %x)\n", pDeviceObject, ReadOffset->QuadPart, ReadLength, Buffer); DPRINT ("Building synchronous FSD Request...\n"); @@ -108,7 +108,7 @@ if (!NT_SUCCESS (Status)) { - DPRINT ("IO failed!!! VfatReadSectors : Error code: %x\n", Status); + DPRINT ("IO failed!!! VfatReadDisk : Error code: %x\n", Status); DPRINT ("(pDeviceObject %x, Offset %I64x, Size %d, Buffer %x\n", pDeviceObject, ReadOffset->QuadPart, ReadLength, Buffer); return (Status); @@ -134,7 +134,7 @@ DPRINT ("Building asynchronous FSD Request...\n"); - Buffer = MmGetMdlVirtualAddress(IrpContext->Irp->MdlAddress) + BufferOffset; + Buffer = (PCHAR)MmGetMdlVirtualAddress(IrpContext->Irp->MdlAddress) + BufferOffset; Irp = IoAllocateIrp(IrpContext->DeviceExt->StorageDevice->StackSize, TRUE); if (Irp == NULL) @@ -212,7 +212,7 @@ DPRINT ("VfatWriteDiskPartial(IrpContext %x, WriteOffset %I64x, WriteLength %d, BufferOffset %x, Wait %d)\n", IrpContext, WriteOffset->QuadPart, WriteLength, BufferOffset, Wait); - Buffer = MmGetMdlVirtualAddress(IrpContext->Irp->MdlAddress) + BufferOffset; + Buffer = (PCHAR)MmGetMdlVirtualAddress(IrpContext->Irp->MdlAddress) + BufferOffset; DPRINT ("Building asynchronous FSD Request...\n"); Irp = IoAllocateIrp(IrpContext->DeviceExt->StorageDevice->StackSize, TRUE); _____ Modified: trunk/reactos/drivers/fs/vfat/dir.c --- trunk/reactos/drivers/fs/vfat/dir.c 2005-01-12 10:24:56 UTC (rev 12953) +++ trunk/reactos/drivers/fs/vfat/dir.c 2005-01-12 10:46:13 UTC (rev 12954) @@ -20,7 +20,7 @@ // function like DosDateTimeToFileTime -BOOL +BOOLEAN FsdDosDateTimeToSystemTime (PDEVICE_EXTENSION DeviceExt, WORD wDosDate, WORD wDosTime, PLARGE_INTEGER SystemTime) { PDOSTIME pdtime = (PDOSTIME) & wDosTime; @@ -47,11 +47,11 @@ } // function like FileTimeToDosDateTime -BOOL -FsdSystemTimeToDosDateTime (PDEVICE_EXTENSION DeviceExt, PLARGE_INTEGER SystemTime, WORD * pwDosDate, WORD * pwDosTime) +BOOLEAN +FsdSystemTimeToDosDateTime (PDEVICE_EXTENSION DeviceExt, PLARGE_INTEGER SystemTime, USHORT *pDosDate, USHORT *pDosTime) { - PDOSTIME pdtime = (PDOSTIME) pwDosTime; - PDOSDATE pddate = (PDOSDATE) pwDosDate; + PDOSTIME pdtime = (PDOSTIME) pDosTime; + PDOSDATE pddate = (PDOSDATE) pDosDate; TIME_FIELDS TimeFields; LARGE_INTEGER LocalTime; @@ -72,13 +72,13 @@ { pddate->Day = TimeFields.Day; pddate->Month = TimeFields.Month; - pddate->Year = TimeFields.Year - DeviceExt->BaseDateYear; + pddate->Year = (USHORT) (TimeFields.Year - DeviceExt->BaseDateYear); } return TRUE; } -#define DWORD_ROUND_UP(x) ROUND_UP((x), (sizeof(DWORD))) +#define ULONG_ROUND_UP(x) ROUND_UP((x), (sizeof(ULONG))) NTSTATUS VfatGetFileNameInformation (PVFAT_DIRENTRY_CONTEXT DirContext, @@ -88,7 +88,7 @@ return STATUS_BUFFER_OVERFLOW; pInfo->FileNameLength = DirContext->LongNameU.Length; pInfo->NextEntryOffset = - DWORD_ROUND_UP (sizeof (FILE_DIRECTORY_INFORMATION) + DirContext->LongNameU.Length); + ULONG_ROUND_UP (sizeof (FILE_DIRECTORY_INFORMATION) + DirContext->LongNameU.Length); RtlCopyMemory (pInfo->FileName, DirContext->LongNameU.Buffer, DirContext->LongNameU.Length); return STATUS_SUCCESS; } @@ -103,7 +103,7 @@ return STATUS_BUFFER_OVERFLOW; pInfo->FileNameLength = DirContext->LongNameU.Length; pInfo->NextEntryOffset = - DWORD_ROUND_UP (sizeof (FILE_DIRECTORY_INFORMATION) + DirContext->LongNameU.Length); + ULONG_ROUND_UP (sizeof (FILE_DIRECTORY_INFORMATION) + DirContext->LongNameU.Length); RtlCopyMemory (pInfo->FileName, DirContext->LongNameU.Buffer, DirContext->LongNameU.Length); // pInfo->FileIndex=; if (DeviceExt->Flags & VCB_IS_FATX) @@ -173,7 +173,7 @@ return STATUS_BUFFER_OVERFLOW; pInfo->FileNameLength = DirContext->LongNameU.Length; pInfo->NextEntryOffset = - DWORD_ROUND_UP (sizeof (FILE_FULL_DIRECTORY_INFORMATION) + DirContext->LongNameU.Length); + ULONG_ROUND_UP (sizeof (FILE_FULL_DIRECTORY_INFORMATION) + DirContext->LongNameU.Length); RtlCopyMemory (pInfo->FileName, DirContext->LongNameU.Buffer, DirContext->LongNameU.Length); // pInfo->FileIndex=; if (DeviceExt->Flags & VCB_IS_FATX) @@ -231,7 +231,7 @@ pInfo->FileNameLength = DirContext->LongNameU.Length; RtlCopyMemory(pInfo->FileName, DirContext->LongNameU.Buffer, DirContext->LongNameU.Length); pInfo->NextEntryOffset = - DWORD_ROUND_UP (sizeof (FILE_BOTH_DIRECTORY_INFORMATION) + DirContext->LongNameU.Length); + ULONG_ROUND_UP (sizeof (FILE_BOTH_DIRECTORY_INFORMATION) + DirContext->LongNameU.Length); pInfo->ShortName[0] = 0; pInfo->ShortNameLength = 0; // pInfo->FileIndex=; @@ -264,7 +264,7 @@ { pInfo->FileNameLength = DirContext->LongNameU.Length; pInfo->NextEntryOffset = - DWORD_ROUND_UP (sizeof (FILE_BOTH_DIRECTORY_INFORMATION) + DirContext->LongNameU.Length); + ULONG_ROUND_UP (sizeof (FILE_BOTH_DIRECTORY_INFORMATION) + DirContext->LongNameU.Length); RtlCopyMemory(pInfo->ShortName, DirContext->ShortNameU.Buffer, DirContext->ShortNameU.Length); pInfo->ShortNameLength = DirContext->ShortNameU.Length; RtlCopyMemory (pInfo->FileName, DirContext->LongNameU.Buffer, DirContext->LongNameU.Length); _____ Modified: trunk/reactos/drivers/fs/vfat/direntry.c --- trunk/reactos/drivers/fs/vfat/direntry.c 2005-01-12 10:24:56 UTC (rev 12953) +++ trunk/reactos/drivers/fs/vfat/direntry.c 2005-01-12 10:46:13 UTC (rev 12954) @@ -45,7 +45,7 @@ return cluster; } -BOOL FATIsDirectoryEmpty(PVFATFCB Fcb) +BOOLEAN FATIsDirectoryEmpty(PVFATFCB Fcb) { LARGE_INTEGER FileOffset; PVOID Context = NULL; @@ -98,7 +98,7 @@ return TRUE; } -BOOL FATXIsDirectoryEmpty(PVFATFCB Fcb) +BOOLEAN FATXIsDirectoryEmpty(PVFATFCB Fcb) { LARGE_INTEGER FileOffset; PVOID Context = NULL; @@ -144,7 +144,7 @@ return TRUE; } -BOOL VfatIsDirectoryEmpty(PVFATFCB Fcb) +BOOLEAN VfatIsDirectoryEmpty(PVFATFCB Fcb) { if (Fcb->Flags & FCB_IS_FATX_ENTRY) return FATXIsDirectoryEmpty(Fcb); _____ Modified: trunk/reactos/drivers/fs/vfat/dirwr.c --- trunk/reactos/drivers/fs/vfat/dirwr.c 2005-01-12 10:24:56 UTC (rev 12953) +++ trunk/reactos/drivers/fs/vfat/dirwr.c 2005-01-12 10:46:13 UTC (rev 12954) @@ -151,7 +151,7 @@ return FALSE; } // clear the new dir cluster - FileOffset.u.LowPart = (DWORD)(pDirFcb->RFCB.FileSize.QuadPart - + FileOffset.u.LowPart = (ULONG)(pDirFcb->RFCB.FileSize.QuadPart - DeviceExt->FatInfo.BytesPerCluster); CcMapData (pDirFcb->FileObject, &FileOffset, DeviceExt->FatInfo.BytesPerCluster, TRUE, &Context, (PVOID*)&pFatEntry); @@ -195,7 +195,7 @@ PVOID Context = NULL; PFAT_DIR_ENTRY pFatEntry; slot *pSlots; - short nbSlots = 0, j, posCar; + USHORT nbSlots = 0, j, posCar; PUCHAR Buffer; BOOLEAN needTilde = FALSE, needLong = FALSE; BOOLEAN lCaseBase = FALSE, uCaseBase, lCaseExt = FALSE, uCaseExt; @@ -402,11 +402,11 @@ pSlots[i].attr = 0xf; if (i) { - pSlots[i].id = nbSlots - i - 1; + pSlots[i].id = (unsigned char)(nbSlots - i - 1); } else { - pSlots[i].id = nbSlots - i - 1 + 0x40; + pSlots[i].id = (unsigned char)(nbSlots - i - 1 + 0x40); } pSlots[i].alias_checksum = pSlots[0].alias_checksum; RtlCopyMemory (pSlots[i].name0_4, DirContext.LongNameU.Buffer + (nbSlots - i - 2) * 13, 10); _____ Modified: trunk/reactos/drivers/fs/vfat/fcb.c --- trunk/reactos/drivers/fs/vfat/fcb.c 2005-01-12 10:24:56 UTC (rev 12953) +++ trunk/reactos/drivers/fs/vfat/fcb.c 2005-01-12 10:46:13 UTC (rev 12954) @@ -151,13 +151,13 @@ ExFreeToNPagedLookasideList(&VfatGlobalData->FcbLookasideList, pFCB); } -BOOL +BOOLEAN vfatFCBIsDirectory(PVFATFCB FCB) { return *FCB->Attributes & FILE_ATTRIBUTE_DIRECTORY; } -BOOL +BOOLEAN vfatFCBIsRoot(PVFATFCB FCB) { return FCB->PathNameU.Length == sizeof(WCHAR) && FCB->PathNameU.Buffer[0] == L'\\' ? TRUE : FALSE; _____ Modified: trunk/reactos/drivers/fs/vfat/finfo.c --- trunk/reactos/drivers/fs/vfat/finfo.c 2005-01-12 10:24:56 UTC (rev 12953) +++ trunk/reactos/drivers/fs/vfat/finfo.c 2005-01-12 10:46:13 UTC (rev 12954) @@ -479,7 +479,7 @@ ULONG ClusterSize = DeviceExt->FatInfo.BytesPerCluster; ULONG NewSize = AllocationSize->u.LowPart; ULONG NCluster; - BOOL AllocSizeChanged = FALSE; + BOOLEAN AllocSizeChanged = FALSE; DPRINT("VfatSetAllocationSizeInformation()\n"); @@ -746,7 +746,7 @@ PVFATFCB FCB = NULL; NTSTATUS RC = STATUS_SUCCESS; PVOID SystemBuffer; - BOOL CanWait = IrpContext->Flags & IRPCONTEXT_CANWAIT; + BOOLEAN CanWait = (IrpContext->Flags & IRPCONTEXT_CANWAIT) != 0; /* PRECONDITION */ ASSERT(IrpContext); _____ Modified: trunk/reactos/drivers/fs/vfat/fsctl.c --- trunk/reactos/drivers/fs/vfat/fsctl.c 2005-01-12 10:24:56 UTC (rev 12953) +++ trunk/reactos/drivers/fs/vfat/fsctl.c 2005-01-12 10:46:13 UTC (rev 12954) @@ -56,7 +56,7 @@ LARGE_INTEGER Offset; struct _BootSector* Boot; struct _BootSectorFatX* BootFatX; - BOOL PartitionInfoIsValid = FALSE; + BOOLEAN PartitionInfoIsValid = FALSE; DPRINT("VfatHasFileSystem\n"); _____ Modified: trunk/reactos/drivers/fs/vfat/iface.c --- trunk/reactos/drivers/fs/vfat/iface.c 2005-01-12 10:24:56 UTC (rev 12953) +++ trunk/reactos/drivers/fs/vfat/iface.c 2005-01-12 10:46:13 UTC (rev 12954) @@ -45,7 +45,7 @@ DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath) /* - * FUNCTION: Called by the system to initalize the driver + * FUNCTION: Called by the system to initialize the driver * ARGUMENTS: * DriverObject = object describing this driver * RegistryPath = path to our configuration entries _____ Modified: trunk/reactos/drivers/fs/vfat/rw.c --- trunk/reactos/drivers/fs/vfat/rw.c 2005-01-12 10:24:56 UTC (rev 12953) +++ trunk/reactos/drivers/fs/vfat/rw.c 2005-01-12 10:46:13 UTC (rev 12954) @@ -375,7 +375,7 @@ ASSERT(WriteOffset.QuadPart + Length <= Fcb->RFCB.AllocationSize.QuadPart); ASSERT(WriteOffset.u.LowPart % BytesPerSector == 0); - ASSERT(Length % BytesPerSector == 0) + ASSERT(Length % BytesPerSector == 0); // Is this a write of the volume ? if (Fcb->Flags & FCB_IS_VOLUME) @@ -705,7 +705,7 @@ CHECKPOINT; if (ByteOffset.QuadPart + Length > ROUND_UP(Fcb->RFCB.FileSize.QuadPart, BytesPerSector)) { - Length = ROUND_UP(Fcb->RFCB.FileSize.QuadPart, BytesPerSector) - ByteOffset.QuadPart; + Length = (ULONG)(ROUND_UP(Fcb->RFCB.FileSize.QuadPart, BytesPerSector) - ByteOffset.QuadPart); } Status = VfatLockUserBuffer(IrpContext->Irp, Length, IoWriteAccess); @@ -719,8 +719,8 @@ if (Status == STATUS_VERIFY_REQUIRED) { DPRINT("VfatReadFile returned STATUS_VERIFY_REQUIRED\n"); - DeviceToVerify = IoGetDeviceToVerify((struct _ETHREAD*)KeGetCurrentThread()); - IoSetDeviceToVerify((struct _ETHREAD*)KeGetCurrentThread(), NULL); + DeviceToVerify = IoGetDeviceToVerify(PsGetCurrentThread()); + IoSetDeviceToVerify(PsGetCurrentThread(), NULL); Status = IoVerifyVolume (DeviceToVerify, FALSE); if (NT_SUCCESS(Status)) _____ Modified: trunk/reactos/drivers/fs/vfat/vfat.h --- trunk/reactos/drivers/fs/vfat/vfat.h 2005-01-12 10:24:56 UTC (rev 12953) +++ trunk/reactos/drivers/fs/vfat/vfat.h 2005-01-12 10:46:13 UTC (rev 12954) @@ -179,7 +179,7 @@ ULONG NumberOfClusters; ULONG FatType; ULONG Sectors; - BOOL FixedMedia; + BOOLEAN FixedMedia; } FATINFO, *PFATINFO; struct _VFATFCB; @@ -356,17 +356,17 @@ typedef struct __DOSTIME { - WORD Second:5; - WORD Minute:6; - WORD Hour:5; + USHORT Second:5; + USHORT Minute:6; + USHORT Hour:5; } DOSTIME, *PDOSTIME; typedef struct __DOSDATE { - WORD Day:5; - WORD Month:4; - WORD Year:5; + USHORT Day:5; + USHORT Month:4; + USHORT Year:5; } DOSDATE, *PDOSDATE; @@ -441,15 +441,15 @@ NTSTATUS VfatDirectoryControl (PVFAT_IRP_CONTEXT); -BOOL FsdDosDateTimeToSystemTime (PDEVICE_EXTENSION DeviceExt, - WORD wDosDate, - WORD wDosTime, - PLARGE_INTEGER SystemTime); +BOOLEAN FsdDosDateTimeToSystemTime (PDEVICE_EXTENSION DeviceExt, + USHORT DosDate, + USHORT DosTime, + PLARGE_INTEGER SystemTime); -BOOL FsdSystemTimeToDosDateTime (PDEVICE_EXTENSION DeviceExt, - PLARGE_INTEGER SystemTime, - WORD *pwDosDate, - WORD *pwDosTime); +BOOLEAN FsdSystemTimeToDosDateTime (PDEVICE_EXTENSION DeviceExt, + PLARGE_INTEGER SystemTime, + USHORT *pDosDate, + USHORT *pDosTime); /* -------------------------------------------------------- create.c */ @@ -602,7 +602,7 @@ ULONG vfatDirEntryGetFirstCluster (PDEVICE_EXTENSION pDeviceExt, PDIR_ENTRY pDirEntry); -BOOL VfatIsDirectoryEmpty(PVFATFCB Fcb); +BOOLEAN VfatIsDirectoryEmpty(PVFATFCB Fcb); NTSTATUS FATGetNextDirEntry(PVOID * pContext, PVOID * pPage, @@ -641,9 +641,9 @@ PVFATFCB vfatOpenRootFCB (PDEVICE_EXTENSION pVCB); -BOOL vfatFCBIsDirectory (PVFATFCB FCB); +BOOLEAN vfatFCBIsDirectory (PVFATFCB FCB); -BOOL vfatFCBIsRoot(PVFATFCB FCB); +BOOLEAN vfatFCBIsRoot(PVFATFCB FCB); NTSTATUS vfatAttachFCBToFileObject (PDEVICE_EXTENSION vcb, PVFATFCB fcb, _____ Modified: trunk/reactos/drivers/fs/vfat/volume.c --- trunk/reactos/drivers/fs/vfat/volume.c 2005-01-12 10:24:56 UTC (rev 12953) +++ trunk/reactos/drivers/fs/vfat/volume.c 2005-01-12 10:46:13 UTC (rev 12954) @@ -169,7 +169,7 @@ PDIR_ENTRY Entry; PVFATFCB pRootFcb; LARGE_INTEGER FileOffset; - BOOL LabelFound = FALSE; + BOOLEAN LabelFound = FALSE; DIR_ENTRY VolumeLabelDirEntry; ULONG VolumeLabelDirIndex; ULONG LabelLen;

19 years, 10 months

[ros-diffs] [navaraf] 12953: Herv, Poussineau <poussine@freesurf.fr>

by navaraf＠svn.reactos.com

Herv, Poussineau <poussine(a)freesurf.fr> Fill DriverName field in DRIVER_OBJECT structure. Modified: trunk/reactos/ntoskrnl/io/create.c Modified: trunk/reactos/ntoskrnl/io/driver.c _____ Modified: trunk/reactos/ntoskrnl/io/create.c --- trunk/reactos/ntoskrnl/io/create.c 2005-01-12 10:23:25 UTC (rev 12952) +++ trunk/reactos/ntoskrnl/io/create.c 2005-01-12 10:24:56 UTC (rev 12953) @@ -86,8 +86,10 @@ if (ParentObjectType != IoDeviceObjectType && ParentObjectType != IoFileObjectType) { - CPRINT("Parent is a %S which is neither a file type nor a device type\n", - BODY_TO_HEADER(Parent)->ObjectType->TypeName.Buffer); + DPRINT("Parent [%wZ] is a %S which is neither a file type nor a device type ; remaining path = %S\n", + &BODY_TO_HEADER(Parent)->Name, + BODY_TO_HEADER(Parent)->ObjectType->TypeName.Buffer, + RemainingPath); return(STATUS_UNSUCCESSFUL); } _____ Modified: trunk/reactos/ntoskrnl/io/driver.c --- trunk/reactos/ntoskrnl/io/driver.c 2005-01-12 10:23:25 UTC (rev 12952) +++ trunk/reactos/ntoskrnl/io/driver.c 2005-01-12 10:24:56 UTC (rev 12953) @@ -181,6 +181,7 @@ DPRINT("IopDeleteDriver(ObjectBody %x)\n", ObjectBody); ExFreePool(Object->DriverExtension); + RtlFreeUnicodeString(&Object->DriverName); OldIrql = KeRaiseIrqlToDpcLevel(); @@ -208,6 +209,7 @@ UNICODE_STRING DriverName; OBJECT_ATTRIBUTES ObjectAttributes; NTSTATUS Status; + PWSTR Buffer = NULL; DPRINT("IopCreateDriverObject(%p '%wZ' %x %p %x)\n", DriverObject, ServiceName, FileSystem, DriverImageStart, DriverImageSize); @@ -225,6 +227,10 @@ RtlInitUnicodeString(&DriverName, NameBuffer); DPRINT("Driver name: '%wZ'\n", &DriverName); + + Buffer = (PWSTR)ExAllocatePool(NonPagedPool, DriverName.Length); + /* If we don't success, it is not a problem. Our driver + * object will not have associated driver name... */ } else { @@ -258,6 +264,12 @@ Object->DriverStart = DriverImageStart; Object->DriverSize = DriverImageSize; + if (Buffer) + { + Object->DriverName.Buffer = Buffer; + Object->DriverName.Length = Object->DriverName.MaximumLength = DriverName.Length; + RtlCopyMemory(Object->DriverName.Buffer, DriverName.Buffer, DriverName.Length); + } *DriverObject = Object;

19 years, 10 months

[gvg] 12952: Sync to Wine-20050111:

by gvg＠svn.reactos.com

Sync to Wine-20050111: Michael Stefaniuc <mstefani(a)redhat.de> - Do not check for non NULL pointer before HeapFree'ing it. It's redundant. Eric Pouech <pouech-eric(a)wanadoo.fr> - Fixed some errors in function prototypes. - ReadFile and WriteFile must be passed a parameter for the number of handled bytes when no overlapped operation is done. - Removed excessive statement (break after return or goto, not useful break, not needed vars...) Robert Shearman <rob(a)codeweavers.com> - Remove unnecessary WNDPROC casts. - Document how thread-safety is ensured for each member of the stub_manager and ifstub structs. - Make stub_manager ref counted to ensure it doesn't get freed whilst it is still being used. - ifstubs are now freed only when the controlling stub_manager is freed. - Rename stub_manager_ref/unref to stub_manager_ext_addref/release respectively and make then take an unsigned long to prevent malicious callers from passing in a negative value and corrupting the ref count. - Rename iid in wine_marshal_id to ipid and use IPIDs instead of IIDs in the stub manager. - The channel buffer can be NULL if the proxy is disconnected, so check for this before releasing it. - Make the ClassFactory proxy support aggregation. - Document how thread-safety is ensured for each member of the stub_manager and ifstub structs. - Make stub_manager ref counted to ensure it doesn't get freed whilst it is still being used. - ifstubs are now freed only when the controlling stub_manager is freed. - Rename stub_manager_ref/unref to stub_manager_ext_addref/release respectively and make then take an unsigned long to prevent malicious callers from passing in a negative value and corrupting the ref count. - The current architecture cannot handle pipes changing address, so use a static array. Fixes memory corruption that sometimes occurs when using multiple pipes. - Fix race on apartment creation. - Display errors in decimal to make searching for the meaning in winerror.h easier. - Move named pipe macros into rpc.c. - Remove unneeded function. - Implement COM local servers using table marshaling to avoid doing the marshaling in a child thread where COM has not been initialized. - Remove unneeded includes and the unused COMPOBJ_hInstance32 variable. - Make the wine_marshal_id structure more like the DCOM OBJREF structure, by replacing the process id field by apartment id (OXID), changing the users of the process id field to use the new field and renaming the objectid field to oid. - Fix StdMarshalImpl_UnmarshalInterface to invalidate and release its stub when doing a same apartment marshal. - Fixed incorrect unsigned test. - Add tracing for proxy ref count functions. - Release the channel on proxy destruction. - Implement proxy manager. - Add documentation to several functions. - Coding style changes according to the style Mike and I have agreed upon for COM related files. - Use OBJREF on the wire for generic marshaling functions. - Add some function declarations to objbase.h. - Add stubs for server ref counting. - Implement HRESULT marshaling. - Make struct oletls ref counted so that it is only detached from the apartment on the final CoUninitialize. - Decrease the size of the crit sec on destroying an apartment - it is only needed for touching the apartment list. - Small cleanups. Mike Hearn <mh(a)codeweavers.com> - Implement the COM stub manager, refactor the current stub code. - Begin implementing interface stubs. - Make apartment access thread-safe by introducing refcounting and wider usage of the apartment lock. - Rework OLE TLS management to eliminate uninitialised apartments and parent chaining. - Comment out an assert, as we don't yet implement IRemUnknown. - Propagate apartments through the intermediate threads, make listener thread apartment scoped. - Rename the STUBMGR thread to more accurately reflect its purpose. - Add a DCOM todo list. Mike McCormack <mike(a)codeweavers.com> - Test and fix a few problems with OLE storage streams. - Allow COM to start services containing COM servers. - Tests and fixes for StgOpenStorage. - Test and fix StgCreateDocFile grfModes. Paul Vriens <Paul.Vriens(a)xs4all.nl> - use Interlocked* functions in AddRef and Release. - store the result of the Interlocked functions and use only this. Francois Gouget <fgouget(a)free.fr> - Assorted spelling fixes. Alexandre Julliard <julliard(a)winehq.org> - Janitorial: C booleans must not be compared against TRUE. Bill Medland <billmedland(a)mercuryspeed.com> - Corrected testing for multithreaded (based upon observations by Paul Vriens, Christian Costa and Robert Shearman). - Added TRACE for investigating OXID errors. Added: trunk/reactos/include/wine/list.h Modified: trunk/reactos/include/wine/objidl.h Modified: trunk/reactos/lib/ole32/Makefile.in Modified: trunk/reactos/lib/ole32/bindctx.c Modified: trunk/reactos/lib/ole32/clipboard.c Modified: trunk/reactos/lib/ole32/compobj.c Modified: trunk/reactos/lib/ole32/compobj_private.h Modified: trunk/reactos/lib/ole32/compositemoniker.c Modified: trunk/reactos/lib/ole32/datacache.c Modified: trunk/reactos/lib/ole32/defaulthandler.c Modified: trunk/reactos/lib/ole32/errorinfo.c Modified: trunk/reactos/lib/ole32/filemoniker.c Modified: trunk/reactos/lib/ole32/ftmarshal.c Modified: trunk/reactos/lib/ole32/hglobalstream.c Modified: trunk/reactos/lib/ole32/ifs.c Modified: trunk/reactos/lib/ole32/ifs.h Modified: trunk/reactos/lib/ole32/itemmoniker.c Modified: trunk/reactos/lib/ole32/marshal.c Modified: trunk/reactos/lib/ole32/memlockbytes.c Modified: trunk/reactos/lib/ole32/moniker.c Modified: trunk/reactos/lib/ole32/ole2.c Modified: trunk/reactos/lib/ole32/oleobj.c Modified: trunk/reactos/lib/ole32/oleproxy.c Modified: trunk/reactos/lib/ole32/rpc.c Modified: trunk/reactos/lib/ole32/stg_bigblockfile.c Modified: trunk/reactos/lib/ole32/stg_stream.c Modified: trunk/reactos/lib/ole32/storage32.c _____ Added: trunk/reactos/include/wine/list.h --- trunk/reactos/include/wine/list.h 2005-01-12 10:22:33 UTC (rev 12951) +++ trunk/reactos/include/wine/list.h 2005-01-12 10:23:25 UTC (rev 12952) @@ -0,0 +1,153 @@ +/* + * Linked lists support + * + * Copyright (C) 2002 Alexandre Julliard + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef __WINE_SERVER_LIST_H +#define __WINE_SERVER_LIST_H + +struct list +{ + struct list *next; + struct list *prev; +}; + +/* Define a list like so: + * + * struct gadget + * { + * struct list entry; <-- doesn't have to be the first item in the struct + * int a, b; + * }; + * + * static struct list global_gadgets = LIST_INIT( global_gadgets ); + * + * or + * + * struct some_global_thing + * { + * struct list gadgets; + * }; + * + * list_init( &some_global_thing->gadgets ); + * + * Manipulate it like this: + * + * list_add_head( &global_gadgets, &new_gadget->entry ); + * list_remove( &new_gadget->entry ); + * list_add_after( &some_random_gadget->entry, &new_gadget->entry ); + * + * And to iterate over it: + * + * struct list *cursor; + * LIST_FOR_EACH( cursor, &global_gadgets ) + * { + * struct gadget *gadget = LIST_ENTRY( cursor, struct gadget, entry ); + * } + * + */ + +/* add an element after the specified one */ +inline static void list_add_after( struct list *elem, struct list *to_add ) +{ + to_add->next = elem->next; + to_add->prev = elem; + elem->next->prev = to_add; + elem->next = to_add; +} + +/* add an element before the specified one */ +inline static void list_add_before( struct list *elem, struct list *to_add ) +{ + to_add->next = elem; + to_add->prev = elem->prev; + elem->prev->next = to_add; + elem->prev = to_add; +} + +/* add element at the head of the list */ +inline static void list_add_head( struct list *list, struct list *elem ) +{ + list_add_after( list, elem ); +} + +/* add element at the tail of the list */ +inline static void list_add_tail( struct list *list, struct list *elem ) +{ + list_add_before( list, elem ); +} + +/* remove an element from its list */ +inline static void list_remove( struct list *elem ) +{ + elem->next->prev = elem->prev; + elem->prev->next = elem->next; +} + +/* get the next element */ +inline static struct list *list_next( struct list *list, struct list *elem ) +{ + struct list *ret = elem->next; + if (elem->next == list) ret = NULL; + return ret; +} + +/* get the previous element */ +inline static struct list *list_prev( struct list *list, struct list *elem ) +{ + struct list *ret = elem->prev; + if (elem->prev == list) ret = NULL; + return ret; +} + +/* get the first element */ +inline static struct list *list_head( struct list *list ) +{ + return list_next( list, list ); +} + +/* get the last element */ +inline static struct list *list_tail( struct list *list ) +{ + return list_prev( list, list ); +} + +/* check if a list is empty */ +inline static int list_empty( struct list *list ) +{ + return list->next == list; +} + +/* initialize a list */ +inline static void list_init( struct list *list ) +{ + list->next = list->prev = list; +} + +/* iterate through the list */ +#define LIST_FOR_EACH(cursor,list) \ + for ((cursor) = (list)->next; (cursor) != (list); (cursor) = (cursor)->next) + +/* macros for statically initialized lists */ +#define LIST_INIT(list) { &(list), &(list) } + +/* get pointer to object containing list element */ +#define LIST_ENTRY(elem, type, field) \ + ((type *)((char *)(elem) - (unsigned int)(&((type *)0)->field))) + +#endif /* __WINE_SERVER_LIST_H */ _____ Modified: trunk/reactos/include/wine/objidl.h --- trunk/reactos/include/wine/objidl.h 2005-01-12 10:22:33 UTC (rev 12951) +++ trunk/reactos/include/wine/objidl.h 2005-01-12 10:23:25 UTC (rev 12952) @@ -1943,4 +1943,67 @@ #endif /* __IGlobalInterfaceTable_INTERFACE_DEFINED__ */ +#ifndef __IInternalUnknown_FWD_DEFINED__ +#define __IInternalUnknown_FWD_DEFINED__ +typedef struct IInternalUnknown IInternalUnknown; +#endif + +/********************************************************************** ******* + * IInternalUnknown interface + */ +#ifndef __IInternalUnknown_INTERFACE_DEFINED__ +#define __IInternalUnknown_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_IInternalUnknown, 0x00000021, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46); +#if defined(__cplusplus) && !defined(CINTERFACE) +struct IInternalUnknown : public IUnknown +{ + virtual HRESULT STDMETHODCALLTYPE QueryInternalInterface( + REFIID riid, + void** ppv) = 0; + +}; +#else +typedef struct IInternalUnknownVtbl IInternalUnknownVtbl; +struct IInternalUnknown { + const IInternalUnknownVtbl* lpVtbl; +}; +struct IInternalUnknownVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + IInternalUnknown* This, + REFIID riid, + void** ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + IInternalUnknown* This); + + ULONG (STDMETHODCALLTYPE *Release)( + IInternalUnknown* This); + + /*** IInternalUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInternalInterface)( + IInternalUnknown* This, + REFIID riid, + void** ppv); + + END_INTERFACE +}; + +#ifdef COBJMACROS +/*** IUnknown methods ***/ +#define IInternalUnknown_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IInternalUnknown_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IInternalUnknown_Release(p) (p)->lpVtbl->Release(p) +/*** IInternalUnknown methods ***/ +#define IInternalUnknown_QueryInternalInterface(p,a,b) (p)->lpVtbl->QueryInternalInterface(p,a,b) +#endif + +#endif + +#endif /* __IInternalUnknown_INTERFACE_DEFINED__ */ + + #endif /* __WINE_OBJIDL_H */ _____ Modified: trunk/reactos/lib/ole32/Makefile.in --- trunk/reactos/lib/ole32/Makefile.in 2005-01-12 10:22:33 UTC (rev 12951) +++ trunk/reactos/lib/ole32/Makefile.in 2005-01-12 10:23:25 UTC (rev 12952) @@ -35,7 +35,8 @@ rpc.c \ stg_bigblockfile.c \ stg_stream.c \ - storage32.c + storage32.c \ + stubmanager.c C_SRCS16 = \ memlockbytes16.c \ _____ Modified: trunk/reactos/lib/ole32/bindctx.c --- trunk/reactos/lib/ole32/bindctx.c 2005-01-12 10:22:33 UTC (rev 12951) +++ trunk/reactos/lib/ole32/bindctx.c 2005-01-12 10:23:25 UTC (rev 12952) @@ -275,8 +275,7 @@ if(This->bindCtxTable[index].pObj) IUnknown_Release(This->bindCtxTable[index].pObj); - if(This->bindCtxTable[index].pkeyObj) - HeapFree(GetProcessHeap(),0,This->bindCtxTable[index].pkeyObj); + HeapFree(GetProcessHeap(),0,This->bindCtxTable[index].pkeyObj); /* left-shift all elements in the right side of the current revoked object */ for(j=index; j<This->bindCtxTableLastIndex-1; j++) @@ -302,8 +301,7 @@ { if(This->bindCtxTable[i].pObj) IUnknown_Release(This->bindCtxTable[i].pObj); - if(This->bindCtxTable[i].pkeyObj) - HeapFree(GetProcessHeap(),0,This->bindCtxTable[i].pkeyObj); + HeapFree(GetProcessHeap(),0,This->bindCtxTable[i].pkeyObj); } This->bindCtxTableLastIndex = 0; @@ -472,8 +470,7 @@ /* release the object if it's found */ if(This->bindCtxTable[index].pObj) IUnknown_Release(This->bindCtxTable[index].pObj); - if(This->bindCtxTable[index].pkeyObj) - HeapFree(GetProcessHeap(),0,This->bindCtxTable[index].pkeyObj); + HeapFree(GetProcessHeap(),0,This->bindCtxTable[index].pkeyObj); /* remove the object from the table with a left-shifting of all objects in the right side */ for(j=index; j<This->bindCtxTableLastIndex-1; j++) _____ Modified: trunk/reactos/lib/ole32/clipboard.c --- trunk/reactos/lib/ole32/clipboard.c 2005-01-12 10:22:33 UTC (rev 12951) +++ trunk/reactos/lib/ole32/clipboard.c 2005-01-12 10:23:25 UTC (rev 12952) @@ -736,7 +736,7 @@ * We don't bother doing this since the FindClassByAtom code * would have to be changed to deal with this idiosyncrasy. */ wcex.style = CS_GLOBALCLASS; - wcex.lpfnWndProc = (WNDPROC)OLEClipbrd_WndProc; + wcex.lpfnWndProc = OLEClipbrd_WndProc; wcex.hInstance = 0; wcex.lpszClassName = OLEClipbrd_WNDCLASS; @@ -1489,8 +1489,7 @@ /* * Free the array of FORMATETC's */ - if (afmt) - HeapFree(GetProcessHeap(), 0, afmt); + HeapFree(GetProcessHeap(), 0, afmt); /* * Close Windows clipboard _____ Modified: trunk/reactos/lib/ole32/compobj.c --- trunk/reactos/lib/ole32/compobj.c 2005-01-12 10:22:33 UTC (rev 12951) +++ trunk/reactos/lib/ole32/compobj.c 2005-01-12 10:23:25 UTC (rev 12952) @@ -21,6 +21,44 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Note + * 1. COINIT_MULTITHREADED is 0; it is the lack of COINIT_APARTMENTTHREADED + * Therefore do not test against COINIT_MULTITHREADED + * + * TODO list: (items bunched together depend on each other) + * + * - Switch wine_marshal_id to use IPIDs not IIDs + * - Once that's done, replace wine_marshal_id with STDOBJREF + * + * - Rewrite the CoLockObjectExternal code, it does totally the wrong + * thing currently (should be controlling the stub manager) + * + * - Make the MTA dynamically allocated and refcounted + * - Free the ReservedForOle data in DllMain(THREAD_DETACH) + * + * - Implement the service control manager (in rpcss) to keep track + * of registered class objects: ISCM::ServerRegisterClsid et al + * - Implement the OXID resolver so we don't need magic pipe names for + * clients and servers to meet up + * - Flip our marshalling on top of the RPC runtime transport API, + * so we no longer use named pipes to communicate + * - Rework threading so re-entrant calls don't need to be sent on + * the incoming pipe + * - Implement RPC thread affinity (should fix InstallShield painting + * problems) + * + * - Implement IRemUnknown and marshalling for it, then use that for + * reffing/unreffing the stub manager from a proxy instead of our + * current hack of simply reffing the stub manager once when it's + * registered. + * - Implement table marshalling, then use it to let us do the final + * rework of the threading + * + * - Make our custom marshalling use NDR to be wire compatible with + * native DCOM + * + * */ #include "config.h" @@ -61,15 +99,15 @@ * * TODO: Most of these things will have to be made thread-safe. */ -HINSTANCE COMPOBJ_hInstance32 = 0; static HRESULT COM_GetRegisteredClassObject(REFCLSID rclsid, DWORD dwClsContext, LPUNKNOWN* ppUnk); -static void COM_RevokeAllClasses(); -static void COM_ExternalLockFreeList(); +static void COM_RevokeAllClasses(void); +static void COM_ExternalLockFreeList(void); const CLSID CLSID_StdGlobalInterfaceTable = { 0x00000323, 0, 0, {0xc0, 0, 0, 0, 0, 0, 0, 0x46} }; -APARTMENT MTA, *apts; +APARTMENT MTA; +static struct list apts = LIST_INIT( apts ); static CRITICAL_SECTION csApartment; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -102,7 +140,7 @@ DWORD runContext; DWORD connectFlags; DWORD dwCookie; - HANDLE hThread; /* only for localserver */ + LPSTREAM pMarshaledData; /* FIXME: only really need to store OXID and IPID */ struct tagRegisteredClass* nextClass; } RegisteredClass; @@ -206,6 +244,7 @@ MTA.oxid = 0; } + /* creates an apartment structure which stores OLE thread-local * information. Call with COINIT_UNINITIALIZED to create an apartment * that will be initialized with a model later. Note: do not call @@ -213,81 +252,138 @@ * with a different COINIT value */ APARTMENT* COM_CreateApartment(DWORD model) { - APARTMENT *apt; - BOOL create = (NtCurrentTeb()->ReservedForOle == NULL); + APARTMENT *apt = COM_CurrentApt(); - if (create) + if (!apt) { + if (!(model & COINIT_APARTMENTTHREADED)) /* See note 1 above */ + { + TRACE("thread 0x%lx is entering the multithreaded apartment\n", GetCurrentThreadId()); + COM_CurrentInfo()->apt = &MTA; + return COM_CurrentInfo()->apt; + } + + TRACE("creating new apartment, model=%ld\n", model); + apt = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(APARTMENT)); apt->tid = GetCurrentThreadId(); DuplicateHandle(GetCurrentProcess(), GetCurrentThread(), GetCurrentProcess(), &apt->thread, THREAD_ALL_ACCESS, FALSE, 0); + + list_init(&apt->proxies); + list_init(&apt->stubmgrs); + apt->oidc = 1; + apt->refs = 1; + InitializeCriticalSection(&apt->cs); + + apt->model = model; + + /* we don't ref the apartment as CoInitializeEx will do it for us */ + + if (model & COINIT_APARTMENTTHREADED) + { + /* FIXME: how does windoze create OXIDs? */ + apt->oxid = MTA.oxid | GetCurrentThreadId(); + TRACE("Created apartment on OXID %s\n", wine_dbgstr_longlong(apt->oxid)); + apt->win = CreateWindowA(aptWinClass, NULL, 0, + 0, 0, 0, 0, + 0, 0, OLE32_hInstance, NULL); + } + + EnterCriticalSection(&csApartment); + list_add_head(&apts, &apt->entry); + LeaveCriticalSection(&csApartment); + + COM_CurrentInfo()->apt = apt; } - else - apt = NtCurrentTeb()->ReservedForOle; - apt->model = model; - if (model & COINIT_APARTMENTTHREADED) { - /* FIXME: how does windoze create OXIDs? */ - apt->oxid = MTA.oxid | GetCurrentThreadId(); - apt->win = CreateWindowA(aptWinClass, NULL, 0, - 0, 0, 0, 0, - 0, 0, OLE32_hInstance, NULL); - InitializeCriticalSection(&apt->cs); - } - else if (!(model & COINIT_UNINITIALIZED)) { - apt->parent = &MTA; - apt->oxid = MTA.oxid; - } - EnterCriticalSection(&csApartment); - if (create) + return apt; +} + +DWORD COM_ApartmentAddRef(struct apartment *apt) +{ + return InterlockedIncrement(&apt->refs); +} + +DWORD COM_ApartmentRelease(struct apartment *apt) +{ + DWORD ret; + + ret = InterlockedDecrement(&apt->refs); + if (ret == 0) { - if (apts) apts->prev = apt; - apt->next = apts; - apts = apt; + TRACE("destroying apartment %p, oxid %s\n", apt, wine_dbgstr_longlong(apt->oxid)); + + EnterCriticalSection(&csApartment); + list_remove(&apt->entry); + LeaveCriticalSection(&csApartment); + + MARSHAL_Disconnect_Proxies(apt); + + if (apt->win) DestroyWindow(apt->win); + + if (!list_empty(&apt->stubmgrs)) + { + FIXME("Destroy outstanding stubs\n"); + } + + if (apt->filter) IUnknown_Release(apt->filter); + + + DeleteCriticalSection(&apt->cs); + CloseHandle(apt->thread); + HeapFree(GetProcessHeap(), 0, apt); + + apt = NULL; } - LeaveCriticalSection(&csApartment); - NtCurrentTeb()->ReservedForOle = apt; - return apt; + + return ret; } -static void COM_DestroyApartment(APARTMENT *apt) +/* The given OXID must be local to this process: you cannot use + * apartment windows to send RPCs to other processes. This all needs + * to move to rpcrt4. + * + * The ref parameter is here mostly to ensure people remember that + * they get one, you should normally take a ref for thread safety. + */ +APARTMENT *COM_ApartmentFromOXID(OXID oxid, BOOL ref) { + APARTMENT *result = NULL; + struct list *cursor; + EnterCriticalSection(&csApartment); - if (apt->prev) apt->prev->next = apt->next; - if (apt->next) apt->next->prev = apt->prev; - if (apts == apt) apts = apt->next; - apt->prev = NULL; apt->next = NULL; + LIST_FOR_EACH( cursor, &apts ) + { + struct apartment *apt = LIST_ENTRY( cursor, struct apartment, entry ); + if (apt->oxid == oxid) + { + result = apt; + if (ref) COM_ApartmentAddRef(result); + break; + } + } LeaveCriticalSection(&csApartment); - if (apt->model & COINIT_APARTMENTTHREADED) { - if (apt->win) DestroyWindow(apt->win); - DeleteCriticalSection(&apt->cs); - } - CloseHandle(apt->thread); - HeapFree(GetProcessHeap(), 0, apt); + + return result; } -/* The given OXID must be local to this process: you cannot use apartment - windows to send RPCs to other processes. This all needs to move to rpcrt4 */ -HWND COM_GetApartmentWin(OXID oxid) +HWND COM_GetApartmentWin(OXID oxid, BOOL ref) { APARTMENT *apt; - HWND win = 0; - EnterCriticalSection(&csApartment); - apt = apts; - while (apt && apt->oxid != oxid) apt = apt->next; - if (apt) win = apt->win; - LeaveCriticalSection(&csApartment); - return win; + apt = COM_ApartmentFromOXID(oxid, ref); + if (!apt) return NULL; + + return apt->win; } /* Currently inter-thread marshalling is not fully implemented, so this does nothing */ static LRESULT CALLBACK COM_AptWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { return DefWindowProcA(hWnd, msg, wParam, lParam); -} +} /*********************************************************************** ****** * This section contains OpenDllList implemantation @@ -418,8 +514,7 @@ * CoUninitialize */ HRESULT WINAPI CoInitializeEx( - LPVOID lpReserved, /* [in] pointer to win32 malloc interface - (obsolete, should be NULL) */ + LPVOID lpReserved, /* [in] pointer to win32 malloc interface (obsolete, should be NULL) */ DWORD dwCoInit /* [in] A value from COINIT specifies the threading model */ ) { @@ -433,21 +528,6 @@ ERR("(%p, %x) - Bad parameter passed-in %p, must be an old Windows Application\n", lpReserved, (int)dwCoInit, lpReserved); } - apt = NtCurrentTeb()->ReservedForOle; - if (apt && !(apt->model == COINIT_UNINITIALIZED)) - { - if (dwCoInit != apt->model) - { - /* Changing the threading model after it's been set is illegal. If this warning is triggered by Wine - code then we are probably using the wrong threading model to implement that API. */ - ERR("Attempt to change threading model of this apartment from 0x%lx to 0x%lx\n", apt->model, dwCoInit); - return RPC_E_CHANGED_MODE; - } - hr = S_FALSE; - } - else - hr = S_OK; - /* * Check the lock count. If this is the first time going through the initialize * process, we have to initialize the libraries. @@ -463,13 +543,25 @@ COM_InitMTA(); + /* we may need to defer this until after apartment initialisation */ RunningObjectTableImpl_Initialize(); } - if (!apt || apt->model == COINIT_UNINITIALIZED) apt = COM_CreateApartment(dwCoInit); + if (!(apt = COM_CurrentInfo()->apt)) + { + apt = COM_CreateApartment(dwCoInit); + if (!apt) return E_OUTOFMEMORY; + } + else if (dwCoInit != apt->model) + { + /* Changing the threading model after it's been set is illegal. If this warning is triggered by Wine + code then we are probably using the wrong threading model to implement that API. */ + ERR("Attempt to change threading model of this apartment from 0x%lx to 0x%lx\n", apt->model, dwCoInit); + COM_ApartmentRelease(apt); + return RPC_E_CHANGED_MODE; + } - InterlockedIncrement(&apt->inits); - if (hr == S_OK) NtCurrentTeb()->ReservedForOle = apt; + COM_CurrentInfo()->inits++; return hr; } @@ -480,14 +572,20 @@ void COM_FlushMessageQueue(void) { MSG message; - APARTMENT *apt = NtCurrentTeb()->ReservedForOle; + APARTMENT *apt = COM_CurrentApt(); if (!apt || !apt->win) return; TRACE("Flushing STA message queue\n"); - while (PeekMessageA(&message, NULL, 0, 0, PM_REMOVE)) { - if (message.hwnd != apt->win) continue; + while (PeekMessageA(&message, NULL, 0, 0, PM_REMOVE)) + { + if (message.hwnd != apt->win) + { + WARN("discarding message 0x%x for window %p\n", message.message, message.hwnd); + continue; + } + TranslateMessage(&message); DispatchMessageA(&message); } @@ -511,19 +609,27 @@ */ void WINAPI CoUninitialize(void) { + struct oletls * info = COM_CurrentInfo(); LONG lCOMRefCnt; - APARTMENT *apt; TRACE("()\n"); - apt = NtCurrentTeb()->ReservedForOle; - if (!apt) return; - if (InterlockedDecrement(&apt->inits)==0) { - NtCurrentTeb()->ReservedForOle = NULL; - COM_DestroyApartment(apt); - apt = NULL; + /* will only happen on OOM */ + if (!info) return; + + /* sanity check */ + if (!info->inits) + { + ERR("Mismatched CoUninitialize\n"); + return; } + if (!--info->inits) + { + COM_ApartmentRelease(info->apt); + info->apt = NULL; + } + /* * Decrease the reference count. * If we are back to 0 locks on the COM library, make sure we free @@ -536,14 +642,6 @@ RunningObjectTableImpl_UnInitialize(); - /* disconnect proxies to release the corresponding stubs. - * It is confirmed in "Essential COM" in the sub-chapter on - * "Lifecycle Management and Marshalling" that the native version also - * does some kind of proxy cleanup in this function. - * FIXME: does it just disconnect or completely destroy the proxies? - * FIXME: should this be in the apartment destructor? */ - MARSHAL_Disconnect_Proxies(); - /* Release the references to the registered class objects */ COM_RevokeAllClasses(); @@ -1091,117 +1189,24 @@ return hr; } -static DWORD WINAPI -_LocalServerThread(LPVOID param) { - HANDLE hPipe; - char pipefn[200]; - RegisteredClass *newClass = (RegisteredClass*)param; - HRESULT hres; - IStream *pStm; - STATSTG ststg; - unsigned char *buffer; - int buflen; - IClassFactory *classfac; - LARGE_INTEGER seekto; - ULARGE_INTEGER newpos; - ULONG res; - - TRACE("Starting threader for %s.\n",debugstr_guid(&newClass->classIdentifier)); - - strcpy(pipefn,PIPEPREF); - WINE_StringFromCLSID(&newClass->classIdentifier,pipefn+strlen(PIPEPREF)) ; - - hPipe = CreateNamedPipeA( pipefn, PIPE_ACCESS_DUPLEX, - PIPE_TYPE_BYTE|PIPE_WAIT, PIPE_UNLIMITED_INSTANCES, - 4096, 4096, NMPWAIT_USE_DEFAULT_WAIT, NULL ); - if (hPipe == INVALID_HANDLE_VALUE) { - FIXME("pipe creation failed for %s, le is %lx\n",pipefn,GetLastError()); - return 1; - } - while (1) { - if (!ConnectNamedPipe(hPipe,NULL)) { - ERR("Failure during ConnectNamedPipe %lx, ABORT!\n",GetLastError()); - break; - } - - TRACE("marshalling IClassFactory to client\n"); - - hres = IUnknown_QueryInterface(newClass->classObject,&IID_IClassFactory,(LPVOID *)&classfac); - if (hres) return hres; - - hres = CreateStreamOnHGlobal(0,TRUE,&pStm); - if (hres) { - FIXME("Failed to create stream on hglobal.\n"); - return hres; - } - hres = CoMarshalInterface(pStm,&IID_IClassFactory,(LPVOID)classfac,0,NULL,0); - if (hres) { - FIXME("CoMarshalInterface failed, %lx!\n",hres); - return hres; - } - - IUnknown_Release(classfac); /* is this right? */ - - hres = IStream_Stat(pStm,&ststg,0); - if (hres) return hres; - - buflen = ststg.cbSize.u.LowPart; - buffer = HeapAlloc(GetProcessHeap(),0,buflen); - seekto.u.LowPart = 0; - seekto.u.HighPart = 0; - hres = IStream_Seek(pStm,seekto,SEEK_SET,&newpos); - if (hres) { - FIXME("IStream_Seek failed, %lx\n",hres); - return hres; - } - - hres = IStream_Read(pStm,buffer,buflen,&res); - if (hres) { - FIXME("Stream Read failed, %lx\n",hres); - return hres; - } - - IStream_Release(pStm); - - WriteFile(hPipe,buffer,buflen,&res,NULL); - FlushFileBuffers(hPipe); - DisconnectNamedPipe(hPipe); - - TRACE("done marshalling IClassFactory\n"); - } - CloseHandle(hPipe); - return 0; -} - /*********************************************************************** ******* * CoRegisterClassObject [OLE32.@] - * - * This method will register the class object for a given class - * ID. Servers housed in EXE files use this method instead of - * exporting DllGetClassObject to allow other code to connect to their - * objects. * - * When a class object (an object which implements IClassFactory) is - * registered in this way, a new thread is started which listens for - * connections on a named pipe specific to the registered CLSID. When - * something else connects to it, it writes out the marshalled - * IClassFactory interface to the pipe. The code on the other end uses - * this buffer to unmarshal the class factory, and can then call - * methods on it. + * Registers the class object for a given class ID. Servers housed in EXE + * files use this method instead of exporting DllGetClassObject to allow + * other code to connect to their objects. * - * In Windows, such objects are registered with the RPC endpoint - * mapper, not with a unique named pipe. - * - * MSDN claims that multiple interface registrations are legal, but we - * can't do that with our current implementation. - * * RETURNS - * S_OK on success, - * E_INVALIDARG if lpdwRegister or pUnk are NULL, + * S_OK on success, + * E_INVALIDARG if lpdwRegister or pUnk are NULL, * CO_E_OBJISREG if the object is already registered. We should not return this. * * SEE ALSO * CoRevokeClassObject, CoGetClassObject + * + * BUGS + * MSDN claims that multiple interface registrations are legal, but we + * can't do that with our current implementation. */ HRESULT WINAPI CoRegisterClassObject( REFCLSID rclsid, /* [in] CLSID of the object to register */ @@ -1220,6 +1225,12 @@ if ( (lpdwRegister==0) || (pUnk==0) ) return E_INVALIDARG; + if (!COM_CurrentApt()) + { + ERR("COM was not initialized\n"); + return CO_E_NOTINITIALIZED; + } + *lpdwRegister = 0; /* @@ -1243,7 +1254,7 @@ newClass->connectFlags = flags; /* * Use the address of the chain node as the cookie since we are sure it's - * unique. + * unique. FIXME: not on 64-bit platforms. */ newClass->dwCookie = (DWORD)newClass; newClass->nextClass = firstRegisteredClass; @@ -1261,10 +1272,30 @@ *lpdwRegister = newClass->dwCookie; if (dwClsContext & CLSCTX_LOCAL_SERVER) { - DWORD tid; + IClassFactory *classfac; - STUBMGR_Start(); - newClass->hThread=CreateThread(NULL,0,_LocalServerThread,newClass,0,&tid ); + hr = IUnknown_QueryInterface(newClass->classObject, &IID_IClassFactory, + (LPVOID*)&classfac); + if (hr) return hr; + + hr = CreateStreamOnHGlobal(0, TRUE, &newClass->pMarshaledData); + if (hr) { + FIXME("Failed to create stream on hglobal, %lx\n", hr); + IUnknown_Release(classfac); + return hr; + } + hr = CoMarshalInterface(newClass->pMarshaledData, &IID_IClassFactory, + (LPVOID)classfac, MSHCTX_LOCAL, NULL, + MSHLFLAGS_TABLESTRONG); + if (hr) { + FIXME("CoMarshalInterface failed, %lx!\n",hr); + IUnknown_Release(classfac); + return hr; + } + + IUnknown_Release(classfac); + + RPC_StartLocalServer(&newClass->classIdentifier, newClass->pMarshaledData); } return S_OK; } @@ -1310,6 +1341,15 @@ */ IUnknown_Release(curClass->classObject); + if (curClass->pMarshaledData) + { + LARGE_INTEGER zero; + memset(&zero, 0, sizeof(zero)); + /* FIXME: stop local server thread */ + IStream_Seek(curClass->pMarshaledData, zero, SEEK_SET, NULL); + CoReleaseMarshalData(curClass->pMarshaledData); + } + /* * Free the memory used by the chain node. */ @@ -1509,7 +1549,7 @@ pat=ReadPatternFromRegistry(i,j); hFile=CreateFileW(filePathName,,,,,,hFile); SetFilePosition(hFile,pat.offset); - ReadFile(hFile,buf,pat.size,NULL,NULL); + ReadFile(hFile,buf,pat.size,&r,NULL); if (memcmp(buf&pat.mask,pat.pattern.pat.size)==0){ *pclsid=ReadCLSIDFromRegistry(i); @@ -1573,7 +1613,7 @@ LPCLASSFACTORY lpclf = 0; if (!COM_CurrentApt()) return CO_E_NOTINITIALIZED; - + /* * Sanity check */ @@ -1590,15 +1630,15 @@ * Rather than create a class factory, we can just check for it here */ if (IsEqualIID(rclsid, &CLSID_StdGlobalInterfaceTable)) { - if (StdGlobalInterfaceTableInstance == NULL) + if (StdGlobalInterfaceTableInstance == NULL) StdGlobalInterfaceTableInstance = StdGlobalInterfaceTable_Construct(); hres = IGlobalInterfaceTable_QueryInterface( (IGlobalInterfaceTable*) StdGlobalInterfaceTableInstance, iid, ppv); if (hres) return hres; - + TRACE("Retrieved GIT (%p)\n", *ppv); return S_OK; } - + /* * Get a class factory to construct the object we want. */ @@ -1982,6 +2022,8 @@ BOOL fLock, /* [in] do lock */ BOOL fLastUnlockReleases) /* [in] unlock all */ { + TRACE("pUnk=%p, fLock=%s, fLastUnlockReleases=%s\n", + pUnk, fLock ? "TRUE" : "FALSE", fLastUnlockReleases ? "TRUE" : "FALSE"); if (fLock) { /* @@ -2015,19 +2057,19 @@ */ HRESULT WINAPI CoGetState(IUnknown ** ppv) { - APARTMENT * apt = COM_CurrentInfo(); + HRESULT hr = E_FAIL; - FIXME("\n"); + *ppv = NULL; - if(apt && apt->state) { - IUnknown_AddRef(apt->state); - *ppv = apt->state; - FIXME("-- %p\n", *ppv); - return S_OK; - } - *ppv = NULL; - return E_FAIL; + if (COM_CurrentInfo()->state) + { + IUnknown_AddRef(COM_CurrentInfo()->state); + *ppv = COM_CurrentInfo()->state; + TRACE("apt->state=%p\n", COM_CurrentInfo()->state); + hr = S_OK; + } + return hr; } /*********************************************************************** @@ -2036,22 +2078,17 @@ */ HRESULT WINAPI CoSetState(IUnknown * pv) { - APARTMENT * apt = COM_CurrentInfo(); + if (pv) IUnknown_AddRef(pv); - if (!apt) apt = COM_CreateApartment(COINIT_UNINITIALIZED); + if (COM_CurrentInfo()->state) + { + TRACE("-- release %p now\n", COM_CurrentInfo()->state); + IUnknown_Release(COM_CurrentInfo()->state); + } - FIXME("(%p),stub!\n", pv); + COM_CurrentInfo()->state = pv; [truncated at 1000 lines; 3210 more skipped]

19 years, 10 months

[gvg] 12951: Sync to Wine-20050111

by gvg＠svn.reactos.com

Sync to Wine-20050111 Added: trunk/reactos/lib/ole32/stubmanager.c _____ Copied: trunk/reactos/lib/ole32/stubmanager.c (from rev 12950, vendor/wine/dlls/ole32/current/stubmanager.c)

19 years, 10 months

[navaraf] 12950: Portability fixes.

by navaraf＠svn.reactos.com

Portability fixes. Modified: trunk/reactos/ntoskrnl/include/internal/ke.h Modified: trunk/reactos/ntoskrnl/include/internal/mm.h Modified: trunk/reactos/ntoskrnl/include/internal/pool.h Modified: trunk/reactos/ntoskrnl/ke/main.c Modified: trunk/reactos/ntoskrnl/mm/RPoolMgr.h Modified: trunk/reactos/ntoskrnl/mm/freelist.c Modified: trunk/reactos/ntoskrnl/mm/kmap.c Modified: trunk/reactos/ntoskrnl/mm/marea.c Modified: trunk/reactos/ntoskrnl/mm/mdl.c Modified: trunk/reactos/ntoskrnl/mm/mm.c Modified: trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/ntoskrnl/mm/npool.c Modified: trunk/reactos/ntoskrnl/mm/pagefile.c Modified: trunk/reactos/ntoskrnl/mm/pageop.c Modified: trunk/reactos/ntoskrnl/mm/section.c _____ Modified: trunk/reactos/ntoskrnl/include/internal/ke.h --- trunk/reactos/ntoskrnl/include/internal/ke.h 2005-01-12 10:05:05 UTC (rev 12949) +++ trunk/reactos/ntoskrnl/include/internal/ke.h 2005-01-12 10:05:31 UTC (rev 12950) @@ -58,7 +58,7 @@ ULONG IpiRequest); VOID -KeIpiGenericCall(VOID STDCALL (*WorkerRoutine)(PVOID), +KeIpiGenericCall(VOID (STDCALL *WorkerRoutine)(PVOID), PVOID Argument); /* next file ***************************************************************/ _____ Modified: trunk/reactos/ntoskrnl/include/internal/mm.h --- trunk/reactos/ntoskrnl/include/internal/mm.h 2005-01-12 10:05:05 UTC (rev 12949) +++ trunk/reactos/ntoskrnl/include/internal/mm.h 2005-01-12 10:05:31 UTC (rev 12950) @@ -453,9 +453,9 @@ VOID MiShutdownMemoryManager(VOID); -VOID MmInit1(ULONG FirstKernelPhysAddress, - ULONG LastKernelPhysAddress, - ULONG LastKernelAddress, +VOID MmInit1(ULONG_PTR FirstKernelPhysAddress, + ULONG_PTR LastKernelPhysAddress, + ULONG_PTR LastKernelAddress, PADDRESS_RANGE BIOSMemoryMap, ULONG AddressRangeCount, ULONG MaxMemInMeg); @@ -507,11 +507,11 @@ /* mm.c **********************************************************************/ NTSTATUS MmAccessFault(KPROCESSOR_MODE Mode, - ULONG Address, + ULONG_PTR Address, BOOLEAN FromMdl); NTSTATUS MmNotPresentFault(KPROCESSOR_MODE Mode, - ULONG Address, + ULONG_PTR Address, BOOLEAN FromMdl); /* anonmem.c *****************************************************************/ @@ -633,10 +633,10 @@ ULONG MmGetLockCountPage(PFN_TYPE Page); -PVOID MmInitializePageList(PVOID FirstPhysKernelAddress, - PVOID LastPhysKernelAddress, +PVOID MmInitializePageList(ULONG_PTR FirstPhysKernelAddress, + ULONG_PTR LastPhysKernelAddress, ULONG MemorySizeInPages, - ULONG LastKernelBase, + ULONG_PTR LastKernelBase, PADDRESS_RANGE BIOSMemoryMap, ULONG AddressRangeCount); _____ Modified: trunk/reactos/ntoskrnl/include/internal/pool.h --- trunk/reactos/ntoskrnl/include/internal/pool.h 2005-01-12 10:05:05 UTC (rev 12949) +++ trunk/reactos/ntoskrnl/include/internal/pool.h 2005-01-12 10:05:31 UTC (rev 12950) @@ -45,7 +45,7 @@ */ #define MM_CACHE_LINE_SIZE 32 -#define MM_ROUND_UP(x,s) ((PVOID)(((ULONG)(x)+(s)-1) & ~((s)-1))) -#define MM_ROUND_DOWN(x,s) ((PVOID)(((ULONG)(x)) & ~((s)-1))) +#define MM_ROUND_UP(x,s) ((PVOID)(((ULONG_PTR)(x)+(s)-1) & ~((ULONG_PTR)(s)-1))) +#define MM_ROUND_DOWN(x,s) ((PVOID)(((ULONG_PTR)(x)) & ~((ULONG_PTR)(s)-1))) #endif /* __INTERNAL_POOL_H */ _____ Modified: trunk/reactos/ntoskrnl/ke/main.c --- trunk/reactos/ntoskrnl/ke/main.c 2005-01-12 10:05:05 UTC (rev 12949) +++ trunk/reactos/ntoskrnl/ke/main.c 2005-01-12 10:05:31 UTC (rev 12950) @@ -76,9 +76,9 @@ static CHAR KeLoaderCommandLine[256]; static ADDRESS_RANGE KeMemoryMap[64]; static ULONG KeMemoryMapRangeCount; -static ULONG FirstKrnlPhysAddr; -static ULONG LastKrnlPhysAddr; -static ULONG LastKernelAddress; +static ULONG_PTR FirstKrnlPhysAddr; +static ULONG_PTR LastKrnlPhysAddr; +static ULONG_PTR LastKernelAddress; volatile BOOLEAN Initialized = FALSE; extern ULONG MmCoreDumpType; extern CHAR KiTimerSystemAuditing; _____ Modified: trunk/reactos/ntoskrnl/mm/RPoolMgr.h --- trunk/reactos/ntoskrnl/mm/RPoolMgr.h 2005-01-12 10:05:05 UTC (rev 12949) +++ trunk/reactos/ntoskrnl/mm/RPoolMgr.h 2005-01-12 10:05:31 UTC (rev 12950) @@ -13,16 +13,16 @@ typedef unsigned long rulong; -#define R_IS_POOL_PTR(pool,ptr) (void*)(ptr) >= pool->UserBase && (char*)(ptr) < ((char*)pool->UserBase+pool->UserSize) +#define R_IS_POOL_PTR(pool,ptr) (void*)(ptr) >= pool->UserBase && (ULONG_PTR)(ptr) < ((ULONG_PTR)pool->UserBase + pool->UserSize) #define R_ASSERT_PTR(pool,ptr) ASSERT( R_IS_POOL_PTR(pool,ptr) ) #define R_ASSERT_SIZE(pool,sz) ASSERT( sz > (sizeof(R_USED)+2*R_RZ) && sz >= sizeof(R_FREE) && sz < pool->UserSize ) #ifndef R_ROUND_UP -#define R_ROUND_UP(x,s) ((PVOID)(((rulong)(x)+(s)-1) & ~((s)-1))) +#define R_ROUND_UP(x,s) ((PVOID)(((ULONG_PTR)(x)+(s)-1) & ~((ULONG_PTR)(s)-1))) #endif//R_ROUND_UP #ifndef R_ROUND_DOWN -#define R_ROUND_DOWN(x,s) ((PVOID)(((rulong)(x)) & ~((s)-1))) +#define R_ROUND_DOWN(x,s) ((PVOID)(((ULONG_PTR)(x)) & ~((ULONG_PTR)(s)-1))) #endif//R_ROUND_DOWN #ifndef R_QUEMIN @@ -79,7 +79,7 @@ rulong Status : 2; rulong Size; #if R_STACK - rulong LastOwnerStack[R_STACK]; + ULONG_PTR LastOwnerStack[R_STACK]; #endif//R_STACK struct _R_FREE* NextFree; struct _R_FREE* PrevFree; @@ -95,7 +95,7 @@ rulong Status : 2; rulong Size; #if R_STACK - rulong LastOwnerStack[R_STACK]; + ULONG_PTR LastOwnerStack[R_STACK]; #endif//R_STACK struct _R_USED* NextUsed; #if R_RZ @@ -245,7 +245,7 @@ pool->FirstFree = Item->NextFree; } #if defined(DBG) || defined(KDBG) - Item->NextFree = Item->PrevFree = (PR_FREE)0xDEADBEEF; + Item->NextFree = Item->PrevFree = (PR_FREE)(ULONG_PTR)0xDEADBEEF; #endif//DBG || KDBG } @@ -281,7 +281,7 @@ block->Status = 0; RFreeFillStack ( block ); #if defined(DBG) || defined(KDBG) - block->PrevFree = block->NextFree = (PR_FREE)0xDEADBEEF; + block->PrevFree = block->NextFree = (PR_FREE)(ULONG_PTR)0xDEADBEEF; #endif//DBG || KDBG return block; } @@ -644,7 +644,7 @@ // now add the block to the used block list #if defined(DBG) || defined(KDBG) - Block->NextUsed = (PR_USED)0xDEADBEEF; + Block->NextUsed = (PR_USED)(ULONG_PTR)0xDEADBEEF; #endif//R_USED_LIST Block->Tag = Tag; _____ Modified: trunk/reactos/ntoskrnl/mm/freelist.c --- trunk/reactos/ntoskrnl/mm/freelist.c 2005-01-12 10:05:05 UTC (rev 12949) +++ trunk/reactos/ntoskrnl/mm/freelist.c 2005-01-12 10:05:31 UTC (rev 12950) @@ -284,10 +284,10 @@ PVOID INIT_FUNCTION -MmInitializePageList(PVOID FirstPhysKernelAddress, - PVOID LastPhysKernelAddress, +MmInitializePageList(ULONG_PTR FirstPhysKernelAddress, + ULONG_PTR LastPhysKernelAddress, ULONG MemorySizeInPages, - ULONG LastKernelAddress, + ULONG_PTR LastKernelAddress, PADDRESS_RANGE BIOSMemoryMap, ULONG AddressRangeCount) /* @@ -331,9 +331,9 @@ DPRINT("Reserved %d\n", Reserved); LastKernelAddress = PAGE_ROUND_UP(LastKernelAddress); - LastKernelAddress = ((ULONG)LastKernelAddress + (Reserved * PAGE_SIZE)); - LastPhysKernelAddress = (PVOID)PAGE_ROUND_UP(LastPhysKernelAddress); - LastPhysKernelAddress = (char*)LastPhysKernelAddress + (Reserved * PAGE_SIZE); + LastKernelAddress = ((ULONG_PTR)LastKernelAddress + (Reserved * PAGE_SIZE)); + LastPhysKernelAddress = (ULONG_PTR)PAGE_ROUND_UP(LastPhysKernelAddress); + LastPhysKernelAddress = (ULONG_PTR)LastPhysKernelAddress + (Reserved * PAGE_SIZE); MmStats.NrTotalPages = 0; MmStats.NrSystemPages = 0; @@ -349,7 +349,7 @@ LastPage = MmPageArraySize; for (i = 0; i < Reserved; i++) { - PVOID Address = (char*)(ULONG)MmPageArray + (i * PAGE_SIZE); + PVOID Address = (char*)MmPageArray + (i * PAGE_SIZE); ULONG j, start, end; if (!MmIsPagePresent(NULL, Address)) { _____ Modified: trunk/reactos/ntoskrnl/mm/kmap.c --- trunk/reactos/ntoskrnl/mm/kmap.c 2005-01-12 10:05:05 UTC (rev 12949) +++ trunk/reactos/ntoskrnl/mm/kmap.c 2005-01-12 10:05:31 UTC (rev 12950) @@ -32,7 +32,7 @@ ExUnmapPage(PVOID Addr) { KIRQL oldIrql; - ULONG Base = ((char*)Addr - (char*)MM_KERNEL_MAP_BASE) / PAGE_SIZE; + ULONG_PTR Base = ((ULONG_PTR)Addr - (ULONG_PTR)MM_KERNEL_MAP_BASE) / PAGE_SIZE; DPRINT("ExUnmapPage(Addr %x)\n",Addr); @@ -93,12 +93,12 @@ { KIRQL oldlvl; PVOID Addr; - ULONG Base; + ULONG_PTR Base; NTSTATUS Status; KeAcquireSpinLock(&AllocMapLock, &oldlvl); Base = RtlFindClearBitsAndSet(&AllocMap, 1, AllocMapHint); - if (Base != 0xFFFFFFFF) + if (Base != (ULONG_PTR)-1) { AllocMapHint = Base + 1; KeReleaseSpinLock(&AllocMapLock, oldlvl); @@ -131,7 +131,7 @@ MiFreeNonPagedPoolRegion(PVOID Addr, ULONG Count, BOOLEAN Free) { ULONG i; - ULONG Base = ((char*)Addr - (char*)MM_KERNEL_MAP_BASE) / PAGE_SIZE; + ULONG_PTR Base = ((char*)Addr - (char*)MM_KERNEL_MAP_BASE) / PAGE_SIZE; KIRQL oldlvl; for (i = 0; i < Count; i++) @@ -154,12 +154,12 @@ * FUNCTION: Allocates a region of pages within the nonpaged pool area */ { - ULONG Base; + ULONG_PTR Base; KIRQL oldlvl; KeAcquireSpinLock(&AllocMapLock, &oldlvl); Base = RtlFindClearBitsAndSet(&AllocMap, nr_pages, AllocMapHint); - if (Base == 0xFFFFFFFF) + if (Base == (ULONG_PTR)-1) { DbgPrint("CRITICAL: Out of non-paged pool space\n"); KEBUGCHECK(0); _____ Modified: trunk/reactos/ntoskrnl/mm/marea.c --- trunk/reactos/ntoskrnl/mm/marea.c 2005-01-12 10:05:05 UTC (rev 12949) +++ trunk/reactos/ntoskrnl/mm/marea.c 2005-01-12 10:05:31 UTC (rev 12950) @@ -188,7 +188,7 @@ Node != NULL; Node = MmIterateNextNode(Node)) { - DbgPrint("Start %x End %x Attributes %x\n", + DbgPrint("Start %p End %p Attributes %x\n", Node->StartingAddress, Node->EndingAddress, Node->Attributes); } @@ -203,7 +203,7 @@ { PMEMORY_AREA Node = AddressSpace->MemoryAreaRoot; - DPRINT("MmLocateMemoryAreaByAddress(AddressSpace %x, Address %x)\n", + DPRINT("MmLocateMemoryAreaByAddress(AddressSpace %p, Address %p)\n", AddressSpace, Address); if (!(KdDebugState & KD_DEBUG_SCREEN)) @@ -217,13 +217,13 @@ Node = Node->RightChild; else { - DPRINT("MmLocateMemoryAreaByAddress(%x): %x [%x - %x]\n", + DPRINT("MmLocateMemoryAreaByAddress(%p): %p [%p - %p]\n", Address, Node, Node->StartingAddress, Node->EndingAddress); return Node; } } - DPRINT("MmLocateMemoryAreaByAddress(%x): 0\n", Address); + DPRINT("MmLocateMemoryAreaByAddress(%p): 0\n", Address); return NULL; } @@ -250,24 +250,24 @@ if (Node->StartingAddress >= Address && Node->StartingAddress < Extent) { - DPRINT("MmLocateMemoryAreaByRegion(%x - %x): %x - %x\n", - Address, Address + Length, Node->StartingAddress, + DPRINT("MmLocateMemoryAreaByRegion(%p - %p): %p - %p\n", + Address, (ULONG_PTR)Address + Length, Node->StartingAddress, Node->EndingAddress); return Node; } if (Node->EndingAddress > Address && Node->EndingAddress < Extent) { - DPRINT("MmLocateMemoryAreaByRegion(%x - %x): %x - %x\n", - Address, Address + Length, Node->StartingAddress, + DPRINT("MmLocateMemoryAreaByRegion(%p - %p): %p - %p\n", + Address, (ULONG_PTR)Address + Length, Node->StartingAddress, Node->EndingAddress); return Node; } if (Node->StartingAddress <= Address && Node->EndingAddress >= Extent) { - DPRINT("MmLocateMemoryAreaByRegion(%x - %x): %x - %x\n", - Address, Address + Length, Node->StartingAddress, + DPRINT("MmLocateMemoryAreaByRegion(%p - %p): %p - %p\n", + Address, (ULONG_PTR)Address + Length, Node->StartingAddress, Node->EndingAddress); return Node; } @@ -417,9 +417,9 @@ Node = AddressSpace->MemoryAreaRoot; do { - DPRINT("marea->EndingAddress: %x Node->StartingAddress: %x\n", + DPRINT("marea->EndingAddress: %p Node->StartingAddress: %p\n", marea->EndingAddress, Node->StartingAddress); - DPRINT("marea->StartingAddress: %x Node->EndingAddress: %x\n", + DPRINT("marea->StartingAddress: %p Node->EndingAddress: %p\n", marea->StartingAddress, Node->EndingAddress); ASSERT(marea->EndingAddress <= Node->StartingAddress || marea->StartingAddress >= Node->EndingAddress); @@ -467,7 +467,7 @@ MmVerifyMemoryAreas(AddressSpace); - DPRINT("LowestAddress: %x HighestAddress: %x\n", + DPRINT("LowestAddress: %p HighestAddress: %p\n", AddressSpace->LowestAddress, HighestAddress); AlignedAddress = MM_ROUND_UP(AddressSpace->LowestAddress, Granularity); @@ -475,9 +475,9 @@ /* Special case for empty tree. */ if (AddressSpace->MemoryAreaRoot == NULL) { - if (HighestAddress - AlignedAddress >= Length) + if ((ULONG_PTR)HighestAddress - (ULONG_PTR)AlignedAddress >= Length) { - DPRINT("MmFindGapBottomUp: %x\n", AlignedAddress); + DPRINT("MmFindGapBottomUp: %p\n", AlignedAddress); return AlignedAddress; } DPRINT("MmFindGapBottomUp: 0\n"); @@ -497,9 +497,9 @@ AlignedAddress = MM_ROUND_UP(PreviousNode->EndingAddress, Granularity); if (Node->StartingAddress > AlignedAddress && - Node->StartingAddress - AlignedAddress >= Length) + (ULONG_PTR)Node->StartingAddress - (ULONG_PTR)AlignedAddress >= Length) { - DPRINT("MmFindGapBottomUp: %x\n", AlignedAddress); + DPRINT("MmFindGapBottomUp: %p\n", AlignedAddress); return AlignedAddress; } @@ -508,18 +508,18 @@ /* Check if there is enough space after the last memory area. */ AlignedAddress = MM_ROUND_UP(PreviousNode->EndingAddress, Granularity); - if (HighestAddress - AlignedAddress >= Length) + if ((ULONG_PTR)HighestAddress - (ULONG_PTR)AlignedAddress >= Length) { - DPRINT("MmFindGapBottomUp: %x\n", AlignedAddress); + DPRINT("MmFindGapBottomUp: %p\n", AlignedAddress); return AlignedAddress; } /* Check if there is enough space before the first memory area. */ AlignedAddress = MM_ROUND_UP(AddressSpace->LowestAddress, Granularity); if (FirstNode->StartingAddress > AlignedAddress && - FirstNode->StartingAddress - AlignedAddress >= Length) + (ULONG_PTR)FirstNode->StartingAddress - (ULONG_PTR)AlignedAddress >= Length) { - DPRINT("MmFindGapBottomUp: %x\n", AlignedAddress); + DPRINT("MmFindGapBottomUp: %p\n", AlignedAddress); return AlignedAddress; } @@ -542,10 +542,10 @@ MmVerifyMemoryAreas(AddressSpace); - DPRINT("LowestAddress: %x HighestAddress: %x\n", + DPRINT("LowestAddress: %p HighestAddress: %p\n", AddressSpace->LowestAddress, HighestAddress); - AlignedAddress = MM_ROUND_DOWN(HighestAddress - Length + 1, Granularity); + AlignedAddress = MM_ROUND_DOWN((ULONG_PTR)HighestAddress - Length + 1, Granularity); /* Check for overflow. */ if (AlignedAddress > HighestAddress) @@ -556,7 +556,7 @@ { if (AlignedAddress >= (PVOID)AddressSpace->LowestAddress) { - DPRINT("MmFindGapTopDown: %x\n", AlignedAddress); + DPRINT("MmFindGapTopDown: %p\n", AlignedAddress); return AlignedAddress; } DPRINT("MmFindGapTopDown: 0\n"); @@ -569,7 +569,7 @@ /* Check if there is enough space after the last memory area. */ if (Node->EndingAddress <= AlignedAddress) { - DPRINT("MmFindGapTopDown: %x\n", AlignedAddress); + DPRINT("MmFindGapTopDown: %p\n", AlignedAddress); return AlignedAddress; } @@ -581,7 +581,7 @@ if (Node == NULL) break; - AlignedAddress = MM_ROUND_DOWN(PreviousNode->StartingAddress - Length + 1, Granularity); + AlignedAddress = MM_ROUND_DOWN((ULONG_PTR)PreviousNode->StartingAddress - Length + 1, Granularity); /* Check for overflow. */ if (AlignedAddress > PreviousNode->StartingAddress) @@ -589,14 +589,14 @@ if (Node->EndingAddress <= AlignedAddress) { - DPRINT("MmFindGapTopDown: %x\n", AlignedAddress); + DPRINT("MmFindGapTopDown: %p\n", AlignedAddress); return AlignedAddress; } PreviousNode = Node; } - AlignedAddress = MM_ROUND_DOWN(PreviousNode->StartingAddress - Length + 1, Granularity); + AlignedAddress = MM_ROUND_DOWN((ULONG_PTR)PreviousNode->StartingAddress - Length + 1, Granularity); /* Check for overflow. */ if (AlignedAddress > PreviousNode->StartingAddress) @@ -604,7 +604,7 @@ if (AlignedAddress >= (PVOID)AddressSpace->LowestAddress) { - DPRINT("MmFindGapTopDown: %x\n", AlignedAddress); + DPRINT("MmFindGapTopDown: %p\n", AlignedAddress); return AlignedAddress; } @@ -675,13 +675,15 @@ if (RightNeighbour) { - DPRINT("MmFindGapAtAddress: %x [%x]\n", Address, RightNeighbour->StartingAddress - Address); - return RightNeighbour->StartingAddress - Address; + DPRINT("MmFindGapAtAddress: %p [%p]\n", Address, + (ULONG_PTR)RightNeighbour->StartingAddress - (ULONG_PTR)Address); + return (ULONG_PTR)RightNeighbour->StartingAddress - (ULONG_PTR)Address; } else { - DPRINT("MmFindGapAtAddress: %x [%x]\n", Address, HighestAddress - Address); - return HighestAddress - Address; + DPRINT("MmFindGapAtAddress: %p [%p]\n", Address, + (ULONG_PTR)HighestAddress - (ULONG_PTR)Address); + return (ULONG_PTR)HighestAddress - (ULONG_PTR)Address; } } @@ -726,7 +728,7 @@ PVOID FreePageContext) { PMEMORY_AREA *ParentReplace; - PVOID Address; + ULONG_PTR Address; PVOID EndAddress; PEPROCESS CurrentProcess = PsGetCurrentProcess(); @@ -737,7 +739,9 @@ } EndAddress = MM_ROUND_UP(MemoryArea->EndingAddress, PAGE_SIZE); - for (Address = MemoryArea->StartingAddress; Address < EndAddress; Address += PAGE_SIZE) + for (Address = (ULONG_PTR)MemoryArea->StartingAddress; + Address < (ULONG_PTR)EndAddress; + Address += PAGE_SIZE) { if (MemoryArea->Type == MEMORY_AREA_IO_MAPPING) { @@ -866,8 +870,8 @@ { PMEMORY_AREA MemoryArea; - DPRINT("MmFreeMemoryArea(AddressSpace %x, BaseAddress %x, " - "FreePageContext %d)\n", AddressSpace, BaseAddress, + DPRINT("MmFreeMemoryArea(AddressSpace %p, BaseAddress %p, " + "FreePageContext %p)\n", AddressSpace, BaseAddress, FreePageContext); MmVerifyMemoryAreas(AddressSpace); @@ -926,9 +930,9 @@ ULONG tmpLength; PMEMORY_AREA MemoryArea; - DPRINT("MmCreateMemoryArea(Type %d, BaseAddress %x, " - "*BaseAddress %x, Length %x, Attributes %x, TopDown: %x, " - "FixedAddress %x, Result %x)\n", + DPRINT("MmCreateMemoryArea(Type %d, BaseAddress %p, " + "*BaseAddress %p, Length %p, Attributes %x, TopDown: %x, " + "FixedAddress %x, Result %p)\n", Type, BaseAddress, *BaseAddress, Length, Attributes, TopDown, FixedAddress, Result); @@ -988,7 +992,7 @@ RtlZeroMemory(MemoryArea, sizeof(MEMORY_AREA)); MemoryArea->Type = Type; MemoryArea->StartingAddress = *BaseAddress; - MemoryArea->EndingAddress = *BaseAddress + tmpLength; + MemoryArea->EndingAddress = (PVOID)((ULONG_PTR)*BaseAddress + tmpLength); MemoryArea->Attributes = Attributes; MemoryArea->LockCount = 0; MemoryArea->Process = Process; @@ -999,7 +1003,7 @@ *Result = MemoryArea; - DPRINT("MmCreateMemoryArea() succeeded (%x)\n", *BaseAddress); + DPRINT("MmCreateMemoryArea() succeeded (%p)\n", *BaseAddress); return STATUS_SUCCESS; } _____ Modified: trunk/reactos/ntoskrnl/mm/mdl.c --- trunk/reactos/ntoskrnl/mm/mdl.c 2005-01-12 10:05:05 UTC (rev 12949) +++ trunk/reactos/ntoskrnl/mm/mdl.c 2005-01-12 10:05:31 UTC (rev 12950) @@ -98,11 +98,11 @@ PVOID MmGetMdlPageAddress(PMDL Mdl, PVOID Offset) { - PULONG MdlPages; + PPFN_NUMBER MdlPages; - MdlPages = (PULONG)(Mdl + 1); + MdlPages = (PPFN_NUMBER)(Mdl + 1); - return((PVOID)MdlPages[((ULONG)Offset) / PAGE_SIZE]); + return((PVOID)MdlPages[((ULONG_PTR)Offset) / PAGE_SIZE]); } @@ -123,8 +123,8 @@ */ { ULONG i; - PULONG MdlPages; - PFN_TYPE Page; + PPFN_NUMBER MdlPages; + PFN_NUMBER Page; /* * MmProbeAndLockPages MUST have been called to lock this mdl! @@ -161,7 +161,7 @@ } - MdlPages = (PULONG)(Mdl + 1); + MdlPages = (PPFN_NUMBER)(Mdl + 1); for (i=0; i<(PAGE_ROUND_UP(Mdl->ByteCount+Mdl->ByteOffset)/PAGE_SIZE); i++) { Page = MdlPages[i]; @@ -422,7 +422,7 @@ if (!MmIsPagePresent(NULL, Address)) { - Status = MmNotPresentFault(Mode, (ULONG)Address, TRUE); + Status = MmNotPresentFault(Mode, (ULONG_PTR)Address, TRUE); if (!NT_SUCCESS(Status)) { for (j = 0; j < i; j++) @@ -442,7 +442,7 @@ if ((Operation == IoWriteAccess || Operation == IoModifyAccess) && (!(MmGetPageProtect(NULL, (PVOID)Address) & PAGE_READWRITE))) { - Status = MmAccessFault(Mode, (ULONG)Address, TRUE); + Status = MmAccessFault(Mode, (ULONG_PTR)Address, TRUE); if (!NT_SUCCESS(Status)) { for (j = 0; j < i; j++) @@ -541,7 +541,7 @@ * mdl buffer must (at least) be in kernel space, thou this doesn't * necesarely mean that the buffer in within _nonpaged_ kernel space... */ - ASSERT((ULONG)Mdl->StartVa >= KERNEL_BASE); + ASSERT((ULONG_PTR)Mdl->StartVa >= KERNEL_BASE); PageCount = PAGE_ROUND_UP(Mdl->ByteOffset + Mdl->ByteCount) / PAGE_SIZE; MdlPages = (PPFN_TYPE)(Mdl + 1); _____ Modified: trunk/reactos/ntoskrnl/mm/mm.c --- trunk/reactos/ntoskrnl/mm/mm.c 2005-01-12 10:05:05 UTC (rev 12949) +++ trunk/reactos/ntoskrnl/mm/mm.c 2005-01-12 10:05:31 UTC (rev 12950) @@ -55,7 +55,7 @@ if (ExGetPreviousMode() == UserMode) { - if ((ULONG)Dest >= KERNEL_BASE) + if ((ULONG_PTR)Dest >= KERNEL_BASE) { return(STATUS_ACCESS_VIOLATION); } @@ -76,7 +76,7 @@ if (ExGetPreviousMode() == UserMode) { - if ((ULONG)Src >= KERNEL_BASE) + if ((ULONG_PTR)Src >= KERNEL_BASE) { return(STATUS_ACCESS_VIOLATION); } @@ -177,7 +177,7 @@ MEMORY_AREA* MemoryArea; PMADDRESS_SPACE AddressSpace; - if ((ULONG)VirtualAddress >= KERNEL_BASE) + if ((ULONG_PTR)VirtualAddress >= KERNEL_BASE) { AddressSpace = MmGetKernelAddressSpace(); } @@ -200,7 +200,7 @@ } NTSTATUS MmAccessFault(KPROCESSOR_MODE Mode, - ULONG Address, /* FiN TODO: Should be ULONG_PTR! */ + ULONG_PTR Address, BOOLEAN FromMdl) { PMADDRESS_SPACE AddressSpace; @@ -322,7 +322,7 @@ } NTSTATUS MmNotPresentFault(KPROCESSOR_MODE Mode, - ULONG Address, /* FiN TODO: Should be ULONG_PTR! */ + ULONG_PTR Address, BOOLEAN FromMdl) { PMADDRESS_SPACE AddressSpace; _____ Modified: trunk/reactos/ntoskrnl/mm/mminit.c --- trunk/reactos/ntoskrnl/mm/mminit.c 2005-01-12 10:05:05 UTC (rev 12949) +++ trunk/reactos/ntoskrnl/mm/mminit.c 2005-01-12 10:05:31 UTC (rev 12950) @@ -72,7 +72,7 @@ {} VOID INIT_FUNCTION -MmInitVirtualMemory(ULONG LastKernelAddress, +MmInitVirtualMemory(ULONG_PTR LastKernelAddress, ULONG KernelLength) /* * FUNCTION: Intialize the memory areas list @@ -133,7 +133,7 @@ BoundaryAddressMultiple); BaseAddress = (PVOID)KERNEL_BASE; - Length = PAGE_ROUND_UP(((ULONG)&_text_end__)) - KERNEL_BASE; + Length = PAGE_ROUND_UP(((ULONG_PTR)&_text_end__)) - KERNEL_BASE; ParamLength = ParamLength - Length; /* @@ -151,10 +151,10 @@ FALSE, BoundaryAddressMultiple); - BaseAddress = (PVOID)PAGE_ROUND_UP(((ULONG)&_text_end__)); + BaseAddress = (PVOID)PAGE_ROUND_UP(((ULONG_PTR)&_text_end__)); ASSERT(BaseAddress == (PVOID)&_init_start__); - Length = PAGE_ROUND_UP(((ULONG)&_init_end__)) - - PAGE_ROUND_UP(((ULONG)&_text_end__)); + Length = PAGE_ROUND_UP(((ULONG_PTR)&_init_end__)) - + PAGE_ROUND_UP(((ULONG_PTR)&_text_end__)); ParamLength = ParamLength - Length; MmCreateMemoryArea(NULL, @@ -168,11 +168,11 @@ FALSE, BoundaryAddressMultiple); - Length = PAGE_ROUND_UP(((ULONG)&_bss_end__)) - - PAGE_ROUND_UP(((ULONG)&_init_end__)); + Length = PAGE_ROUND_UP(((ULONG_PTR)&_bss_end__)) - + PAGE_ROUND_UP(((ULONG_PTR)&_init_end__)); ParamLength = ParamLength - Length; DPRINT("Length %x\n",Length); - BaseAddress = (PVOID)PAGE_ROUND_UP(((ULONG)&_init_end__)); + BaseAddress = (PVOID)PAGE_ROUND_UP(((ULONG_PTR)&_init_end__)); DPRINT("BaseAddress %x\n",BaseAddress); /* @@ -190,8 +190,8 @@ FALSE, BoundaryAddressMultiple); - BaseAddress = (PVOID)PAGE_ROUND_UP(((ULONG)&_bss_end__)); - Length = LastKernelAddress - (ULONG)BaseAddress; + BaseAddress = (PVOID)PAGE_ROUND_UP(((ULONG_PTR)&_bss_end__)); + Length = LastKernelAddress - (ULONG_PTR)BaseAddress; MmCreateMemoryArea(NULL, MmGetKernelAddressSpace(), MEMORY_AREA_SYSTEM, @@ -277,9 +277,9 @@ } VOID INIT_FUNCTION -MmInit1(ULONG FirstKrnlPhysAddr, - ULONG LastKrnlPhysAddr, - ULONG LastKernelAddress, +MmInit1(ULONG_PTR FirstKrnlPhysAddr, + ULONG_PTR LastKrnlPhysAddr, + ULONG_PTR LastKernelAddress, PADDRESS_RANGE BIOSMemoryMap, ULONG AddressRangeCount, ULONG MaxMem) @@ -289,12 +289,13 @@ { ULONG i; ULONG kernel_len; + ULONG_PTR MappingAddress; #ifndef CONFIG_SMP - extern unsigned int unmap_me, unmap_me2, unmap_me3; #endif + extern unsigned int pagetable_start, pagetable_end; - DPRINT("MmInit1(FirstKrnlPhysAddr, %x, LastKrnlPhysAddr %x, LastKernelAddress %x)\n", + DPRINT("MmInit1(FirstKrnlPhysAddr, %p, LastKrnlPhysAddr %p, LastKernelAddress %p)\n", FirstKrnlPhysAddr, LastKrnlPhysAddr, LastKernelAddress); @@ -383,8 +384,9 @@ DbgPrint("Used memory %dKb\n", (MmStats.NrTotalPages * PAGE_SIZE) / 1024); - LastKernelAddress = (ULONG)MmInitializePageList((PVOID)FirstKrnlPhysAddr, - (PVOID)LastKrnlPhysAddr, + LastKernelAddress = (ULONG_PTR)MmInitializePageList( + FirstKrnlPhysAddr, + LastKrnlPhysAddr, MmStats.NrTotalPages, PAGE_ROUND_UP(LastKernelAddress), BIOSMemoryMap, @@ -405,15 +407,18 @@ DPRINT("Invalidating between %x and %x\n", LastKernelAddress, KERNEL_BASE + 0x00600000); - for (i=(LastKernelAddress); i<KERNEL_BASE + 0x00600000; i+=PAGE_SIZE) + for (MappingAddress = LastKernelAddress; + MappingAddress < KERNEL_BASE + 0x00600000; + MappingAddress += PAGE_SIZE) { - MmRawDeleteVirtualMapping((PVOID)(i)); + MmRawDeleteVirtualMapping((PVOID)MappingAddress); } - extern unsigned int pagetable_start, pagetable_end; - for (i = (ULONG_PTR)&pagetable_start; i < (ULONG_PTR)&pagetable_end; i += PAGE_SIZE) + for (MappingAddress = (ULONG_PTR)&pagetable_start; + MappingAddress < (ULONG_PTR)&pagetable_end; + MappingAddress += PAGE_SIZE) { - MmDeleteVirtualMapping(NULL, (PVOID)i, FALSE, NULL, NULL); + MmDeleteVirtualMapping(NULL, (PVOID)MappingAddress, FALSE, NULL, NULL); } DPRINT("Almost done MmInit()\n"); _____ Modified: trunk/reactos/ntoskrnl/mm/npool.c --- trunk/reactos/ntoskrnl/mm/npool.c 2005-01-12 10:05:05 UTC (rev 12949) +++ trunk/reactos/ntoskrnl/mm/npool.c 2005-01-12 10:05:31 UTC (rev 12950) @@ -1235,11 +1235,11 @@ { NTSTATUS Status; PFN_TYPE Page[32]; - ULONG StartIndex, EndIndex; + ULONG_PTR StartIndex, EndIndex; ULONG i, j, k; - StartIndex = (ULONG)((char*)(PVOID)PAGE_ROUND_UP((ULONG)((char*)blk + BLOCK_HDR_SIZE)) - (char*)MiNonPagedPoolStart) / PAGE_SIZE; - EndIndex = (ULONG)((char*)PAGE_ROUND_UP(end) - (char*)MiNonPagedPoolStart) / PAGE_SIZE; + StartIndex = (ULONG_PTR)(PAGE_ROUND_UP((ULONG_PTR)blk + BLOCK_HDR_SIZE - (ULONG_PTR)MiNonPagedPoolStart)) / PAGE_SIZE; + EndIndex = ((ULONG_PTR)PAGE_ROUND_UP(end) - (ULONG_PTR)MiNonPagedPoolStart) / PAGE_SIZE; for (i = StartIndex; i < EndIndex; i++) @@ -1266,7 +1266,7 @@ } } Status = MmCreateVirtualMapping(NULL, - MiNonPagedPoolStart + i * PAGE_SIZE, + (PVOID)((ULONG_PTR)MiNonPagedPoolStart + i * PAGE_SIZE), PAGE_READWRITE|PAGE_SYSTEM, Page, k); @@ -1333,12 +1333,12 @@ * from alignment. If not, calculate forward to the next alignment * and see if we allocate there... */ - new_size = (ULONG)aligned_addr - (ULONG)addr + size; - if ((ULONG)aligned_addr - (ULONG)addr < BLOCK_HDR_SIZE) + new_size = (ULONG_PTR)aligned_addr - (ULONG_PTR)addr + size; + if ((ULONG_PTR)aligned_addr - (ULONG_PTR)addr < BLOCK_HDR_SIZE) { /* not enough room for a free block header, add some more bytes */ aligned_addr = MM_ROUND_UP(block_to_address((BLOCK_HDR*)((char*)current + BLOCK_HDR_SIZE)), alignment); - new_size = (ULONG)aligned_addr - (ULONG)addr + size; + new_size = (ULONG_PTR)aligned_addr - (ULONG_PTR)addr + size; } if (current->Size >= new_size && (best == NULL || current->Size < best->Size)) @@ -1382,9 +1382,9 @@ * if size-aligned, break off the preceding bytes into their own block... */ previous = current; - previous_size = (ULONG)blk - (ULONG)previous - BLOCK_HDR_SIZE; + previous_size = (ULONG_PTR)blk - (ULONG_PTR)previous - BLOCK_HDR_SIZE; current = blk; - current_size -= ((ULONG)current - (ULONG)previous); + current_size -= ((ULONG_PTR)current - (ULONG_PTR)previous); } } @@ -1393,7 +1393,7 @@ if (current_size >= size + BLOCK_HDR_SIZE + MM_POOL_ALIGNMENT) { /* create a new free block after our block, if the memory size is >= 4 byte for this block */ - next = (BLOCK_HDR*)((ULONG)current + size + BLOCK_HDR_SIZE); + next = (BLOCK_HDR*)((ULONG_PTR)current + size + BLOCK_HDR_SIZE); next_size = current_size - size - BLOCK_HDR_SIZE; current_size = size; end = (char*)next + BLOCK_HDR_SIZE; @@ -1828,9 +1828,9 @@ /* the second block is the first free block */ blk = (BLOCK_HDR*)((char*)blk + BLOCK_HDR_SIZE + blk->Size); memset(blk, 0, BLOCK_HDR_SIZE); - memset((char*)blk + BLOCK_HDR_SIZE, 0x0cc, MiNonPagedPoolNrOfPages * PAGE_SIZE - ((ULONG)blk + BLOCK_HDR_SIZE - (ULONG)MiNonPagedPoolStart)); + memset((char*)blk + BLOCK_HDR_SIZE, 0x0cc, MiNonPagedPoolNrOfPages * PAGE_SIZE - ((ULONG_PTR)blk + BLOCK_HDR_SIZE - (ULONG_PTR)MiNonPagedPoolStart)); blk->Magic = BLOCK_HDR_FREE_MAGIC; - blk->Size = MiNonPagedPoolLength - ((ULONG)blk + BLOCK_HDR_SIZE - (ULONG)MiNonPagedPoolStart); + blk->Size = MiNonPagedPoolLength - ((ULONG_PTR)blk + BLOCK_HDR_SIZE - (ULONG_PTR)MiNonPagedPoolStart); blk->previous = (BLOCK_HDR*)MiNonPagedPoolStart; add_to_free_list(blk); #endif _____ Modified: trunk/reactos/ntoskrnl/mm/pagefile.c --- trunk/reactos/ntoskrnl/mm/pagefile.c 2005-01-12 10:05:05 UTC (rev 12949) +++ trunk/reactos/ntoskrnl/mm/pagefile.c 2005-01-12 10:05:31 UTC (rev 12950) @@ -532,7 +532,7 @@ Headers->BugCheckParameters[3] = BugCodeParameter4; Headers->FaultingStackBase = (PVOID)Thread->Tcb.StackLimit; Headers->FaultingStackSize = - StackSize = (ULONG_PTR)(Thread->Tcb.StackBase - Thread->Tcb.StackLimit); + StackSize = (ULONG_PTR)Thread->Tcb.StackBase - (ULONG_PTR)Thread->Tcb.StackLimit; Headers->PhysicalMemorySize = MmStats.NrTotalPages * PAGE_SIZE; /* Initialize the dump device. */ _____ Modified: trunk/reactos/ntoskrnl/mm/pageop.c --- trunk/reactos/ntoskrnl/mm/pageop.c 2005-01-12 10:05:05 UTC (rev 12949) +++ trunk/reactos/ntoskrnl/mm/pageop.c 2005-01-12 10:05:31 UTC (rev 12950) @@ -70,7 +70,7 @@ MmCheckForPageOp(PMEMORY_AREA MArea, ULONG Pid, PVOID Address, PMM_SECTION_SEGMENT Segment, ULONG Offset) { - ULONG Hash; + ULONG_PTR Hash; KIRQL oldIrql; PMM_PAGEOP PageOp; @@ -79,11 +79,11 @@ */ if (MArea->Type == MEMORY_AREA_SECTION_VIEW) { - Hash = (((ULONG)Segment) | (((ULONG)Offset) / PAGE_SIZE)); + Hash = (((ULONG_PTR)Segment) | (((ULONG_PTR)Offset) / PAGE_SIZE)); } else { - Hash = (((ULONG)Pid) | (((ULONG)Address) / PAGE_SIZE)); + Hash = (((ULONG_PTR)Pid) | (((ULONG_PTR)Address) / PAGE_SIZE)); } Hash = Hash % PAGEOP_HASH_TABLE_SIZE; @@ -137,7 +137,7 @@ * pid, address pair. */ { - ULONG Hash; + ULONG_PTR Hash; KIRQL oldIrql; PMM_PAGEOP PageOp; @@ -146,11 +146,11 @@ */ if (MArea->Type == MEMORY_AREA_SECTION_VIEW) { - Hash = (((ULONG)Segment) | (((ULONG)Offset) / PAGE_SIZE)); + Hash = (((ULONG_PTR)Segment) | (((ULONG_PTR)Offset) / PAGE_SIZE)); } else { - Hash = (((ULONG)Pid) | (((ULONG)Address) / PAGE_SIZE)); + Hash = (((ULONG_PTR)Pid) | (((ULONG_PTR)Address) / PAGE_SIZE)); } Hash = Hash % PAGEOP_HASH_TABLE_SIZE; _____ Modified: trunk/reactos/ntoskrnl/mm/section.c --- trunk/reactos/ntoskrnl/mm/section.c 2005-01-12 10:05:05 UTC (rev 12949) +++ trunk/reactos/ntoskrnl/mm/section.c 2005-01-12 10:05:31 UTC (rev 12950) @@ -3265,8 +3265,8 @@ return(Status); } - if (0 != InterlockedCompareExchangeUL(&FileObject->SectionObjectPointer->ImageSec tionObject, - ImageSectionObject, 0)) + if (NULL != InterlockedCompareExchangePointer(&FileObject->SectionObjectPointer->Ima geSectionObject, + ImageSectionObject, NULL)) { /* * An other thread has initialized the some image in the background @@ -4089,7 +4089,7 @@ KEBUGCHECK(0); } Status = MmCreateVirtualMapping (NULL, - (PVOID)(Result + (i * PAGE_SIZE)), + (PVOID)((ULONG_PTR)Result + (i * PAGE_SIZE)), PAGE_READWRITE, &Page, 1); @@ -4201,9 +4201,9 @@ { if (!(SectionSegments[i].Characteristics & IMAGE_SCN_TYPE_NOLOAD)) { - ULONG MaxExtent; - MaxExtent = (ULONG)((char*)SectionSegments[i].VirtualAddress + - SectionSegments[i].Length); + ULONG_PTR MaxExtent; + MaxExtent = (ULONG_PTR)SectionSegments[i].VirtualAddress + + SectionSegments[i].Length; ImageSize = max(ImageSize, MaxExtent); } }

19 years, 10 months

[navaraf] 12949: Portability fixes.

by navaraf＠svn.reactos.com

Portability fixes. Modified: trunk/reactos/include/ddk/mmfuncs.h Modified: trunk/reactos/include/ddk/mmtypes.h Modified: trunk/reactos/include/msvcrt/crttypes.h Modified: trunk/reactos/include/msvcrt/stddef.h Modified: trunk/reactos/include/napi/teb.h Modified: trunk/reactos/include/ntos/mm.h Modified: trunk/reactos/include/pseh/framebased.h _____ Modified: trunk/reactos/include/ddk/mmfuncs.h --- trunk/reactos/include/ddk/mmfuncs.h 2005-01-12 09:31:44 UTC (rev 12948) +++ trunk/reactos/include/ddk/mmfuncs.h 2005-01-12 10:05:05 UTC (rev 12949) @@ -26,21 +26,9 @@ * Size = Size of range * RETURNS: The number of pages */ -#if 0 -extern inline unsigned int ADDRESS_AND_SIZE_TO_SPAN_PAGES(PVOID Va, - ULONG Size) -{ - ULONG HighestAddr; - ULONG LowestAddr; - - HighestAddr = PAGE_ROUND_UP(Size + ((ULONG)Va)); - LowestAddr = PAGE_ROUND_DOWN((ULONG)Va); - return((HighestAddr - LowestAddr) / PAGE_SIZE); -} -#endif #define ADDRESS_AND_SIZE_TO_SPAN_PAGES(Va, Size) \ - (ULONG)((PAGE_ROUND_UP((Size) + ((ULONG)(Va))) - \ - PAGE_ROUND_DOWN((ULONG)(Va))) / PAGE_SIZE) + (ULONG)((PAGE_ROUND_UP((Size) + ((ULONG_PTR)(Va))) - \ + PAGE_ROUND_DOWN((ULONG_PTR)(Va))) / PAGE_SIZE) /* * FUNCTION: Returns FALSE is the pointer is NULL, TRUE otherwise @@ -50,7 +38,7 @@ /* * FUNCTION: Returns the byte offset of the address within its page */ -#define BYTE_OFFSET(va) (((ULONG)va)%PAGE_SIZE) +#define BYTE_OFFSET(va) (((ULONG_PTR)va)%PAGE_SIZE) #define PAGE_OFFSET(va) BYTE_OFFSET(va) @@ -59,10 +47,9 @@ * required to hold it */ #define BYTES_TO_PAGES(Size) \ - ((ULONG) ((ULONG_PTR) (Size) >> PAGE_SHIFT) + (((ULONG) (Size) & (PAGE_SIZE - 1)) != 0)) + (((Size) >> PAGE_SHIFT) + (((Size) & (PAGE_SIZE - 1)) != 0)) - -#define PAGE_ALIGN(va) ( (PVOID) (((ULONG)(va)) & (~(PAGE_SIZE-1))) ) +#define PAGE_ALIGN(va) ( (PVOID) (((ULONG_PTR)(va)) & (~(PAGE_SIZE-1))) ) #define PAGE_BASE(va) PAGE_ALIGN(va) NTSTATUS @@ -331,10 +318,10 @@ { \ (MemoryDescriptorList)->Next = (PMDL)NULL; \ (MemoryDescriptorList)->Size = (CSHORT)(sizeof(MDL) + \ - (ADDRESS_AND_SIZE_TO_SPAN_PAGES((BaseVa),(Length)) * sizeof(ULONG))); \ + (ADDRESS_AND_SIZE_TO_SPAN_PAGES((BaseVa),(Length)) * sizeof(PFN_NUMBER))); \ (MemoryDescriptorList)->MdlFlags = 0; \ - (MemoryDescriptorList)->StartVa = (PVOID)PAGE_BASE(BaseVa); \ - (MemoryDescriptorList)->ByteOffset = (ULONG)PAGE_OFFSET(BaseVa); \ + (MemoryDescriptorList)->StartVa = PAGE_ALIGN(BaseVa); \ + (MemoryDescriptorList)->ByteOffset = BYTE_OFFSET(BaseVa); \ (MemoryDescriptorList)->ByteCount = (Length); \ } _____ Modified: trunk/reactos/include/ddk/mmtypes.h --- trunk/reactos/include/ddk/mmtypes.h 2005-01-12 09:31:44 UTC (rev 12948) +++ trunk/reactos/include/ddk/mmtypes.h 2005-01-12 10:05:05 UTC (rev 12949) @@ -15,7 +15,7 @@ * PURPOSE: Returns the byte offset of a field within a structure */ #ifndef FIELD_OFFSET -#define FIELD_OFFSET(Type,Field) ((LONG)(&(((Type *)(0))->Field))) +#define FIELD_OFFSET(Type,Field) ((ULONG_PTR)(&(((Type *)(0))->Field))) #endif /* @@ -27,9 +27,16 @@ * Field = Name of the field whose address is none */ #ifndef CONTAINING_RECORD -#define CONTAINING_RECORD(Address,Type,Field) ((Type *)(((LONG)Address) - FIELD_OFFSET(Type,Field))) +#define CONTAINING_RECORD(Address,Type,Field) ((Type *)(((ULONG_PTR)Address) - FIELD_OFFSET(Type,Field))) #endif +#ifdef _M_IX86 +typedef ULONG PFN_NUMBER, *PPFN_NUMBER; +#elif _M_IA64 +typedef ULONG64 PFN_NUMBER, *PPFN_NUMBER; +#else +#error Unknown architecture +#endif #define MDL_MAPPED_TO_SYSTEM_VA (0x1) #define MDL_PAGES_LOCKED (0x2) _____ Modified: trunk/reactos/include/msvcrt/crttypes.h --- trunk/reactos/include/msvcrt/crttypes.h 2005-01-12 09:31:44 UTC (rev 12948) +++ trunk/reactos/include/msvcrt/crttypes.h 2005-01-12 10:05:05 UTC (rev 12949) @@ -49,20 +49,6 @@ struct _EPROCESS { int foobar; }; #endif -#ifndef _DEBUG -#pragma function(_disable,_enable) -#pragma function(_inp,_inpw,_outp,_outpw) -#pragma function(_lrotl,_lrotr,_rotl,_rotr) -#pragma function(abs,fabs,labs) -#pragma function(memcpy,memcmp,memset) -#pragma function(strcat,strcmp,strcpy,strlen,_strset) -#pragma function(fmod,sqrt) -#pragma function(log,log10,pow,exp) -#pragma function(tan,atan,atan2,tanh) -#pragma function(cos,acos,cosh) -#pragma function(sin,asin,sinh) -#endif - #endif /*__GNUC__*/ _____ Modified: trunk/reactos/include/msvcrt/stddef.h --- trunk/reactos/include/msvcrt/stddef.h 2005-01-12 09:31:44 UTC (rev 12948) +++ trunk/reactos/include/msvcrt/stddef.h 2005-01-12 10:05:05 UTC (rev 12949) @@ -154,7 +154,11 @@ #if defined (__MSVCRT_STDDEF_H_) || defined (__need_NULL) #undef NULL +#ifdef __cplusplus #define NULL (0) +#else +#define NULL ((void *)0) +#endif #endif /* __MSVCRT_STDDEF_H_ or __need_NULL */ #undef __need_NULL _____ Modified: trunk/reactos/include/napi/teb.h --- trunk/reactos/include/napi/teb.h 2005-01-12 09:31:44 UTC (rev 12948) +++ trunk/reactos/include/napi/teb.h 2005-01-12 10:05:05 UTC (rev 12949) @@ -286,7 +286,7 @@ #define NtCurrentTeb() ((struct _TEB *)__gregister_get(13)) #else -#error Unsupported architecture or no architecture specified. +struct _TEB * NtCurrentTeb(void); #endif #endif _____ Modified: trunk/reactos/include/ntos/mm.h --- trunk/reactos/include/ntos/mm.h 2005-01-12 09:31:44 UTC (rev 12948) +++ trunk/reactos/include/ntos/mm.h 2005-01-12 10:05:05 UTC (rev 12949) @@ -62,7 +62,7 @@ #endif /* __USE_W32API */ -#define PAGE_ROUND_UP(x) ( (((ULONG)x)%PAGE_SIZE) ? ((((ULONG)x)&(~(PAGE_SIZE-1)))+PAGE_SIZE) : ((ULONG)x) ) -#define PAGE_ROUND_DOWN(x) (((ULONG)x)&(~(PAGE_SIZE-1))) +#define PAGE_ROUND_UP(x) ( (((ULONG_PTR)x)%PAGE_SIZE) ? ((((ULONG_PTR)x)&(~(PAGE_SIZE-1)))+PAGE_SIZE) : ((ULONG_PTR)x) ) +#define PAGE_ROUND_DOWN(x) (((ULONG_PTR)x)&(~(PAGE_SIZE-1))) #endif /* __INCLUDE_MM_H */ _____ Modified: trunk/reactos/include/pseh/framebased.h --- trunk/reactos/include/pseh/framebased.h 2005-01-12 09:31:44 UTC (rev 12948) +++ trunk/reactos/include/pseh/framebased.h 2005-01-12 10:05:05 UTC (rev 12949) @@ -176,11 +176,11 @@ #define _SEH_TRY_FILTER_FINALLY(FILTER_, FINALLY_) \ { \ - _SEH_DECLARE_HANDLERS(FILTER_, FINALLY_); \ - \ _SEHFrame_t * _SEHFrame; \ volatile _SEHPortableFrame_t * _SEHPortableFrame; \ \ + _SEH_DECLARE_HANDLERS(FILTER_, FINALLY_); \ + \ _SEHFrame = _alloca(sizeof(_SEHFrame_t)); \ _SEHFrame->SEH_Header.SPF_Handlers = &_SEHHandlers; \ _SEHFrame->SEH_Locals = &_SEHLocals; \

19 years, 10 months

[gvg] 12948: Sync to Wine-20050111:

by gvg＠svn.reactos.com

Sync to Wine-20050111: Vitaly Lipatov <lav(a)etersoft.ru> - Get real screen properties. - Add description for MsiGetMode, MSIRUNMODE constants. - Add ScreenX, ScreenY, ColorBits installer properties. Mike McCormack <mike(a)codeweavers.com> - Add a simple test case for MSI databases. - Remove unneeded whitespace, indent correctly. - Remove more fixed length buffers, rewrite functions to return malloc'ed memory. - Remove a lot of fixed length buffers. - Implement thread safety for records. - Fix selecting string columns and matching against a wildcard. - Implement MsiRecordSetStreamA/W and add tests for records containing streams. - Fix records according to test cases. - Fix transposition of 4 byte values when reading in table data from storage. - MsiCloseAllHandles only closes handles allocated in the calling thread. Francois Gouget <fgouget(a)free.fr> - Assorted spelling fixes. Aric Stewart <aric(a)codeweavers.com> - Make all custom type 1 actions happen in a seperate thread and close all handles for that thread when it exits. Honors the concept of temporary MSI handles for custom actions. - Properly deformat keys written to the registry. - Because directory mappings can change between the CostFinalize step and the InstallFiles step we need to do a final resolution of the target file name before installing. - When checking for an existing .lnk shortcut extension on the filename do not just search for '.' but actually verify it is '.lnk'. - CustomAction 35 should call SetTargetPath not just set the property. - TARGETDIR and SOURCEDIR may not be entries 0 in the directory tables. So when resolving the folder we need to seek them out. - When we handle SetTargetPath we need to be sure to recalculate the resulting paths as things with the now set Directory as the parent will change. - Change how we install files so that we extract files as we need them, cuts down on extraction time and unused files. - Improve progress bar tracking. - Be sure that set paths are terminated with a backslash. - Free allocated buffers. - Parse out the full features by using the ',' character and do comparisons based on the full feature names. - Continue when a duplicate component is found and loaded. - Rework how we handle Feature and Component States. I have confirmed from testing that, although documented nowhere, having ADDLOCAL on the install line overrides INSTALLLEVEL. - Track all files extracted from cabinents as tempfiles so they can be removed at the end of the install to not leave uninstalled but uncabbed files laying around. - Move Install Features selection and evaluation into CostFinalize. - Allow for end of install actions. - Create the shortcut directory if it does not exist. - Set the INSTALLLEVEL in CostFinalize if it is not set. - Eliminate some fixed length buffers. - Enable asynchronous dll custom action calls. - Make sure to include trailing backslash in path. - Move around and rename some functions. - Fix incorrect return code check. - Fix folder resolution. - Let negative number be parsed correctly. Needed for accessing actions with sequences such as -1. - Added MsiSetExternalUIW. - Include a System16Folder definition. - Free allocated buffers. - Blank the property buffers even if the property is not found. - Include the trailing backslash on the Windows volume. - Fix folder resolution. Eric Pouech <pouech-eric(a)wanadoo.fr> - Fixed some errors in function prototypes. Steven Edwards <steven(a)codeweavers.com> - Add and fix some stubs. Ulrich Czekalla <ulrich(a)codeweavers.com> - Set the out buffer count to zero on read error. Michael Stefaniuc <mstefani(a)redhat.de> - Add missing HeapFree's (found by smatch). Paul Vriens <Paul.Vriens(a)xs4all.nl> - Use Interlocked* functions in AddRef and Release. Modified: trunk/reactos/include/wine/msiquery.h Modified: trunk/reactos/lib/msi/Makefile.in Modified: trunk/reactos/lib/msi/action.c Modified: trunk/reactos/lib/msi/handle.c Modified: trunk/reactos/lib/msi/msi.c Modified: trunk/reactos/lib/msi/msi.spec Modified: trunk/reactos/lib/msi/msipriv.h Modified: trunk/reactos/lib/msi/package.c Modified: trunk/reactos/lib/msi/query.h Modified: trunk/reactos/lib/msi/record.c Modified: trunk/reactos/lib/msi/sql.tab.c Modified: trunk/reactos/lib/msi/sql.tab.h Modified: trunk/reactos/lib/msi/sql.y Modified: trunk/reactos/lib/msi/table.c Modified: trunk/reactos/lib/msi/where.c _____ Modified: trunk/reactos/include/wine/msiquery.h --- trunk/reactos/include/wine/msiquery.h 2005-01-12 09:03:31 UTC (rev 12947) +++ trunk/reactos/include/wine/msiquery.h 2005-01-12 09:31:44 UTC (rev 12948) @@ -59,7 +59,30 @@ #define MSIDBOPEN_TRANSACT (LPCTSTR)1 #define MSIDBOPEN_DIRECT (LPCTSTR)2 #define MSIDBOPEN_CREATE (LPCTSTR)3 +#define MSIDBOPEN_CREATEDIRECT (LPCTSTR)4 +typedef enum tagMSIRUNMODE +{ + MSIRUNMODE_ADMIN = 0, + MSIRUNMODE_ADVERTISE = 1, + MSIRUNMODE_MAINTENANCE = 2, + MSIRUNMODE_ROLLBACKENABLED = 3, + MSIRUNMODE_LOGENABLED = 4, + MSIRUNMODE_OPERATIONS = 5, + MSIRUNMODE_REBOOTATEND = 6, + MSIRUNMODE_REBOOTNOW = 7, + MSIRUNMODE_CABINET = 8, + MSIRUNMODE_SOURCESHORTNAMES = 9, + MSIRUNMODE_TARGETSHORTNAMES = 10, + MSIRUNMODE_RESERVED11 = 11, + MSIRUNMODE_WINDOWS9X = 12, + MSIRUNMODE_ZAWENABLED = 13, + MSIRUNMODE_RESERVED14 = 14, + MSIRUNMODE_RESERVED15 = 15, + MSIRUNMODE_SCHEDULED = 16, + MSIRUNMODE_ROLLBACK = 17, + MSIRUNMODE_COMMIT = 18 +} MSIRUNMODE; /* view manipulation */ UINT WINAPI MsiViewFetch(MSIHANDLE,MSIHANDLE*); @@ -123,15 +146,12 @@ #define MsiEvaluateCondition WINELIB_NAME_AW(MsiEvaluateCondition) /* property functions */ -UINT WINAPI MsiGetPropertyA(MSIHANDLE hInstall, LPCSTR szName, - LPSTR szValueBuf, DWORD* pchValueBuf); -UINT WINAPI MsiGetPropertyW(MSIHANDLE hInstall, LPCWSTR szName, - LPWSTR szValueBuf, DWORD* pchValueBuf); +UINT WINAPI MsiGetPropertyA(MSIHANDLE, LPCSTR, LPSTR, DWORD*); +UINT WINAPI MsiGetPropertyW(MSIHANDLE, LPCWSTR, LPWSTR, DWORD*); #define MsiGetProperty WINELIB_NAME_AW(MsiGetProperty) -UINT WINAPI MsiSetPropertyA(MSIHANDLE hInstall, LPCSTR szName, LPCSTR szValue); -UINT WINAPI MsiSetPropertyW(MSIHANDLE hInstall, LPCWSTR szName, - LPCWSTR szValue); +UINT WINAPI MsiSetPropertyA(MSIHANDLE, LPCSTR, LPCSTR); +UINT WINAPI MsiSetPropertyW(MSIHANDLE, LPCWSTR, LPCWSTR); #define MsiSetProperty WINELIB_NAME_AW(MsiSetProperty) UINT WINAPI MsiGetTargetPathA(MSIHANDLE,LPCSTR,LPSTR,DWORD*); @@ -148,11 +168,13 @@ MSIHANDLE WINAPI MsiGetActiveDatabase(MSIHANDLE); -UINT WINAPI MsiViewGetColumnInfo( MSIHANDLE, MSICOLINFO, MSIHANDLE*); -INT WINAPI MsiProcessMessage( MSIHANDLE, INSTALLMESSAGE, MSIHANDLE); +UINT WINAPI MsiViewGetColumnInfo(MSIHANDLE, MSICOLINFO, MSIHANDLE*); +INT WINAPI MsiProcessMessage(MSIHANDLE, INSTALLMESSAGE, MSIHANDLE); -UINT WINAPI MsiSetFeatureStateA( MSIHANDLE, LPCSTR, INSTALLSTATE); -UINT WINAPI MsiSetFeatureStateW( MSIHANDLE, LPCWSTR, INSTALLSTATE); +UINT WINAPI MsiSetFeatureStateA(MSIHANDLE, LPCSTR, INSTALLSTATE); +UINT WINAPI MsiSetFeatureStateW(MSIHANDLE, LPCWSTR, INSTALLSTATE); #define MsiSetFeatureState WINELIB_NAME_AW(MsiSetFeatureState) +BOOL WINAPI MsiGetMode(MSIHANDLE, MSIRUNMODE); + #endif /* __WINE_MSIQUERY_H */ _____ Modified: trunk/reactos/lib/msi/Makefile.in --- trunk/reactos/lib/msi/Makefile.in 2005-01-12 09:03:31 UTC (rev 12947) +++ trunk/reactos/lib/msi/Makefile.in 2005-01-12 09:31:44 UTC (rev 12948) @@ -3,7 +3,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = msi.dll -IMPORTS = shell32 cabinet oleaut32 ole32 version user32 advapi32 kernel32 +IMPORTS = shell32 cabinet oleaut32 ole32 version user32 gdi32 advapi32 kernel32 EXTRALIBS = -luuid $(LIBUNICODE) C_SRCS = \ @@ -31,6 +31,8 @@ EXTRA_SRCS = sql.y cond.y EXTRA_OBJS = sql.tab.o cond.tab.o +SUBDIRS = tests + @MAKE_DLL_RULES@ sql.tab.c sql.tab.h: sql.y _____ Modified: trunk/reactos/lib/msi/action.c --- trunk/reactos/lib/msi/action.c 2005-01-12 09:03:31 UTC (rev 12947) +++ trunk/reactos/lib/msi/action.c 2005-01-12 09:31:44 UTC (rev 12948) @@ -51,6 +51,8 @@ #include "ver.h" #define CUSTOM_ACTION_TYPE_MASK 0x3F +#define REG_PROGRESS_VALUE 13200 +#define COMPONENT_PROGRESS_VALUE 24000 WINE_DEFAULT_DEBUG_CHANNEL(msi); @@ -65,8 +67,10 @@ WCHAR Directory[96]; INT Attributes; - INSTALLSTATE State; - BOOL Enabled; + INSTALLSTATE Installed; + INSTALLSTATE ActionRequest; + INSTALLSTATE Action; + INT ComponentCount; INT Components[1024]; /* yes hardcoded limit.... I am bad */ INT Cost; @@ -81,21 +85,23 @@ WCHAR Condition[0x100]; WCHAR KeyPath[96]; - INSTALLSTATE State; - BOOL FeatureState; + INSTALLSTATE Installed; + INSTALLSTATE ActionRequest; + INSTALLSTATE Action; + BOOL Enabled; INT Cost; } MSICOMPONENT; typedef struct tagMSIFOLDER { - WCHAR Directory[96]; - WCHAR TargetDefault[96]; - WCHAR SourceDefault[96]; + LPWSTR Directory; + LPWSTR TargetDefault; + LPWSTR SourceDefault; - WCHAR ResolvedTarget[MAX_PATH]; - WCHAR ResolvedSource[MAX_PATH]; - WCHAR Property[MAX_PATH]; /* initially set property */ + LPWSTR ResolvedTarget; + LPWSTR ResolvedSource; + LPWSTR Property; /* initially set property */ INT ParentIndex; INT State; /* 0 = uninitialized */ @@ -108,12 +114,12 @@ typedef struct tagMSIFILE { - WCHAR File[72]; + LPWSTR File; INT ComponentIndex; - WCHAR FileName[MAX_PATH]; + LPWSTR FileName; INT FileSize; - WCHAR Version[72]; - WCHAR Language[20]; + LPWSTR Version; + LPWSTR Language; INT Attributes; INT Sequence; @@ -123,8 +129,8 @@ /* 2 = present but replace */ /* 3 = present do not replace */ /* 4 = Installed */ - WCHAR SourcePath[MAX_PATH]; - WCHAR TargetPath[MAX_PATH]; + LPWSTR SourcePath; + LPWSTR TargetPath; BOOL Temporary; }MSIFILE; @@ -134,6 +140,7 @@ static UINT ACTION_ProcessExecSequence(MSIPACKAGE *package, BOOL UIran); static UINT ACTION_ProcessUISequence(MSIPACKAGE *package); +static UINT ACTION_PerformActionSequence(MSIPACKAGE *package, UINT seq); UINT ACTION_PerformAction(MSIPACKAGE *package, const WCHAR *action); static UINT ACTION_LaunchConditions(MSIPACKAGE *package); @@ -158,15 +165,15 @@ const LPWSTR target, const INT type); static UINT HANDLE_CustomType2(MSIPACKAGE *package, const LPWSTR source, const LPWSTR target, const INT type); -static UINT HANDLE_CustomType18(MSIPACKAGE *package, const LPWSTR source, +static UINT HANDLE_CustomType18(MSIPACKAGE *package, const LPWSTR source, const LPWSTR target, const INT type); -static UINT HANDLE_CustomType50(MSIPACKAGE *package, const LPWSTR source, +static UINT HANDLE_CustomType50(MSIPACKAGE *package, const LPWSTR source, const LPWSTR target, const INT type); -static UINT HANDLE_CustomType34(MSIPACKAGE *package, const LPWSTR source, +static UINT HANDLE_CustomType34(MSIPACKAGE *package, const LPWSTR source, const LPWSTR target, const INT type); static DWORD deformat_string(MSIPACKAGE *package, WCHAR* ptr,WCHAR** data); -static UINT resolve_folder(MSIPACKAGE *package, LPCWSTR name, LPWSTR path, +static LPWSTR resolve_folder(MSIPACKAGE *package, LPCWSTR name, BOOL source, BOOL set_prop, MSIFOLDER **folder); static int track_tempfile(MSIPACKAGE *package, LPCWSTR name, LPCWSTR path); @@ -223,12 +230,9 @@ ********************************************************/ inline static void reduce_to_longfilename(WCHAR* filename) { - if (strchrW(filename,'|')) - { - WCHAR newname[MAX_PATH]; - strcpyW(newname,strchrW(filename,'|')+1); - strcpyW(filename,newname); - } + LPWSTR p = strchrW(filename,'|'); + if (p) + memmove(filename, p+1, (strlenW(p+1)+1)*sizeof(WCHAR)); } inline static char *strdupWtoA( const WCHAR *str ) @@ -256,6 +260,15 @@ return ret; } +static LPWSTR dupstrW(LPCWSTR src) +{ + LPWSTR dest; + if (!src) return NULL; + dest = HeapAlloc(GetProcessHeap(), 0, (strlenW(src)+1)*sizeof(WCHAR)); + strcpyW(dest, src); + return dest; +} + inline static WCHAR *load_dynamic_stringW(MSIRECORD *row, INT index) { UINT rc; @@ -263,16 +276,58 @@ LPWSTR ret; sz = 0; - rc = MSI_RecordGetStringW(row,index,NULL,&sz); - if (sz <= 0) + if (MSI_RecordIsNull(row,index)) return NULL; + rc = MSI_RecordGetStringW(row,index,NULL,&sz); + + /* having an empty string is different than NULL */ + if (sz == 0) + { + ret = HeapAlloc(GetProcessHeap(),0,sizeof(WCHAR)); + ret[0] = 0; + return ret; + } + sz ++; ret = HeapAlloc(GetProcessHeap(),0,sz * sizeof (WCHAR)); rc = MSI_RecordGetStringW(row,index,ret,&sz); + if (rc!=ERROR_SUCCESS) + { + ERR("Unable to load dynamic string\n"); + HeapFree(GetProcessHeap(), 0, ret); + ret = NULL; + } return ret; } +inline static LPWSTR load_dynamic_property(MSIPACKAGE *package, LPCWSTR prop, + UINT* rc) +{ + DWORD sz = 0; + LPWSTR str; + UINT r; + + r = MSI_GetPropertyW(package, prop, NULL, &sz); + if (r != ERROR_SUCCESS && r != ERROR_MORE_DATA) + { + if (rc) + *rc = r; + return NULL; + } + sz++; + str = HeapAlloc(GetProcessHeap(),0,sz*sizeof(WCHAR)); + r = MSI_GetPropertyW(package, prop, str, &sz); + if (r != ERROR_SUCCESS) + { + HeapFree(GetProcessHeap(),0,str); + str = NULL; + } + if (rc) + *rc = r; + return str; +} + inline static int get_loaded_component(MSIPACKAGE* package, LPCWSTR Component ) { int rc = -1; @@ -321,6 +376,7 @@ return rc; } + static int track_tempfile(MSIPACKAGE *package, LPCWSTR name, LPCWSTR path) { DWORD i; @@ -343,8 +399,8 @@ memset(&package->files[index],0,sizeof(MSIFILE)); - strcpyW(package->files[index].File,name); - strcpyW(package->files[index].TargetPath,path); + package->files[index].File = dupstrW(name); + package->files[index].TargetPath = dupstrW(path); package->files[index].Temporary = TRUE; TRACE("Tracking tempfile (%s)\n",debugstr_w(package->files[index].File)); @@ -362,11 +418,103 @@ for (i = 0; i < package->loaded_files; i++) { if (package->files[i].Temporary) + { + TRACE("Cleaning up %s\n",debugstr_w(package->files[i].TargetPath)); DeleteFileW(package->files[i].TargetPath); + } } } +/* Called when the package is being closed */ +extern void ACTION_free_package_structures( MSIPACKAGE* package) +{ + INT i; + + TRACE("Freeing package action data\n"); + + /* No dynamic buffers in features */ + if (package->features && package->loaded_features > 0) + HeapFree(GetProcessHeap(),0,package->features); + + for (i = 0; i < package->loaded_folders; i++) + { + HeapFree(GetProcessHeap(),0,package->folders[i].Directory); + HeapFree(GetProcessHeap(),0,package->folders[i].TargetDefault); + HeapFree(GetProcessHeap(),0,package->folders[i].SourceDefault); + HeapFree(GetProcessHeap(),0,package->folders[i].ResolvedTarget); + HeapFree(GetProcessHeap(),0,package->folders[i].ResolvedSource); + HeapFree(GetProcessHeap(),0,package->folders[i].Property); + } + if (package->folders && package->loaded_folders > 0) + HeapFree(GetProcessHeap(),0,package->folders); + + /* no dynamic buffers in components */ + if (package->components && package->loaded_components > 0) + HeapFree(GetProcessHeap(),0,package->components); + + for (i = 0; i < package->loaded_files; i++) + { + HeapFree(GetProcessHeap(),0,package->files[i].File); + HeapFree(GetProcessHeap(),0,package->files[i].FileName); + HeapFree(GetProcessHeap(),0,package->files[i].Version); + HeapFree(GetProcessHeap(),0,package->files[i].Language); + HeapFree(GetProcessHeap(),0,package->files[i].SourcePath); + HeapFree(GetProcessHeap(),0,package->files[i].TargetPath); + } + + if (package->files && package->loaded_files > 0) + HeapFree(GetProcessHeap(),0,package->files); +} + +static UINT ACTION_OpenQuery( MSIDATABASE *db, MSIQUERY **view, LPCWSTR fmt, ... ) +{ + LPWSTR szQuery; + LPCWSTR p; + UINT sz, rc; + va_list va; + + /* figure out how much space we need to allocate */ + va_start(va, fmt); + sz = strlenW(fmt) + 1; + p = fmt; + while (*p) + { + p = strchrW(p, '%'); + if (!p) + break; + p++; + switch (*p) + { + case 's': /* a string */ + sz += strlenW(va_arg(va,LPCWSTR)); + break; + case 'd': + case 'i': /* an integer -2147483648 seems to be longest */ + sz += 3*sizeof(int); + (void)va_arg(va,int); + break; + case '%': /* a single % - leave it alone */ + break; + default: + FIXME("Unhandled character type %c\n",*p); + } + p++; + } + va_end(va); + + /* construct the string */ + szQuery = HeapAlloc(GetProcessHeap(), 0, sz*sizeof(WCHAR)); + va_start(va, fmt); + vsnprintfW(szQuery, sz, fmt, va); + va_end(va); + + /* perform the query */ + rc = MSI_DatabaseOpenViewW(db, szQuery, view); + HeapFree(GetProcessHeap(), 0, szQuery); + return rc; +} + static void ui_progress(MSIPACKAGE *package, int a, int b, int c, int d ) { MSIRECORD * row; @@ -390,17 +538,14 @@ UINT rc; MSIQUERY * view; MSIRECORD * row = 0; - static WCHAR *ActionFormat=NULL; - static WCHAR LastAction[0x100] = {0}; - WCHAR Query[1024]; LPWSTR ptr; - if (strcmpW(LastAction,action)!=0) + if (!package->LastAction || strcmpW(package->LastAction,action)) { - sprintfW(Query,Query_t,action); - rc = MSI_DatabaseOpenViewW(package->db, Query, &view); + rc = ACTION_OpenQuery(package->db, &view, Query_t, action); if (rc != ERROR_SUCCESS) return; + rc = MSI_ViewExecute(view, 0); if (rc != ERROR_SUCCESS) { @@ -422,18 +567,22 @@ return; } - if (ActionFormat) - HeapFree(GetProcessHeap(),0,ActionFormat); + /* update the cached actionformat */ + if (package->ActionFormat) + HeapFree(GetProcessHeap(),0,package->ActionFormat); + package->ActionFormat = load_dynamic_stringW(row,3); - ActionFormat = load_dynamic_stringW(row,3); - strcpyW(LastAction,action); + if (package->LastAction) + HeapFree(GetProcessHeap(),0,package->LastAction); + package->LastAction = dupstrW(action); + msiobj_release(&row->hdr); MSI_ViewClose(view); msiobj_release(&view->hdr); } message[0]=0; - ptr = ActionFormat; + ptr = package->ActionFormat; while (*ptr) { LPWSTR ptr2; @@ -489,12 +638,10 @@ MSIQUERY * view; MSIRECORD * row = 0; WCHAR *ActionText=NULL; - WCHAR Query[1024]; GetTimeFormatW(LOCALE_USER_DEFAULT, 0, NULL, format, timet, 0x100); - sprintfW(Query,Query_t,action); - rc = MSI_DatabaseOpenViewW(package->db, Query, &view); + rc = ACTION_OpenQuery(package->db, &view, Query_t, action); if (rc != ERROR_SUCCESS) return; rc = MSI_ViewExecute(view, 0); @@ -555,6 +702,58 @@ msiobj_release(&row->hdr); } +/* + * build_directory_name() + * + * This function is to save messing round with directory names + * It handles adding backslashes between path segments, + * and can add \ at the end of the directory name if told to. + * + * It takes a variable number of arguments. + * It always allocates a new string for the result, so make sure + * to free the return value when finished with it. + * + * The first arg is the number of path segments that follow. + * The arguments following count are a list of path segments. + * A path segment may be NULL. + * + * Path segments will be added with a \ separating them. + * A \ will not be added after the last segment, however if the + * last segment is NULL, then the last character will be a \ + * + */ +static LPWSTR build_directory_name(DWORD count, ...) +{ + DWORD sz = 1, i; + LPWSTR dir; + va_list va; + + va_start(va,count); + for(i=0; i<count; i++) + { + LPCWSTR str = va_arg(va,LPCWSTR); + if (str) + sz += strlenW(str) + 1; + } + va_end(va); + + dir = HeapAlloc(GetProcessHeap(), 0, sz*sizeof(WCHAR)); + dir[0]=0; + + va_start(va,count); + for(i=0; i<count; i++) + { + LPCWSTR str = va_arg(va,LPCWSTR); + if (!str) + continue; + strcatW(dir, str); + if( ((i+1)!=count) && dir[strlenW(dir)-1]!='\\') + strcatW(dir, cszbs); + } + return dir; +} + + /**************************************************** * TOP level entry points *****************************************************/ @@ -569,23 +768,23 @@ if (szPackagePath) { - LPWSTR p; - WCHAR check[MAX_PATH]; - WCHAR pth[MAX_PATH]; - DWORD size; + LPWSTR p, check, path; - strcpyW(pth,szPackagePath); - p = strrchrW(pth,'\\'); + path = dupstrW(szPackagePath); + p = strrchrW(path,'\\'); if (p) { p++; *p=0; } - size = MAX_PATH; - if (MSI_GetPropertyW(package,cszSourceDir,check,&size) - != ERROR_SUCCESS ) - MSI_SetPropertyW(package, cszSourceDir, pth); + check = load_dynamic_property(package, cszSourceDir,NULL); + if (!check) + MSI_SetPropertyW(package, cszSourceDir, path); + else + HeapFree(GetProcessHeap(), 0, check); + + HeapFree(GetProcessHeap(), 0, path); } if (szCommandLine) @@ -595,8 +794,8 @@ while (*ptr) { - WCHAR prop[0x100]; - WCHAR val[0x100]; + WCHAR *prop = NULL; + WCHAR *val = NULL; TRACE("Looking at %s\n",debugstr_w(ptr)); @@ -607,10 +806,13 @@ DWORD len = 0; while (*ptr == ' ') ptr++; - strncpyW(prop,ptr,ptr2-ptr); - prop[ptr2-ptr]=0; + len = ptr2-ptr; + prop = HeapAlloc(GetProcessHeap(),0,(len+1)*sizeof(WCHAR)); + strncpyW(prop,ptr,len); + prop[len]=0; ptr2++; - + + len = 0; ptr = ptr2; while (*ptr && (quote || (!quote && *ptr!=' '))) { @@ -625,14 +827,18 @@ ptr2++; len -= 2; } + val = HeapAlloc(GetProcessHeap(),0,(len+1)*sizeof(WCHAR)); strncpyW(val,ptr2,len); - val[len]=0; + val[len] = 0; if (strlenW(prop) > 0) { - TRACE("Found commandline property (%s) = (%s)\n", debugstr_w(prop), debugstr_w(val)); + TRACE("Found commandline property (%s) = (%s)\n", + debugstr_w(prop), debugstr_w(val)); MSI_SetPropertyW(package,prop,val); } + HeapFree(GetProcessHeap(),0,val); + HeapFree(GetProcessHeap(),0,prop); } ptr++; } @@ -653,10 +859,93 @@ else rc = ACTION_ProcessExecSequence(package,FALSE); + /* process the ending type action */ + if (rc == ERROR_SUCCESS) + rc = ACTION_PerformActionSequence(package,-1); + else if (rc == ERROR_FUNCTION_FAILED) + rc = ACTION_PerformActionSequence(package,-3); + return rc; } +static UINT ACTION_PerformActionSequence(MSIPACKAGE *package, UINT seq) +{ + MSIQUERY * view; + UINT rc; + WCHAR buffer[0x100]; + DWORD sz = 0x100; + MSIRECORD * row = 0; + static const WCHAR ExecSeqQuery[] = { + 's','e','l','e','c','t',' ','*',' ', + 'f','r','o','m',' ', + 'I','n','s','t','a','l','l','E','x','e','c','u','t','e', + 'S','e','q','u','e','n','c','e',' ', + 'w','h','e','r','e',' ','S','e','q','u','e','n','c','e',' ', + '=',' ','%','i',0}; + rc = ACTION_OpenQuery(package->db, &view, ExecSeqQuery, seq); + + if (rc == ERROR_SUCCESS) + { + rc = MSI_ViewExecute(view, 0); + + if (rc != ERROR_SUCCESS) + { + MSI_ViewClose(view); + msiobj_release(&view->hdr); + goto end; + } + + TRACE("Running the actions\n"); + + rc = MSI_ViewFetch(view,&row); + if (rc != ERROR_SUCCESS) + { + rc = ERROR_SUCCESS; + goto end; + } + + /* check conditions */ + if (!MSI_RecordIsNull(row,2)) + { + LPWSTR cond = NULL; + cond = load_dynamic_stringW(row,2); + + if (cond) + { + /* this is a hack to skip errors in the condition code */ + if (MSI_EvaluateConditionW(package, cond) == MSICONDITION_FALSE) + { + HeapFree(GetProcessHeap(),0,cond); + msiobj_release(&row->hdr); + goto end; + } + else + HeapFree(GetProcessHeap(),0,cond); + } + } + + sz=0x100; + rc = MSI_RecordGetStringW(row,1,buffer,&sz); + if (rc != ERROR_SUCCESS) + { + ERR("Error is %x\n",rc); + msiobj_release(&row->hdr); + goto end; + } + + rc = ACTION_PerformAction(package,buffer); + msiobj_release(&row->hdr); +end: + MSI_ViewClose(view); + msiobj_release(&view->hdr); + } + else + rc = ERROR_SUCCESS; + + return rc; +} + static UINT ACTION_ProcessExecSequence(MSIPACKAGE *package, BOOL UIran) { MSIQUERY * view; @@ -669,7 +958,6 @@ 'w','h','e','r','e',' ','S','e','q','u','e','n','c','e',' ', '>',' ','%','i',' ','o','r','d','e','r',' ', 'b','y',' ','S','e','q','u','e','n','c','e',0 }; - WCHAR Query[1024]; MSIRECORD * row = 0; static const WCHAR IVQuery[] = { 's','e','l','e','c','t',' ','S','e','q','u','e','n','c','e',' ', @@ -678,11 +966,11 @@ 'w','h','e','r','e',' ','A','c','t','i','o','n',' ','=',' ', '`','I','n','s','t','a','l','l','V','a','l','i','d','a','t','e','`', 0}; + INT seq = 0; + /* get the sequence number */ if (UIran) { - INT seq = 0; - rc = MSI_DatabaseOpenViewW(package->db, IVQuery, &view); if (rc != ERROR_SUCCESS) return rc; @@ -704,12 +992,9 @@ msiobj_release(&row->hdr); MSI_ViewClose(view); msiobj_release(&view->hdr); - sprintfW(Query,ExecSeqQuery,seq); } - else - sprintfW(Query,ExecSeqQuery,0); - - rc = MSI_DatabaseOpenViewW(package->db, Query, &view); + + rc = ACTION_OpenQuery(package->db, &view, ExecSeqQuery, seq); if (rc == ERROR_SUCCESS) { rc = MSI_ViewExecute(view, 0); @@ -721,7 +1006,7 @@ goto end; } - TRACE("Running the actions \n"); + TRACE("Running the actions\n"); while (1) { @@ -900,7 +1185,6 @@ TRACE("Performing action (%s)\n",debugstr_w(action)); ui_actioninfo(package, action, TRUE, 0); ui_actionstart(package, action); - ui_progress(package,2,1,0,0); /* pre install, setup and configuration block */ if (strcmpW(action,szLaunchConditions)==0) @@ -961,21 +1245,16 @@ UINT rc = ERROR_SUCCESS; MSIQUERY * view; MSIRECORD * row = 0; - WCHAR ExecSeqQuery[1024] = + static const WCHAR ExecSeqQuery[] = {'s','e','l','e','c','t',' ','*',' ','f','r','o','m',' ','C','u','s','t','o' -,'m','A','c','t','i','o','n',' ','w','h','e','r','e',' ','`','A','c','t','i' -,'o','n','`',' ','=',' ','`',0}; - static const WCHAR end[]={'`',0}; + ,'m','A','c','t','i','o','n',' ','w','h','e','r','e',' ','`','A','c','t','i' + ,'o','n','`',' ','=',' ','`','%','s','`',0}; UINT type; LPWSTR source; LPWSTR target; WCHAR *deformated=NULL; - strcatW(ExecSeqQuery,action); - strcatW(ExecSeqQuery,end); - - rc = MSI_DatabaseOpenViewW(package->db, ExecSeqQuery, &view); - + rc = ACTION_OpenQuery(package->db, &view, ExecSeqQuery, action); if (rc != ERROR_SUCCESS) return rc; @@ -1022,6 +1301,10 @@ rc = HANDLE_CustomType34(package,source,target,type); break; case 35: /* Directory set with formatted text. */ + deformat_string(package,target,&deformated); + MSI_SetTargetPathW(package, source, deformated); + HeapFree(GetProcessHeap(),0,deformated); + break; case 51: /* Property set with formatted text. */ deformat_string(package,target,&deformated); rc = MSI_SetPropertyW(package,source,deformated); @@ -1063,10 +1346,9 @@ UINT rc; MSIQUERY * view; MSIRECORD * row = 0; - WCHAR Query[1024] = + static const WCHAR fmt[] = {'s','e','l','e','c','t',' ','*',' ','f','r','o','m',' ','B','i' -,'n','a','r','y',' ','w','h','e','r','e',' ','N','a','m','e','=','`',0}; - static const WCHAR end[]={'`',0}; +,'n','a','r','y',' ','w','h','e','r','e',' ','N','a','m','e','=','`','%','s','`',0}; HANDLE the_file; CHAR buffer[1024]; @@ -1079,10 +1361,7 @@ if (the_file == INVALID_HANDLE_VALUE) return ERROR_FUNCTION_FAILED; - strcatW(Query,source); - strcatW(Query,end); - - rc = MSI_DatabaseOpenViewW( package->db, Query, &view); + rc = ACTION_OpenQuery(package->db, &view, fmt, source); if (rc != ERROR_SUCCESS) return rc; @@ -1127,66 +1406,82 @@ return ERROR_SUCCESS; } - typedef UINT __stdcall CustomEntry(MSIHANDLE); typedef struct { MSIPACKAGE *package; - WCHAR target[MAX_PATH]; - WCHAR source[MAX_PATH]; + WCHAR *target; + WCHAR *source; } thread_struct; -#if 0 -static DWORD WINAPI DllThread(LPVOID info) +static DWORD WINAPI ACTION_CallDllFunction(thread_struct *stuff) { - HANDLE DLL; + HANDLE hModule; LPSTR proc; - thread_struct *stuff; CustomEntry *fn; - - stuff = (thread_struct*)info; - TRACE("Asynchronous start (%s, %s) \n", debugstr_w(stuff->source), + TRACE("calling function (%s, %s) \n", debugstr_w(stuff->source), debugstr_w(stuff->target)); - DLL = LoadLibraryW(stuff->source); - if (DLL) + hModule = LoadLibraryW(stuff->source); + if (hModule) { proc = strdupWtoA( stuff->target ); - fn = (CustomEntry*)GetProcAddress(DLL,proc); + fn = (CustomEntry*)GetProcAddress(hModule,proc); if (fn) { MSIHANDLE hPackage; MSIPACKAGE *package = stuff->package; - TRACE("Calling function\n"); + TRACE("Calling function %s\n", proc); hPackage = msiobj_findhandle( &package->hdr ); - if( !hPackage ) + if (hPackage ) + { + fn(hPackage); + msiobj_release( &package->hdr ); + } + else ERR("Handle for object %p not found\n", package ); - fn(hPackage); - msiobj_release( &package->hdr ); } else ERR("Cannot load functon\n"); HeapFree(GetProcessHeap(),0,proc); - FreeLibrary(DLL); + FreeLibrary(hModule); } else ERR("Unable to load library\n"); msiobj_release( &stuff->package->hdr ); - HeapFree( GetProcessHeap(), 0, info ); + HeapFree(GetProcessHeap(),0,stuff->source); + HeapFree(GetProcessHeap(),0,stuff->target); + HeapFree(GetProcessHeap(), 0, stuff); return 0; } -#endif +static DWORD WINAPI DllThread(LPVOID info) +{ + thread_struct *stuff; + DWORD rc = 0; + + TRACE("MSI Thread (0x%lx) started for custom action\n", + GetCurrentThreadId()); + + stuff = (thread_struct*)info; + rc = ACTION_CallDllFunction(stuff); + + TRACE("MSI Thread (0x%lx) finished\n",GetCurrentThreadId()); + /* clse all handles for this thread */ + MsiCloseAllHandles(); + return rc; +} + static UINT HANDLE_CustomType1(MSIPACKAGE *package, const LPWSTR source, const LPWSTR target, const INT type) { WCHAR tmp_file[MAX_PATH]; - CustomEntry *fn; - HANDLE DLL; - LPSTR proc; + thread_struct *info; + DWORD ThreadId; + HANDLE ThreadHandle; store_binary_to_temp(package, source, tmp_file); @@ -1199,76 +1494,57 @@ strcatW(tmp_file,dot); } - if (type & 0xc0) - { - /* DWORD ThreadId; */ - thread_struct *info = HeapAlloc( GetProcessHeap(), 0, sizeof(*info) ); + info = HeapAlloc( GetProcessHeap(), 0, sizeof(*info) ); + msiobj_addref( &package->hdr ); + info->package = package; + info->target = dupstrW(target); + info->source = dupstrW(tmp_file); - /* msiobj_addref( &package->hdr ); */ - info->package = package; - strcpyW(info->target,target); - strcpyW(info->source,tmp_file); - TRACE("Start Asynchronous execution\n"); - FIXME("DATABASE NOT THREADSAFE... not starting\n"); - /* CreateThread(NULL,0,DllThread,(LPVOID)&info,0,&ThreadId); */ - /* FIXME: release the package if the CreateThread fails */ - HeapFree( GetProcessHeap(), 0, info ); - return ERROR_SUCCESS; - } - - DLL = LoadLibraryW(tmp_file); - if (DLL) - { - proc = strdupWtoA( target ); - fn = (CustomEntry*)GetProcAddress(DLL,proc); - if (fn) - { - MSIHANDLE hPackage; + ThreadHandle = CreateThread(NULL,0,DllThread,(LPVOID)info,0,&ThreadId); - TRACE("Calling function\n"); - hPackage = msiobj_findhandle( &package->hdr ); - if( !hPackage ) - ERR("Handle for object %p not found\n", package ); - fn(hPackage); - msiobj_release( &package->hdr ); - } - else - ERR("Cannot load functon\n"); + if (!(type & 0xc0)) + WaitForSingleObject(ThreadHandle,INFINITE); - HeapFree(GetProcessHeap(),0,proc); - FreeLibrary(DLL); - } - else - ERR("Unable to load library\n"); - [truncated at 1000 lines; 8611 more skipped]

19 years, 10 months

[gvg] 12947: Wine-20050111 vendor drop

by gvg＠svn.reactos.com

Wine-20050111 vendor drop Added: vendor/wine/dlls/ole32/Wine-20050111/ Modified: vendor/wine/dlls/ole32/Wine-20050111/Makefile.in Modified: vendor/wine/dlls/ole32/Wine-20050111/bindctx.c Modified: vendor/wine/dlls/ole32/Wine-20050111/clipboard.c Modified: vendor/wine/dlls/ole32/Wine-20050111/compobj.c Modified: vendor/wine/dlls/ole32/Wine-20050111/compobj_private.h Modified: vendor/wine/dlls/ole32/Wine-20050111/compositemoniker.c Modified: vendor/wine/dlls/ole32/Wine-20050111/datacache.c Modified: vendor/wine/dlls/ole32/Wine-20050111/defaulthandler.c Modified: vendor/wine/dlls/ole32/Wine-20050111/errorinfo.c Modified: vendor/wine/dlls/ole32/Wine-20050111/filemoniker.c Modified: vendor/wine/dlls/ole32/Wine-20050111/ftmarshal.c Modified: vendor/wine/dlls/ole32/Wine-20050111/hglobalstream.c Modified: vendor/wine/dlls/ole32/Wine-20050111/ifs.c Modified: vendor/wine/dlls/ole32/Wine-20050111/ifs.h Modified: vendor/wine/dlls/ole32/Wine-20050111/itemmoniker.c Modified: vendor/wine/dlls/ole32/Wine-20050111/marshal.c Modified: vendor/wine/dlls/ole32/Wine-20050111/memlockbytes.c Modified: vendor/wine/dlls/ole32/Wine-20050111/moniker.c Modified: vendor/wine/dlls/ole32/Wine-20050111/ole2.c Modified: vendor/wine/dlls/ole32/Wine-20050111/oleobj.c Modified: vendor/wine/dlls/ole32/Wine-20050111/oleproxy.c Modified: vendor/wine/dlls/ole32/Wine-20050111/rpc.c Modified: vendor/wine/dlls/ole32/Wine-20050111/stg_bigblockfile.c Modified: vendor/wine/dlls/ole32/Wine-20050111/stg_stream.c Modified: vendor/wine/dlls/ole32/Wine-20050111/storage32.c Added: vendor/wine/dlls/ole32/Wine-20050111/stubmanager.c Modified: vendor/wine/dlls/ole32/current/Makefile.in Modified: vendor/wine/dlls/ole32/current/bindctx.c Modified: vendor/wine/dlls/ole32/current/clipboard.c Modified: vendor/wine/dlls/ole32/current/compobj.c Modified: vendor/wine/dlls/ole32/current/compobj_private.h Modified: vendor/wine/dlls/ole32/current/compositemoniker.c Modified: vendor/wine/dlls/ole32/current/datacache.c Modified: vendor/wine/dlls/ole32/current/defaulthandler.c Modified: vendor/wine/dlls/ole32/current/errorinfo.c Modified: vendor/wine/dlls/ole32/current/filemoniker.c Modified: vendor/wine/dlls/ole32/current/ftmarshal.c Modified: vendor/wine/dlls/ole32/current/hglobalstream.c Modified: vendor/wine/dlls/ole32/current/ifs.c Modified: vendor/wine/dlls/ole32/current/ifs.h Modified: vendor/wine/dlls/ole32/current/itemmoniker.c Modified: vendor/wine/dlls/ole32/current/marshal.c Modified: vendor/wine/dlls/ole32/current/memlockbytes.c Modified: vendor/wine/dlls/ole32/current/moniker.c Modified: vendor/wine/dlls/ole32/current/ole2.c Modified: vendor/wine/dlls/ole32/current/oleobj.c Modified: vendor/wine/dlls/ole32/current/oleproxy.c Modified: vendor/wine/dlls/ole32/current/rpc.c Modified: vendor/wine/dlls/ole32/current/stg_bigblockfile.c Modified: vendor/wine/dlls/ole32/current/stg_stream.c Modified: vendor/wine/dlls/ole32/current/storage32.c Added: vendor/wine/dlls/ole32/current/stubmanager.c _____ Copied: vendor/wine/dlls/ole32/Wine-20050111 (from rev 12927, vendor/wine/dlls/ole32/current) _____ Modified: vendor/wine/dlls/ole32/Wine-20050111/Makefile.in --- vendor/wine/dlls/ole32/current/Makefile.in 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/ole32/Wine-20050111/Makefile.in 2005-01-12 09:03:31 UTC (rev 12947) @@ -35,7 +35,8 @@ rpc.c \ stg_bigblockfile.c \ stg_stream.c \ - storage32.c + storage32.c \ + stubmanager.c C_SRCS16 = \ memlockbytes16.c \ _____ Modified: vendor/wine/dlls/ole32/Wine-20050111/bindctx.c --- vendor/wine/dlls/ole32/current/bindctx.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/ole32/Wine-20050111/bindctx.c 2005-01-12 09:03:31 UTC (rev 12947) @@ -275,8 +275,7 @@ if(This->bindCtxTable[index].pObj) IUnknown_Release(This->bindCtxTable[index].pObj); - if(This->bindCtxTable[index].pkeyObj) - HeapFree(GetProcessHeap(),0,This->bindCtxTable[index].pkeyObj); + HeapFree(GetProcessHeap(),0,This->bindCtxTable[index].pkeyObj); /* left-shift all elements in the right side of the current revoked object */ for(j=index; j<This->bindCtxTableLastIndex-1; j++) @@ -302,8 +301,7 @@ { if(This->bindCtxTable[i].pObj) IUnknown_Release(This->bindCtxTable[i].pObj); - if(This->bindCtxTable[i].pkeyObj) - HeapFree(GetProcessHeap(),0,This->bindCtxTable[i].pkeyObj); + HeapFree(GetProcessHeap(),0,This->bindCtxTable[i].pkeyObj); } This->bindCtxTableLastIndex = 0; @@ -472,8 +470,7 @@ /* release the object if it's found */ if(This->bindCtxTable[index].pObj) IUnknown_Release(This->bindCtxTable[index].pObj); - if(This->bindCtxTable[index].pkeyObj) - HeapFree(GetProcessHeap(),0,This->bindCtxTable[index].pkeyObj); + HeapFree(GetProcessHeap(),0,This->bindCtxTable[index].pkeyObj); /* remove the object from the table with a left-shifting of all objects in the right side */ for(j=index; j<This->bindCtxTableLastIndex-1; j++) _____ Modified: vendor/wine/dlls/ole32/Wine-20050111/clipboard.c --- vendor/wine/dlls/ole32/current/clipboard.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/ole32/Wine-20050111/clipboard.c 2005-01-12 09:03:31 UTC (rev 12947) @@ -736,7 +736,7 @@ * We don't bother doing this since the FindClassByAtom code * would have to be changed to deal with this idiosyncrasy. */ wcex.style = CS_GLOBALCLASS; - wcex.lpfnWndProc = (WNDPROC)OLEClipbrd_WndProc; + wcex.lpfnWndProc = OLEClipbrd_WndProc; wcex.hInstance = 0; wcex.lpszClassName = OLEClipbrd_WNDCLASS; @@ -1489,8 +1489,7 @@ /* * Free the array of FORMATETC's */ - if (afmt) - HeapFree(GetProcessHeap(), 0, afmt); + HeapFree(GetProcessHeap(), 0, afmt); /* * Close Windows clipboard _____ Modified: vendor/wine/dlls/ole32/Wine-20050111/compobj.c --- vendor/wine/dlls/ole32/current/compobj.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/ole32/Wine-20050111/compobj.c 2005-01-12 09:03:31 UTC (rev 12947) @@ -21,6 +21,44 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Note + * 1. COINIT_MULTITHREADED is 0; it is the lack of COINIT_APARTMENTTHREADED + * Therefore do not test against COINIT_MULTITHREADED + * + * TODO list: (items bunched together depend on each other) + * + * - Switch wine_marshal_id to use IPIDs not IIDs + * - Once that's done, replace wine_marshal_id with STDOBJREF + * + * - Rewrite the CoLockObjectExternal code, it does totally the wrong + * thing currently (should be controlling the stub manager) + * + * - Make the MTA dynamically allocated and refcounted + * - Free the ReservedForOle data in DllMain(THREAD_DETACH) + * + * - Implement the service control manager (in rpcss) to keep track + * of registered class objects: ISCM::ServerRegisterClsid et al + * - Implement the OXID resolver so we don't need magic pipe names for + * clients and servers to meet up + * - Flip our marshalling on top of the RPC runtime transport API, + * so we no longer use named pipes to communicate + * - Rework threading so re-entrant calls don't need to be sent on + * the incoming pipe + * - Implement RPC thread affinity (should fix InstallShield painting + * problems) + * + * - Implement IRemUnknown and marshalling for it, then use that for + * reffing/unreffing the stub manager from a proxy instead of our + * current hack of simply reffing the stub manager once when it's + * registered. + * - Implement table marshalling, then use it to let us do the final + * rework of the threading + * + * - Make our custom marshalling use NDR to be wire compatible with + * native DCOM + * + * */ #include "config.h" @@ -61,15 +99,15 @@ * * TODO: Most of these things will have to be made thread-safe. */ -HINSTANCE COMPOBJ_hInstance32 = 0; static HRESULT COM_GetRegisteredClassObject(REFCLSID rclsid, DWORD dwClsContext, LPUNKNOWN* ppUnk); -static void COM_RevokeAllClasses(); -static void COM_ExternalLockFreeList(); +static void COM_RevokeAllClasses(void); +static void COM_ExternalLockFreeList(void); const CLSID CLSID_StdGlobalInterfaceTable = { 0x00000323, 0, 0, {0xc0, 0, 0, 0, 0, 0, 0, 0x46} }; -APARTMENT MTA, *apts; +APARTMENT MTA; +static struct list apts = LIST_INIT( apts ); static CRITICAL_SECTION csApartment; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -102,7 +140,7 @@ DWORD runContext; DWORD connectFlags; DWORD dwCookie; - HANDLE hThread; /* only for localserver */ + LPSTREAM pMarshaledData; /* FIXME: only really need to store OXID and IPID */ struct tagRegisteredClass* nextClass; } RegisteredClass; @@ -206,6 +244,7 @@ MTA.oxid = 0; } + /* creates an apartment structure which stores OLE thread-local * information. Call with COINIT_UNINITIALIZED to create an apartment * that will be initialized with a model later. Note: do not call @@ -213,81 +252,138 @@ * with a different COINIT value */ APARTMENT* COM_CreateApartment(DWORD model) { - APARTMENT *apt; - BOOL create = (NtCurrentTeb()->ReservedForOle == NULL); + APARTMENT *apt = COM_CurrentApt(); - if (create) + if (!apt) { + if (!(model & COINIT_APARTMENTTHREADED)) /* See note 1 above */ + { + TRACE("thread 0x%lx is entering the multithreaded apartment\n", GetCurrentThreadId()); + COM_CurrentInfo()->apt = &MTA; + return COM_CurrentInfo()->apt; + } + + TRACE("creating new apartment, model=%ld\n", model); + apt = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(APARTMENT)); apt->tid = GetCurrentThreadId(); DuplicateHandle(GetCurrentProcess(), GetCurrentThread(), GetCurrentProcess(), &apt->thread, THREAD_ALL_ACCESS, FALSE, 0); + + list_init(&apt->proxies); + list_init(&apt->stubmgrs); + apt->oidc = 1; + apt->refs = 1; + InitializeCriticalSection(&apt->cs); + + apt->model = model; + + /* we don't ref the apartment as CoInitializeEx will do it for us */ + + if (model & COINIT_APARTMENTTHREADED) + { + /* FIXME: how does windoze create OXIDs? */ + apt->oxid = MTA.oxid | GetCurrentThreadId(); + TRACE("Created apartment on OXID %s\n", wine_dbgstr_longlong(apt->oxid)); + apt->win = CreateWindowA(aptWinClass, NULL, 0, + 0, 0, 0, 0, + 0, 0, OLE32_hInstance, NULL); + } + + EnterCriticalSection(&csApartment); + list_add_head(&apts, &apt->entry); + LeaveCriticalSection(&csApartment); + + COM_CurrentInfo()->apt = apt; } - else - apt = NtCurrentTeb()->ReservedForOle; - apt->model = model; - if (model & COINIT_APARTMENTTHREADED) { - /* FIXME: how does windoze create OXIDs? */ - apt->oxid = MTA.oxid | GetCurrentThreadId(); - apt->win = CreateWindowA(aptWinClass, NULL, 0, - 0, 0, 0, 0, - 0, 0, OLE32_hInstance, NULL); - InitializeCriticalSection(&apt->cs); - } - else if (!(model & COINIT_UNINITIALIZED)) { - apt->parent = &MTA; - apt->oxid = MTA.oxid; - } - EnterCriticalSection(&csApartment); - if (create) + return apt; +} + +DWORD COM_ApartmentAddRef(struct apartment *apt) +{ + return InterlockedIncrement(&apt->refs); +} + +DWORD COM_ApartmentRelease(struct apartment *apt) +{ + DWORD ret; + + ret = InterlockedDecrement(&apt->refs); + if (ret == 0) { - if (apts) apts->prev = apt; - apt->next = apts; - apts = apt; + TRACE("destroying apartment %p, oxid %s\n", apt, wine_dbgstr_longlong(apt->oxid)); + + EnterCriticalSection(&csApartment); + list_remove(&apt->entry); + LeaveCriticalSection(&csApartment); + + MARSHAL_Disconnect_Proxies(apt); + + if (apt->win) DestroyWindow(apt->win); + + if (!list_empty(&apt->stubmgrs)) + { + FIXME("Destroy outstanding stubs\n"); + } + + if (apt->filter) IUnknown_Release(apt->filter); + + + DeleteCriticalSection(&apt->cs); + CloseHandle(apt->thread); + HeapFree(GetProcessHeap(), 0, apt); + + apt = NULL; } - LeaveCriticalSection(&csApartment); - NtCurrentTeb()->ReservedForOle = apt; - return apt; + + return ret; } -static void COM_DestroyApartment(APARTMENT *apt) +/* The given OXID must be local to this process: you cannot use + * apartment windows to send RPCs to other processes. This all needs + * to move to rpcrt4. + * + * The ref parameter is here mostly to ensure people remember that + * they get one, you should normally take a ref for thread safety. + */ +APARTMENT *COM_ApartmentFromOXID(OXID oxid, BOOL ref) { + APARTMENT *result = NULL; + struct list *cursor; + EnterCriticalSection(&csApartment); - if (apt->prev) apt->prev->next = apt->next; - if (apt->next) apt->next->prev = apt->prev; - if (apts == apt) apts = apt->next; - apt->prev = NULL; apt->next = NULL; + LIST_FOR_EACH( cursor, &apts ) + { + struct apartment *apt = LIST_ENTRY( cursor, struct apartment, entry ); + if (apt->oxid == oxid) + { + result = apt; + if (ref) COM_ApartmentAddRef(result); + break; + } + } LeaveCriticalSection(&csApartment); - if (apt->model & COINIT_APARTMENTTHREADED) { - if (apt->win) DestroyWindow(apt->win); - DeleteCriticalSection(&apt->cs); - } - CloseHandle(apt->thread); - HeapFree(GetProcessHeap(), 0, apt); + + return result; } -/* The given OXID must be local to this process: you cannot use apartment - windows to send RPCs to other processes. This all needs to move to rpcrt4 */ -HWND COM_GetApartmentWin(OXID oxid) +HWND COM_GetApartmentWin(OXID oxid, BOOL ref) { APARTMENT *apt; - HWND win = 0; - EnterCriticalSection(&csApartment); - apt = apts; - while (apt && apt->oxid != oxid) apt = apt->next; - if (apt) win = apt->win; - LeaveCriticalSection(&csApartment); - return win; + apt = COM_ApartmentFromOXID(oxid, ref); + if (!apt) return NULL; + + return apt->win; } /* Currently inter-thread marshalling is not fully implemented, so this does nothing */ static LRESULT CALLBACK COM_AptWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { return DefWindowProcA(hWnd, msg, wParam, lParam); -} +} /*********************************************************************** ****** * This section contains OpenDllList implemantation @@ -418,8 +514,7 @@ * CoUninitialize */ HRESULT WINAPI CoInitializeEx( - LPVOID lpReserved, /* [in] pointer to win32 malloc interface - (obsolete, should be NULL) */ + LPVOID lpReserved, /* [in] pointer to win32 malloc interface (obsolete, should be NULL) */ DWORD dwCoInit /* [in] A value from COINIT specifies the threading model */ ) { @@ -433,21 +528,6 @@ ERR("(%p, %x) - Bad parameter passed-in %p, must be an old Windows Application\n", lpReserved, (int)dwCoInit, lpReserved); } - apt = NtCurrentTeb()->ReservedForOle; - if (apt && !(apt->model == COINIT_UNINITIALIZED)) - { - if (dwCoInit != apt->model) - { - /* Changing the threading model after it's been set is illegal. If this warning is triggered by Wine - code then we are probably using the wrong threading model to implement that API. */ - ERR("Attempt to change threading model of this apartment from 0x%lx to 0x%lx\n", apt->model, dwCoInit); - return RPC_E_CHANGED_MODE; - } - hr = S_FALSE; - } - else - hr = S_OK; - /* * Check the lock count. If this is the first time going through the initialize * process, we have to initialize the libraries. @@ -463,13 +543,25 @@ COM_InitMTA(); + /* we may need to defer this until after apartment initialisation */ RunningObjectTableImpl_Initialize(); } - if (!apt || apt->model == COINIT_UNINITIALIZED) apt = COM_CreateApartment(dwCoInit); + if (!(apt = COM_CurrentInfo()->apt)) + { + apt = COM_CreateApartment(dwCoInit); + if (!apt) return E_OUTOFMEMORY; + } + else if (dwCoInit != apt->model) + { + /* Changing the threading model after it's been set is illegal. If this warning is triggered by Wine + code then we are probably using the wrong threading model to implement that API. */ + ERR("Attempt to change threading model of this apartment from 0x%lx to 0x%lx\n", apt->model, dwCoInit); + COM_ApartmentRelease(apt); + return RPC_E_CHANGED_MODE; + } - InterlockedIncrement(&apt->inits); - if (hr == S_OK) NtCurrentTeb()->ReservedForOle = apt; + COM_CurrentInfo()->inits++; return hr; } @@ -480,14 +572,20 @@ void COM_FlushMessageQueue(void) { MSG message; - APARTMENT *apt = NtCurrentTeb()->ReservedForOle; + APARTMENT *apt = COM_CurrentApt(); if (!apt || !apt->win) return; TRACE("Flushing STA message queue\n"); - while (PeekMessageA(&message, NULL, 0, 0, PM_REMOVE)) { - if (message.hwnd != apt->win) continue; + while (PeekMessageA(&message, NULL, 0, 0, PM_REMOVE)) + { + if (message.hwnd != apt->win) + { + WARN("discarding message 0x%x for window %p\n", message.message, message.hwnd); + continue; + } + TranslateMessage(&message); DispatchMessageA(&message); } @@ -511,19 +609,27 @@ */ void WINAPI CoUninitialize(void) { + struct oletls * info = COM_CurrentInfo(); LONG lCOMRefCnt; - APARTMENT *apt; TRACE("()\n"); - apt = NtCurrentTeb()->ReservedForOle; - if (!apt) return; - if (InterlockedDecrement(&apt->inits)==0) { - NtCurrentTeb()->ReservedForOle = NULL; - COM_DestroyApartment(apt); - apt = NULL; + /* will only happen on OOM */ + if (!info) return; + + /* sanity check */ + if (!info->inits) + { + ERR("Mismatched CoUninitialize\n"); + return; } + if (!--info->inits) + { + COM_ApartmentRelease(info->apt); + info->apt = NULL; + } + /* * Decrease the reference count. * If we are back to 0 locks on the COM library, make sure we free @@ -536,14 +642,6 @@ RunningObjectTableImpl_UnInitialize(); - /* disconnect proxies to release the corresponding stubs. - * It is confirmed in "Essential COM" in the sub-chapter on - * "Lifecycle Management and Marshalling" that the native version also - * does some kind of proxy cleanup in this function. - * FIXME: does it just disconnect or completely destroy the proxies? - * FIXME: should this be in the apartment destructor? */ - MARSHAL_Disconnect_Proxies(); - /* Release the references to the registered class objects */ COM_RevokeAllClasses(); @@ -1091,117 +1189,24 @@ return hr; } -static DWORD WINAPI -_LocalServerThread(LPVOID param) { - HANDLE hPipe; - char pipefn[200]; - RegisteredClass *newClass = (RegisteredClass*)param; - HRESULT hres; - IStream *pStm; - STATSTG ststg; - unsigned char *buffer; - int buflen; - IClassFactory *classfac; - LARGE_INTEGER seekto; - ULARGE_INTEGER newpos; - ULONG res; - - TRACE("Starting threader for %s.\n",debugstr_guid(&newClass->classIdentifier)); - - strcpy(pipefn,PIPEPREF); - WINE_StringFromCLSID(&newClass->classIdentifier,pipefn+strlen(PIPEPREF)) ; - - hPipe = CreateNamedPipeA( pipefn, PIPE_ACCESS_DUPLEX, - PIPE_TYPE_BYTE|PIPE_WAIT, PIPE_UNLIMITED_INSTANCES, - 4096, 4096, NMPWAIT_USE_DEFAULT_WAIT, NULL ); - if (hPipe == INVALID_HANDLE_VALUE) { - FIXME("pipe creation failed for %s, le is %lx\n",pipefn,GetLastError()); - return 1; - } - while (1) { - if (!ConnectNamedPipe(hPipe,NULL)) { - ERR("Failure during ConnectNamedPipe %lx, ABORT!\n",GetLastError()); - break; - } - - TRACE("marshalling IClassFactory to client\n"); - - hres = IUnknown_QueryInterface(newClass->classObject,&IID_IClassFactory,(LPVOID *)&classfac); - if (hres) return hres; - - hres = CreateStreamOnHGlobal(0,TRUE,&pStm); - if (hres) { - FIXME("Failed to create stream on hglobal.\n"); - return hres; - } - hres = CoMarshalInterface(pStm,&IID_IClassFactory,(LPVOID)classfac,0,NULL,0); - if (hres) { - FIXME("CoMarshalInterface failed, %lx!\n",hres); - return hres; - } - - IUnknown_Release(classfac); /* is this right? */ - - hres = IStream_Stat(pStm,&ststg,0); - if (hres) return hres; - - buflen = ststg.cbSize.u.LowPart; - buffer = HeapAlloc(GetProcessHeap(),0,buflen); - seekto.u.LowPart = 0; - seekto.u.HighPart = 0; - hres = IStream_Seek(pStm,seekto,SEEK_SET,&newpos); - if (hres) { - FIXME("IStream_Seek failed, %lx\n",hres); - return hres; - } - - hres = IStream_Read(pStm,buffer,buflen,&res); - if (hres) { - FIXME("Stream Read failed, %lx\n",hres); - return hres; - } - - IStream_Release(pStm); - - WriteFile(hPipe,buffer,buflen,&res,NULL); - FlushFileBuffers(hPipe); - DisconnectNamedPipe(hPipe); - - TRACE("done marshalling IClassFactory\n"); - } - CloseHandle(hPipe); - return 0; -} - /*********************************************************************** ******* * CoRegisterClassObject [OLE32.@] - * - * This method will register the class object for a given class - * ID. Servers housed in EXE files use this method instead of - * exporting DllGetClassObject to allow other code to connect to their - * objects. * - * When a class object (an object which implements IClassFactory) is - * registered in this way, a new thread is started which listens for - * connections on a named pipe specific to the registered CLSID. When - * something else connects to it, it writes out the marshalled - * IClassFactory interface to the pipe. The code on the other end uses - * this buffer to unmarshal the class factory, and can then call - * methods on it. + * Registers the class object for a given class ID. Servers housed in EXE + * files use this method instead of exporting DllGetClassObject to allow + * other code to connect to their objects. * - * In Windows, such objects are registered with the RPC endpoint - * mapper, not with a unique named pipe. - * - * MSDN claims that multiple interface registrations are legal, but we - * can't do that with our current implementation. - * * RETURNS - * S_OK on success, - * E_INVALIDARG if lpdwRegister or pUnk are NULL, + * S_OK on success, + * E_INVALIDARG if lpdwRegister or pUnk are NULL, * CO_E_OBJISREG if the object is already registered. We should not return this. * * SEE ALSO * CoRevokeClassObject, CoGetClassObject + * + * BUGS + * MSDN claims that multiple interface registrations are legal, but we + * can't do that with our current implementation. */ HRESULT WINAPI CoRegisterClassObject( REFCLSID rclsid, /* [in] CLSID of the object to register */ @@ -1220,6 +1225,12 @@ if ( (lpdwRegister==0) || (pUnk==0) ) return E_INVALIDARG; + if (!COM_CurrentApt()) + { + ERR("COM was not initialized\n"); + return CO_E_NOTINITIALIZED; + } + *lpdwRegister = 0; /* @@ -1243,7 +1254,7 @@ newClass->connectFlags = flags; /* * Use the address of the chain node as the cookie since we are sure it's - * unique. + * unique. FIXME: not on 64-bit platforms. */ newClass->dwCookie = (DWORD)newClass; newClass->nextClass = firstRegisteredClass; @@ -1261,10 +1272,30 @@ *lpdwRegister = newClass->dwCookie; if (dwClsContext & CLSCTX_LOCAL_SERVER) { - DWORD tid; + IClassFactory *classfac; - STUBMGR_Start(); - newClass->hThread=CreateThread(NULL,0,_LocalServerThread,newClass,0,&tid ); + hr = IUnknown_QueryInterface(newClass->classObject, &IID_IClassFactory, + (LPVOID*)&classfac); + if (hr) return hr; + + hr = CreateStreamOnHGlobal(0, TRUE, &newClass->pMarshaledData); + if (hr) { + FIXME("Failed to create stream on hglobal, %lx\n", hr); + IUnknown_Release(classfac); + return hr; + } + hr = CoMarshalInterface(newClass->pMarshaledData, &IID_IClassFactory, + (LPVOID)classfac, MSHCTX_LOCAL, NULL, + MSHLFLAGS_TABLESTRONG); + if (hr) { + FIXME("CoMarshalInterface failed, %lx!\n",hr); + IUnknown_Release(classfac); + return hr; + } + + IUnknown_Release(classfac); + + RPC_StartLocalServer(&newClass->classIdentifier, newClass->pMarshaledData); } return S_OK; } @@ -1310,6 +1341,15 @@ */ IUnknown_Release(curClass->classObject); + if (curClass->pMarshaledData) + { + LARGE_INTEGER zero; + memset(&zero, 0, sizeof(zero)); + /* FIXME: stop local server thread */ + IStream_Seek(curClass->pMarshaledData, zero, SEEK_SET, NULL); + CoReleaseMarshalData(curClass->pMarshaledData); + } + /* * Free the memory used by the chain node. */ @@ -1509,7 +1549,7 @@ pat=ReadPatternFromRegistry(i,j); hFile=CreateFileW(filePathName,,,,,,hFile); SetFilePosition(hFile,pat.offset); - ReadFile(hFile,buf,pat.size,NULL,NULL); + ReadFile(hFile,buf,pat.size,&r,NULL); if (memcmp(buf&pat.mask,pat.pattern.pat.size)==0){ *pclsid=ReadCLSIDFromRegistry(i); @@ -1573,7 +1613,7 @@ LPCLASSFACTORY lpclf = 0; if (!COM_CurrentApt()) return CO_E_NOTINITIALIZED; - + /* * Sanity check */ @@ -1590,15 +1630,15 @@ * Rather than create a class factory, we can just check for it here */ if (IsEqualIID(rclsid, &CLSID_StdGlobalInterfaceTable)) { - if (StdGlobalInterfaceTableInstance == NULL) + if (StdGlobalInterfaceTableInstance == NULL) StdGlobalInterfaceTableInstance = StdGlobalInterfaceTable_Construct(); hres = IGlobalInterfaceTable_QueryInterface( (IGlobalInterfaceTable*) StdGlobalInterfaceTableInstance, iid, ppv); if (hres) return hres; - + TRACE("Retrieved GIT (%p)\n", *ppv); return S_OK; } - + /* * Get a class factory to construct the object we want. */ @@ -1982,6 +2022,8 @@ BOOL fLock, /* [in] do lock */ BOOL fLastUnlockReleases) /* [in] unlock all */ { + TRACE("pUnk=%p, fLock=%s, fLastUnlockReleases=%s\n", + pUnk, fLock ? "TRUE" : "FALSE", fLastUnlockReleases ? "TRUE" : "FALSE"); if (fLock) { /* @@ -2015,19 +2057,19 @@ */ HRESULT WINAPI CoGetState(IUnknown ** ppv) { - APARTMENT * apt = COM_CurrentInfo(); + HRESULT hr = E_FAIL; - FIXME("\n"); + *ppv = NULL; - if(apt && apt->state) { - IUnknown_AddRef(apt->state); - *ppv = apt->state; - FIXME("-- %p\n", *ppv); - return S_OK; - } - *ppv = NULL; - return E_FAIL; + if (COM_CurrentInfo()->state) + { + IUnknown_AddRef(COM_CurrentInfo()->state); + *ppv = COM_CurrentInfo()->state; + TRACE("apt->state=%p\n", COM_CurrentInfo()->state); + hr = S_OK; + } + return hr; } /*********************************************************************** @@ -2036,22 +2078,17 @@ */ HRESULT WINAPI CoSetState(IUnknown * pv) { - APARTMENT * apt = COM_CurrentInfo(); + if (pv) IUnknown_AddRef(pv); - if (!apt) apt = COM_CreateApartment(COINIT_UNINITIALIZED); + if (COM_CurrentInfo()->state) + { + TRACE("-- release %p now\n", COM_CurrentInfo()->state); + IUnknown_Release(COM_CurrentInfo()->state); + } - FIXME("(%p),stub!\n", pv); + COM_CurrentInfo()->state = pv; - if (pv) { - IUnknown_AddRef(pv); - } - - if (apt->state) { - TRACE("-- release %p now\n", apt->state); - IUnknown_Release(apt->state); - } - apt->state = pv; - return S_OK; + return S_OK; } @@ -2206,7 +2243,7 @@ done: if (hkey) RegCloseKey(hkey); return res; - + } /*********************************************************************** _____ Modified: vendor/wine/dlls/ole32/Wine-20050111/compobj_private.h --- vendor/wine/dlls/ole32/current/compobj_private.h 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/ole32/Wine-20050111/compobj_private.h 2005-01-12 09:03:31 UTC (rev 12947) @@ -5,6 +5,7 @@ * Copyright 1999 Sylvain St-Germain * Copyright 2002 Marcus Meissner * Copyright 2003 Ove Kåven, TransGaming Technologies + * Copyright 2004 Mike Hearn, CodeWeavers Inc * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -28,6 +29,8 @@ #include <stdarg.h> +#include "wine/list.h" + #include "windef.h" #include "winbase.h" #include "wtypes.h" @@ -35,13 +38,9 @@ #include "winreg.h" #include "winternl.h" -/* Windows maps COINIT values to 0x80 for apartment threaded, 0x140 - * for free threaded, and 0 for uninitialized apartments. There is - * no real advantage in us doing this and certainly no release version - * of an app should be poking around with these flags. So we need a - * special value for uninitialized */ -#define COINIT_UNINITIALIZED 0x100 +struct apartment; + /* exported interface */ typedef struct tagXIF { struct tagXIF *next; @@ -56,7 +55,7 @@ /* exported object */ typedef struct tagXOBJECT { IRpcStubBufferVtbl *lpVtbl; - struct tagAPARTMENT *parent; + struct apartment *parent; struct tagXOBJECT *next; LPUNKNOWN obj; /* object identity (IUnknown) */ OID oid; /* object ID */ @@ -65,51 +64,54 @@ DWORD refs; /* external reference count */ } XOBJECT; -/* imported interface */ -typedef struct tagIIF { - struct tagIIF *next; +/* imported interface proxy */ +struct ifproxy +{ + struct list entry; LPVOID iface; /* interface pointer */ IID iid; /* interface ID */ IPID ipid; /* imported interface ID */ LPRPCPROXYBUFFER proxy; /* interface proxy */ DWORD refs; /* imported (public) references */ - HRESULT hres; /* result of proxy creation attempt */ -} IIF; +}; -/* imported object */ -typedef struct tagIOBJECT { - IRemUnknownVtbl *lpVtbl; - struct tagAPARTMENT *parent; - struct tagIOBJECT *next; +/* imported object / proxy manager */ +struct proxy_manager +{ + const IInternalUnknownVtbl *lpVtbl; + struct apartment *parent; + struct list entry; LPRPCCHANNELBUFFER chan; /* channel to object */ OXID oxid; /* object exported ID */ OID oid; /* object ID */ - IPID ipid; /* first imported interface ID */ - IIF *ifaces; /* imported interfaces */ + struct list interfaces; /* imported interfaces */ DWORD refs; /* proxy reference count */ -} IOBJECT; + CRITICAL_SECTION cs; /* thread safety for this object and children */ +}; -/* apartment */ -typedef struct tagAPARTMENT { - struct tagAPARTMENT *next, *prev, *parent; +/* this needs to become a COM object that implements IRemUnknown */ +struct apartment +{ + struct list entry; + + DWORD refs; /* refcount of the apartment */ DWORD model; /* threading model */ - DWORD inits; /* CoInitialize count */ DWORD tid; /* thread id */ HANDLE thread; /* thread handle */ OXID oxid; /* object exporter ID */ - OID oidc; /* object ID counter */ + OID oidc; /* object ID counter, starts at 1, zero is invalid OID */ HWND win; /* message window */ CRITICAL_SECTION cs; /* thread safety */ LPMESSAGEFILTER filter; /* message filter */ XOBJECT *objs; /* exported objects */ - IOBJECT *proxies; /* imported objects */ - LPUNKNOWN state; /* state object (see Co[Get,Set]State) */ - LPVOID ErrorInfo; /* thread error info */ -} APARTMENT; + struct list proxies; /* imported objects */ + DWORD listenertid; /* id of apartment_listener_thread */ + struct list stubmgrs; /* stub managers for exported objects */ +}; -extern APARTMENT MTA, *apts; +typedef struct apartment APARTMENT; -extern void* StdGlobalInterfaceTable_Construct(); +extern void* StdGlobalInterfaceTable_Construct(void); extern void StdGlobalInterfaceTable_Destroy(void* self); extern HRESULT StdGlobalInterfaceTable_GetFactory(LPVOID *ppv); @@ -118,75 +120,124 @@ extern void* StdGlobalInterfaceTableInstance; -#define PIPEPREF "\\\\.\\pipe\\" -#define OLESTUBMGR PIPEPREF"WINE_OLE_StubMgr" - /* Standard Marshalling definitions */ typedef struct _wine_marshal_id { - DWORD processid; - DWORD objectid; /* unique value corresp. IUnknown of object */ - IID iid; + OXID oxid; /* id of apartment */ + OID oid; /* id of stub manager */ + IPID ipid; /* id of interface pointer */ } wine_marshal_id; inline static BOOL MARSHAL_Compare_Mids(wine_marshal_id *mid1,wine_marshal_id *mid2) { return - (mid1->processid == mid2->processid) && - (mid1->objectid == mid2->objectid) && - IsEqualIID(&(mid1->iid),&(mid2->iid)) + (mid1->oxid == mid2->oxid) && + (mid1->oid == mid2->oid) && + IsEqualGUID(&(mid1->ipid),&(mid2->ipid)) ; } -/* compare without interface compare */ -inline static BOOL -MARSHAL_Compare_Mids_NoInterface(wine_marshal_id *mid1, wine_marshal_id *mid2) { - return - (mid1->processid == mid2->processid) && - (mid1->objectid == mid2->objectid) - ; -} +HRESULT MARSHAL_Disconnect_Proxies(APARTMENT *apt); +HRESULT MARSHAL_GetStandardMarshalCF(LPVOID *ppv); -HRESULT MARSHAL_Find_Stub_Buffer(wine_marshal_id *mid,IRpcStubBuffer **stub); -void MARSHAL_Invalidate_Stub_From_MID(wine_marshal_id *mid); -HRESULT MARSHAL_Disconnect_Proxies(); +/* Thread-safety Annotation Legend: + * + * RO - The value is read only. It never changes after creation, so no + * locking is required. + * LOCK - The value is written to only using Interlocked* functions. + * CS - The value is read or written to with a critical section held. + * The identifier following "CS" is the specific critical section that + * must be used. + */ -HRESULT MARSHAL_GetStandardMarshalCF(LPVOID *ppv); +/* an interface stub */ +struct ifstub +{ + struct list entry; /* entry in stub_manager->ifstubs list (CS stub_manager->lock) */ + IRpcStubBuffer *stubbuffer; /* RO */ + IID iid; /* RO */ + IPID ipid; /* RO */ + IUnknown *iface; /* RO */ + BOOL table; /* CS stub_manager->lock */ +}; -void STUBMGR_Start(); +/* stub managers hold refs on the object and each interface stub */ +struct stub_manager +{ + struct list entry; /* entry in apartment stubmgr list (CS apt->cs) */ + struct list ifstubs; /* list of active ifstubs for the object (CS lock) */ + CRITICAL_SECTION lock; + APARTMENT *apt; /* owning apt (RO) */ + + ULONG extrefs; /* number of 'external' references (LOCK) */ + ULONG refs; /* internal reference count (CS apt->cs) */ + OID oid; /* apartment-scoped unique identifier (RO) */ + IUnknown *object; /* the object we are managing the stub for (RO) */ + ULONG next_ipid; /* currently unused (LOCK) */ [truncated at 1000 lines; 7593 more skipped]

19 years, 10 months

[gvg] 12946: Wine-20050111 vendor drop

by gvg＠svn.reactos.com

Wine-20050111 vendor drop Added: vendor/wine/dlls/msi/Wine-20050111/ Modified: vendor/wine/dlls/msi/Wine-20050111/Makefile.in Modified: vendor/wine/dlls/msi/Wine-20050111/action.c Modified: vendor/wine/dlls/msi/Wine-20050111/handle.c Modified: vendor/wine/dlls/msi/Wine-20050111/msi.c Modified: vendor/wine/dlls/msi/Wine-20050111/msi.spec Modified: vendor/wine/dlls/msi/Wine-20050111/msipriv.h Modified: vendor/wine/dlls/msi/Wine-20050111/msiquery.c Modified: vendor/wine/dlls/msi/Wine-20050111/package.c Modified: vendor/wine/dlls/msi/Wine-20050111/query.h Modified: vendor/wine/dlls/msi/Wine-20050111/record.c Modified: vendor/wine/dlls/msi/Wine-20050111/sql.y Modified: vendor/wine/dlls/msi/Wine-20050111/table.c Modified: vendor/wine/dlls/msi/Wine-20050111/where.c Modified: vendor/wine/dlls/msi/current/Makefile.in Modified: vendor/wine/dlls/msi/current/action.c Modified: vendor/wine/dlls/msi/current/handle.c Modified: vendor/wine/dlls/msi/current/msi.c Modified: vendor/wine/dlls/msi/current/msi.spec Modified: vendor/wine/dlls/msi/current/msipriv.h Modified: vendor/wine/dlls/msi/current/msiquery.c Modified: vendor/wine/dlls/msi/current/package.c Modified: vendor/wine/dlls/msi/current/query.h Modified: vendor/wine/dlls/msi/current/record.c Modified: vendor/wine/dlls/msi/current/sql.y Modified: vendor/wine/dlls/msi/current/table.c Modified: vendor/wine/dlls/msi/current/where.c _____ Copied: vendor/wine/dlls/msi/Wine-20050111 (from rev 12927, vendor/wine/dlls/msi/current) _____ Modified: vendor/wine/dlls/msi/Wine-20050111/Makefile.in --- vendor/wine/dlls/msi/current/Makefile.in 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/msi/Wine-20050111/Makefile.in 2005-01-12 08:56:56 UTC (rev 12946) @@ -3,7 +3,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = msi.dll -IMPORTS = shell32 cabinet oleaut32 ole32 version user32 advapi32 kernel32 +IMPORTS = shell32 cabinet oleaut32 ole32 version user32 gdi32 advapi32 kernel32 EXTRALIBS = -luuid $(LIBUNICODE) C_SRCS = \ @@ -31,6 +31,8 @@ EXTRA_SRCS = sql.y cond.y EXTRA_OBJS = sql.tab.o cond.tab.o +SUBDIRS = tests + @MAKE_DLL_RULES@ sql.tab.c sql.tab.h: sql.y _____ Modified: vendor/wine/dlls/msi/Wine-20050111/action.c --- vendor/wine/dlls/msi/current/action.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/msi/Wine-20050111/action.c 2005-01-12 08:56:56 UTC (rev 12946) @@ -50,6 +50,8 @@ #include "ver.h" #define CUSTOM_ACTION_TYPE_MASK 0x3F +#define REG_PROGRESS_VALUE 13200 +#define COMPONENT_PROGRESS_VALUE 24000 WINE_DEFAULT_DEBUG_CHANNEL(msi); @@ -64,8 +66,10 @@ WCHAR Directory[96]; INT Attributes; - INSTALLSTATE State; - BOOL Enabled; + INSTALLSTATE Installed; + INSTALLSTATE ActionRequest; + INSTALLSTATE Action; + INT ComponentCount; INT Components[1024]; /* yes hardcoded limit.... I am bad */ INT Cost; @@ -80,21 +84,23 @@ WCHAR Condition[0x100]; WCHAR KeyPath[96]; - INSTALLSTATE State; - BOOL FeatureState; + INSTALLSTATE Installed; + INSTALLSTATE ActionRequest; + INSTALLSTATE Action; + BOOL Enabled; INT Cost; } MSICOMPONENT; typedef struct tagMSIFOLDER { - WCHAR Directory[96]; - WCHAR TargetDefault[96]; - WCHAR SourceDefault[96]; + LPWSTR Directory; + LPWSTR TargetDefault; + LPWSTR SourceDefault; - WCHAR ResolvedTarget[MAX_PATH]; - WCHAR ResolvedSource[MAX_PATH]; - WCHAR Property[MAX_PATH]; /* initially set property */ + LPWSTR ResolvedTarget; + LPWSTR ResolvedSource; + LPWSTR Property; /* initially set property */ INT ParentIndex; INT State; /* 0 = uninitialized */ @@ -107,12 +113,12 @@ typedef struct tagMSIFILE { - WCHAR File[72]; + LPWSTR File; INT ComponentIndex; - WCHAR FileName[MAX_PATH]; + LPWSTR FileName; INT FileSize; - WCHAR Version[72]; - WCHAR Language[20]; + LPWSTR Version; + LPWSTR Language; INT Attributes; INT Sequence; @@ -122,8 +128,8 @@ /* 2 = present but replace */ /* 3 = present do not replace */ /* 4 = Installed */ - WCHAR SourcePath[MAX_PATH]; - WCHAR TargetPath[MAX_PATH]; + LPWSTR SourcePath; + LPWSTR TargetPath; BOOL Temporary; }MSIFILE; @@ -133,6 +139,7 @@ static UINT ACTION_ProcessExecSequence(MSIPACKAGE *package, BOOL UIran); static UINT ACTION_ProcessUISequence(MSIPACKAGE *package); +static UINT ACTION_PerformActionSequence(MSIPACKAGE *package, UINT seq); UINT ACTION_PerformAction(MSIPACKAGE *package, const WCHAR *action); static UINT ACTION_LaunchConditions(MSIPACKAGE *package); @@ -157,15 +164,15 @@ const LPWSTR target, const INT type); static UINT HANDLE_CustomType2(MSIPACKAGE *package, const LPWSTR source, const LPWSTR target, const INT type); -static UINT HANDLE_CustomType18(MSIPACKAGE *package, const LPWSTR source, +static UINT HANDLE_CustomType18(MSIPACKAGE *package, const LPWSTR source, const LPWSTR target, const INT type); -static UINT HANDLE_CustomType50(MSIPACKAGE *package, const LPWSTR source, +static UINT HANDLE_CustomType50(MSIPACKAGE *package, const LPWSTR source, const LPWSTR target, const INT type); -static UINT HANDLE_CustomType34(MSIPACKAGE *package, const LPWSTR source, +static UINT HANDLE_CustomType34(MSIPACKAGE *package, const LPWSTR source, const LPWSTR target, const INT type); static DWORD deformat_string(MSIPACKAGE *package, WCHAR* ptr,WCHAR** data); -static UINT resolve_folder(MSIPACKAGE *package, LPCWSTR name, LPWSTR path, +static LPWSTR resolve_folder(MSIPACKAGE *package, LPCWSTR name, BOOL source, BOOL set_prop, MSIFOLDER **folder); static int track_tempfile(MSIPACKAGE *package, LPCWSTR name, LPCWSTR path); @@ -222,12 +229,9 @@ ********************************************************/ inline static void reduce_to_longfilename(WCHAR* filename) { - if (strchrW(filename,'|')) - { - WCHAR newname[MAX_PATH]; - strcpyW(newname,strchrW(filename,'|')+1); - strcpyW(filename,newname); - } + LPWSTR p = strchrW(filename,'|'); + if (p) + memmove(filename, p+1, (strlenW(p+1)+1)*sizeof(WCHAR)); } inline static char *strdupWtoA( const WCHAR *str ) @@ -255,6 +259,15 @@ return ret; } +static LPWSTR dupstrW(LPCWSTR src) +{ + LPWSTR dest; + if (!src) return NULL; + dest = HeapAlloc(GetProcessHeap(), 0, (strlenW(src)+1)*sizeof(WCHAR)); + strcpyW(dest, src); + return dest; +} + inline static WCHAR *load_dynamic_stringW(MSIRECORD *row, INT index) { UINT rc; @@ -262,16 +275,58 @@ LPWSTR ret; sz = 0; - rc = MSI_RecordGetStringW(row,index,NULL,&sz); - if (sz <= 0) + if (MSI_RecordIsNull(row,index)) return NULL; + rc = MSI_RecordGetStringW(row,index,NULL,&sz); + + /* having an empty string is different than NULL */ + if (sz == 0) + { + ret = HeapAlloc(GetProcessHeap(),0,sizeof(WCHAR)); + ret[0] = 0; + return ret; + } + sz ++; ret = HeapAlloc(GetProcessHeap(),0,sz * sizeof (WCHAR)); rc = MSI_RecordGetStringW(row,index,ret,&sz); + if (rc!=ERROR_SUCCESS) + { + ERR("Unable to load dynamic string\n"); + HeapFree(GetProcessHeap(), 0, ret); + ret = NULL; + } return ret; } +inline static LPWSTR load_dynamic_property(MSIPACKAGE *package, LPCWSTR prop, + UINT* rc) +{ + DWORD sz = 0; + LPWSTR str; + UINT r; + + r = MSI_GetPropertyW(package, prop, NULL, &sz); + if (r != ERROR_SUCCESS && r != ERROR_MORE_DATA) + { + if (rc) + *rc = r; + return NULL; + } + sz++; + str = HeapAlloc(GetProcessHeap(),0,sz*sizeof(WCHAR)); + r = MSI_GetPropertyW(package, prop, str, &sz); + if (r != ERROR_SUCCESS) + { + HeapFree(GetProcessHeap(),0,str); + str = NULL; + } + if (rc) + *rc = r; + return str; +} + inline static int get_loaded_component(MSIPACKAGE* package, LPCWSTR Component ) { int rc = -1; @@ -320,6 +375,7 @@ return rc; } + static int track_tempfile(MSIPACKAGE *package, LPCWSTR name, LPCWSTR path) { DWORD i; @@ -342,8 +398,8 @@ memset(&package->files[index],0,sizeof(MSIFILE)); - strcpyW(package->files[index].File,name); - strcpyW(package->files[index].TargetPath,path); + package->files[index].File = dupstrW(name); + package->files[index].TargetPath = dupstrW(path); package->files[index].Temporary = TRUE; TRACE("Tracking tempfile (%s)\n",debugstr_w(package->files[index].File)); @@ -361,11 +417,103 @@ for (i = 0; i < package->loaded_files; i++) { if (package->files[i].Temporary) + { + TRACE("Cleaning up %s\n",debugstr_w(package->files[i].TargetPath)); DeleteFileW(package->files[i].TargetPath); + } } } +/* Called when the package is being closed */ +extern void ACTION_free_package_structures( MSIPACKAGE* package) +{ + INT i; + + TRACE("Freeing package action data\n"); + + /* No dynamic buffers in features */ + if (package->features && package->loaded_features > 0) + HeapFree(GetProcessHeap(),0,package->features); + + for (i = 0; i < package->loaded_folders; i++) + { + HeapFree(GetProcessHeap(),0,package->folders[i].Directory); + HeapFree(GetProcessHeap(),0,package->folders[i].TargetDefault); + HeapFree(GetProcessHeap(),0,package->folders[i].SourceDefault); + HeapFree(GetProcessHeap(),0,package->folders[i].ResolvedTarget); + HeapFree(GetProcessHeap(),0,package->folders[i].ResolvedSource); + HeapFree(GetProcessHeap(),0,package->folders[i].Property); + } + if (package->folders && package->loaded_folders > 0) + HeapFree(GetProcessHeap(),0,package->folders); + + /* no dynamic buffers in components */ + if (package->components && package->loaded_components > 0) + HeapFree(GetProcessHeap(),0,package->components); + + for (i = 0; i < package->loaded_files; i++) + { + HeapFree(GetProcessHeap(),0,package->files[i].File); + HeapFree(GetProcessHeap(),0,package->files[i].FileName); + HeapFree(GetProcessHeap(),0,package->files[i].Version); + HeapFree(GetProcessHeap(),0,package->files[i].Language); + HeapFree(GetProcessHeap(),0,package->files[i].SourcePath); + HeapFree(GetProcessHeap(),0,package->files[i].TargetPath); + } + + if (package->files && package->loaded_files > 0) + HeapFree(GetProcessHeap(),0,package->files); +} + +static UINT ACTION_OpenQuery( MSIDATABASE *db, MSIQUERY **view, LPCWSTR fmt, ... ) +{ + LPWSTR szQuery; + LPCWSTR p; + UINT sz, rc; + va_list va; + + /* figure out how much space we need to allocate */ + va_start(va, fmt); + sz = strlenW(fmt) + 1; + p = fmt; + while (*p) + { + p = strchrW(p, '%'); + if (!p) + break; + p++; + switch (*p) + { + case 's': /* a string */ + sz += strlenW(va_arg(va,LPCWSTR)); + break; + case 'd': + case 'i': /* an integer -2147483648 seems to be longest */ + sz += 3*sizeof(int); + (void)va_arg(va,int); + break; + case '%': /* a single % - leave it alone */ + break; + default: + FIXME("Unhandled character type %c\n",*p); + } + p++; + } + va_end(va); + + /* construct the string */ + szQuery = HeapAlloc(GetProcessHeap(), 0, sz*sizeof(WCHAR)); + va_start(va, fmt); + vsnprintfW(szQuery, sz, fmt, va); + va_end(va); + + /* perform the query */ + rc = MSI_DatabaseOpenViewW(db, szQuery, view); + HeapFree(GetProcessHeap(), 0, szQuery); + return rc; +} + static void ui_progress(MSIPACKAGE *package, int a, int b, int c, int d ) { MSIRECORD * row; @@ -389,17 +537,14 @@ UINT rc; MSIQUERY * view; MSIRECORD * row = 0; - static WCHAR *ActionFormat=NULL; - static WCHAR LastAction[0x100] = {0}; - WCHAR Query[1024]; LPWSTR ptr; - if (strcmpW(LastAction,action)!=0) + if (!package->LastAction || strcmpW(package->LastAction,action)) { - sprintfW(Query,Query_t,action); - rc = MSI_DatabaseOpenViewW(package->db, Query, &view); + rc = ACTION_OpenQuery(package->db, &view, Query_t, action); if (rc != ERROR_SUCCESS) return; + rc = MSI_ViewExecute(view, 0); if (rc != ERROR_SUCCESS) { @@ -421,18 +566,22 @@ return; } - if (ActionFormat) - HeapFree(GetProcessHeap(),0,ActionFormat); + /* update the cached actionformat */ + if (package->ActionFormat) + HeapFree(GetProcessHeap(),0,package->ActionFormat); + package->ActionFormat = load_dynamic_stringW(row,3); - ActionFormat = load_dynamic_stringW(row,3); - strcpyW(LastAction,action); + if (package->LastAction) + HeapFree(GetProcessHeap(),0,package->LastAction); + package->LastAction = dupstrW(action); + msiobj_release(&row->hdr); MSI_ViewClose(view); msiobj_release(&view->hdr); } message[0]=0; - ptr = ActionFormat; + ptr = package->ActionFormat; while (*ptr) { LPWSTR ptr2; @@ -488,12 +637,10 @@ MSIQUERY * view; MSIRECORD * row = 0; WCHAR *ActionText=NULL; - WCHAR Query[1024]; GetTimeFormatW(LOCALE_USER_DEFAULT, 0, NULL, format, timet, 0x100); - sprintfW(Query,Query_t,action); - rc = MSI_DatabaseOpenViewW(package->db, Query, &view); + rc = ACTION_OpenQuery(package->db, &view, Query_t, action); if (rc != ERROR_SUCCESS) return; rc = MSI_ViewExecute(view, 0); @@ -554,6 +701,58 @@ msiobj_release(&row->hdr); } +/* + * build_directory_name() + * + * This function is to save messing round with directory names + * It handles adding backslashes between path segments, + * and can add \ at the end of the directory name if told to. + * + * It takes a variable number of arguments. + * It always allocates a new string for the result, so make sure + * to free the return value when finished with it. + * + * The first arg is the number of path segments that follow. + * The arguments following count are a list of path segments. + * A path segment may be NULL. + * + * Path segments will be added with a \ separating them. + * A \ will not be added after the last segment, however if the + * last segment is NULL, then the last character will be a \ + * + */ +static LPWSTR build_directory_name(DWORD count, ...) +{ + DWORD sz = 1, i; + LPWSTR dir; + va_list va; + + va_start(va,count); + for(i=0; i<count; i++) + { + LPCWSTR str = va_arg(va,LPCWSTR); + if (str) + sz += strlenW(str) + 1; + } + va_end(va); + + dir = HeapAlloc(GetProcessHeap(), 0, sz*sizeof(WCHAR)); + dir[0]=0; + + va_start(va,count); + for(i=0; i<count; i++) + { + LPCWSTR str = va_arg(va,LPCWSTR); + if (!str) + continue; + strcatW(dir, str); + if( ((i+1)!=count) && dir[strlenW(dir)-1]!='\\') + strcatW(dir, cszbs); + } + return dir; +} + + /**************************************************** * TOP level entry points *****************************************************/ @@ -568,23 +767,23 @@ if (szPackagePath) { - LPWSTR p; - WCHAR check[MAX_PATH]; - WCHAR pth[MAX_PATH]; - DWORD size; + LPWSTR p, check, path; - strcpyW(pth,szPackagePath); - p = strrchrW(pth,'\\'); + path = dupstrW(szPackagePath); + p = strrchrW(path,'\\'); if (p) { p++; *p=0; } - size = MAX_PATH; - if (MSI_GetPropertyW(package,cszSourceDir,check,&size) - != ERROR_SUCCESS ) - MSI_SetPropertyW(package, cszSourceDir, pth); + check = load_dynamic_property(package, cszSourceDir,NULL); + if (!check) + MSI_SetPropertyW(package, cszSourceDir, path); + else + HeapFree(GetProcessHeap(), 0, check); + + HeapFree(GetProcessHeap(), 0, path); } if (szCommandLine) @@ -594,8 +793,8 @@ while (*ptr) { - WCHAR prop[0x100]; - WCHAR val[0x100]; + WCHAR *prop = NULL; + WCHAR *val = NULL; TRACE("Looking at %s\n",debugstr_w(ptr)); @@ -606,10 +805,13 @@ DWORD len = 0; while (*ptr == ' ') ptr++; - strncpyW(prop,ptr,ptr2-ptr); - prop[ptr2-ptr]=0; + len = ptr2-ptr; + prop = HeapAlloc(GetProcessHeap(),0,(len+1)*sizeof(WCHAR)); + strncpyW(prop,ptr,len); + prop[len]=0; ptr2++; - + + len = 0; ptr = ptr2; while (*ptr && (quote || (!quote && *ptr!=' '))) { @@ -624,14 +826,18 @@ ptr2++; len -= 2; } + val = HeapAlloc(GetProcessHeap(),0,(len+1)*sizeof(WCHAR)); strncpyW(val,ptr2,len); - val[len]=0; + val[len] = 0; if (strlenW(prop) > 0) { - TRACE("Found commandline property (%s) = (%s)\n", debugstr_w(prop), debugstr_w(val)); + TRACE("Found commandline property (%s) = (%s)\n", + debugstr_w(prop), debugstr_w(val)); MSI_SetPropertyW(package,prop,val); } + HeapFree(GetProcessHeap(),0,val); + HeapFree(GetProcessHeap(),0,prop); } ptr++; } @@ -652,10 +858,93 @@ else rc = ACTION_ProcessExecSequence(package,FALSE); + /* process the ending type action */ + if (rc == ERROR_SUCCESS) + rc = ACTION_PerformActionSequence(package,-1); + else if (rc == ERROR_FUNCTION_FAILED) + rc = ACTION_PerformActionSequence(package,-3); + return rc; } +static UINT ACTION_PerformActionSequence(MSIPACKAGE *package, UINT seq) +{ + MSIQUERY * view; + UINT rc; + WCHAR buffer[0x100]; + DWORD sz = 0x100; + MSIRECORD * row = 0; + static const WCHAR ExecSeqQuery[] = { + 's','e','l','e','c','t',' ','*',' ', + 'f','r','o','m',' ', + 'I','n','s','t','a','l','l','E','x','e','c','u','t','e', + 'S','e','q','u','e','n','c','e',' ', + 'w','h','e','r','e',' ','S','e','q','u','e','n','c','e',' ', + '=',' ','%','i',0}; + rc = ACTION_OpenQuery(package->db, &view, ExecSeqQuery, seq); + + if (rc == ERROR_SUCCESS) + { + rc = MSI_ViewExecute(view, 0); + + if (rc != ERROR_SUCCESS) + { + MSI_ViewClose(view); + msiobj_release(&view->hdr); + goto end; + } + + TRACE("Running the actions\n"); + + rc = MSI_ViewFetch(view,&row); + if (rc != ERROR_SUCCESS) + { + rc = ERROR_SUCCESS; + goto end; + } + + /* check conditions */ + if (!MSI_RecordIsNull(row,2)) + { + LPWSTR cond = NULL; + cond = load_dynamic_stringW(row,2); + + if (cond) + { + /* this is a hack to skip errors in the condition code */ + if (MSI_EvaluateConditionW(package, cond) == MSICONDITION_FALSE) + { + HeapFree(GetProcessHeap(),0,cond); + msiobj_release(&row->hdr); + goto end; + } + else + HeapFree(GetProcessHeap(),0,cond); + } + } + + sz=0x100; + rc = MSI_RecordGetStringW(row,1,buffer,&sz); + if (rc != ERROR_SUCCESS) + { + ERR("Error is %x\n",rc); + msiobj_release(&row->hdr); + goto end; + } + + rc = ACTION_PerformAction(package,buffer); + msiobj_release(&row->hdr); +end: + MSI_ViewClose(view); + msiobj_release(&view->hdr); + } + else + rc = ERROR_SUCCESS; + + return rc; +} + static UINT ACTION_ProcessExecSequence(MSIPACKAGE *package, BOOL UIran) { MSIQUERY * view; @@ -668,7 +957,6 @@ 'w','h','e','r','e',' ','S','e','q','u','e','n','c','e',' ', '>',' ','%','i',' ','o','r','d','e','r',' ', 'b','y',' ','S','e','q','u','e','n','c','e',0 }; - WCHAR Query[1024]; MSIRECORD * row = 0; static const WCHAR IVQuery[] = { 's','e','l','e','c','t',' ','S','e','q','u','e','n','c','e',' ', @@ -677,11 +965,11 @@ 'w','h','e','r','e',' ','A','c','t','i','o','n',' ','=',' ', '`','I','n','s','t','a','l','l','V','a','l','i','d','a','t','e','`', 0}; + INT seq = 0; + /* get the sequence number */ if (UIran) { - INT seq = 0; - rc = MSI_DatabaseOpenViewW(package->db, IVQuery, &view); if (rc != ERROR_SUCCESS) return rc; @@ -703,12 +991,9 @@ msiobj_release(&row->hdr); MSI_ViewClose(view); msiobj_release(&view->hdr); - sprintfW(Query,ExecSeqQuery,seq); } - else - sprintfW(Query,ExecSeqQuery,0); - - rc = MSI_DatabaseOpenViewW(package->db, Query, &view); + + rc = ACTION_OpenQuery(package->db, &view, ExecSeqQuery, seq); if (rc == ERROR_SUCCESS) { rc = MSI_ViewExecute(view, 0); @@ -720,7 +1005,7 @@ goto end; } - TRACE("Running the actions \n"); + TRACE("Running the actions\n"); while (1) { @@ -899,7 +1184,6 @@ TRACE("Performing action (%s)\n",debugstr_w(action)); ui_actioninfo(package, action, TRUE, 0); ui_actionstart(package, action); - ui_progress(package,2,1,0,0); /* pre install, setup and configuration block */ if (strcmpW(action,szLaunchConditions)==0) @@ -960,21 +1244,16 @@ UINT rc = ERROR_SUCCESS; MSIQUERY * view; MSIRECORD * row = 0; - WCHAR ExecSeqQuery[1024] = + static const WCHAR ExecSeqQuery[] = {'s','e','l','e','c','t',' ','*',' ','f','r','o','m',' ','C','u','s','t','o' -,'m','A','c','t','i','o','n',' ','w','h','e','r','e',' ','`','A','c','t','i' -,'o','n','`',' ','=',' ','`',0}; - static const WCHAR end[]={'`',0}; + ,'m','A','c','t','i','o','n',' ','w','h','e','r','e',' ','`','A','c','t','i' + ,'o','n','`',' ','=',' ','`','%','s','`',0}; UINT type; LPWSTR source; LPWSTR target; WCHAR *deformated=NULL; - strcatW(ExecSeqQuery,action); - strcatW(ExecSeqQuery,end); - - rc = MSI_DatabaseOpenViewW(package->db, ExecSeqQuery, &view); - + rc = ACTION_OpenQuery(package->db, &view, ExecSeqQuery, action); if (rc != ERROR_SUCCESS) return rc; @@ -1021,6 +1300,10 @@ rc = HANDLE_CustomType34(package,source,target,type); break; case 35: /* Directory set with formatted text. */ + deformat_string(package,target,&deformated); + MSI_SetTargetPathW(package, source, deformated); + HeapFree(GetProcessHeap(),0,deformated); + break; case 51: /* Property set with formatted text. */ deformat_string(package,target,&deformated); rc = MSI_SetPropertyW(package,source,deformated); @@ -1062,10 +1345,9 @@ UINT rc; MSIQUERY * view; MSIRECORD * row = 0; - WCHAR Query[1024] = + static const WCHAR fmt[] = {'s','e','l','e','c','t',' ','*',' ','f','r','o','m',' ','B','i' -,'n','a','r','y',' ','w','h','e','r','e',' ','N','a','m','e','=','`',0}; - static const WCHAR end[]={'`',0}; +,'n','a','r','y',' ','w','h','e','r','e',' ','N','a','m','e','=','`','%','s','`',0}; HANDLE the_file; CHAR buffer[1024]; @@ -1078,10 +1360,7 @@ if (the_file == INVALID_HANDLE_VALUE) return ERROR_FUNCTION_FAILED; - strcatW(Query,source); - strcatW(Query,end); - - rc = MSI_DatabaseOpenViewW( package->db, Query, &view); + rc = ACTION_OpenQuery(package->db, &view, fmt, source); if (rc != ERROR_SUCCESS) return rc; @@ -1126,66 +1405,82 @@ return ERROR_SUCCESS; } - typedef UINT __stdcall CustomEntry(MSIHANDLE); typedef struct { MSIPACKAGE *package; - WCHAR target[MAX_PATH]; - WCHAR source[MAX_PATH]; + WCHAR *target; + WCHAR *source; } thread_struct; -#if 0 -static DWORD WINAPI DllThread(LPVOID info) +static DWORD WINAPI ACTION_CallDllFunction(thread_struct *stuff) { - HANDLE DLL; + HANDLE hModule; LPSTR proc; - thread_struct *stuff; CustomEntry *fn; - - stuff = (thread_struct*)info; - TRACE("Asynchronous start (%s, %s) \n", debugstr_w(stuff->source), + TRACE("calling function (%s, %s) \n", debugstr_w(stuff->source), debugstr_w(stuff->target)); - DLL = LoadLibraryW(stuff->source); - if (DLL) + hModule = LoadLibraryW(stuff->source); + if (hModule) { proc = strdupWtoA( stuff->target ); - fn = (CustomEntry*)GetProcAddress(DLL,proc); + fn = (CustomEntry*)GetProcAddress(hModule,proc); if (fn) { MSIHANDLE hPackage; MSIPACKAGE *package = stuff->package; - TRACE("Calling function\n"); + TRACE("Calling function %s\n", proc); hPackage = msiobj_findhandle( &package->hdr ); - if( !hPackage ) + if (hPackage ) + { + fn(hPackage); + msiobj_release( &package->hdr ); + } + else ERR("Handle for object %p not found\n", package ); - fn(hPackage); - msiobj_release( &package->hdr ); } else ERR("Cannot load functon\n"); HeapFree(GetProcessHeap(),0,proc); - FreeLibrary(DLL); + FreeLibrary(hModule); } else ERR("Unable to load library\n"); msiobj_release( &stuff->package->hdr ); - HeapFree( GetProcessHeap(), 0, info ); + HeapFree(GetProcessHeap(),0,stuff->source); + HeapFree(GetProcessHeap(),0,stuff->target); + HeapFree(GetProcessHeap(), 0, stuff); return 0; } -#endif +static DWORD WINAPI DllThread(LPVOID info) +{ + thread_struct *stuff; + DWORD rc = 0; + + TRACE("MSI Thread (0x%lx) started for custom action\n", + GetCurrentThreadId()); + + stuff = (thread_struct*)info; + rc = ACTION_CallDllFunction(stuff); + + TRACE("MSI Thread (0x%lx) finished\n",GetCurrentThreadId()); + /* clse all handles for this thread */ + MsiCloseAllHandles(); + return rc; +} + static UINT HANDLE_CustomType1(MSIPACKAGE *package, const LPWSTR source, const LPWSTR target, const INT type) { WCHAR tmp_file[MAX_PATH]; - CustomEntry *fn; - HANDLE DLL; - LPSTR proc; + thread_struct *info; + DWORD ThreadId; + HANDLE ThreadHandle; store_binary_to_temp(package, source, tmp_file); @@ -1198,76 +1493,57 @@ strcatW(tmp_file,dot); } - if (type & 0xc0) - { - /* DWORD ThreadId; */ - thread_struct *info = HeapAlloc( GetProcessHeap(), 0, sizeof(*info) ); + info = HeapAlloc( GetProcessHeap(), 0, sizeof(*info) ); + msiobj_addref( &package->hdr ); + info->package = package; + info->target = dupstrW(target); + info->source = dupstrW(tmp_file); - /* msiobj_addref( &package->hdr ); */ - info->package = package; - strcpyW(info->target,target); - strcpyW(info->source,tmp_file); - TRACE("Start Asynchronous execution\n"); - FIXME("DATABASE NOT THREADSAFE... not starting\n"); - /* CreateThread(NULL,0,DllThread,(LPVOID)&info,0,&ThreadId); */ - /* FIXME: release the package if the CreateThread fails */ - HeapFree( GetProcessHeap(), 0, info ); - return ERROR_SUCCESS; - } - - DLL = LoadLibraryW(tmp_file); - if (DLL) - { - proc = strdupWtoA( target ); - fn = (CustomEntry*)GetProcAddress(DLL,proc); - if (fn) - { - MSIHANDLE hPackage; + ThreadHandle = CreateThread(NULL,0,DllThread,(LPVOID)info,0,&ThreadId); - TRACE("Calling function\n"); - hPackage = msiobj_findhandle( &package->hdr ); - if( !hPackage ) - ERR("Handle for object %p not found\n", package ); - fn(hPackage); - msiobj_release( &package->hdr ); - } - else - ERR("Cannot load functon\n"); + if (!(type & 0xc0)) + WaitForSingleObject(ThreadHandle,INFINITE); - HeapFree(GetProcessHeap(),0,proc); - FreeLibrary(DLL); - } - else - ERR("Unable to load library\n"); - + CloseHandle(ThreadHandle); + return ERROR_SUCCESS; } static UINT HANDLE_CustomType2(MSIPACKAGE *package, const LPWSTR source, const LPWSTR target, const INT type) { - WCHAR tmp_file[MAX_PATH*2]; + WCHAR tmp_file[MAX_PATH]; STARTUPINFOW si; PROCESS_INFORMATION info; BOOL rc; + INT len; WCHAR *deformated; + WCHAR *cmd; static const WCHAR spc[] = {' ',0}; memset(&si,0,sizeof(STARTUPINFOW)); store_binary_to_temp(package, source, tmp_file); - strcatW(tmp_file,spc); deformat_string(package,target,&deformated); - strcatW(tmp_file,deformated); + len = strlenW(tmp_file) + strlenW(deformated) + 2; + + cmd = (WCHAR*)HeapAlloc(GetProcessHeap(),0,sizeof(WCHAR)*len); + + strcpyW(cmd,tmp_file); + strcatW(cmd,spc); + strcatW(cmd,deformated); + HeapFree(GetProcessHeap(),0,deformated); - TRACE("executing exe %s \n",debugstr_w(tmp_file)); + TRACE("executing exe %s \n",debugstr_w(cmd)); - rc = CreateProcessW(NULL, tmp_file, NULL, NULL, FALSE, 0, NULL, + rc = CreateProcessW(NULL, cmd, NULL, NULL, FALSE, 0, NULL, c_collen, &si, &info); + HeapFree(GetProcessHeap(),0,cmd); + if ( !rc ) { ERR("Unable to execute command\n"); @@ -1282,33 +1558,43 @@ return ERROR_SUCCESS; } -static UINT HANDLE_CustomType18(MSIPACKAGE *package, const LPWSTR source, +static UINT HANDLE_CustomType18(MSIPACKAGE *package, const LPWSTR source, const LPWSTR target, const INT type) { - WCHAR filename[MAX_PATH*2]; STARTUPINFOW si; PROCESS_INFORMATION info; BOOL rc; WCHAR *deformated; + WCHAR *cmd; + INT len; static const WCHAR spc[] = {' ',0}; int index; memset(&si,0,sizeof(STARTUPINFOW)); index = get_loaded_file(package,source); - strcpyW(filename,package->files[index].TargetPath); - strcatW(filename,spc); [truncated at 1000 lines; 7895 more skipped]

19 years, 10 months

[gdalsnes] 12945: add MakeSureDirectoryPathExistsExA/W

by gdalsnes＠svn.reactos.com

add MakeSureDirectoryPathExistsExA/W Added: trunk/reactos/include/rosrtl/path.h Added: trunk/reactos/lib/rosrtl/file/path.c Modified: trunk/reactos/lib/rosrtl/makefile _____ Added: trunk/reactos/include/rosrtl/path.h --- trunk/reactos/include/rosrtl/path.h 2005-01-12 06:02:58 UTC (rev 12944) +++ trunk/reactos/include/rosrtl/path.h 2005-01-12 07:51:11 UTC (rev 12945) @@ -0,0 +1,21 @@ +/* + */ + +#ifndef ROSRTL_PATH_H__ +#define ROSRTL_PATH_H__ + +#ifdef __cplusplus +extern "C" +{ +#endif + +BOOL STDCALL MakeSureDirectoryPathExistsExA(LPCSTR DirPath, BOOL FileAtEnd); +BOOL STDCALL MakeSureDirectoryPathExistsExW(LPCWSTR DirPath, BOOL FileAtEnd); + +#ifdef __cplusplus +} +#endif + +#endif + +/* EOF */ _____ Added: trunk/reactos/lib/rosrtl/file/path.c --- trunk/reactos/lib/rosrtl/file/path.c 2005-01-12 06:02:58 UTC (rev 12944) +++ trunk/reactos/lib/rosrtl/file/path.c 2005-01-12 07:51:11 UTC (rev 12945) @@ -0,0 +1,100 @@ +#include <windows.h> +#include <string.h> + + +/********************************************************************** * + * MakeSureDirectoryPathExistsExA + * + * If a dir is at the end and the path ends with a backslash, FileAtEnd + * is ignored. If the path doesn't end with a backslash, FileAtEnd is + * used to determine if the last part of the path is a file name or a + * directory. + * + * Path may be absolute or relative to current dir. + */ +BOOL STDCALL MakeSureDirectoryPathExistsExA(LPCSTR DirPath, BOOL FileAtEnd) +{ + char Path[MAX_PATH]; + char *SlashPos = Path; + char Slash; + BOOL bRes; + + strcpy(Path, DirPath); + + while((SlashPos=strpbrk(SlashPos+1,"\\/"))) + { + Slash = *SlashPos; + *SlashPos = 0; + + bRes = CreateDirectoryA(Path, NULL); + if (bRes == FALSE && GetLastError() != ERROR_ALREADY_EXISTS) + { + return FALSE; + } + + *SlashPos = Slash; + + if (*(SlashPos+1) == 0) return TRUE; + } + + if (!FileAtEnd) + { + bRes = CreateDirectoryA(Path, NULL); + if (bRes == FALSE && GetLastError() != ERROR_ALREADY_EXISTS) + { + return FALSE; + } + } + + return TRUE; +} + + + + +/********************************************************************** * + * MakeSureDirectoryPathExistsExW + * + * If a dir is at the end and the path ends with a backslash, FileAtEnd + * is ignored. If the path doesn't end with a backslash, FileAtEnd is + * used to determine if the last part of the path is a file name or a + * directory. + * + * Path may be absolute or relative to current dir. + */ +BOOL STDCALL MakeSureDirectoryPathExistsExW(LPCWSTR DirPath, BOOL FileAtEnd) +{ + WCHAR Path[MAX_PATH]; + WCHAR *SlashPos = Path; + WCHAR Slash; + BOOL bRes; + + wcscpy(Path, DirPath); + + while((SlashPos=wcspbrk(SlashPos+1,L"\\/"))) + { + Slash = *SlashPos; + *SlashPos = 0; + + bRes = CreateDirectoryW(Path, NULL); + if (bRes == FALSE && GetLastError() != ERROR_ALREADY_EXISTS) + { + return FALSE; + } + + *SlashPos = Slash; + + if (*(SlashPos+1) == 0) return TRUE; + } + + if (!FileAtEnd) + { + bRes = CreateDirectoryW(Path, NULL); + if (bRes == FALSE && GetLastError() != ERROR_ALREADY_EXISTS) + { + return FALSE; + } + } + + return TRUE; +} _____ Modified: trunk/reactos/lib/rosrtl/makefile --- trunk/reactos/lib/rosrtl/makefile 2005-01-12 06:02:58 UTC (rev 12944) +++ trunk/reactos/lib/rosrtl/makefile 2005-01-12 07:51:11 UTC (rev 12945) @@ -30,7 +30,8 @@ misc/qsort.o FILE_OBJECTS = \ - file/sparse.o + file/sparse.o \ + file/path.o RECMUTEX_OBJECTS = recmutex/recmutex.o

19 years, 10 months

← Newer
1
...
40
41
42
43
44
45
46
...
71
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 January 2005