Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cfinck] 32268: Fix the comment style (/* */ is the only correct one for CSS,  for HTML) FF gives a warning about this in its error console
by cfinck＠svn.reactos.org 10 Feb '08

10 Feb '08

Author: cfinck Date: Sun Feb 10 20:07:24 2008 New Revision: 32268 URL: http://svn.reactos.org/svn/reactos?rev=32268&view=rev Log: Fix the comment style (/* */ is the only correct one for CSS,  for HTML) FF gives a warning about this in its error console Modified: trunk/web/reactos.org/htdocs/paste/highlight.css Modified: trunk/web/reactos.org/htdocs/paste/highlight.css URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/paste/highl… ============================================================================== --- trunk/web/reactos.org/htdocs/paste/highlight.css (original) +++ trunk/web/reactos.org/htdocs/paste/highlight.css Sun Feb 10 20:07:24 2008 @@ -1,4 +1,4 @@ - +/* CSS derived from rafb.net */ BODY { MARGIN: 0px; FONT-FAMILY: Verdana, Geneva, Arial, Helvetica, sans-serif; BACKGROUND-COLOR: white

1 0

[greatlrd] 32267: fixet more building issue with trunk
by greatlrd＠svn.reactos.org 10 Feb '08

10 Feb '08

Author: greatlrd Date: Sun Feb 10 19:21:07 2008 New Revision: 32267 URL: http://svn.reactos.org/svn/reactos?rev=32267&view=rev Log: fixet more building issue with trunk Modified: branches/reactx/reactos/include/dxsdk/ks.h Modified: branches/reactx/reactos/include/dxsdk/ks.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/dxsdk/ks… ============================================================================== --- branches/reactx/reactos/include/dxsdk/ks.h (original) +++ branches/reactx/reactos/include/dxsdk/ks.h Sun Feb 10 19:21:07 2008 @@ -601,11 +601,7 @@ KSGRAPHMANAGER_FUNCTIONTABLE FunctionTable; } KSPROPERTY_GRAPHMANAGER_INTERFACE, *PKSPROPERTY_GRAPHMANAGER_INTERFACE; - typedef struct - { - ULONG Count; - PKSATTRIBUTE* Attributes; - } KSATTRIBUTE_LIST, *PKSATTRIBUTE_LIST; + #endif // DDK @@ -1423,6 +1419,12 @@ typedef struct { + ULONG Count; + PKSATTRIBUTE* Attributes; + } KSATTRIBUTE_LIST, *PKSATTRIBUTE_LIST; + + typedef struct + { ULONG InterfacesCount; const KSPIN_INTERFACE* Interfaces; ULONG MediumsCount; @@ -1481,12 +1483,9 @@ typedef VOID (*PFNKSDEFAULTFREE)(IN PVOID Context, IN PVOID Buffer); typedef NTSTATUS (*PFNKSINITIALIZEALLOCATOR)(IN PVOID InitialContext, IN PKSALLOCATOR_FRAMING AllocatorFraming, OUT PVOID* Context); typedef VOID (*PFNKSDELETEALLOCATOR)(IN PVOID Context); - - typedef struct - { - PFNALLOCATOR_ALLOCATEFRAME AllocateFrame; - PFNALLOCATOR_FREEFRAME FreeFrame; - } KSSTREAMALLOCATOR_FUNCTIONTABLE, *PKSSTREAMALLOCATOR_FUNCTIONTABLE; + typedef LONGLONG (FASTCALL *PFNKSCLOCK_GETTIME)(IN PFILE_OBJECT FileObject); + typedef LONGLONG (FASTCALL *PFNKSCLOCK_CORRELATEDTIME)(IN PFILE_OBJECT FileObject, OUT PLONGLONG SystemTime); + typedef struct { @@ -1711,9 +1710,7 @@ #if defined(_NTDDK_) typedef NTSTATUS (*PFNALLOCATOR_ALLOCATEFRAME)(IN PFILE_OBJECT FileObject, PVOID *Frame); - typedef VOID (*PFNALLOCATOR_FREEFRAME)(IN PFILE_OBJECT FileObject, IN PVOID Frame); - typedef LONGLONG (FASTCALL *PFNKSCLOCK_GETTIME)(IN PFILE_OBJECT FileObject); - typedef LONGLONG (FASTCALL *PFNKSCLOCK_CORRELATEDTIME)(IN PFILE_OBJECT FileObject, OUT PLONGLONG SystemTime); + typedef VOID (*PFNALLOCATOR_FREEFRAME)(IN PFILE_OBJECT FileObject, IN PVOID Frame); typedef BOOLEAN (*PFNKSSETTIMER)(IN PVOID Context, IN PKTIMER Timer, IN LARGE_INTEGER DueTime, IN PKDPC Dpc); typedef BOOLEAN (*PFNKSCANCELTIMER)(IN PVOID Context, IN PKTIMER Timer); typedef LONGLONG (FASTCALL *PFNKSCORRELATEDTIME)(IN PVOID Context, OUT PLONGLONG SystemTime); @@ -1723,8 +1720,12 @@ typedef NTSTATUS (*PFNKSALLOCATOR)(IN PIRP Irp, IN ULONG BufferSize, IN BOOLEAN InputOperation); typedef BOOLEAN (*PFNKSFASTHANDLER)(IN PFILE_OBJECT FileObject, IN PKSIDENTIFIER Request, IN ULONG RequestLength, IN OUT PVOID Data, IN ULONG DataLength, OUT PIO_STATUS_BLOCK IoStatus); - + typedef struct + { + PFNALLOCATOR_ALLOCATEFRAME AllocateFrame; + PFNALLOCATOR_FREEFRAME FreeFrame; + } KSSTREAMALLOCATOR_FUNCTIONTABLE, *PKSSTREAMALLOCATOR_FUNCTIONTABLE; typedef struct { @@ -1818,6 +1819,9 @@ ULONG FastIoCount; const KSFASTMETHOD_ITEM*FastIoTable; } KSMETHOD_SET, *PKSMETHOD_SET; + + typedef NTSTATUS (*PFNKSADDEVENT)(IN PIRP Irp, IN PKSEVENTDATA EventData, IN struct _KSEVENT_ENTRY* EventEntry); + typedef VOID (*PFNKSREMOVEEVENT)(IN PFILE_OBJECT FileObject, IN struct _KSEVENT_ENTRY* EventEntry ); typedef struct { @@ -1898,6 +1902,10 @@ PFAST_IO_WRITE FastWrite; } KSDISPATCH_TABLE, *PKSDISPATCH_TABLE; + typedef VOID (*PFNREFERENCEDEVICEOBJECT)( IN PVOID Context ); + typedef VOID (*PFNDEREFERENCEDEVICEOBJECT)( IN PVOID Context ); + typedef NTSTATUS (*PFNQUERYREFERENCESTRING)( IN PVOID Context, IN OUT PWCHAR *String); + typedef struct { INTERFACE Interface; @@ -1906,13 +1914,10 @@ PFNQUERYREFERENCESTRING QueryReferenceString; } BUS_INTERFACE_REFERENCE, *PBUS_INTERFACE_REFERENCE; - typedef NTSTATUS (*PFNKSADDEVENT)(IN PIRP Irp, IN PKSEVENTDATA EventData, IN struct _KSEVENT_ENTRY* EventEntry); - typedef VOID (*PFNKSREMOVEEVENT)(IN PFILE_OBJECT FileObject, IN struct _KSEVENT_ENTRY* EventEntry ); + + typedef VOID (*PFNKSITEMFREECALLBACK)( IN PKSOBJECT_CREATE_ITEM CreateItem ); - typedef NTSTATUS (*PFNKSIRPLISTCALLBACK)( IN PIRP Irp, IN PVOID Context ); - typedef VOID (*PFNREFERENCEDEVICEOBJECT)( IN PVOID Context ); - typedef VOID (*PFNDEREFERENCEDEVICEOBJECT)( IN PVOID Context ); - typedef NTSTATUS (*PFNQUERYREFERENCESTRING)( IN PVOID Context, IN OUT PWCHAR *String); + typedef NTSTATUS (*PFNKSIRPLISTCALLBACK)( IN PIRP Irp, IN PVOID Context ); typedef NTSTATUS (*PFNQUERYMEDIUMSLIST)( IN PVOID Context, OUT ULONG* MediumsCount, OUT PKSPIN_MEDIUM* MediumList); @@ -2186,6 +2191,7 @@ PFNQUERYMEDIUMSLIST QueryMediumsList; } BUS_INTERFACE_MEDIUMS, *PBUS_INTERFACE_MEDIUMS; + struct KSAUTOMATION_TABLE_ { ULONG PropertySetsCount; @@ -2201,6 +2207,7 @@ PVOID Alignment; #endif } KSAUTOMATION_TABLE, *PKSAUTOMATION_TABLE; + #define DEFINE_KSAUTOMATION_TABLE(table) const KSAUTOMATION_TABLE table = struct _KSDEVICE_DISPATCH { @@ -2355,7 +2362,7 @@ KSSTATE ClientState; }; - #define DEFINE_KSAUTOMATION_TABLE(table) const KSAUTOMATION_TABLE table = + #define DEFINE_KSAUTOMATION_PROPERTIES(table) SIZEOF_ARRAY(table), sizeof(KSPROPERTY_ITEM), table #define DEFINE_KSAUTOMATION_METHODS(table) SIZEOF_ARRAY(table), sizeof(KSMETHOD_ITEM), table #define DEFINE_KSAUTOMATION_EVENTS(table) SIZEOF_ARRAY(table), sizeof(KSEVENT_ITEM), table

1 0

[greatlrd] 32266: fixed some wrong postions of some struct
by greatlrd＠svn.reactos.org 10 Feb '08

10 Feb '08

Author: greatlrd Date: Sun Feb 10 18:23:49 2008 New Revision: 32266 URL: http://svn.reactos.org/svn/reactos?rev=32266&view=rev Log: fixed some wrong postions of some struct Modified: branches/reactx/reactos/include/dxsdk/ks.h Modified: branches/reactx/reactos/include/dxsdk/ks.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/dxsdk/ks… ============================================================================== --- branches/reactx/reactos/include/dxsdk/ks.h (original) +++ branches/reactx/reactos/include/dxsdk/ks.h Sun Feb 10 18:23:49 2008 @@ -1507,17 +1507,19 @@ typedef struct { + ULONG MinFrameSize; + ULONG MaxFrameSize; + ULONG Stepping; +} KS_FRAMING_RANGE, *PKS_FRAMING_RANGE; + +typedef struct +{ KS_FRAMING_RANGE Range; ULONG InPlaceWeight; ULONG NotInPlaceWeight; } KS_FRAMING_RANGE_WEIGHTED, *PKS_FRAMING_RANGE_WEIGHTED; -typedef struct -{ - ULONG MinFrameSize; - ULONG MaxFrameSize; - ULONG Stepping; -} KS_FRAMING_RANGE, *PKS_FRAMING_RANGE; + typedef struct { @@ -1542,6 +1544,15 @@ ULONG PinWeight; KS_FRAMING_ITEM FramingItem[1]; } KSALLOCATOR_FRAMING_EX, *PKSALLOCATOR_FRAMING_EX; + +typedef struct +{ + LONGLONG PresentationStart; + LONGLONG Duration; + KSPIN_INTERFACE Interface; + LONG Rate; + ULONG Flags; +} KSRATE, *PKSRATE; typedef struct { @@ -1597,14 +1608,7 @@ ULONG Reserved; } KSFRAMETIME, *PKSFRAMETIME; -typedef struct -{ - LONGLONG PresentationStart; - LONGLONG Duration; - KSPIN_INTERFACE Interface; - LONG Rate; - ULONG Flags; -} KSRATE, *PKSRATE; + typedef struct {

1 0

[hpoussin] 32265: Simplify SetupDiSetDeviceRegistryPropertyW/SetupDiGetDeviceRegistryPropertyW Misc cleanup
by hpoussin＠svn.reactos.org 10 Feb '08

10 Feb '08

Author: hpoussin Date: Sun Feb 10 17:37:19 2008 New Revision: 32265 URL: http://svn.reactos.org/svn/reactos?rev=32265&view=rev Log: Simplify SetupDiSetDeviceRegistryPropertyW/SetupDiGetDeviceRegistryPropertyW Misc cleanup Modified: trunk/reactos/dll/win32/setupapi/devinst.c trunk/reactos/dll/win32/setupapi/misc.c trunk/reactos/dll/win32/setupapi/parser.c trunk/reactos/dll/win32/setupapi/queue.c trunk/reactos/dll/win32/setupapi/setupapi_private.h Modified: trunk/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devinst.c (original) +++ trunk/reactos/dll/win32/setupapi/devinst.c Sun Feb 10 17:37:19 2008 @@ -1235,7 +1235,7 @@ { MachineNameW = MultiByteToUnicode(MachineName, CP_ACP); if (MachineNameW == NULL) - return (HDEVINFO)INVALID_HANDLE_VALUE; + return INVALID_HANDLE_VALUE; } hDevInfo = SetupDiCreateDeviceInfoListExW(ClassGuid, hwndParent, @@ -1273,7 +1273,7 @@ DWORD size = FIELD_OFFSET(struct DeviceInfoSet, szData); DWORD rc; CONFIGRET cr; - HDEVINFO ret = (HDEVINFO)INVALID_HANDLE_VALUE; + HDEVINFO ret = INVALID_HANDLE_VALUE; TRACE("%s %p %s %p\n", debugstr_guid(ClassGuid), hwndParent, debugstr_w(MachineName), Reserved); @@ -1292,14 +1292,14 @@ if (Reserved != NULL) { SetLastError(ERROR_INVALID_PARAMETER); - return (HDEVINFO)INVALID_HANDLE_VALUE; + return INVALID_HANDLE_VALUE; } list = MyMalloc(size); if (!list) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return (HDEVINFO)INVALID_HANDLE_VALUE; + return INVALID_HANDLE_VALUE; } ZeroMemory(list, FIELD_OFFSET(struct DeviceInfoSet, szData)); @@ -1413,7 +1413,7 @@ TRACE("%p %p %lu %lu %lu %p %s\n", DeviceInfoSet, DeviceInfoData, Scope, HwProfile, KeyType, InfHandle, debugstr_w(InfSectionName)); - if (!DeviceInfoSet || DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE) + if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE) { SetLastError(ERROR_INVALID_HANDLE); return INVALID_HANDLE_VALUE; @@ -1680,7 +1680,7 @@ SetLastError(ERROR_INVALID_DEVINST_NAME); return FALSE; } - if (!DeviceInfoSet || DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE) + if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE) { SetLastError(ERROR_INVALID_HANDLE); return FALSE; @@ -1784,7 +1784,7 @@ TRACE("%p %p %08x %p %p %p\n", DeviceInfoSet, DeviceInfoData, Flags, CompareProc, CompareContext, DupDeviceInfoData); - if (!DeviceInfoSet || DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE) + if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE) { SetLastError(ERROR_INVALID_HANDLE); return FALSE; @@ -1823,7 +1823,7 @@ SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - if (devinfo && devinfo != (HDEVINFO)INVALID_HANDLE_VALUE) + if (devinfo && devinfo != INVALID_HANDLE_VALUE) { struct DeviceInfoSet *list = (struct DeviceInfoSet *)devinfo; if (list->magic == SETUP_DEVICE_INFO_SET_MAGIC) @@ -1887,7 +1887,7 @@ &size); if (!ret && GetLastError() != ERROR_INSUFFICIENT_BUFFER) return FALSE; - instanceId = MyMalloc(DeviceInstanceIdSize * sizeof(WCHAR)); + instanceId = MyMalloc(size * sizeof(WCHAR)); if (instanceId) { ret = SetupDiGetDeviceInstanceIdW(DeviceInfoSet, @@ -2275,7 +2275,7 @@ enumstrW = MultiByteToUnicode(enumstr, CP_ACP); if (!enumstrW) { - ret = (HDEVINFO)INVALID_HANDLE_VALUE; + ret = INVALID_HANDLE_VALUE; goto end; } } @@ -2285,7 +2285,7 @@ if (!machineW) { MyFree(enumstrW); - ret = (HDEVINFO)INVALID_HANDLE_VALUE; + ret = INVALID_HANDLE_VALUE; goto end; } } @@ -2446,7 +2446,7 @@ TRACE("%p %p\n", DeviceInfoSet, DevInfoData); - if (!DeviceInfoSet || DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE) + if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE) { SetLastError(ERROR_INVALID_HANDLE); return FALSE; @@ -2487,7 +2487,7 @@ TRACE("%p %p\n", DeviceInfoSet, DevInfoData); - if (!DeviceInfoSet || DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE) + if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE) { SetLastError(ERROR_INVALID_HANDLE); return FALSE; @@ -2562,7 +2562,7 @@ debugstr_guid(InterfaceClassGuid), debugstr_w(ReferenceString), CreationFlags, DeviceInterfaceData); - if (!DeviceInfoSet || DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE) + if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE) { SetLastError(ERROR_INVALID_HANDLE); return FALSE; @@ -2640,7 +2640,7 @@ TRACE("%p %p %d %08x %p %p\n", DeviceInfoSet, DeviceInterfaceData, Reserved, samDesired, InfHandle, InfSectionName); - if (!DeviceInfoSet || DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE || + if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE || set->magic != SETUP_DEVICE_INFO_SET_MAGIC) { SetLastError(ERROR_INVALID_HANDLE); @@ -2678,7 +2678,7 @@ TRACE("%p %p %d\n", DeviceInfoSet, DeviceInterfaceData, Reserved); - if (!DeviceInfoSet || DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE || + if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE || set->magic != SETUP_DEVICE_INFO_SET_MAGIC) { SetLastError(ERROR_INVALID_HANDLE); @@ -2733,7 +2733,7 @@ TRACE("%p, %p, %s, %d, %p\n", DeviceInfoSet, DeviceInfoData, debugstr_guid(InterfaceClassGuid), MemberIndex, DeviceInterfaceData); - if (!DeviceInfoSet || DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE || + if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE || set->magic != SETUP_DEVICE_INFO_SET_MAGIC) { SetLastError(ERROR_INVALID_HANDLE); @@ -2838,7 +2838,7 @@ BOOL ret = FALSE; TRACE("%p\n", devinfo); - if (devinfo && devinfo != (HDEVINFO)INVALID_HANDLE_VALUE) + if (devinfo && devinfo != INVALID_HANDLE_VALUE) { struct DeviceInfoSet *list = (struct DeviceInfoSet *)devinfo; @@ -2874,7 +2874,7 @@ DeviceInterfaceData, DeviceInterfaceDetailData, DeviceInterfaceDetailDataSize, RequiredSize, DeviceInfoData); - if (!DeviceInfoSet || DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE || + if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE || set->magic != SETUP_DEVICE_INFO_SET_MAGIC) { SetLastError(ERROR_INVALID_HANDLE); @@ -2960,7 +2960,7 @@ DeviceInterfaceData, DeviceInterfaceDetailData, DeviceInterfaceDetailDataSize, RequiredSize, DeviceInfoData); - if (!DeviceInfoSet || DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE || + if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE || set->magic != SETUP_DEVICE_INFO_SET_MAGIC) { SetLastError(ERROR_INVALID_HANDLE); @@ -3024,6 +3024,51 @@ return ret; } +struct PropertyMapEntry +{ + DWORD regType; + LPCSTR nameA; + LPCWSTR nameW; +}; + +static struct PropertyMapEntry PropertyMap[] = { + { REG_SZ, "DeviceDesc", REGSTR_VAL_DEVDESC }, + { REG_MULTI_SZ, "HardwareId", REGSTR_VAL_HARDWAREID }, + { REG_MULTI_SZ, "CompatibleIDs", REGSTR_VAL_COMPATIBLEIDS }, + { 0, NULL, NULL }, /* SPDRP_UNUSED0 */ + { REG_SZ, "Service", REGSTR_VAL_SERVICE }, + { 0, NULL, NULL }, /* SPDRP_UNUSED1 */ + { 0, NULL, NULL }, /* SPDRP_UNUSED2 */ + { REG_SZ, "Class", REGSTR_VAL_CLASS }, + { REG_SZ, "ClassGUID", REGSTR_VAL_CLASSGUID }, + { REG_SZ, "Driver", REGSTR_VAL_DRIVER }, + { REG_DWORD, "ConfigFlags", REGSTR_VAL_CONFIGFLAGS }, + { REG_SZ, "Mfg", REGSTR_VAL_MFG }, + { REG_SZ, "FriendlyName", REGSTR_VAL_FRIENDLYNAME }, + { REG_SZ, "LocationInformation", REGSTR_VAL_LOCATION_INFORMATION }, + { 0, NULL, NULL }, /* SPDRP_PHYSICAL_DEVICE_OBJECT_NAME */ + { REG_DWORD, "Capabilities", REGSTR_VAL_CAPABILITIES }, + { REG_DWORD, "UINumber", REGSTR_VAL_UI_NUMBER }, + { REG_MULTI_SZ, "UpperFilters", REGSTR_VAL_UPPERFILTERS }, + { REG_MULTI_SZ, "LowerFilters", REGSTR_VAL_LOWERFILTERS }, + { 0, NULL, NULL }, /* SPDRP_BUSTYPEGUID */ + { 0, NULL, NULL }, /* SPDRP_LEGACYBUSTYPE */ + { 0, NULL, NULL }, /* SPDRP_BUSNUMBER */ + { 0, NULL, NULL }, /* SPDRP_ENUMERATOR_NAME */ + { REG_BINARY, "Security", REGSTR_SECURITY }, + { 0, NULL, NULL }, /* SPDRP_SECURITY_SDS */ + { 0, NULL, NULL }, /* SPDRP_DEVTYPE */ + { 0, NULL, NULL }, /* SPDRP_EXCLUSIVE */ + { 0, NULL, NULL }, /* SPDRP_CHARACTERISTICS */ + { 0, NULL, NULL }, /* SPDRP_ADDRESS */ + { REG_SZ, "UINumberDescFormat", REGSTR_UI_NUMBER_DESC_FORMAT }, + { 0, NULL, NULL }, /* SPDRP_DEVICE_POWER_DATA */ + { 0, NULL, NULL }, /* SPDRP_REMOVAL_POLICY */ + { 0, NULL, NULL }, /* SPDRP_REMOVAL_POLICY_HW_DEFAULT */ + { 0, NULL, NULL }, /* SPDRP_REMOVAL_POLICY_OVERRIDE */ + { 0, NULL, NULL }, /* SPDRP_INSTALL_STATE */ +}; + /*********************************************************************** * SetupDiGetDeviceRegistryPropertyA (SETUPAPI.@) */ @@ -3122,8 +3167,6 @@ DWORD PropertyBufferSize, PDWORD RequiredSize) { - HKEY hEnumKey, hKey; - DWORD rc; BOOL ret = FALSE; struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; struct DeviceInfo *devInfo; @@ -3148,171 +3191,56 @@ SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - if (Property >= SPDRP_MAXIMUM_PROPERTY) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - devInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; - { - switch (Property) - { - case SPDRP_CAPABILITIES: - case SPDRP_CLASS: - case SPDRP_CLASSGUID: - case SPDRP_COMPATIBLEIDS: - case SPDRP_CONFIGFLAGS: - case SPDRP_DEVICEDESC: - case SPDRP_DRIVER: - case SPDRP_FRIENDLYNAME: - case SPDRP_HARDWAREID: - case SPDRP_LOCATION_INFORMATION: - case SPDRP_LOWERFILTERS: - case SPDRP_MFG: - case SPDRP_SECURITY: - case SPDRP_SERVICE: - case SPDRP_UI_NUMBER: - case SPDRP_UI_NUMBER_DESC_FORMAT: - case SPDRP_UPPERFILTERS: - { - LPCWSTR RegistryPropertyName; - DWORD BufferSize; - - switch (Property) - { - case SPDRP_CAPABILITIES: - RegistryPropertyName = REGSTR_VAL_CAPABILITIES; break; - case SPDRP_CLASS: - RegistryPropertyName = REGSTR_VAL_CLASS; break; - case SPDRP_CLASSGUID: - RegistryPropertyName = REGSTR_VAL_CLASSGUID; break; - case SPDRP_COMPATIBLEIDS: - RegistryPropertyName = REGSTR_VAL_COMPATIBLEIDS; break; - case SPDRP_CONFIGFLAGS: - RegistryPropertyName = REGSTR_VAL_CONFIGFLAGS; break; - case SPDRP_DEVICEDESC: - RegistryPropertyName = REGSTR_VAL_DEVDESC; break; - case SPDRP_DRIVER: - RegistryPropertyName = REGSTR_VAL_DRIVER; break; - case SPDRP_FRIENDLYNAME: - RegistryPropertyName = REGSTR_VAL_FRIENDLYNAME; break; - case SPDRP_HARDWAREID: - RegistryPropertyName = REGSTR_VAL_HARDWAREID; break; - case SPDRP_LOCATION_INFORMATION: - RegistryPropertyName = REGSTR_VAL_LOCATION_INFORMATION; break; - case SPDRP_LOWERFILTERS: - RegistryPropertyName = REGSTR_VAL_LOWERFILTERS; break; - case SPDRP_MFG: - RegistryPropertyName = REGSTR_VAL_MFG; break; - case SPDRP_SECURITY: - RegistryPropertyName = REGSTR_SECURITY; break; - case SPDRP_SERVICE: - RegistryPropertyName = REGSTR_VAL_SERVICE; break; - case SPDRP_UI_NUMBER: - RegistryPropertyName = REGSTR_VAL_UI_NUMBER; break; - case SPDRP_UI_NUMBER_DESC_FORMAT: - RegistryPropertyName = REGSTR_UI_NUMBER_DESC_FORMAT; break; - case SPDRP_UPPERFILTERS: - RegistryPropertyName = REGSTR_VAL_UPPERFILTERS; break; - default: - /* Should not happen */ - RegistryPropertyName = NULL; break; - } - - /* Open registry key name */ - rc = RegOpenKeyExW( - set->HKLM, - REGSTR_PATH_SYSTEMENUM, - 0, /* Options */ - 0, - &hEnumKey); - if (rc != ERROR_SUCCESS) - { - SetLastError(rc); - break; - } - rc = RegOpenKeyExW( - hEnumKey, - devInfo->Data, - 0, /* Options */ - KEY_QUERY_VALUE, - &hKey); - RegCloseKey(hEnumKey); - if (rc != ERROR_SUCCESS) - { - SetLastError(rc); - break; - } - /* Read registry entry */ - BufferSize = PropertyBufferSize; - rc = RegQueryValueExW( - hKey, - RegistryPropertyName, - NULL, /* Reserved */ - PropertyRegDataType, - PropertyBuffer, - &BufferSize); - if (RequiredSize) - *RequiredSize = BufferSize; - switch(rc) { - case ERROR_SUCCESS: - if (PropertyBuffer != NULL || BufferSize == 0) - ret = TRUE; - else - SetLastError(ERROR_INSUFFICIENT_BUFFER); - break; - case ERROR_MORE_DATA: - SetLastError(ERROR_INSUFFICIENT_BUFFER); - break; - default: - SetLastError(rc); - } - RegCloseKey(hKey); - break; - } - - case SPDRP_PHYSICAL_DEVICE_OBJECT_NAME: - { - DWORD required = (strlenW(devInfo->Data) + 1) * sizeof(WCHAR); - - if (PropertyRegDataType) - *PropertyRegDataType = REG_SZ; - if (RequiredSize) - *RequiredSize = required; - if (PropertyBufferSize >= required) - { - strcpyW((LPWSTR)PropertyBuffer, devInfo->Data); + if (Property < sizeof(PropertyMap) / sizeof(PropertyMap[0]) + && PropertyMap[Property].nameW) + { + DWORD size = PropertyBufferSize; + HKEY hKey; + LONG l; + hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DEV, KEY_QUERY_VALUE); + if (hKey == INVALID_HANDLE_VALUE) + return FALSE; + l = RegQueryValueExW(hKey, PropertyMap[Property].nameW, + NULL, PropertyRegDataType, PropertyBuffer, &size); + RegCloseKey(hKey); + + if (RequiredSize) + *RequiredSize = size; + switch(l) { + case ERROR_SUCCESS: + if (PropertyBuffer != NULL || size == 0) ret = TRUE; - } else SetLastError(ERROR_INSUFFICIENT_BUFFER); break; - } - - /*case SPDRP_BUSTYPEGUID: - case SPDRP_LEGACYBUSTYPE: - case SPDRP_BUSNUMBER: - case SPDRP_ENUMERATOR_NAME: - case SPDRP_SECURITY_SDS: - case SPDRP_DEVTYPE: - case SPDRP_EXCLUSIVE: - case SPDRP_CHARACTERISTICS: - case SPDRP_ADDRESS: - case SPDRP_DEVICE_POWER_DATA:*/ -#if (WINVER >= 0x501) - /*case SPDRP_REMOVAL_POLICY: - case SPDRP_REMOVAL_POLICY_HW_DEFAULT: - case SPDRP_REMOVAL_POLICY_OVERRIDE: - case SPDRP_INSTALL_STATE:*/ -#endif - + case ERROR_MORE_DATA: + SetLastError(ERROR_INSUFFICIENT_BUFFER); + break; default: - { - ERR("Property 0x%lx not implemented\n", Property); - SetLastError(ERROR_NOT_SUPPORTED); - } - } + SetLastError(l); + } + } + else if (Property == SPDRP_PHYSICAL_DEVICE_OBJECT_NAME) + { + DWORD required = (strlenW(devInfo->Data) + 1) * sizeof(WCHAR); + + if (PropertyRegDataType) + *PropertyRegDataType = REG_SZ; + if (RequiredSize) + *RequiredSize = required; + if (PropertyBufferSize >= required) + { + strcpyW((LPWSTR)PropertyBuffer, devInfo->Data); + ret = TRUE; + } + else + SetLastError(ERROR_INSUFFICIENT_BUFFER); + } + else + { + ERR("Property 0x%lx not implemented\n", Property); + SetLastError(ERROR_NOT_SUPPORTED); } return ret; } @@ -3388,107 +3316,29 @@ SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - - switch (Property) - { - case SPDRP_COMPATIBLEIDS: - case SPDRP_CONFIGFLAGS: - case SPDRP_FRIENDLYNAME: - case SPDRP_HARDWAREID: - case SPDRP_LOCATION_INFORMATION: - case SPDRP_LOWERFILTERS: - case SPDRP_SECURITY: - case SPDRP_SERVICE: - case SPDRP_UI_NUMBER_DESC_FORMAT: - case SPDRP_UPPERFILTERS: - { - LPCWSTR RegistryPropertyName; - DWORD RegistryDataType; - HKEY hKey; - LONG rc; - - switch (Property) - { - case SPDRP_COMPATIBLEIDS: - RegistryPropertyName = REGSTR_VAL_COMPATIBLEIDS; - RegistryDataType = REG_MULTI_SZ; - break; - case SPDRP_CONFIGFLAGS: - RegistryPropertyName = REGSTR_VAL_CONFIGFLAGS; - RegistryDataType = REG_DWORD; - break; - case SPDRP_FRIENDLYNAME: - RegistryPropertyName = REGSTR_VAL_FRIENDLYNAME; - RegistryDataType = REG_SZ; - break; - case SPDRP_HARDWAREID: - RegistryPropertyName = REGSTR_VAL_HARDWAREID; - RegistryDataType = REG_MULTI_SZ; - break; - case SPDRP_LOCATION_INFORMATION: - RegistryPropertyName = REGSTR_VAL_LOCATION_INFORMATION; - RegistryDataType = REG_SZ; - break; - case SPDRP_LOWERFILTERS: - RegistryPropertyName = REGSTR_VAL_LOWERFILTERS; - RegistryDataType = REG_MULTI_SZ; - break; - case SPDRP_SECURITY: - RegistryPropertyName = REGSTR_SECURITY; - RegistryDataType = REG_BINARY; - break; - case SPDRP_SERVICE: - RegistryPropertyName = REGSTR_VAL_SERVICE; - RegistryDataType = REG_SZ; - break; - case SPDRP_UI_NUMBER_DESC_FORMAT: - RegistryPropertyName = REGSTR_UI_NUMBER_DESC_FORMAT; - RegistryDataType = REG_SZ; - break; - case SPDRP_UPPERFILTERS: - RegistryPropertyName = REGSTR_VAL_UPPERFILTERS; - RegistryDataType = REG_MULTI_SZ; - break; - default: - /* Should not happen */ - RegistryPropertyName = NULL; - RegistryDataType = REG_BINARY; - break; - } - /* Open device registry key */ - hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DEV, KEY_SET_VALUE); - if (hKey != INVALID_HANDLE_VALUE) - { - /* Write new data */ - rc = RegSetValueExW( - hKey, - RegistryPropertyName, - 0, /* Reserved */ - RegistryDataType, - PropertyBuffer, - PropertyBufferSize); - if (rc == ERROR_SUCCESS) - ret = TRUE; - else - SetLastError(rc); - RegCloseKey(hKey); - } - break; - } - - /*case SPDRP_CHARACTERISTICS: - case SPDRP_DEVTYPE: - case SPDRP_EXCLUSIVE:*/ -#if (WINVER >= 0x501) - //case SPDRP_REMOVAL_POLICY_OVERRIDE: -#endif - //case SPDRP_SECURITY_SDS: - - default: - { - ERR("Property 0x%lx not implemented\n", Property); - SetLastError(ERROR_NOT_SUPPORTED); - } + if (Property < sizeof(PropertyMap) / sizeof(PropertyMap[0]) + && PropertyMap[Property].nameW) + { + HKEY hKey; + LONG l; + hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DEV, KEY_SET_VALUE); + if (hKey == INVALID_HANDLE_VALUE) + return FALSE; + /* Write new data */ + l = RegSetValueExW( + hKey, PropertyMap[Property].nameW, 0, + PropertyMap[Property].regType, PropertyBuffer, + PropertyBufferSize); + if (!l) + ret = TRUE; + else + SetLastError(l); + RegCloseKey(hKey); + } + else + { + ERR("Property 0x%lx not implemented\n", Property); + SetLastError(ERROR_NOT_SUPPORTED); } TRACE("Returning %d\n", ret); @@ -5457,7 +5307,7 @@ TRACE("%p %p %d %d %d %x\n", DeviceInfoSet, DeviceInfoData, Scope, HwProfile, KeyType, samDesired); - if (!DeviceInfoSet || DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE) + if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE) { SetLastError(ERROR_INVALID_HANDLE); return INVALID_HANDLE_VALUE; @@ -5543,7 +5393,7 @@ TRACE("%p %p %d %d %d\n", DeviceInfoSet, DeviceInfoData, Scope, HwProfile, KeyType); - if (!DeviceInfoSet || DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE) + if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE) { SetLastError(ERROR_INVALID_HANDLE); return FALSE; Modified: trunk/reactos/dll/win32/setupapi/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/misc.c?… ============================================================================== --- trunk/reactos/dll/win32/setupapi/misc.c (original) +++ trunk/reactos/dll/win32/setupapi/misc.c Sun Feb 10 17:37:19 2008 @@ -787,7 +787,7 @@ TRACE("%s %p\n", debugstr_w(lpFileName), pSecurityDescriptor); - SecDesc = (PSECURITY_DESCRIPTOR)MyMalloc(dwSize); + SecDesc = MyMalloc(dwSize); if (SecDesc == NULL) return ERROR_NOT_ENOUGH_MEMORY; @@ -806,7 +806,7 @@ return dwError; } - SecDesc = (PSECURITY_DESCRIPTOR)MyRealloc(SecDesc, dwSize); + SecDesc = MyRealloc(SecDesc, dwSize); if (SecDesc == NULL) return ERROR_NOT_ENOUGH_MEMORY; Modified: trunk/reactos/dll/win32/setupapi/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/parser.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/parser.c (original) +++ trunk/reactos/dll/win32/setupapi/parser.c Sun Feb 10 17:37:19 2008 @@ -243,7 +243,7 @@ /* retrieve a given line from section/line index */ -inline static struct line *get_line( struct inf_file *file, unsigned int section_index, +static inline struct line *get_line( struct inf_file *file, unsigned int section_index, unsigned int line_index ) { struct section *section; @@ -433,7 +433,7 @@ /* push the current state on the parser stack */ -inline static void push_state( struct parser *parser, enum parser_state state ) +static inline void push_state( struct parser *parser, enum parser_state state ) { ASSERT( parser->stack_pos < sizeof(parser->stack)/sizeof(parser->stack[0]) ); parser->stack[parser->stack_pos++] = state; @@ -441,7 +441,7 @@ /* pop the current state */ -inline static void pop_state( struct parser *parser ) +static inline void pop_state( struct parser *parser ) { ASSERT( parser->stack_pos ); parser->state = parser->stack[--parser->stack_pos]; @@ -449,7 +449,7 @@ /* set the parser state and return the previous one */ -inline static enum parser_state set_state( struct parser *parser, enum parser_state state ) +static inline enum parser_state set_state( struct parser *parser, enum parser_state state ) { enum parser_state ret = parser->state; parser->state = state; @@ -458,14 +458,14 @@ /* check if the pointer points to an end of file */ -inline static int is_eof( const struct parser *parser, const WCHAR *ptr ) +static inline int is_eof( const struct parser *parser, const WCHAR *ptr ) { return (ptr >= parser->end || *ptr == CONTROL_Z); } /* check if the pointer points to an end of line */ -inline static int is_eol( const struct parser *parser, const WCHAR *ptr ) +static inline int is_eol( const struct parser *parser, const WCHAR *ptr ) { return (ptr >= parser->end || *ptr == CONTROL_Z || *ptr == '\n'); } @@ -1067,7 +1067,7 @@ HINF WINAPI SetupOpenInfFileA( PCSTR name, PCSTR class, DWORD style, UINT *error ) { UNICODE_STRING nameW, classW; - HINF ret = (HINF)INVALID_HANDLE_VALUE; + HINF ret = INVALID_HANDLE_VALUE; classW.Buffer = NULL; if (class && !RtlCreateUnicodeStringFromAsciiz( &classW, class )) @@ -1171,11 +1171,11 @@ if (strchrW( name, '\\' ) || strchrW( name, '/' )) { - if (!(len = GetFullPathNameW( name, 0, NULL, NULL ))) return (HINF)INVALID_HANDLE_VALUE; + if (!(len = GetFullPathNameW( name, 0, NULL, NULL ))) return INVALID_HANDLE_VALUE; if (!(path = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) { SetLastError( ERROR_NOT_ENOUGH_MEMORY ); - return (HINF)INVALID_HANDLE_VALUE; + return INVALID_HANDLE_VALUE; } GetFullPathNameW( name, len, path, NULL ); handle = CreateFileW( path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 ); @@ -1189,7 +1189,7 @@ if (!(path = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) { SetLastError( ERROR_NOT_ENOUGH_MEMORY ); - return (HINF)INVALID_HANDLE_VALUE; + return INVALID_HANDLE_VALUE; } GetWindowsDirectoryW( path, len ); p = path + strlenW(path); @@ -1212,7 +1212,7 @@ if (!file) { HeapFree( GetProcessHeap(), 0, path ); - return (HINF)INVALID_HANDLE_VALUE; + return INVALID_HANDLE_VALUE; } TRACE( "%s -> %p\n", debugstr_w(path), file ); file->filename = path; @@ -1226,7 +1226,7 @@ /* Not enough memory */ SetLastError(ERROR_NOT_ENOUGH_MEMORY); SetupCloseInfFile((HINF)file); - return (HINF)INVALID_HANDLE_VALUE; + return INVALID_HANDLE_VALUE; } else if (!PARSER_GetInfClassW((HINF)file, &ClassGuid, ClassName, strlenW(class) + 1, NULL)) { @@ -1234,7 +1234,7 @@ HeapFree(GetProcessHeap(), 0, ClassName); SetLastError(ERROR_CLASS_MISMATCH); SetupCloseInfFile((HINF)file); - return (HINF)INVALID_HANDLE_VALUE; + return INVALID_HANDLE_VALUE; } else if (strcmpW(class, ClassName) != 0) { @@ -1242,7 +1242,7 @@ HeapFree(GetProcessHeap(), 0, ClassName); SetLastError(ERROR_CLASS_MISMATCH); SetupCloseInfFile((HINF)file); - return (HINF)INVALID_HANDLE_VALUE; + return INVALID_HANDLE_VALUE; } HeapFree(GetProcessHeap(), 0, ClassName); } @@ -1261,7 +1261,7 @@ if (!name) return SetupOpenAppendInfFileW( NULL, parent_hinf, error ); child_hinf = SetupOpenInfFileA( name, NULL, INF_STYLE_WIN4, error ); - if (child_hinf == (HINF)INVALID_HANDLE_VALUE) return FALSE; + if (child_hinf == INVALID_HANDLE_VALUE) return FALSE; append_inf_file( parent_hinf, child_hinf ); TRACE( "%p: appended %s (%p)\n", parent_hinf, debugstr_a(name), child_hinf ); return TRUE; @@ -1286,14 +1286,14 @@ sizeof(filename)/sizeof(WCHAR), NULL )) { child_hinf = SetupOpenInfFileW( filename, NULL, INF_STYLE_WIN4, error ); - if (child_hinf == (HINF)INVALID_HANDLE_VALUE) return FALSE; + if (child_hinf == INVALID_HANDLE_VALUE) return FALSE; append_inf_file( parent_hinf, child_hinf ); TRACE( "%p: appended %s (%p)\n", parent_hinf, debugstr_w(filename), child_hinf ); } return TRUE; } child_hinf = SetupOpenInfFileW( name, NULL, INF_STYLE_WIN4, error ); - if (child_hinf == (HINF)INVALID_HANDLE_VALUE) return FALSE; + if (child_hinf == INVALID_HANDLE_VALUE) return FALSE; append_inf_file( parent_hinf, child_hinf ); TRACE( "%p: appended %s (%p)\n", parent_hinf, debugstr_w(name), child_hinf ); return TRUE; Modified: trunk/reactos/dll/win32/setupapi/queue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/queue.c… ============================================================================== --- trunk/reactos/dll/win32/setupapi/queue.c (original) +++ trunk/reactos/dll/win32/setupapi/queue.c Sun Feb 10 17:37:19 2008 @@ -63,7 +63,7 @@ }; -inline static WCHAR *strdupW( const WCHAR *str ) +static inline WCHAR *strdupW( const WCHAR *str ) { WCHAR *ret = NULL; if (str) @@ -74,7 +74,7 @@ return ret; } -inline static char *strdupWtoA( const WCHAR *str ) +static inline char *strdupWtoA( const WCHAR *str ) { char *ret = NULL; if (str) @@ -87,7 +87,7 @@ } /* append a file operation to a queue */ -inline static void queue_file_op( struct file_op_queue *queue, struct file_op *op ) +static inline void queue_file_op( struct file_op_queue *queue, struct file_op *op ) { op->next = NULL; if (queue->tail) queue->tail->next = op; @@ -417,7 +417,7 @@ struct file_queue *queue; if (!(queue = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*queue)))) - return (HSPFILEQ)INVALID_HANDLE_VALUE; + return INVALID_HANDLE_VALUE; return queue; } Modified: trunk/reactos/dll/win32/setupapi/setupapi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi_private.h (original) +++ trunk/reactos/dll/win32/setupapi/setupapi_private.h Sun Feb 10 17:37:19 2008 @@ -241,11 +241,11 @@ struct inf_file; extern const WCHAR *DIRID_get_string( int dirid ); +extern unsigned int PARSER_string_substA( const struct inf_file *file, const WCHAR *text, + char *buffer, unsigned int size ); +extern unsigned int PARSER_string_substW( const struct inf_file *file, const WCHAR *text, + WCHAR *buffer, unsigned int size ); extern const WCHAR *PARSER_get_inf_filename( HINF hinf ); -extern unsigned int PARSER_string_substA( const struct inf_file *file, const WCHAR *text, char *buffer, - unsigned int size ); -extern unsigned int PARSER_string_substW( const struct inf_file *file, const WCHAR *text, WCHAR *buffer, - unsigned int size ); extern WCHAR *PARSER_get_src_root( HINF hinf ); extern WCHAR *PARSER_get_dest_dir( INFCONTEXT *context );

1 0

[fireball] 32264: - Update winesync status.
by fireball＠svn.reactos.org 10 Feb '08

10 Feb '08

Author: fireball Date: Sun Feb 10 16:52:47 2008 New Revision: 32264 URL: http://svn.reactos.org/svn/reactos?rev=32264&view=rev Log: - Update winesync status. Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE (original) +++ trunk/reactos/media/doc/README.WINE Sun Feb 10 16:52:47 2008 @@ -70,7 +70,7 @@ reactos/dll/win32/powrprof # Autosync reactos/dll/win32/riched20 # Autosync reactos/dll/win32/riched32 # Autosync -reactos/dll/win32/rpcrt4 # Synced to Wine-20080105 +reactos/dll/win32/rpcrt4 # Synced to Wine-0_9_55 reactos/dll/win32/rsabase # Autosync reactos/dll/win32/rsaenh # Autosync reactos/dll/win32/schannel # Autosync

1 0

[fireball] 32263: Winesync to Wine-0.9.55.
by fireball＠svn.reactos.org 10 Feb '08

10 Feb '08

Author: fireball Date: Sun Feb 10 16:51:59 2008 New Revision: 32263 URL: http://svn.reactos.org/svn/reactos?rev=32263&view=rev Log: Winesync to Wine-0.9.55. Modified: trunk/reactos/dll/win32/rpcrt4/rpc_binding.h trunk/reactos/dll/win32/rpcrt4/rpc_server.c trunk/reactos/dll/win32/rpcrt4/rpc_transport.c trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec Modified: trunk/reactos/dll/win32/rpcrt4/rpc_binding.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_bindi… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_binding.h (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_binding.h Sun Feb 10 16:51:59 2008 @@ -41,6 +41,7 @@ /* our copy of NT auth identity structure, if the authentication service * takes an NT auth identity */ SEC_WINNT_AUTH_IDENTITY_W *nt_identity; + LPWSTR server_principal_name; } RpcAuthInfo; typedef struct _RpcQualityOfService @@ -73,6 +74,7 @@ /* client-only */ struct list conn_pool_entry; ULONG assoc_group_id; /* association group returned during binding */ + RPC_ASYNC_STATE *async_state; /* server-only */ /* The active interface bound to server. */ @@ -92,6 +94,7 @@ int (*write)(RpcConnection *conn, const void *buffer, unsigned int len); int (*close)(RpcConnection *conn); void (*cancel_call)(RpcConnection *conn); + int (*wait_for_incoming_data)(RpcConnection *conn); size_t (*get_top_of_tower)(unsigned char *tower_data, const char *networkaddr, const char *endpoint); RPC_STATUS (*parse_top_of_tower)(const unsigned char *tower_data, size_t tower_size, char **networkaddr, char **endpoint); }; Modified: trunk/reactos/dll/win32/rpcrt4/rpc_server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_serve… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_server.c (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_server.c Sun Feb 10 16:51:59 2008 @@ -391,6 +391,7 @@ packet = HeapAlloc(GetProcessHeap(), 0, sizeof(RpcPacket)); if (!packet) { + I_RpcFree(msg->Buffer); HeapFree(GetProcessHeap(), 0, msg); break; } @@ -399,6 +400,7 @@ packet->msg = msg; if (!QueueUserWorkItem(RPCRT4_worker_thread, packet, WT_EXECUTELONGFUNCTION)) { ERR("couldn't queue work item for worker thread, error was %d\n", GetLastError()); + I_RpcFree(msg->Buffer); HeapFree(GetProcessHeap(), 0, msg); HeapFree(GetProcessHeap(), 0, packet); break; Modified: trunk/reactos/dll/win32/rpcrt4/rpc_transport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_trans… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_transport.c (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_transport.c Sun Feb 10 16:51:59 2008 @@ -434,6 +434,12 @@ /* FIXME: implement when named pipe writes use overlapped I/O */ } +static int rpcrt4_conn_np_wait_for_incoming_data(RpcConnection *Connection) +{ + /* FIXME: implement when named pipe writes use overlapped I/O */ + return -1; +} + static size_t rpcrt4_ncacn_np_get_top_of_tower(unsigned char *tower_data, const char *networkaddr, const char *endpoint) @@ -1074,6 +1080,32 @@ TRACE("%p\n", Connection); write(tcpc->cancel_fds[1], &dummy, 1); +} + +static int rpcrt4_conn_tcp_wait_for_incoming_data(RpcConnection *Connection) +{ + RpcConnection_tcp *tcpc = (RpcConnection_tcp *) Connection; + struct pollfd pfds[2]; + + TRACE("%p\n", Connection); + + pfds[0].fd = tcpc->sock; + pfds[0].events = POLLIN; + pfds[1].fd = tcpc->cancel_fds[0]; + pfds[1].events = POLLIN; + if (poll(pfds, 2, -1 /* infinite */) == -1 && errno != EINTR) + { + ERR("poll() failed: %s\n", strerror(errno)); + return -1; + } + if (pfds[1].revents & POLLIN) /* canceled */ + { + char dummy; + read(pfds[1].fd, &dummy, sizeof(dummy)); + return -1; + } + + return 0; } static size_t rpcrt4_ncacn_ip_tcp_get_top_of_tower(unsigned char *tower_data, @@ -1361,6 +1393,7 @@ rpcrt4_conn_np_write, rpcrt4_conn_np_close, rpcrt4_conn_np_cancel_call, + rpcrt4_conn_np_wait_for_incoming_data, rpcrt4_ncacn_np_get_top_of_tower, rpcrt4_ncacn_np_parse_top_of_tower, }, @@ -1373,6 +1406,7 @@ rpcrt4_conn_np_write, rpcrt4_conn_np_close, rpcrt4_conn_np_cancel_call, + rpcrt4_conn_np_wait_for_incoming_data, rpcrt4_ncalrpc_get_top_of_tower, rpcrt4_ncalrpc_parse_top_of_tower, }, @@ -1385,6 +1419,7 @@ rpcrt4_conn_tcp_write, rpcrt4_conn_tcp_close, rpcrt4_conn_tcp_cancel_call, + rpcrt4_conn_tcp_wait_for_incoming_data, rpcrt4_ncacn_ip_tcp_get_top_of_tower, rpcrt4_ncacn_ip_tcp_parse_top_of_tower, } @@ -1501,6 +1536,7 @@ NewConnection->QOS = QOS; list_init(&NewConnection->conn_pool_entry); + NewConnection->async_state = NULL; TRACE("connection: %p\n", NewConnection); *Connection = NewConnection; Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4.rb… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild (original) +++ trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild Sun Feb 10 16:51:59 2008 @@ -16,6 +16,7 @@ <library>uuid</library> <library>ntdll</library> <library>kernel32</library> + <library>user32</library> <library>advapi32</library> <library>secur32</library> <library>iphlpapi</library> Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4.sp… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec (original) +++ trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec Sun Feb 10 16:51:59 2008 @@ -21,7 +21,6 @@ @ stdcall I_RpcAbortAsyncCall(ptr long) I_RpcAsyncAbortCall @ stdcall I_RpcAllocate(long) @ stdcall I_RpcAsyncAbortCall(ptr long) -@ stub I_RpcAsyncSendReceive # NT4 @ stdcall I_RpcAsyncSetHandle(ptr ptr) @ stub I_RpcBCacheAllocate @ stub I_RpcBCacheFree @@ -39,7 +38,6 @@ @ stdcall I_RpcBindingSetAsync(ptr ptr) @ stub I_RpcBindingToStaticStringBindingW @ stub I_RpcClearMutex -@ stub I_RpcConnectionInqSockBuffSize2 @ stub I_RpcConnectionInqSockBuffSize @ stub I_RpcConnectionSetSockBuffSize @ stub I_RpcDeleteMutex @@ -48,19 +46,13 @@ @ stdcall I_RpcFree(ptr) @ stdcall I_RpcFreeBuffer(ptr) @ stub I_RpcFreePipeBuffer -@ stub I_RpcGetAssociationContext @ stdcall I_RpcGetBuffer(ptr) @ stub I_RpcGetBufferWithObject @ stdcall I_RpcGetCurrentCallHandle() @ stub I_RpcGetExtendedError -@ stub I_RpcGetServerContextList -@ stub I_RpcGetThreadEvent # win9x -@ stub I_RpcGetThreadWindowHandle # win9x @ stub I_RpcIfInqTransferSyntaxes -@ stub I_RpcLaunchDatagramReceiveThread # win9x @ stub I_RpcLogEvent @ stdcall I_RpcMapWin32Status(long) -@ stub I_RpcMonitorAssociation @ stub I_RpcNegotiateTransferSyntax # wxp @ stub I_RpcNsBindingSetEntryName @ stub I_RpcNsBindingSetEntryNameA @@ -83,46 +75,24 @@ @ stub I_RpcServerSetAddressChangeFn @ stdcall I_RpcServerStartListening(ptr) # win9x @ stdcall I_RpcServerStopListening() # win9x -@ stub I_RpcServerUnregisterEndpointA # win9x -@ stub I_RpcServerUnregisterEndpointW # win9x @ stub I_RpcServerUseProtseq2A @ stub I_RpcServerUseProtseq2W @ stub I_RpcServerUseProtseqEp2A @ stub I_RpcServerUseProtseqEp2W -@ stub I_RpcSetAssociationContext # win9x @ stub I_RpcSetAsyncHandle -@ stub I_RpcSetServerContextList -@ stub I_RpcSetThreadParams # win9x -@ stub I_RpcSetWMsgEndpoint # NT4 @ stub I_RpcSsDontSerializeContext -@ stub I_RpcStopMonitorAssociation @ stub I_RpcSystemFunction001 # wxp (oh, brother!) -@ stub I_RpcTransCancelMigration # win9x -@ stub I_RpcTransClientMaxFrag # win9x -@ stub I_RpcTransClientReallocBuffer # win9x @ stub I_RpcTransConnectionAllocatePacket @ stub I_RpcTransConnectionFreePacket @ stub I_RpcTransConnectionReallocPacket @ stub I_RpcTransDatagramAllocate2 @ stub I_RpcTransDatagramAllocate @ stub I_RpcTransDatagramFree -@ stub I_RpcTransGetAddressList @ stub I_RpcTransGetThreadEvent @ stub I_RpcTransIoCancelled -@ stub I_RpcTransMaybeMakeReceiveAny # win9x -@ stub I_RpcTransMaybeMakeReceiveDirect # win9x -@ stub I_RpcTransPingServer # win9x -@ stub I_RpcTransServerFindConnection # win9x -@ stub I_RpcTransServerFreeBuffer # win9x -@ stub I_RpcTransServerMaxFrag # win9x @ stub I_RpcTransServerNewConnection -@ stub I_RpcTransServerProtectThread # win9x -@ stub I_RpcTransServerReallocBuffer # win9x -@ stub I_RpcTransServerReceiveDirectReady # win9x -@ stub I_RpcTransServerUnprotectThread # win9x @ stub I_RpcTurnOnEEInfoPropagation # wxp @ stdcall I_RpcWindowProc(ptr long long long) # win9x -@ stub I_RpcltDebugSetPDUFilter @ stub I_UuidCreate @ stub MIDL_wchar_strcpy @ stub MIDL_wchar_strlen @@ -135,8 +105,6 @@ @ stub MesHandleFree @ stub MesIncrementalHandleReset @ stub MesInqProcEncodingId -@ stub MqGetContext # win9x -@ stub MqRegisterQueue # win9x @ stdcall NDRCContextBinding(ptr) @ stdcall NDRCContextMarshall(ptr ptr) @ stdcall NDRCContextUnmarshall(ptr ptr ptr long) @@ -361,7 +329,6 @@ @ stub NdrpReleaseTypeGenCookie # wxp @ stub NdrpSetRpcSsDefaults @ stub NdrpVarVtOfTypeDesc # wxp -@ stub PerformRpcInitialization @ stdcall RpcAbortAsyncCall(ptr long) RpcAsyncAbortCall @ stdcall RpcAsyncAbortCall(ptr long) @ stdcall RpcAsyncCancelCall(ptr long) @@ -421,8 +388,6 @@ @ stub RpcIfInqId @ stdcall RpcImpersonateClient(ptr) @ stdcall RpcInitializeAsyncHandle(ptr long) RpcAsyncInitializeHandle -@ stub RpcMgmtBindingInqParameter # win9x -@ stub RpcMgmtBindingSetParameter # win9x @ stdcall RpcMgmtEnableIdleCleanup() @ stdcall RpcMgmtEpEltInqBegin(ptr long ptr long ptr ptr) @ stub RpcMgmtEpEltInqDone @@ -432,7 +397,6 @@ @ stub RpcMgmtInqComTimeout @ stub RpcMgmtInqDefaultProtectLevel @ stdcall RpcMgmtInqIfIds(ptr ptr) -@ stub RpcMgmtInqParameter # win9x @ stub RpcMgmtInqServerPrincNameA @ stub RpcMgmtInqServerPrincNameW @ stub RpcMgmtInqStats @@ -440,7 +404,6 @@ @ stub RpcMgmtSetAuthorizationFn @ stdcall RpcMgmtSetCancelTimeout(long) @ stdcall RpcMgmtSetComTimeout(ptr long) -@ stub RpcMgmtSetParameter # win9x @ stdcall RpcMgmtSetServerStackSize(long) @ stub RpcMgmtStatsVectorFree @ stdcall RpcMgmtStopServerListening(ptr) @@ -526,7 +489,6 @@ @ stub SimpleTypeAlignment # wxp @ stub SimpleTypeBufferSize # wxp @ stub SimpleTypeMemorySize # wxp -@ stub StartServiceIfNecessary # win9x @ stdcall TowerConstruct(ptr ptr ptr ptr ptr ptr) @ stdcall TowerExplode(ptr ptr ptr ptr ptr ptr) @ stdcall UuidCompare(ptr ptr ptr)

1 0

[fireball] 32262: Winesync to Wine-0.9.55.
by fireball＠svn.reactos.org 10 Feb '08

10 Feb '08

Author: fireball Date: Sun Feb 10 16:22:36 2008 New Revision: 32262 URL: http://svn.reactos.org/svn/reactos?rev=32262&view=rev Log: Winesync to Wine-0.9.55. Added: trunk/rostests/winetests/msi/automation.c (with props) trunk/rostests/winetests/msi/source.c (with props) Modified: trunk/rostests/winetests/msi/db.c trunk/rostests/winetests/msi/format.c trunk/rostests/winetests/msi/install.c trunk/rostests/winetests/msi/msi.c trunk/rostests/winetests/msi/msi.rbuild trunk/rostests/winetests/msi/package.c trunk/rostests/winetests/msi/record.c trunk/rostests/winetests/msi/suminfo.c trunk/rostests/winetests/msi/testlist.c [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/rostests/winetests/msi/automation.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/automation.… Modified: trunk/rostests/winetests/msi/db.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/db.c?rev=32… Modified: trunk/rostests/winetests/msi/format.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/format.c?re… Modified: trunk/rostests/winetests/msi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/install.c?r… Modified: trunk/rostests/winetests/msi/msi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/msi.c?rev=3… Modified: trunk/rostests/winetests/msi/msi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/msi.rbuild?… Modified: trunk/rostests/winetests/msi/package.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/package.c?r… Modified: trunk/rostests/winetests/msi/record.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/record.c?re… Added: trunk/rostests/winetests/msi/source.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/source.c?re… Modified: trunk/rostests/winetests/msi/suminfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/suminfo.c?r… Modified: trunk/rostests/winetests/msi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/testlist.c?…

1 0

[fireball] 32261: Winesync to Wine-0.9.55.
by fireball＠svn.reactos.org 10 Feb '08

10 Feb '08

Author: fireball Date: Sun Feb 10 16:16:32 2008 New Revision: 32261 URL: http://svn.reactos.org/svn/reactos?rev=32261&view=rev Log: Winesync to Wine-0.9.55. Modified: trunk/reactos/dll/win32/msi/action.c trunk/reactos/dll/win32/msi/database.c trunk/reactos/dll/win32/msi/files.c trunk/reactos/dll/win32/msi/format.c trunk/reactos/dll/win32/msi/msi.c trunk/reactos/dll/win32/msi/registry.c trunk/reactos/dll/win32/msi/streams.c Modified: trunk/reactos/dll/win32/msi/action.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/action.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/action.c (original) +++ trunk/reactos/dll/win32/msi/action.c Sun Feb 10 16:16:32 2008 @@ -2240,6 +2240,7 @@ DWORD *size) { LPSTR data = NULL; + if (value[0]=='#' && value[1]!='#' && value[1]!='%') { if (value[1]=='x') @@ -2321,6 +2322,7 @@ { static const WCHAR szMulti[] = {'[','~',']',0}; LPCWSTR ptr; + LPWSTR newdata; *type=REG_SZ; if (value[0]=='#') @@ -2339,7 +2341,29 @@ if (strstrW(value,szMulti)) *type = REG_MULTI_SZ; + /* remove initial delimiter */ + if (!strncmpW(value, szMulti, 3)) + ptr = value + 3; + *size = deformat_string(package, ptr,(LPWSTR*)&data); + + /* add double NULL terminator */ + if (*type == REG_MULTI_SZ) + { + *size += sizeof(WCHAR); + newdata = msi_alloc(*size); + if (!newdata) + { + msi_free(data); + return NULL; + } + + memcpy(newdata, data, *size - 1); + newdata[*size] = '\0'; + + msi_free(data); + data = (LPSTR)newdata; + } } return data; } Modified: trunk/reactos/dll/win32/msi/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/database.c?r… ============================================================================== --- trunk/reactos/dll/win32/msi/database.c (original) +++ trunk/reactos/dll/win32/msi/database.c Sun Feb 10 16:16:32 2008 @@ -408,6 +408,10 @@ else type = type_long; break; + default: + ERR("Unknown type: %c\n", types[i][0]); + msi_free(columns); + return NULL; } sprintfW(expanded, column_fmt, columns_data[i], type, size, extra, comma); Modified: trunk/reactos/dll/win32/msi/files.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/files.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/msi/files.c (original) +++ trunk/reactos/dll/win32/msi/files.c Sun Feb 10 16:16:32 2008 @@ -901,12 +901,10 @@ } dest = build_directory_name(2, dest_path, dest_name); - create_full_pathW(dest); + create_full_pathW(dest_path); TRACE("Duplicating file %s to %s\n",debugstr_w(file->TargetPath), debugstr_w(dest)); - - CreateDirectoryW(dest_path, NULL); if (strcmpW(file->TargetPath,dest)) rc = !CopyFileW(file->TargetPath,dest,TRUE); Modified: trunk/reactos/dll/win32/msi/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/format.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/format.c (original) +++ trunk/reactos/dll/win32/msi/format.c Sun Feb 10 16:16:32 2008 @@ -19,10 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* -http://msdn.microsoft.com/library/default.asp?url=/library/en-us/msi/setup/msiformatrecord.asp - */ - #include <stdarg.h> #include <stdio.h> @@ -43,11 +39,288 @@ WINE_DEFAULT_DEBUG_CHANNEL(msi); - -static DWORD deformat_string_internal(MSIPACKAGE *package, LPCWSTR ptr, - WCHAR** data, DWORD len, MSIRECORD* record, - BOOL* in_group); - +/* types arranged by precedence */ +#define FORMAT_NULL 0x0001 +#define FORMAT_LITERAL 0x0002 +#define FORMAT_NUMBER 0x0004 +#define FORMAT_LBRACK 0x0010 +#define FORMAT_LBRACE 0x0020 +#define FORMAT_RBRACK 0x0011 +#define FORMAT_RBRACE 0x0021 +#define FORMAT_ESCAPE 0x0040 +#define FORMAT_PROPNULL 0x0080 +#define FORMAT_ERROR 0x1000 +#define FORMAT_FAIL 0x2000 + +#define left_type(x) (x & 0xF0) + +typedef struct _tagFORMAT +{ + MSIPACKAGE *package; + MSIRECORD *record; + LPWSTR deformatted; + int len; + int n; + BOOL propfailed; + BOOL groupfailed; + int groups; +} FORMAT; + +typedef struct _tagFORMSTR +{ + struct list entry; + int n; + int len; + int type; + BOOL propfound; + BOOL nonprop; +} FORMSTR; + +typedef struct _tagSTACK +{ + struct list items; +} STACK; + +static STACK *create_stack(void) +{ + STACK *stack = msi_alloc(sizeof(STACK)); + list_init(&stack->items); + return stack; +} + +static void free_stack(STACK *stack) +{ + while (!list_empty(&stack->items)) + { + FORMSTR *str = LIST_ENTRY(list_head(&stack->items), FORMSTR, entry); + list_remove(&str->entry); + msi_free(str); + } + + msi_free(stack); +} + +static void stack_push(STACK *stack, FORMSTR *str) +{ + list_add_head(&stack->items, &str->entry); +} + +static FORMSTR *stack_pop(STACK *stack) +{ + FORMSTR *ret; + + if (list_empty(&stack->items)) + return NULL; + + ret = LIST_ENTRY(list_head(&stack->items), FORMSTR, entry); + list_remove(&ret->entry); + return ret; +} + +static FORMSTR *stack_find(STACK *stack, int type) +{ + FORMSTR *str; + + LIST_FOR_EACH_ENTRY(str, &stack->items, FORMSTR, entry) + { + if (str->type == type) + return str; + } + + return NULL; +} + +static FORMSTR *stack_peek(STACK *stack) +{ + return LIST_ENTRY(list_head(&stack->items), FORMSTR, entry); +} + +static LPCWSTR get_formstr_data(FORMAT *format, FORMSTR *str) +{ + return &format->deformatted[str->n]; +} + +static LPWSTR dup_formstr(FORMAT *format, FORMSTR *str) +{ + LPWSTR val; + LPCWSTR data; + + if (str->len == 0) + return NULL; + + val = msi_alloc((str->len + 1) * sizeof(WCHAR)); + data = get_formstr_data(format, str); + lstrcpynW(val, data, str->len + 1); + + return val; +} + +static LPWSTR deformat_index(FORMAT *format, FORMSTR *str) +{ + LPWSTR val, ret; + + val = msi_alloc((str->len + 1) * sizeof(WCHAR)); + lstrcpynW(val, get_formstr_data(format, str), str->len + 1); + + ret = msi_dup_record_field(format->record, atoiW(val)); + + msi_free(val); + return ret; +} + +static LPWSTR deformat_property(FORMAT *format, FORMSTR *str) +{ + LPWSTR val, ret; + + val = msi_alloc((str->len + 1) * sizeof(WCHAR)); + lstrcpynW(val, get_formstr_data(format, str), str->len + 1); + + ret = msi_dup_property(format->package, val); + + msi_free(val); + return ret; +} + +static LPWSTR deformat_component(FORMAT *format, FORMSTR *str) +{ + LPWSTR key, ret = NULL; + MSICOMPONENT *comp; + BOOL source; + + key = msi_alloc((str->len + 1) * sizeof(WCHAR)); + lstrcpynW(key, get_formstr_data(format, str), str->len + 1); + + comp = get_loaded_component(format->package, key); + if (!comp) + goto done; + + source = (comp->Action == INSTALLSTATE_SOURCE) ? TRUE : FALSE; + ret = resolve_folder(format->package, comp->Directory, source, FALSE, TRUE, NULL); + +done: + msi_free(key); + return ret; +} + +static LPWSTR deformat_file(FORMAT *format, FORMSTR *str, BOOL shortname) +{ + LPWSTR key, ret = NULL; + MSIFILE *file; + DWORD size; + + key = msi_alloc((str->len + 1) * sizeof(WCHAR)); + lstrcpynW(key, get_formstr_data(format, str), str->len + 1); + + file = get_loaded_file(format->package, key); + if (!file) + goto done; + + if (!shortname) + { + ret = strdupW(file->TargetPath); + goto done; + } + + size = GetShortPathNameW(file->TargetPath, NULL, 0); + if (size <= 0) + { + ret = strdupW(file->TargetPath); + goto done; + } + + size++; + ret = msi_alloc(size * sizeof(WCHAR)); + GetShortPathNameW(file->TargetPath, ret, size); + +done: + msi_free(key); + return ret; +} + +static LPWSTR deformat_environment(FORMAT *format, FORMSTR *str) +{ + LPWSTR key, ret = NULL; + DWORD sz; + + key = msi_alloc((str->len + 1) * sizeof(WCHAR)); + lstrcpynW(key, get_formstr_data(format, str), str->len + 1); + + sz = GetEnvironmentVariableW(key, NULL ,0); + if (sz <= 0) + goto done; + + sz++; + ret = msi_alloc(sz * sizeof(WCHAR)); + GetEnvironmentVariableW(key, ret, sz); + +done: + msi_free(key); + return ret; +} + +static LPWSTR deformat_literal(FORMAT *format, FORMSTR *str, BOOL *propfound, + BOOL *nonprop, int *type) +{ + LPCWSTR data = get_formstr_data(format, str); + LPWSTR replaced = NULL; + char ch = data[0]; + + if (ch == '\\') + { + str->n++; + if (str->len == 1) + { + str->len = 0; + replaced = NULL; + } + else + { + str->len = 1; + replaced = dup_formstr(format, str); + } + } + else if (ch == '~') + { + if (str->len != 1) + replaced = NULL; + else + { + replaced = msi_alloc(sizeof(WCHAR)); + *replaced = '\0'; + } + } + else if (ch == '%' || ch == '#' || ch == '!' || ch == '$') + { + str->n++; + str->len--; + + switch (ch) + { + case '%': + replaced = deformat_environment(format, str); break; + case '#': + replaced = deformat_file(format, str, FALSE); break; + case '!': + replaced = deformat_file(format, str, TRUE); break; + case '$': + replaced = deformat_component(format, str); break; + } + + *type = FORMAT_LITERAL; + } + else + { + replaced = deformat_property(format, str); + *type = FORMAT_LITERAL; + + if (replaced) + *propfound = TRUE; + else + format->propfailed = TRUE; + } + + return replaced; +} static LPWSTR build_default_format(const MSIRECORD* record) { @@ -70,7 +343,7 @@ size = 1; for (i = 1; i <= count; i++) { - sprintfW(index,fmt_index,i); + sprintfW(index, fmt_index, i); str = MSI_RecordGetString(record, i); len = (str) ? lstrlenW(str) : 0; len += (sizeof(fmt_null) - 3) + lstrlenW(index); @@ -84,9 +357,9 @@ } if (str) - sprintfW(buf,fmt,i,str); + sprintfW(buf, fmt, i, str); else - sprintfW(buf,fmt_null,i); + sprintfW(buf, fmt_null, i); if (!rc) { @@ -99,516 +372,493 @@ lstrcatW(rc, buf); } } + msi_free(buf); return rc; } -static const WCHAR* scanW(LPCWSTR buf, WCHAR token, DWORD len) -{ - DWORD i; - for (i = 0; i < len; i++) - if (buf[i] == token) - return &buf[i]; - return NULL; -} - -/* break out helper functions for deformating */ -static LPWSTR deformat_component(MSIPACKAGE* package, LPCWSTR key, DWORD* sz) -{ - LPWSTR value = NULL; - MSICOMPONENT *comp; - BOOL source; - - *sz = 0; - if (!package) +static BOOL format_is_number(WCHAR x) +{ + return ((x >= '0') && (x <= '9')); +} + +static BOOL format_str_is_number(LPWSTR str) +{ + LPWSTR ptr; + + for (ptr = str; *ptr; ptr++) + if (!format_is_number(*ptr)) + return FALSE; + + return TRUE; +} + +static BOOL format_is_alpha(WCHAR x) +{ + return (!format_is_number(x) && x != '\0' && + x != '[' && x != ']' && x != '{' && x != '}'); +} + +static BOOL format_is_literal(WCHAR x) +{ + return (format_is_alpha(x) || format_is_number(x)); +} + +static int format_lex(FORMAT *format, FORMSTR **out) +{ + int type, len = 1; + FORMSTR *str; + LPCWSTR data; + WCHAR ch; + + *out = NULL; + + if (!format->deformatted) + return FORMAT_NULL; + + *out = msi_alloc_zero(sizeof(FORMSTR)); + if (!*out) + return FORMAT_FAIL; + + str = *out; + str->n = format->n; + str->len = 1; + data = get_formstr_data(format, str); + + ch = data[0]; + switch (ch) + { + case '{': type = FORMAT_LBRACE; break; + case '}': type = FORMAT_RBRACE; break; + case '[': type = FORMAT_LBRACK; break; + case ']': type = FORMAT_RBRACK; break; + case '~': type = FORMAT_PROPNULL; break; + case '\0': type = FORMAT_NULL; break; + + default: + type = 0; + } + + if (type) + { + str->type = type; + format->n++; + return type; + } + + if (ch == '\\') + { + while (data[len] && data[len] != ']') + len++; + + type = FORMAT_ESCAPE; + } + else if (format_is_alpha(ch)) + { + while (format_is_literal(data[len])) + len++; + + type = FORMAT_LITERAL; + } + else if (format_is_number(ch)) + { + while (format_is_number(data[len])) + len++; + + type = FORMAT_NUMBER; + + if (data[len] != ']') + { + while (format_is_literal(data[len])) + len++; + + type = FORMAT_LITERAL; + } + } + else + { + ERR("Got unknown character %c(%x)\n", ch, ch); + return FORMAT_ERROR; + } + + format->n += len; + str->len = len; + str->type = type; + + return type; +} + +static FORMSTR *format_replace(FORMAT *format, BOOL propfound, BOOL nonprop, + int oldsize, int type, LPWSTR replace) +{ + FORMSTR *ret; + LPWSTR str, ptr; + DWORD size = 0; + int n; + + if (replace) + { + if (!*replace) + size = 1; + else + size = lstrlenW(replace); + } + + size -= oldsize; + size = format->len + size + 1; + + if (size <= 1) + { + msi_free(format->deformatted); + format->deformatted = NULL; + format->len = 0; return NULL; - - comp = get_loaded_component(package,key); - if (comp) - { - source = (comp->Action == INSTALLSTATE_SOURCE) ? TRUE : FALSE; - value = resolve_folder(package, comp->Directory, source, FALSE, TRUE, NULL); - *sz = (strlenW(value)) * sizeof(WCHAR); - } - - return value; -} - -static LPWSTR deformat_file(MSIPACKAGE* package, LPCWSTR key, DWORD* sz, - BOOL shortname) -{ - LPWSTR value = NULL; - MSIFILE *file; - - *sz = 0; - - if (!package) + } + + str = msi_alloc(size * sizeof(WCHAR)); + if (!str) return NULL; - file = get_loaded_file( package, key ); - if (file) - { - if (!shortname) - { - value = strdupW( file->TargetPath ); - *sz = (strlenW(value)) * sizeof(WCHAR); + str[0] = '\0'; + memcpy(str, format->deformatted, format->n * sizeof(WCHAR)); + n = format->n; + + if (replace) + { + if (!*replace) + { + str[n] = '\0'; + n++; } else { - DWORD size = 0; - size = GetShortPathNameW( file->TargetPath, NULL, 0 ); - - if (size > 0) - { - *sz = (size-1) * sizeof (WCHAR); - size ++; - value = msi_alloc(size * sizeof(WCHAR)); - GetShortPathNameW( file->TargetPath, value, size ); - } - else - { - value = strdupW( file->TargetPath ); - *sz = (lstrlenW(value)) * sizeof(WCHAR); - } - } - } - - return value; -} - -static LPWSTR deformat_environment(MSIPACKAGE* package, LPCWSTR key, - DWORD* chunk) -{ - LPWSTR value = NULL; - DWORD sz; - - sz = GetEnvironmentVariableW(key,NULL,0); - if (sz > 0) - { - sz++; - value = msi_alloc(sz * sizeof(WCHAR)); - GetEnvironmentVariableW(key,value,sz); - *chunk = (strlenW(value)) * sizeof(WCHAR); + lstrcpyW(&str[n], replace); + n += lstrlenW(replace); + } + } + + ptr = &format->deformatted[format->n + oldsize]; + memcpy(&str[n], ptr, (lstrlenW(ptr) + 1) * sizeof(WCHAR)); + + msi_free(format->deformatted); + format->deformatted = str; + format->len = size - 1; + + if (!replace) + return NULL; + + ret = msi_alloc_zero(sizeof(FORMSTR)); + if (!ret) + return NULL; + + ret->len = lstrlenW(replace); + ret->type = type; + ret->n = format->n; + ret->propfound = propfound; + ret->nonprop = nonprop; + + return ret; +} + +static LPWSTR replace_stack_group(FORMAT *format, STACK *values, + BOOL *propfound, BOOL *nonprop, + int *oldsize, int *type) +{ + LPWSTR replaced = NULL; + FORMSTR *content; + FORMSTR *node; + int n; + + *nonprop = FALSE; + *propfound = FALSE; + + node = stack_pop(values); + n = node->n; + *oldsize = node->len; + msi_free(node); + + while ((node = stack_pop(values))) + { + *oldsize += node->len; + + if (node->nonprop) + *nonprop = TRUE; + + if (node->propfound) + *propfound = TRUE; + + msi_free(node); + } + + content = msi_alloc_zero(sizeof(FORMSTR)); + content->n = n; + content->len = *oldsize; + content->type = FORMAT_LITERAL; + + if (!format->groupfailed && (*oldsize == 2 || + (format->propfailed && !*nonprop))) + { + msi_free(content); + return NULL; + } + else if (format->deformatted[content->n + 1] == '{' && + format->deformatted[content->n + content->len - 2] == '}') + { + format->groupfailed = FALSE; + content->len = 0; + } + else if (*propfound && !*nonprop && + !format->groupfailed && format->groups == 0) + { + content->n++; + content->len -= 2; } else { - WARN("Unknown environment variable %s\n", debugstr_w(key)); - *chunk = 0; - value = NULL; - } - return value; -} - - -static LPWSTR deformat_NULL(DWORD* chunk) -{ - LPWSTR value; - - value = msi_alloc(sizeof(WCHAR)*2); - value[0] = 0; - *chunk = sizeof(WCHAR); - return value; -} - -static LPWSTR deformat_escape(LPCWSTR key, DWORD* chunk) -{ - LPWSTR value; - - value = msi_alloc(sizeof(WCHAR)*2); - value[0] = key[0]; - *chunk = sizeof(WCHAR); - - return value; -} - - -static BOOL is_key_number(LPCWSTR key) -{ - INT index = 0; - if (key[0] == 0) - return FALSE; - - while (isdigitW(key[index])) index++; - if (key[index] == 0) - return TRUE; + if (format->groups != 0) + format->groupfailed = TRUE; + + *nonprop = TRUE; + } + + replaced = dup_formstr(format, content); + *type = content->type; + msi_free(content); + + if (format->groups == 0) + format->propfailed = FALSE; + + return replaced; +} + +static LPWSTR replace_stack_prop(FORMAT *format, STACK *values, + BOOL *propfound, BOOL *nonprop, + int *oldsize, int *type) +{ + LPWSTR replaced = NULL; + FORMSTR *content; + FORMSTR *node; + int n; + + *propfound = FALSE; + *nonprop = FALSE; + + node = stack_pop(values); + n = node->n; + *oldsize = node->len; + *type = stack_peek(values)->type; + msi_free(node); + + while ((node = stack_pop(values))) + { + *oldsize += node->len; + + if (*type != FORMAT_ESCAPE && + stack_peek(values) && node->type != *type) + *type = FORMAT_LITERAL; + + msi_free(node); + } + + content = msi_alloc_zero(sizeof(FORMSTR)); + content->n = n + 1; + content->len = *oldsize - 2; + content->type = *type; + + if (*type == FORMAT_NUMBER) + { + replaced = deformat_index(format, content); + if (replaced) + *propfound = TRUE; + else + format->propfailed = TRUE; + + if (replaced) + *type = format_str_is_number(replaced) ? + FORMAT_NUMBER : FORMAT_LITERAL; + } + else if (format->package) + { + replaced = deformat_literal(format, content, propfound, nonprop, type); + } else - return FALSE; -} - -static LPWSTR deformat_index(MSIRECORD* record, LPCWSTR key, DWORD* chunk ) -{ - INT index; - LPWSTR value; - - index = atoiW(key); - TRACE("record index %i\n",index); - value = msi_dup_record_field(record,index); - if (value) - *chunk = strlenW(value) * sizeof(WCHAR); - else - { - value = NULL; - *chunk = 0; - } - return value; -} - -static LPWSTR deformat_property(MSIPACKAGE* package, LPCWSTR key, DWORD* chunk) -{ - LPWSTR value; - - if (!package) - return NULL; - - value = msi_dup_property( package, key ); - - if (value) - *chunk = (strlenW(value)) * sizeof(WCHAR); - - return value; -} - -/* - * Groups cannot be nested. They are just treated as from { to next } - */ -static BOOL find_next_group(LPCWSTR source, DWORD len_remaining, - LPWSTR *group, LPCWSTR *mark, - LPCWSTR* mark2) -{ - int i; - BOOL found = FALSE; - - *mark = scanW(source,'{',len_remaining); - if (!*mark) - return FALSE; - - for (i = 1; (*mark - source) + i < len_remaining; i++) - { - if ((*mark)[i] == '}') - { - found = TRUE; - break; - } - } - if (! found) - return FALSE; - - *mark2 = &(*mark)[i]; - - i = *mark2 - *mark; - *group = msi_alloc(i*sizeof(WCHAR)); - - i -= 1; - memcpy(*group,&(*mark)[1],i*sizeof(WCHAR)); - (*group)[i] = 0; - - TRACE("Found group %s\n",debugstr_w(*group)); - return TRUE; -} - - -static BOOL find_next_outermost_key(LPCWSTR source, DWORD len_remaining, - LPWSTR *key, LPCWSTR *mark, LPCWSTR* mark2, - BOOL *nested) -{ - INT count = 0; - INT total_count = 0; - int i; - - *nested = FALSE; - *mark = scanW(source,'[',len_remaining); - if (!*mark) - return FALSE; - - count = 1; - total_count = 1; - for (i = 1; (*mark - source) + i < len_remaining && count > 0; i++) - { - if ((*mark)[i] == '[' && (*mark)[i-1] != '\\') - { - count ++; - total_count ++; - *nested = TRUE; - } - else if ((*mark)[i] == ']' && (*mark)[i-1] != '\\') - { - count --; - } + { + *nonprop = TRUE; + content->n--; + content->len += 2; + replaced = dup_formstr(format, content); + } + + msi_free(content); + return replaced; +} + +static UINT replace_stack(FORMAT *format, STACK *stack, STACK *values) +{ + LPWSTR replaced = NULL; + FORMSTR *beg; + FORMSTR *top; + FORMSTR *node; + BOOL propfound = FALSE; + BOOL nonprop = FALSE; + BOOL group = FALSE; + int oldsize = 0; + int type, n; + + node = stack_peek(values); + type = node->type; + n = node->n; + + if (type == FORMAT_LBRACK) + replaced = replace_stack_prop(format, values, &propfound, + &nonprop, &oldsize, &type); + else if (type == FORMAT_LBRACE) + { + replaced = replace_stack_group(format, values, &propfound, + &nonprop, &oldsize, &type); + group = TRUE; + } + + format->n = n; + beg = format_replace(format, propfound, nonprop, oldsize, type, replaced); + if (!beg) + return ERROR_SUCCESS; + + msi_free(replaced); + format->n = beg->n + beg->len; + + if (type == FORMAT_PROPNULL) + format->n++; + + top = stack_peek(stack); + if (top) + { + type = top->type; + + if ((type == FORMAT_LITERAL || type == FORMAT_NUMBER) && + type == beg->type) + { + top->len += beg->len; + + if (group) + top->nonprop = FALSE; + + if (type == FORMAT_LITERAL) + top->nonprop = beg->nonprop; + + if (beg->propfound) + top->propfound = TRUE; + + msi_free(beg); + return ERROR_SUCCESS; + } + } + + stack_push(stack, beg); + return ERROR_SUCCESS; +} + +static BOOL verify_format(LPWSTR data) +{ + int count = 0; + + while (*data) + { + if (*data == '[' && *(data - 1) != '\\') + count++; + else if (*data == ']') + count--; + + data++; } if (count > 0) return FALSE; - *mark2 = &(*mark)[i-1]; - - i = *mark2 - *mark; - *key = msi_alloc(i*sizeof(WCHAR)); - /* do not have the [] in the key */ - i -= 1; - memcpy(*key,&(*mark)[1],i*sizeof(WCHAR)); - (*key)[i] = 0; - - TRACE("Found Key %s\n",debugstr_w(*key)); return TRUE; } -static LPWSTR deformat_group(MSIPACKAGE* package, LPWSTR group, DWORD len, - MSIRECORD* record, DWORD* size) -{ - LPWSTR value = NULL; - LPCWSTR mark, mark2; - LPWSTR key; - BOOL nested; - INT failcount; - static const WCHAR fmt[] = {'{','%','s','}',0}; - UINT sz; - - if (!group || group[0] == 0) - { - *size = 0; - return NULL; - } - /* if no [] then group is returned as is */ - - if (!find_next_outermost_key(group, len, &key, &mark, &mark2, &nested)) - { - *size = (len+2)*sizeof(WCHAR); - value = msi_alloc(*size); - sprintfW(value,fmt,group); - /* do not return size of the null at the end */ - *size = (len+1)*sizeof(WCHAR); - return value; - } - - msi_free(key); - failcount = 0; - sz = deformat_string_internal(package, group, &value, strlenW(group), - record, &failcount); - if (failcount==0) - { - *size = sz * sizeof(WCHAR); - return value; - } - else if (failcount < 0) - { - LPWSTR v2; - - v2 = msi_alloc((sz+2)*sizeof(WCHAR)); - v2[0] = '{'; - memcpy(&v2[1],value,sz*sizeof(WCHAR)); - v2[sz+1]='}'; - msi_free(value); - - *size = (sz+2)*sizeof(WCHAR); - return v2; - } - else - { - msi_free(value); - *size = 0; - return NULL; - } -} - - -/* - * len is in WCHARs - * return is also in WCHARs - */ static DWORD deformat_string_internal(MSIPACKAGE *package, LPCWSTR ptr, - WCHAR** data, DWORD len, MSIRECORD* record, - INT* failcount) -{ - LPCWSTR mark = NULL; - LPCWSTR mark2 = NULL; - DWORD size=0; - DWORD chunk=0; - LPWSTR key; - LPWSTR value = NULL; - DWORD sz; - LPBYTE newdata = NULL; - const WCHAR* progress = NULL; - BOOL nested = FALSE; - - if (ptr==NULL) - { - TRACE("Deformatting NULL string\n"); + WCHAR** data, DWORD *len, + MSIRECORD* record, INT* failcount) +{ + FORMAT format; + FORMSTR *str = NULL; + STACK *stack, *temp; + FORMSTR *node; + int type; + + if (!ptr) + { *data = NULL; - return 0; - } - - TRACE("Starting with %s\n",debugstr_wn(ptr,len)); - - /* scan for special characters... fast exit */ - if ((!scanW(ptr,'[',len) || (scanW(ptr,'[',len) && !scanW(ptr,']',len))) && - (scanW(ptr,'{',len) && !scanW(ptr,'}',len))) - { - /* not formatted */ - *data = msi_alloc((len*sizeof(WCHAR))); - memcpy(*data,ptr,len*sizeof(WCHAR)); - TRACE("Returning %s\n",debugstr_wn(*data,len)); - return len; - } - - progress = ptr; - - while (progress - ptr < len) - { - /* seek out first group if existing */ - if (find_next_group(progress, len - (progress - ptr), &key, - &mark, &mark2)) - { - value = deformat_group(package, key, strlenW(key)+1, record, - &chunk); - msi_free( key ); - key = NULL; - nested = FALSE; - } - /* formatted string located */ - else if (!find_next_outermost_key(progress, len - (progress - ptr), - &key, &mark, &mark2, &nested)) - { - LPBYTE nd2; - - TRACE("after value %s\n", debugstr_wn((LPWSTR)newdata, - size/sizeof(WCHAR))); - chunk = (len - (progress - ptr)) * sizeof(WCHAR); - TRACE("after chunk is %i + %i\n",size,chunk); - if (size) - nd2 = msi_realloc(newdata,(size+chunk)); - else - nd2 = msi_alloc(chunk); - - newdata = nd2; - memcpy(&newdata[size],progress,chunk); - size+=chunk; - break; - } - - if (mark != progress) - { - LPBYTE tgt; - DWORD old_size = size; - INT cnt = (mark - progress); - TRACE("%i (%i) characters before marker\n",cnt,(mark-progress)); - size += cnt * sizeof(WCHAR); - if (!old_size) - tgt = msi_alloc(size); - else - tgt = msi_realloc(newdata,size); - newdata = tgt; - memcpy(&newdata[old_size],progress,(cnt * sizeof(WCHAR))); - } - - progress = mark; - - if (nested) - { - TRACE("Nested key... %s\n",debugstr_w(key)); - deformat_string_internal(package, key, &value, strlenW(key)+1, - record, failcount); - - msi_free(key); - key = value; - } - - TRACE("Current %s .. %s\n",debugstr_wn((LPWSTR)newdata, - size/sizeof(WCHAR)),debugstr_w(key)); - - if (!package) - { - /* only deformat number indexs */ - if (key && is_key_number(key)) + *len = 0; + return ERROR_SUCCESS; + } + + *data = strdupW(ptr); + *len = lstrlenW(ptr); + + ZeroMemory(&format, sizeof(FORMAT)); + format.package = package; + format.record = record; + format.deformatted = *data; + format.len = *len; + + stack = create_stack(); + temp = create_stack(); + + if (!verify_format(*data)) + return ERROR_SUCCESS; + + while ((type = format_lex(&format, &str)) != FORMAT_NULL) + { + if (type == FORMAT_LBRACK || type == FORMAT_LBRACE || + type == FORMAT_LITERAL || type == FORMAT_NUMBER || + type == FORMAT_ESCAPE || type == FORMAT_PROPNULL) + { + if (type == FORMAT_LBRACE) { - value = deformat_index(record,key,&chunk); - if (!chunk && failcount && *failcount >= 0) - (*failcount)++; + format.propfailed = FALSE; + format.groups++; } - else + else if (type == FORMAT_ESCAPE && + !stack_find(stack, FORMAT_LBRACK)) { - if (failcount) - *failcount = -1; - if(key) + format.n -= str->len - 1; + str->len = 1; + } + + stack_push(stack, str); + } + else if (type == FORMAT_RBRACK || type == FORMAT_RBRACE) + { + if (type == FORMAT_RBRACE) + format.groups--; + + stack_push(stack, str); + + if (stack_find(stack, left_type(type))) + { + do { - DWORD keylen = strlenW(key); - chunk = (keylen + 2)*sizeof(WCHAR); - value = msi_alloc(chunk); - value[0] = '['; - memcpy(&value[1],key,keylen*sizeof(WCHAR)); - value[1+keylen] = ']'; - } + node = stack_pop(stack); + stack_push(temp, node); + } while (node->type != left_type(type)); + + replace_stack(&format, stack, temp); } } - else - { - sz = 0; - if (key) switch (key[0]) - { - case '~': - value = deformat_NULL(&chunk); - break; - case '$': - value = deformat_component(package,&key[1],&chunk); - break; - case '#': - value = deformat_file(package,&key[1], &chunk, FALSE); - break; - case '!': /* should be short path */ - value = deformat_file(package,&key[1], &chunk, TRUE); - break; - case '\\': - value = deformat_escape(&key[1],&chunk); - break; - case '%': - value = deformat_environment(package,&key[1],&chunk); - break; - default: - /* index keys cannot be nested */ - if (is_key_number(key)) - if (!nested) - value = deformat_index(record,key,&chunk); - else - { - static const WCHAR fmt[] = {'[','%','s',']',0}; - value = msi_alloc(10); - sprintfW(value,fmt,key); - chunk = strlenW(value)*sizeof(WCHAR); - } - else - value = deformat_property(package,key,&chunk); - break; - } - } - - msi_free(key); - - if (value!=NULL) - { - LPBYTE nd2; - TRACE("value %s, chunk %i size %i\n",debugstr_w(value), - chunk, size); - if (size) - nd2= msi_realloc(newdata,(size + chunk)); - else - nd2= msi_alloc(chunk); - newdata = nd2; - memcpy(&newdata[size],value,chunk); - size+=chunk; - msi_free(value); - } - else if (failcount && *failcount >=0 ) - (*failcount)++; - - progress = mark2+1; - } - - TRACE("after everything %s\n",debugstr_wn((LPWSTR)newdata, - size/sizeof(WCHAR))); - - *data = (LPWSTR)newdata; - return size / sizeof(WCHAR); -} - + } + + *data = format.deformatted; + *len = format.len; + + msi_free(str); + free_stack(stack); + free_stack(temp); + + return ERROR_SUCCESS; +} UINT MSI_FormatRecordW( MSIPACKAGE* package, MSIRECORD* record, LPWSTR buffer, LPDWORD size ) @@ -626,9 +876,7 @@ TRACE("(%s)\n",debugstr_w(rec)); - len = deformat_string_internal(package,rec,&deformated, - rec ? strlenW(rec) : 0, record, NULL); - + deformat_string_internal(package, rec, &deformated, &len, record, NULL); if (buffer) { if (*size>len) @@ -770,8 +1018,8 @@ goto done; save = len + 1; - len = WideCharToMultiByte(CP_ACP, 0, value, -1, NULL, 0, NULL, NULL); - WideCharToMultiByte(CP_ACP, 0, value, -1, szResult, *sz, NULL, NULL); + len = WideCharToMultiByte(CP_ACP, 0, value, len + 1, NULL, 0, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, value, len, szResult, *sz, NULL, NULL); if (szResult && len > *sz) { Modified: trunk/reactos/dll/win32/msi/msi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.c?rev=32… ============================================================================== --- trunk/reactos/dll/win32/msi/msi.c (original) +++ trunk/reactos/dll/win32/msi/msi.c Sun Feb 10 16:16:32 2008 @@ -1519,6 +1519,10 @@ LPWSTR szwFilePath = NULL, lpwVersionBuff = NULL, lpwLangBuff = NULL; UINT ret = ERROR_OUTOFMEMORY; + if ((lpVersionBuf && !pcchVersionBuf) || + (lpLangBuf && !pcchLangBuf)) + return ERROR_INVALID_PARAMETER; + if( szFilePath ) { szwFilePath = strdupAtoW( szFilePath ); @@ -1543,12 +1547,12 @@ ret = MsiGetFileVersionW(szwFilePath, lpwVersionBuff, pcchVersionBuf, lpwLangBuff, pcchLangBuf); - if( lpwVersionBuff ) + if( (ret == ERROR_SUCCESS || ret == ERROR_MORE_DATA) && lpwVersionBuff ) WideCharToMultiByte(CP_ACP, 0, lpwVersionBuff, -1, - lpVersionBuf, *pcchVersionBuf, NULL, NULL); - if( lpwLangBuff ) + lpVersionBuf, *pcchVersionBuf + 1, NULL, NULL); + if( (ret == ERROR_SUCCESS || ret == ERROR_MORE_DATA) && lpwLangBuff ) WideCharToMultiByte(CP_ACP, 0, lpwLangBuff, -1, - lpLangBuf, *pcchLangBuf, NULL, NULL); + lpLangBuf, *pcchLangBuf + 1, NULL, NULL); end: msi_free(szwFilePath); @@ -1569,7 +1573,7 @@ '%','d','.','%','d','.','%','d','.','%','d',0}; static const WCHAR szLangFormat[] = {'%','d',0}; UINT ret = 0; - DWORD dwVerLen; + DWORD dwVerLen, gle; LPVOID lpVer = NULL; VS_FIXEDFILEINFO *ffi; UINT puLen; @@ -1579,9 +1583,21 @@ lpVersionBuf, pcchVersionBuf?*pcchVersionBuf:0, lpLangBuf, pcchLangBuf?*pcchLangBuf:0); + if ((lpVersionBuf && !pcchVersionBuf) || + (lpLangBuf && !pcchLangBuf)) + return ERROR_INVALID_PARAMETER; + dwVerLen = GetFileVersionInfoSizeW(szFilePath, NULL); if( !dwVerLen ) - return GetLastError(); + { + gle = GetLastError(); + if (gle == ERROR_BAD_PATHNAME) + return ERROR_FILE_NOT_FOUND; + else if (gle == ERROR_RESOURCE_DATA_NOT_FOUND) + return ERROR_FILE_INVALID; + + return gle; + } lpVer = msi_alloc(dwVerLen); if( !lpVer ) @@ -1595,7 +1611,8 @@ ret = GetLastError(); goto end; } - if( lpVersionBuf && pcchVersionBuf && *pcchVersionBuf ) + + if (pcchVersionBuf) { if( VerQueryValueW(lpVer, szVersionResource, (LPVOID*)&ffi, &puLen) && (puLen > 0) ) @@ -1603,24 +1620,32 @@ wsprintfW(tmp, szVersionFormat, HIWORD(ffi->dwFileVersionMS), LOWORD(ffi->dwFileVersionMS), HIWORD(ffi->dwFileVersionLS), LOWORD(ffi->dwFileVersionLS)); - lstrcpynW(lpVersionBuf, tmp, *pcchVersionBuf); - *pcchVersionBuf = lstrlenW(lpVersionBuf); + if (lpVersionBuf) lstrcpynW(lpVersionBuf, tmp, *pcchVersionBuf); + + if (lstrlenW(tmp) >= *pcchVersionBuf) + ret = ERROR_MORE_DATA; + + *pcchVersionBuf = lstrlenW(tmp); } else { - *lpVersionBuf = 0; + if (lpVersionBuf) *lpVersionBuf = 0; *pcchVersionBuf = 0; } } - if( lpLangBuf && pcchLangBuf && *pcchLangBuf ) + if (pcchLangBuf) { DWORD lang = GetUserDefaultLangID(); FIXME("Retrieve language from file\n"); wsprintfW(tmp, szLangFormat, lang); - lstrcpynW(lpLangBuf, tmp, *pcchLangBuf); - *pcchLangBuf = lstrlenW(lpLangBuf); + if (lpLangBuf) lstrcpynW(lpLangBuf, tmp, *pcchLangBuf); + + if (lstrlenW(tmp) >= *pcchLangBuf) + ret = ERROR_MORE_DATA; + + *pcchLangBuf = lstrlenW(tmp); } end: Modified: trunk/reactos/dll/win32/msi/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/registry.c?r… ============================================================================== --- trunk/reactos/dll/win32/msi/registry.c (original) +++ trunk/reactos/dll/win32/msi/registry.c Sun Feb 10 16:16:32 2008 @@ -478,21 +478,17 @@ return ERROR_FUNCTION_FAILED; size = sizeof(buf); - if (!GetTokenInformation(token, TokenUser, (void *)buf, size, &size)) - { + if (!GetTokenInformation(token, TokenUser, (void *)buf, size, &size)) { CloseHandle(token); return ERROR_FUNCTION_FAILED; } user = (PTOKEN_USER)buf; - if (!ConvertSidToStringSidW(user->User.Sid, usersid)) - { + if (!ConvertSidToStringSidW(user->User.Sid, usersid)) { CloseHandle(token); return ERROR_FUNCTION_FAILED; } - CloseHandle(token); - return ERROR_SUCCESS; } @@ -666,7 +662,7 @@ else rc = RegOpenKeyW(HKEY_LOCAL_MACHINE, keypath, key); - msi_free(usersid); + LocalFree(usersid); return rc; } @@ -743,7 +739,7 @@ else rc = RegOpenKeyW(HKEY_LOCAL_MACHINE, keypath, key); - msi_free(usersid); + LocalFree(usersid); return rc; } @@ -768,7 +764,7 @@ sprintfW(keypath, szUserDataComp_fmt, usersid, comp); - msi_free(usersid); + LocalFree(usersid); return RegDeleteTreeW(HKEY_LOCAL_MACHINE, keypath); } @@ -798,7 +794,7 @@ else rc = RegOpenKeyW(HKEY_LOCAL_MACHINE, keypath, key); - msi_free(usersid); + LocalFree(usersid); return rc; } @@ -828,7 +824,7 @@ else rc = RegOpenKeyW(HKEY_LOCAL_MACHINE, keypath, key); - msi_free(usersid); + LocalFree(usersid); return rc; } @@ -853,7 +849,7 @@ sprintfW(keypath, szUserDataProd_fmt, usersid, squished_pc); - msi_free(usersid); + LocalFree(usersid); return RegDeleteTreeW(HKEY_LOCAL_MACHINE, keypath); } @@ -1043,7 +1039,7 @@ } sprintfW(keypath, szInstaller_LocalManagedProd_fmt, usersid, squished_pc); - msi_free(usersid); + LocalFree(usersid); if (create) return RegCreateKeyW(HKEY_LOCAL_MACHINE, keypath, key); Modified: trunk/reactos/dll/win32/msi/streams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/streams.c?re… ============================================================================== --- trunk/reactos/dll/win32/msi/streams.c (original) +++ trunk/reactos/dll/win32/msi/streams.c Sun Feb 10 16:16:32 2008 @@ -54,9 +54,9 @@ UINT row_size; } MSISTREAMSVIEW; -static BOOL add_stream_to_table(MSISTREAMSVIEW *sv, STREAM *stream, int index) -{ - if (index >= sv->max_streams) +static BOOL streams_set_table_size(MSISTREAMSVIEW *sv, int size) +{ + if (size >= sv->max_streams) { sv->max_streams *= 2; sv->streams = msi_realloc(sv->streams, sv->max_streams * sizeof(STREAM *)); @@ -64,7 +64,6 @@ return FALSE; } - sv->streams[index] = stream; return TRUE; } @@ -139,12 +138,6 @@ } static UINT STREAMS_set_row(struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UINT mask) -{ - FIXME("(%p, %d, %p, %d): stub!\n", view, row, rec, mask); - return ERROR_SUCCESS; -} - -static UINT STREAMS_insert_row(struct tagMSIVIEW *view, MSIRECORD *rec, BOOL temporary) { MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view; STREAM *stream; @@ -156,7 +149,10 @@ ULONG count; UINT r = ERROR_FUNCTION_FAILED; - TRACE("(%p, %p, %d)\n", view, rec, temporary); + TRACE("(%p, %p)\n", view, rec); + + if (row > sv->num_rows) + return ERROR_FUNCTION_FAILED; r = MSI_RecordGetIStream(rec, 2, &stm); if (r != ERROR_SUCCESS) @@ -201,8 +197,7 @@ IStorage_OpenStream(sv->db->storage, name, 0, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stream->stream); - if (!add_stream_to_table(sv, stream, sv->num_rows++)) - goto done; + sv->streams[row] = stream; done: msi_free(name); @@ -211,6 +206,16 @@ IStream_Release(stm); return r; +} + +static UINT STREAMS_insert_row(struct tagMSIVIEW *view, MSIRECORD *rec, BOOL temporary) +{ + MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view; + + if (!streams_set_table_size(sv, ++sv->num_rows)) + return ERROR_FUNCTION_FAILED; + + return STREAMS_set_row(view, sv->num_rows - 1, rec, 0); } static UINT STREAMS_delete_row(struct tagMSIVIEW *view, UINT row) @@ -278,6 +283,52 @@ return ERROR_SUCCESS; } +static UINT streams_find_row(MSISTREAMSVIEW *sv, MSIRECORD *rec, UINT *row) +{ + LPCWSTR str; + UINT i, id, data; + + str = MSI_RecordGetString(rec, 1); + msi_string2idW(sv->db->strings, str, &id); + + for (i = 0; i < sv->num_rows; i++) + { + STREAMS_fetch_int(&sv->view, i, 1, &data); + + if (data == id) + { + *row = i; + return ERROR_SUCCESS; + } + } + + return ERROR_FUNCTION_FAILED; +} + +static UINT streams_modify_update(struct tagMSIVIEW *view, MSIRECORD *rec) +{ + MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view; + UINT r, row; + + r = streams_find_row(sv, rec, &row); + if (r != ERROR_SUCCESS) + return ERROR_FUNCTION_FAILED; + + return STREAMS_set_row(view, row, rec, 0); +} + +static UINT streams_modify_assign(struct tagMSIVIEW *view, MSIRECORD *rec) +{ + MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view; + UINT r, row; + + r = streams_find_row(sv, rec, &row); + if (r == ERROR_SUCCESS) + return streams_modify_update(view, rec); + + return STREAMS_insert_row(view, rec, FALSE); +} + static UINT STREAMS_modify(struct tagMSIVIEW *view, MSIMODIFY eModifyMode, MSIRECORD *rec, UINT row) { UINT r; @@ -286,15 +337,21 @@ switch (eModifyMode) { + case MSIMODIFY_ASSIGN: + r = streams_modify_assign(view, rec); + break; + case MSIMODIFY_INSERT: r = STREAMS_insert_row(view, rec, FALSE); break; + case MSIMODIFY_UPDATE: + r = streams_modify_update(view, rec); + break; + case MSIMODIFY_VALIDATE_NEW: case MSIMODIFY_INSERT_TEMPORARY: - case MSIMODIFY_UPDATE: case MSIMODIFY_REFRESH: - case MSIMODIFY_ASSIGN: case MSIMODIFY_REPLACE: case MSIMODIFY_MERGE: case MSIMODIFY_DELETE: @@ -425,11 +482,13 @@ STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stream->stream); CoTaskMemFree(stat.pwcsName); - if (!add_stream_to_table(sv, stream, count++)) + if (!streams_set_table_size(sv, ++count)) { count = -1; break; } + + sv->streams[count - 1] = stream; } IEnumSTATSTG_Release(stgenum);

1 0

[fireball] 32260: - Fix a leakage during DC deletion (introduced in revision 773), spotted by Samuel Serapion.
by fireball＠svn.reactos.org 10 Feb '08

10 Feb '08

Author: fireball Date: Sun Feb 10 16:06:53 2008 New Revision: 32260 URL: http://svn.reactos.org/svn/reactos?rev=32260&view=rev Log: - Fix a leakage during DC deletion (introduced in revision 773), spotted by Samuel Serapion. Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Sun Feb 10 16:06:53 2008 @@ -997,9 +997,7 @@ { NtGdiDeleteObject (DCToDelete->w.hGCClipRgn); } -#if 0 /* FIXME */ PATH_DestroyGdiPath (&DCToDelete->w.path); -#endif DC_UnlockDc( DCToDelete ); DC_FreeDC ( hDC );

1 0

[fireball] 32259: - Add LSTATUS definition.
by fireball＠svn.reactos.org 10 Feb '08

10 Feb '08

Author: fireball Date: Sun Feb 10 16:00:31 2008 New Revision: 32259 URL: http://svn.reactos.org/svn/reactos?rev=32259&view=rev Log: - Add LSTATUS definition. Modified: trunk/reactos/include/psdk/winreg.h Modified: trunk/reactos/include/psdk/winreg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winreg.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winreg.h (original) +++ trunk/reactos/include/psdk/winreg.h Sun Feb 10 16:00:31 2008 @@ -54,6 +54,7 @@ #ifndef RC_INVOKED typedef ACCESS_MASK REGSAM; +typedef LONG LSTATUS; typedef struct value_entA { LPSTR ve_valuename; DWORD ve_valuelen;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs