Ros-diffs December 2008

ros-diffs@reactos.org

31 participants
710 discussions

[mjmartin] 38394: - Fixes VideoPortGetAccessRanges. - Previous implementation was missing the Device number when searching the bus resulting in failure to find Device and Vendor ID. - Function was also passing NULL for first 4 parameters of HalAssignSlotResources causing failure. - Due to this, the device object was then deleted causing failure when trying to find the display device in Csrss:CsrpInitVideo(). - Part 3 of ? fixes for bug 2286.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Sat Dec 27 11:16:07 2008 New Revision: 38394 URL: http://svn.reactos.org/svn/reactos?rev=38394&view=rev Log: - Fixes VideoPortGetAccessRanges. - Previous implementation was missing the Device number when searching the bus resulting in failure to find Device and Vendor ID. - Function was also passing NULL for first 4 parameters of HalAssignSlotResources causing failure. - Due to this, the device object was then deleted causing failure when trying to find the display device in Csrss:CsrpInitVideo(). - Part 3 of ? fixes for bug 2286. Modified: trunk/reactos/drivers/video/videoprt/resource.c Modified: trunk/reactos/drivers/video/videoprt/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/res… ============================================================================== --- trunk/reactos/drivers/video/videoprt/resource.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/resource.c [iso-8859-1] Sat Dec 27 11:16:07 2008 @@ -401,6 +401,7 @@ IN PULONG Slot) { PCI_SLOT_NUMBER PciSlotNumber; + ULONG DeviceNumber; ULONG FunctionNumber; PCI_COMMON_CONFIG Config; PCM_RESOURCE_LIST AllocatedResources; @@ -413,6 +414,7 @@ USHORT DeviceIdToFind; ULONG SlotIdToFind; ULONG ReturnedLength; + BOOLEAN DeviceAndVendorFound = FALSE; TRACE_(VIDEOPRT, "VideoPortGetAccessRanges\n"); @@ -453,36 +455,40 @@ /* * Search for the device id and vendor id on this bus. */ - - for (FunctionNumber = 0; FunctionNumber < 8; FunctionNumber++) + for (DeviceNumber = 0; DeviceNumber < PCI_MAX_DEVICES; DeviceNumber++) { - INFO_(VIDEOPRT, "- Function number: %d\n", FunctionNumber); - PciSlotNumber.u.bits.FunctionNumber = FunctionNumber; - ReturnedLength = HalGetBusData( - PCIConfiguration, - DeviceExtension->SystemIoBusNumber, - PciSlotNumber.u.AsULONG, - &Config, - sizeof(PCI_COMMON_CONFIG)); - INFO_(VIDEOPRT, "- Length of data: %x\n", ReturnedLength); - if (ReturnedLength == sizeof(PCI_COMMON_CONFIG)) + PciSlotNumber.u.bits.DeviceNumber = DeviceNumber; + for (FunctionNumber = 0; FunctionNumber < 8; FunctionNumber++) { - INFO_(VIDEOPRT, "- Slot 0x%02x (Device %d Function %d) VendorId 0x%04x " - "DeviceId 0x%04x\n", - PciSlotNumber.u.AsULONG, - PciSlotNumber.u.bits.DeviceNumber, - PciSlotNumber.u.bits.FunctionNumber, - Config.VendorID, - Config.DeviceID); - - if ((VendorIdToFind == 0 || Config.VendorID == VendorIdToFind) && - (DeviceIdToFind == 0 || Config.DeviceID == DeviceIdToFind)) + INFO_(VIDEOPRT, "- Function number: %d\n", FunctionNumber); + PciSlotNumber.u.bits.FunctionNumber = FunctionNumber; + ReturnedLength = HalGetBusData( + PCIConfiguration, + DeviceExtension->SystemIoBusNumber, + PciSlotNumber.u.AsULONG, + &Config, + sizeof(PCI_COMMON_CONFIG)); + INFO_(VIDEOPRT, "- Length of data: %x\n", ReturnedLength); + if (ReturnedLength == sizeof(PCI_COMMON_CONFIG)) { - break; + INFO_(VIDEOPRT, "- Slot 0x%02x (Device %d Function %d) VendorId 0x%04x " + "DeviceId 0x%04x\n", + PciSlotNumber.u.AsULONG, + PciSlotNumber.u.bits.DeviceNumber, + PciSlotNumber.u.bits.FunctionNumber, + Config.VendorID, + Config.DeviceID); + + if ((VendorIdToFind == 0 || Config.VendorID == VendorIdToFind) && + (DeviceIdToFind == 0 || Config.DeviceID == DeviceIdToFind)) + { + DeviceAndVendorFound = TRUE; + break; + } } } + if (DeviceAndVendorFound) break; } - if (FunctionNumber == 8) { WARN_(VIDEOPRT, "Didn't find device.\n"); @@ -491,7 +497,10 @@ } Status = HalAssignSlotResources( - NULL, NULL, NULL, NULL, + &DeviceExtension->RegistryPath, + NULL, + DeviceExtension->DriverObject, + DeviceExtension->DriverObject->DeviceObject, DeviceExtension->AdapterInterfaceType, DeviceExtension->SystemIoBusNumber, PciSlotNumber.u.AsULONG, @@ -499,13 +508,13 @@ if (!NT_SUCCESS(Status)) { + WARN_(VIDEOPRT, "HalAssignSlotResources failed with status %x.\n",Status); return Status; } DeviceExtension->AllocatedResources = AllocatedResources; } if (AllocatedResources == NULL) return ERROR_NOT_ENOUGH_MEMORY; - AssignedCount = 0; for (FullList = AllocatedResources->List; FullList < AllocatedResources->List + AllocatedResources->Count; @@ -515,7 +524,7 @@ FullList->BusNumber == DeviceExtension->SystemIoBusNumber && 1 == FullList->PartialResourceList.Version && 1 == FullList->PartialResourceList.Revision); - for (Descriptor = FullList->PartialResourceList.PartialDescriptors; + for (Descriptor = FullList->PartialResourceList.PartialDescriptors; Descriptor < FullList->PartialResourceList.PartialDescriptors + FullList->PartialResourceList.Count; Descriptor++) {

15 years, 10 months

[pschweitzer] 38393: SVN maintenance. No code change.

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Dec 27 10:23:14 2008 New Revision: 38393 URL: http://svn.reactos.org/svn/reactos?rev=38393&view=rev Log: SVN maintenance. No code change. Modified: branches/pierre-fsd/ntoskrnl/io/iomgr/device.c (props changed) branches/pierre-fsd/ntoskrnl/io/iomgr/error.c (props changed) branches/pierre-fsd/ntoskrnl/io/iomgr/iomgr.c (props changed) branches/pierre-fsd/ntoskrnl/io/iomgr/rawfs.c (props changed) branches/pierre-fsd/ntoskrnl/io/iomgr/volume.c (props changed) branches/pierre-fsd/ntoskrnl/io/pnpmgr/pnproot.c (props changed) Propchange: branches/pierre-fsd/ntoskrnl/io/iomgr/device.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: branches/pierre-fsd/ntoskrnl/io/iomgr/error.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: branches/pierre-fsd/ntoskrnl/io/iomgr/iomgr.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: branches/pierre-fsd/ntoskrnl/io/iomgr/rawfs.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: branches/pierre-fsd/ntoskrnl/io/iomgr/volume.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: branches/pierre-fsd/ntoskrnl/io/pnpmgr/pnproot.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

15 years, 10 months

[cwittich] 38392: forgot these...

by cwittich＠svn.reactos.org

Author: cwittich Date: Sat Dec 27 09:12:15 2008 New Revision: 38392 URL: http://svn.reactos.org/svn/reactos?rev=38392&view=rev Log: forgot these... Modified: trunk/reactos/include/psdk/msi.h trunk/reactos/include/psdk/msidefs.h Modified: trunk/reactos/include/psdk/msi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msi.h?rev=383… ============================================================================== --- trunk/reactos/include/psdk/msi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/msi.h [iso-8859-1] Sat Dec 27 09:12:15 2008 @@ -45,6 +45,17 @@ INSTALLSTATE_SOURCE = 4, INSTALLSTATE_DEFAULT = 5 } INSTALLSTATE; + +typedef enum tagMSIPATCHSTATE +{ + MSIPATCHSTATE_INVALID = 0, + MSIPATCHSTATE_APPLIED = 1, + MSIPATCHSTATE_SUPERSEDED = 2, + MSIPATCHSTATE_OBSOLETED = 4, + MSIPATCHSTATE_REGISTERED = 8, + MSIPATCHSTATE_ALL = (MSIPATCHSTATE_APPLIED | MSIPATCHSTATE_SUPERSEDED | + MSIPATCHSTATE_OBSOLETED | MSIPATCHSTATE_REGISTERED) +} MSIPATCHSTATE; typedef enum tagINSTALLUILEVEL { @@ -201,6 +212,29 @@ ULONG dwData[4]; } MSIFILEHASHINFO, *PMSIFILEHASHINFO; +typedef enum tagMSIPATCHDATATYPE +{ + MSIPATCH_DATATYPE_PATCHFILE = 0, + MSIPATCH_DATATYPE_XMLPATH = 1, + MSIPATCH_DATATYPE_XMLBLOB = 2, +} MSIPATCHDATATYPE, *PMSIPATCHDATATYPE; + +typedef struct tagMSIPATCHSEQUENCEINFOA +{ + LPCSTR szPatchData; + MSIPATCHDATATYPE ePatchDataType; + DWORD dwOrder; + UINT uStatus; +} MSIPATCHSEQUENCEINFOA, *PMSIPATCHSEQUENCEINFOA; + +typedef struct tagMSIPATCHSEQUENCEINFOW +{ + LPCWSTR szPatchData; + MSIPATCHDATATYPE ePatchDataType; + DWORD dwOrder; + UINT uStatus; +} MSIPATCHSEQUENCEINFOW, *PMSIPATCHSEQUENCEINFOW; + #define MAX_FEATURE_CHARS 38 /* Strings defined in msi.h */ @@ -364,6 +398,8 @@ typedef INT (CALLBACK *INSTALLUI_HANDLERA)(LPVOID, UINT, LPCSTR); typedef INT (CALLBACK *INSTALLUI_HANDLERW)(LPVOID, UINT, LPCWSTR); +typedef INT (CALLBACK *INSTALLUI_HANDLER_RECORD)(LPVOID, UINT, MSIHANDLE); +typedef INSTALLUI_HANDLER_RECORD* PINSTALLUI_HANDLER_RECORD; UINT WINAPI MsiAdvertiseProductA(LPCSTR, LPCSTR, LPCSTR, LANGID); UINT WINAPI MsiAdvertiseProductW(LPCWSTR, LPCWSTR, LPCWSTR, LANGID); @@ -460,6 +496,10 @@ UINT WINAPI MsiGetProductInfoExA(LPCSTR, LPCSTR, MSIINSTALLCONTEXT, LPCSTR, LPSTR, LPDWORD); UINT WINAPI MsiGetProductInfoExW(LPCWSTR, LPCWSTR, MSIINSTALLCONTEXT, LPCWSTR, LPWSTR, LPDWORD); #define MsiGetProductInfoEx WINELIB_NAME_AW(MsiGetProductInfoEx) + +UINT WINAPI MsiGetPatchInfoExA(LPCSTR, LPCSTR, LPCSTR, MSIINSTALLCONTEXT, LPCSTR, LPSTR, LPDWORD); +UINT WINAPI MsiGetPatchInfoExW(LPCWSTR, LPCWSTR, LPCWSTR, MSIINSTALLCONTEXT, LPCWSTR, LPWSTR, LPDWORD); +#define MsiGetPatchInfoEx WINELIB_NAME_AW(MsiGetPatchInfoEx) UINT WINAPI MsiEnableLogA(DWORD, LPCSTR, DWORD); UINT WINAPI MsiEnableLogW(DWORD, LPCWSTR, DWORD); @@ -579,6 +619,12 @@ UINT WINAPI MsiEnumPatchesW(LPCWSTR, DWORD, LPWSTR, LPWSTR, LPDWORD); #define MsiEnumPatches WINELIB_NAME_AW(MsiEnumPatches) +UINT WINAPI MsiEnumPatchesExA(LPCSTR, LPCSTR, DWORD, DWORD, DWORD, LPSTR, LPSTR, + MSIINSTALLCONTEXT*, LPSTR, LPDWORD); +UINT WINAPI MsiEnumPatchesExW(LPCWSTR, LPCWSTR, DWORD, DWORD, DWORD, LPWSTR, LPWSTR, + MSIINSTALLCONTEXT*, LPWSTR, LPDWORD); +#define MsiEnumPatchesEx WINELIB_NAME_AW(MsiEnumPatchesEx) + UINT WINAPI MsiGetFileHashA(LPCSTR, DWORD, PMSIFILEHASHINFO); UINT WINAPI MsiGetFileHashW(LPCWSTR, DWORD, PMSIFILEHASHINFO); #define MsiGetFileHash WINELIB_NAME_AW(MsiGetFileHash) @@ -590,11 +636,24 @@ UINT WINAPI MsiIsProductElevatedA(LPCSTR, BOOL *); UINT WINAPI MsiIsProductElevatedW(LPCWSTR, BOOL *); #define MsiIsProductElevated WINELIB_NAME_AW(MsiIsProductElevated) + +UINT WINAPI MsiDatabaseMergeA(MSIHANDLE, MSIHANDLE, LPCSTR); +UINT WINAPI MsiDatabaseMergeW(MSIHANDLE, MSIHANDLE, LPCWSTR); +#define MsiDatabaseMerge WINELIB_NAME_AW(MsiDatabaseMerge) + +UINT WINAPI MsiInstallMissingComponentA(LPCSTR, LPCSTR, INSTALLSTATE); +UINT WINAPI MsiInstallMissingComponentW(LPCWSTR, LPCWSTR, INSTALLSTATE); +#define MsiInstallMissingComponent WINELIB_NAME_AW(MsiInstallMissingComponent) + +UINT WINAPI MsiDetermineApplicablePatchesA(LPCSTR, DWORD, PMSIPATCHSEQUENCEINFOA); +UINT WINAPI MsiDetermineApplicablePatchesW(LPCWSTR, DWORD, PMSIPATCHSEQUENCEINFOW); +#define MsiDetermineApplicablePatches WINELIB_NAME_AW(MsiDetermineApplicablePatches) /* Non Unicode */ UINT WINAPI MsiCloseHandle(MSIHANDLE); UINT WINAPI MsiCloseAllHandles(void); INSTALLUILEVEL WINAPI MsiSetInternalUI(INSTALLUILEVEL, HWND*); +UINT WINAPI MsiSetExternalUIRecord(INSTALLUI_HANDLER_RECORD, DWORD, LPVOID, PINSTALLUI_HANDLER_RECORD); #ifdef __cplusplus } Modified: trunk/reactos/include/psdk/msidefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msidefs.h?rev… ============================================================================== --- trunk/reactos/include/psdk/msidefs.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/msidefs.h [iso-8859-1] Sat Dec 27 09:12:15 2008 @@ -213,6 +213,13 @@ msidbSumInfoSourceTypeCompressed = 0x00000002, msidbSumInfoSourceTypeAdminImage = 0x00000004, msidbSumInfoSourceTypeLUAPackage = 0x00000008, +}; + +enum msidbRemoveFileInstallMode +{ + msidbRemoveFileInstallModeOnInstall = 0x00000001, + msidbRemoveFileInstallModeOnRemove = 0x00000002, + msidbRemoveFileInstallModeOnBoth = 0x00000003, }; /*

15 years, 10 months

[cwittich] 38391: sync msi with wine 1.1.11

by cwittich＠svn.reactos.org

Author: cwittich Date: Sat Dec 27 09:10:14 2008 New Revision: 38391 URL: http://svn.reactos.org/svn/reactos?rev=38391&view=rev Log: sync msi with wine 1.1.11 Added: trunk/reactos/dll/win32/msi/drop.c (with props) trunk/reactos/dll/win32/msi/media.c (with props) trunk/reactos/dll/win32/msi/msi_Zh.rc (with props) Modified: trunk/reactos/dll/win32/msi/action.c trunk/reactos/dll/win32/msi/alter.c trunk/reactos/dll/win32/msi/appsearch.c trunk/reactos/dll/win32/msi/automation.c trunk/reactos/dll/win32/msi/classes.c trunk/reactos/dll/win32/msi/create.c trunk/reactos/dll/win32/msi/custom.c trunk/reactos/dll/win32/msi/database.c trunk/reactos/dll/win32/msi/delete.c trunk/reactos/dll/win32/msi/dialog.c trunk/reactos/dll/win32/msi/distinct.c trunk/reactos/dll/win32/msi/events.c trunk/reactos/dll/win32/msi/files.c trunk/reactos/dll/win32/msi/helpers.c trunk/reactos/dll/win32/msi/insert.c trunk/reactos/dll/win32/msi/install.c trunk/reactos/dll/win32/msi/join.c trunk/reactos/dll/win32/msi/msi.c trunk/reactos/dll/win32/msi/msi.rbuild trunk/reactos/dll/win32/msi/msi.rc trunk/reactos/dll/win32/msi/msi.spec trunk/reactos/dll/win32/msi/msi_Ko.rc trunk/reactos/dll/win32/msi/msipriv.h trunk/reactos/dll/win32/msi/msiquery.c trunk/reactos/dll/win32/msi/package.c trunk/reactos/dll/win32/msi/query.h trunk/reactos/dll/win32/msi/record.c trunk/reactos/dll/win32/msi/registry.c trunk/reactos/dll/win32/msi/regsvr.c trunk/reactos/dll/win32/msi/select.c trunk/reactos/dll/win32/msi/source.c trunk/reactos/dll/win32/msi/sql.tab.c trunk/reactos/dll/win32/msi/sql.tab.h trunk/reactos/dll/win32/msi/sql.y trunk/reactos/dll/win32/msi/storages.c trunk/reactos/dll/win32/msi/streams.c trunk/reactos/dll/win32/msi/suminfo.c trunk/reactos/dll/win32/msi/table.c trunk/reactos/dll/win32/msi/tokenize.c trunk/reactos/dll/win32/msi/update.c trunk/reactos/dll/win32/msi/upgrade.c trunk/reactos/dll/win32/msi/where.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/msi/action.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/action.c?rev… Modified: trunk/reactos/dll/win32/msi/alter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/alter.c?rev=… Modified: trunk/reactos/dll/win32/msi/appsearch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/appsearch.c?… Modified: trunk/reactos/dll/win32/msi/automation.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/automation.c… Modified: trunk/reactos/dll/win32/msi/classes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/classes.c?re… Modified: trunk/reactos/dll/win32/msi/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/create.c?rev… Modified: trunk/reactos/dll/win32/msi/custom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/custom.c?rev… Modified: trunk/reactos/dll/win32/msi/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/database.c?r… Modified: trunk/reactos/dll/win32/msi/delete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/delete.c?rev… Modified: trunk/reactos/dll/win32/msi/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/dialog.c?rev… Modified: trunk/reactos/dll/win32/msi/distinct.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/distinct.c?r… Added: trunk/reactos/dll/win32/msi/drop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/drop.c?rev=3… Modified: trunk/reactos/dll/win32/msi/events.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/events.c?rev… Modified: trunk/reactos/dll/win32/msi/files.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/files.c?rev=… Modified: trunk/reactos/dll/win32/msi/helpers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/helpers.c?re… Modified: trunk/reactos/dll/win32/msi/insert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/insert.c?rev… Modified: trunk/reactos/dll/win32/msi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/install.c?re… Modified: trunk/reactos/dll/win32/msi/join.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/join.c?rev=3… Added: trunk/reactos/dll/win32/msi/media.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/media.c?rev=… Modified: trunk/reactos/dll/win32/msi/msi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.c?rev=38… Modified: trunk/reactos/dll/win32/msi/msi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.rbuild?r… Modified: trunk/reactos/dll/win32/msi/msi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.rc?rev=3… Modified: trunk/reactos/dll/win32/msi/msi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.spec?rev… Modified: trunk/reactos/dll/win32/msi/msi_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi_Ko.rc?re… Added: trunk/reactos/dll/win32/msi/msi_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi_Zh.rc?re… Modified: trunk/reactos/dll/win32/msi/msipriv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msipriv.h?re… Modified: trunk/reactos/dll/win32/msi/msiquery.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msiquery.c?r… Modified: trunk/reactos/dll/win32/msi/package.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/package.c?re… Modified: trunk/reactos/dll/win32/msi/query.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/query.h?rev=… Modified: trunk/reactos/dll/win32/msi/record.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/record.c?rev… Modified: trunk/reactos/dll/win32/msi/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/registry.c?r… Modified: trunk/reactos/dll/win32/msi/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/regsvr.c?rev… Modified: trunk/reactos/dll/win32/msi/select.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/select.c?rev… Modified: trunk/reactos/dll/win32/msi/source.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/source.c?rev… Modified: trunk/reactos/dll/win32/msi/sql.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/sql.tab.c?re… Modified: trunk/reactos/dll/win32/msi/sql.tab.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/sql.tab.h?re… Modified: trunk/reactos/dll/win32/msi/sql.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/sql.y?rev=38… Modified: trunk/reactos/dll/win32/msi/storages.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/storages.c?r… Modified: trunk/reactos/dll/win32/msi/streams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/streams.c?re… Modified: trunk/reactos/dll/win32/msi/suminfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/suminfo.c?re… Modified: trunk/reactos/dll/win32/msi/table.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/table.c?rev=… Modified: trunk/reactos/dll/win32/msi/tokenize.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/tokenize.c?r… Modified: trunk/reactos/dll/win32/msi/update.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/update.c?rev… Modified: trunk/reactos/dll/win32/msi/upgrade.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/upgrade.c?re… Modified: trunk/reactos/dll/win32/msi/where.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/where.c?rev=…

15 years, 10 months

[cwittich] 38390: fix undo after insert date/time

by cwittich＠svn.reactos.org

Author: cwittich Date: Sat Dec 27 08:26:03 2008 New Revision: 38390 URL: http://svn.reactos.org/svn/reactos?rev=38390&view=rev Log: fix undo after insert date/time Modified: trunk/reactos/base/applications/notepad/dialog.c Modified: trunk/reactos/base/applications/notepad/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/dialog.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/dialog.c [iso-8859-1] Sat Dec 27 08:26:03 2008 @@ -676,16 +676,15 @@ { SYSTEMTIME st; TCHAR szDate[MAX_STRING_LEN]; - static const TCHAR space[] = _T(" "); + TCHAR szText[MAX_STRING_LEN * 2 + 2]; GetLocalTime(&st); GetTimeFormat(LOCALE_USER_DEFAULT, 0, &st, NULL, szDate, MAX_STRING_LEN); - SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)szDate); - - SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)space); - + _tcscpy(szText, szDate); + _tcscat(szText, _T(" ")); GetDateFormat(LOCALE_USER_DEFAULT, DATE_LONGDATE, &st, NULL, szDate, MAX_STRING_LEN); + _tcscat(szText, szDate); SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)szDate); }

15 years, 10 months

[cwittich] 38389: rename "New..." to "New" and "Open" to "Open..." (for german and english only)

by cwittich＠svn.reactos.org

Author: cwittich Date: Sat Dec 27 08:18:11 2008 New Revision: 38389 URL: http://svn.reactos.org/svn/reactos?rev=38389&view=rev Log: rename "New..." to "New" and "Open" to "Open..." (for german and english only) Modified: trunk/reactos/base/applications/notepad/lang/de-DE.rc trunk/reactos/base/applications/notepad/lang/en-US.rc Modified: trunk/reactos/base/applications/notepad/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/de-DE.rc [iso-8859-1] Sat Dec 27 08:18:11 2008 @@ -42,7 +42,7 @@ BEGIN POPUP "&Datei" BEGIN - MENUITEM "&Neu...", CMD_NEW + MENUITEM "&Neu", CMD_NEW MENUITEM "Ö&ffnen...", CMD_OPEN MENUITEM "&Speichern", CMD_SAVE MENUITEM "Speichern &unter...", CMD_SAVE_AS Modified: trunk/reactos/base/applications/notepad/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/en-US.rc [iso-8859-1] Sat Dec 27 08:18:11 2008 @@ -42,8 +42,8 @@ BEGIN POPUP "&File" BEGIN - MENUITEM "&New...", CMD_NEW - MENUITEM "&Open\tCtrl+O", CMD_OPEN + MENUITEM "&New", CMD_NEW + MENUITEM "&Open...\tCtrl+O", CMD_OPEN MENUITEM "&Save\tCtrl+S", CMD_SAVE MENUITEM "Save &as...", CMD_SAVE_AS MENUITEM SEPARATOR

15 years, 10 months

[khornicek] 38388: update PSDK - patch by encoded

by khornicek＠svn.reactos.org

Author: khornicek Date: Sat Dec 27 07:28:36 2008 New Revision: 38388 URL: http://svn.reactos.org/svn/reactos?rev=38388&view=rev Log: update PSDK - patch by encoded Added: trunk/reactos/include/psdk/scarderr.h (with props) Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt.c trunk/reactos/include/psdk/windows.h trunk/reactos/include/psdk/winscard.h trunk/reactos/include/psdk/winsmcrd.h Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/crypt/c… ============================================================================== --- trunk/reactos/dll/win32/advapi32/crypt/crypt.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/crypt/crypt.c [iso-8859-1] Sat Dec 27 07:28:36 2008 @@ -26,7 +26,6 @@ #include <advapi32.h> #include "crypt.h" -#include <winefs.h> #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(crypt); Added: trunk/reactos/include/psdk/scarderr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/scarderr.h?re… ============================================================================== --- trunk/reactos/include/psdk/scarderr.h (added) +++ trunk/reactos/include/psdk/scarderr.h [iso-8859-1] Sat Dec 27 07:28:36 2008 @@ -1,0 +1,96 @@ +/* + * Winscard definitions + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* Note that if you included winerror.h directly or indirectly, + * none of these definitions will be used! + */ +#ifndef SCARD_S_SUCCESS + +#define FACILITY_SYSTEM 0 +#define FACILITY_SCARD 16 + +#define STATUS_SEVERITY_INFORMATIONAL ((NTSTATUS) 0x00000001) +#define STATUS_SEVERITY_WARNING ((NTSTATUS) 0x00000002) +#define STATUS_SEVERITY_ERROR ((NTSTATUS) 0x00000003) + +#define SCARD_S_SUCCESS NO_ERROR +#define SCARD_F_INTERNAL_ERROR ((DWORD)0x80100001) +#define SCARD_E_CANCELLED ((DWORD)0x80100002) +#define SCARD_E_INVALID_HANDLE ((DWORD)0x80100003) +#define SCARD_E_INVALID_PARAMETER ((DWORD)0x80100004) +#define SCARD_E_INVALID_TARGET ((DWORD)0x80100005) +#define SCARD_E_NO_MEMORY ((DWORD)0x80100006) +#define SCARD_F_WAITED_TOO_LONG ((DWORD)0x80100007) +#define SCARD_E_INSUFFICIENT_BUFFER ((DWORD)0x80100008) +#define SCARD_E_UNKNOWN_READER ((DWORD)0x80100009) +#define SCARD_E_TIMEOUT ((DWORD)0x8010000A) +#define SCARD_E_SHARING_VIOLATION ((DWORD)0x8010000B) +#define SCARD_E_NO_SMARTCARD ((DWORD)0x8010000C) +#define SCARD_E_UNKNOWN_CARD ((DWORD)0x8010000D) +#define SCARD_E_CANT_DISPOSE ((DWORD)0x8010000E) +#define SCARD_E_PROTO_MISMATCH ((DWORD)0x8010000F) +#define SCARD_E_NOT_READY ((DWORD)0x80100010) +#define SCARD_E_INVALID_VALUE ((DWORD)0x80100011) +#define SCARD_E_SYSTEM_CANCELLED ((DWORD)0x80100012) +#define SCARD_F_COMM_ERROR ((DWORD)0x80100013) +#define SCARD_F_UNKNOWN_ERROR ((DWORD)0x80100014) +#define SCARD_E_INVALID_ATR ((DWORD)0x80100015) +#define SCARD_E_NOT_TRANSACTED ((DWORD)0x80100016) +#define SCARD_E_READER_UNAVAILABLE ((DWORD)0x80100017) +#define SCARD_P_SHUTDOWN ((DWORD)0x80100018) +#define SCARD_E_PCI_TOO_SMALL ((DWORD)0x80100019) +#define SCARD_E_READER_UNSUPPORTED ((DWORD)0x8010001A) +#define SCARD_E_DUPLICATE_READER ((DWORD)0x8010001B) +#define SCARD_E_CARD_UNSUPPORTED ((DWORD)0x8010001C) +#define SCARD_E_NO_SERVICE ((DWORD)0x8010001D) +#define SCARD_E_SERVICE_STOPPED ((DWORD)0x8010001E) +#define SCARD_E_UNEXPECTED ((DWORD)0x8010001F) +#define SCARD_E_ICC_INSTALLATION ((DWORD)0x80100020) +#define SCARD_E_ICC_CREATEORDER ((DWORD)0x80100021) +#define SCARD_E_UNSUPPORTED_FEATURE ((DWORD)0x80100022) +#define SCARD_E_DIR_NOT_FOUND ((DWORD)0x80100023) +#define SCARD_E_FILE_NOT_FOUND ((DWORD)0x80100024) +#define SCARD_E_NO_DIR ((DWORD)0x80100025) +#define SCARD_E_NO_FILE ((DWORD)0x80100026) +#define SCARD_E_NO_ACCESS ((DWORD)0x80100027) +#define SCARD_E_WRITE_TOO_MANY ((DWORD)0x80100028) +#define SCARD_E_BAD_SEEK ((DWORD)0x80100029) +#define SCARD_E_INVALID_CHV ((DWORD)0x8010002A) +#define SCARD_E_UNKNOWN_RES_MNG ((DWORD)0x8010002B) +#define SCARD_E_NO_SUCH_CERTIFICATE ((DWORD)0x8010002C) +#define SCARD_E_CERTIFICATE_UNAVAILABLE ((DWORD)0x8010002D) +#define SCARD_E_NO_READERS_AVAILABLE ((DWORD)0x8010002E) +#define SCARD_E_COMM_DATA_LOST ((DWORD)0x8010002F) +#define SCARD_E_NO_KEY_CONTAINER ((DWORD)0x80100030) +#define SCARD_E_SERVER_TOO_BUSY ((DWORD)0x80100031) +#define SCARD_W_UNSUPPORTED_CARD ((DWORD)0x80100065) +#define SCARD_W_UNRESPONSIVE_CARD ((DWORD)0x80100066) +#define SCARD_W_UNPOWERED_CARD ((DWORD)0x80100067) +#define SCARD_W_RESET_CARD ((DWORD)0x80100068) +#define SCARD_W_REMOVED_CARD ((DWORD)0x80100069) +#define SCARD_W_SECURITY_VIOLATION ((DWORD)0x8010006A) +#define SCARD_W_WRONG_CHV ((DWORD)0x8010006B) +#define SCARD_W_CHV_BLOCKED ((DWORD)0x8010006C) +#define SCARD_W_EOF ((DWORD)0x8010006D) +#define SCARD_W_CANCELLED_BY_USER ((DWORD)0x8010006E) +#define SCARD_W_CARD_NOT_AUTHENTICATED ((DWORD)0x8010006F) +#define SCARD_W_CACHE_ITEM_NOT_FOUND ((DWORD)0x80100070) +#define SCARD_W_CACHE_ITEM_STALE ((DWORD)0x80100071) +#define SCARD_W_CACHE_ITEM_TOO_BIG ((DWORD)0x80100072) + +#endif /* SCARD_S_SUCCESS */ Propchange: trunk/reactos/include/psdk/scarderr.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/psdk/windows.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windows.h?rev… ============================================================================== --- trunk/reactos/include/psdk/windows.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/windows.h [iso-8859-1] Sat Dec 27 07:28:36 2008 @@ -75,6 +75,11 @@ #include <rpc.h> #include <shellapi.h> #include <winperf.h> +#ifndef NOCRYPT +#include <wincrypt.h> +#include <winefs.h> +#include <winscard.h> +#endif #ifndef NOGDI #include <commdlg.h> #include <winspool.h> Modified: trunk/reactos/include/psdk/winscard.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winscard.h?re… ============================================================================== --- trunk/reactos/include/psdk/winscard.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winscard.h [iso-8859-1] Sat Dec 27 07:28:36 2008 @@ -1,253 +1,150 @@ /* - * WinSCard.h + * Winscard definitions * - * SmartCard API + * 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 SOFTWARE IS NOT COPYRIGHTED + * 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. * - * This source code is offered for use in the public domain. You may - * use, modify or distribute it freely. - * - * This code is distributed in the hope that it will be useful but - * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAIMED. This includes but is not limited to warranties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef __WINSCARD_H -#define __WINSCARD_H +#ifndef __WINE_WINSCARD_H +#define __WINE_WINSCARD_H -#include <WinSmCrd.h> +#include <wtypes.h> +#include <winioctl.h> +#include <winsmcrd.h> +#include <scarderr.h> + +#ifndef _LPCBYTE_DEFINED +#define _LPCBYTE_DEFINED +typedef const BYTE *LPCBYTE; +#endif + +typedef ULONG_PTR SCARDCONTEXT, *PSCARDCONTEXT, *LPSCARDCONTEXT; +typedef ULONG_PTR SCARDHANDLE, *PSCARDHANDLE, *LPSCARDHANDLE; + +typedef struct _SCARD_ATRMASK +{ + DWORD cbAtr; + BYTE rgbAtr[36]; + BYTE rgbMask[36]; +} SCARD_ATRMASK, *PSCARD_ATRMASK, *LPSCARD_ATRMASK; + +typedef struct +{ + LPCSTR szReader; + LPVOID pvUserData; + DWORD dwCurrentState; + DWORD dwEventState; + DWORD cbAtr; + BYTE rgbAtr[36]; +} SCARD_READERSTATEA, *PSCARD_READERSTATEA, *LPSCARD_READERSTATEA; +typedef struct +{ + LPCWSTR szReader; + LPVOID pvUserData; + DWORD dwCurrentState; + DWORD dwEventState; + DWORD cbAtr; + BYTE rgbAtr[36]; +} SCARD_READERSTATEW, *PSCARD_READERSTATEW, *LPSCARD_READERSTATEW; +DECL_WINELIB_TYPE_AW(SCARD_READERSTATE) +DECL_WINELIB_TYPE_AW(PSCARD_READERSTATE) +DECL_WINELIB_TYPE_AW(LPSCARD_READERSTATE) + #ifdef __cplusplus extern "C" { #endif -#define SCARD_S_SUCCESS NO_ERROR - -#define SCARD_F_INTERNAL_ERROR ((DWORD)0x80100001) -#define SCARD_E_CANCELLED ((DWORD)0x80100002) -#define SCARD_E_INVALID_HANDLE ((DWORD)0x80100003) -#define SCARD_E_INVALID_PARAMETER ((DWORD)0x80100004) -#define SCARD_E_INVALID_TARGET ((DWORD)0x80100005) -#define SCARD_E_NO_MEMORY ((DWORD)0x80100006) -#define SCARD_F_WAITED_TOO_LONG ((DWORD)0x80100007) -#define SCARD_E_INSUFFICIENT_BUFFER ((DWORD)0x80100008) -#define SCARD_E_UNKNOWN_READER ((DWORD)0x80100009) -#define SCARD_E_TIMEOUT ((DWORD)0x8010000A) -#define SCARD_E_SHARING_VIOLATION ((DWORD)0x8010000B) -#define SCARD_E_NO_SMARTCARD ((DWORD)0x8010000C) -#define SCARD_E_UNKNOWN_CARD ((DWORD)0x8010000D) -#define SCARD_E_CANT_DISPOSE ((DWORD)0x8010000E) -#define SCARD_E_PROTO_MISMATCH ((DWORD)0x8010000F) -#define SCARD_E_NOT_READY ((DWORD)0x80100010) -#define SCARD_E_INVALID_VALUE ((DWORD)0x80100011) -#define SCARD_E_SYSTEM_CANCELLED ((DWORD)0x80100012) -#define SCARD_F_COMM_ERROR ((DWORD)0x80100013) -#define SCARD_F_UNKNOWN_ERROR ((DWORD)0x80100014) -#define SCARD_E_INVALID_ATR ((DWORD)0x80100015) -#define SCARD_E_NOT_TRANSACTED ((DWORD)0x80100016) -#define SCARD_E_READER_UNAVAILABLE ((DWORD)0x80100017) -#define SCARD_P_SHUTDOWN ((DWORD)0x80100018) -#define SCARD_E_PCI_TOO_SMALL ((DWORD)0x80100019) -#define SCARD_E_READER_UNSUPPORTED ((DWORD)0x8010001A) -#define SCARD_E_DUPLICATE_READER ((DWORD)0x8010001B) -#define SCARD_E_CARD_UNSUPPORTED ((DWORD)0x8010001C) -#define SCARD_E_NO_SERVICE ((DWORD)0x8010001D) -#define SCARD_E_SERVICE_STOPPED ((DWORD)0x8010001E) -#define SCARD_E_UNEXPECTED ((DWORD)0x8010001F) -#define SCARD_E_ICC_INSTALLATION ((DWORD)0x80100020) -#define SCARD_E_ICC_CREATEORDER ((DWORD)0x80100021) -#define SCARD_E_UNSUPPORTED_FEATURE ((DWORD)0x80100022) -#define SCARD_E_DIR_NOT_FOUND ((DWORD)0x80100023) -#define SCARD_E_FILE_NOT_FOUND ((DWORD)0x80100024) -#define SCARD_E_NO_DIR ((DWORD)0x80100025) -#define SCARD_E_NO_FILE ((DWORD)0x80100026) -#define SCARD_E_NO_ACCESS ((DWORD)0x80100027) -#define SCARD_E_WRITE_TOO_MANY ((DWORD)0x80100028) -#define SCARD_E_BAD_SEEK ((DWORD)0x80100029) -#define SCARD_E_INVALID_CHV ((DWORD)0x8010002A) -#define SCARD_E_UNKNOWN_RES_MNG ((DWORD)0x8010002B) -#define SCARD_E_NO_SUCH_CERTIFICATE ((DWORD)0x8010002C) -#define SCARD_E_CERTIFICATE_UNAVAILABLE ((DWORD)0x8010002D) -#define SCARD_E_NO_READERS_AVAILABLE ((DWORD)0x8010002E) -#define SCARD_E_COMM_DATA_LOST ((DWORD)0x8010002F) -#define SCARD_E_NO_KEY_CONTAINER ((DWORD)0x80100030) -#define SCARD_W_UNSUPPORTED_CARD ((DWORD)0x80100065) -#define SCARD_W_UNRESPONSIVE_CARD ((DWORD)0x80100066) -#define SCARD_W_UNPOWERED_CARD ((DWORD)0x80100067) -#define SCARD_W_RESET_CARD ((DWORD)0x80100068) -#define SCARD_W_REMOVED_CARD ((DWORD)0x80100069) -#define SCARD_W_SECURITY_VIOLATION ((DWORD)0x8010006A) -#define SCARD_W_WRONG_CHV ((DWORD)0x8010006B) -#define SCARD_W_CHV_BLOCKED ((DWORD)0x8010006C) -#define SCARD_W_EOF ((DWORD)0x8010006D) -#define SCARD_W_CANCELLED_BY_USER ((DWORD)0x8010006E) -#define SCARD_W_CARD_NOT_AUTHENTICATED ((DWORD)0x8010006F) - -#define SCARD_SHARE_EXCLUSIVE (0x1) -#define SCARD_SHARE_SHARED (0x2) -#define SCARD_SHARE_DIRECT (0x3) - -#define SCARD_LEAVE_CARD (0x0) -#define SCARD_RESET_CARD (0x1) -#define SCARD_UNPOWER_CARD (0x2) -#define SCARD_EJECT_CARD (0x3) - -#define SCARD_AUTOALLOCATE ((DWORD)-1) -#define SCARD_SCOPE_USER (0x0) -#define SCARD_SCOPE_TERMINAL (0x1) -#define SCARD_SCOPE_SYSTEM (0x2) - -#define SCARD_PROVIDER_PRIMARY (0x1) -#define SCARD_PROVIDER_CSP (0x2) - -typedef ULONG_PTR SCARDCONTEXT, *PSCARDCONTEXT, *LPSCARDCONTEXT; -typedef ULONG_PTR SCARDHANDLE, *PSCARDHANDLE, *LPSCARDHANDLE; -typedef const BYTE *LPCBYTE; - -typedef struct _SCARD_READERSTATEA -{ - LPCSTR szReader; - LPVOID pvUserData; - DWORD dwCurrentState; - DWORD dwEventState; - DWORD cbAtr; - BYTE rgbAtr[36]; -} SCARD_READERSTATEA, *PSCARD_READERSTATEA, *LPSCARD_READERSTATEA; - -typedef struct _SCARD_READERSTATEW -{ - LPCWSTR szReader; - LPVOID pvUserData; - DWORD dwCurrentState; - DWORD dwEventState; - DWORD cbAtr; - BYTE rgbAtr[36]; -} SCARD_READERSTATEW, *PSCARD_READERSTATEW, *LPSCARD_READERSTATEW; - -typedef struct _SCARD_ATRMASK -{ - DWORD cbAtr; - BYTE rgbAtr[36]; - BYTE rgbMask[36]; -} SCARD_ATRMASK, *PSCARD_ATRMASK, *LPSCARD_ATRMASK; - -HANDLE WINAPI SCardAccessStartedEvent(VOID); -LONG WINAPI SCardAddReaderToGroupA(SCARDCONTEXT, LPCSTR, LPCSTR); -LONG WINAPI SCardAddReaderToGroupW(SCARDCONTEXT, LPCWSTR, LPCWSTR); -LONG WINAPI SCardBeginTransaction(SCARDHANDLE); -LONG WINAPI SCardCancel(SCARDCONTEXT); -LONG WINAPI SCardConnectA(SCARDCONTEXT, LPCSTR, DWORD, DWORD, LPSCARDHANDLE, LPDWORD); -LONG WINAPI SCardConnectW(SCARDCONTEXT, LPCWSTR, DWORD, DWORD, LPSCARDHANDLE, LPDWORD); -LONG WINAPI SCardControl(SCARDHANDLE, DWORD, LPCVOID, DWORD, LPVOID, DWORD, LPDWORD); -LONG WINAPI SCardDisconnect(SCARDHANDLE, DWORD); -LONG WINAPI SCardEndTransaction(SCARDHANDLE, DWORD); -LONG WINAPI SCardEstablishContext(DWORD, LPCVOID, LPCVOID, LPSCARDCONTEXT); -LONG WINAPI SCardForgetCardTypeA(SCARDCONTEXT, LPCSTR); -LONG WINAPI SCardForgetCardTypeW(SCARDCONTEXT, LPCWSTR); -LONG WINAPI SCardForgetReaderA(SCARDCONTEXT, LPCSTR); -LONG WINAPI SCardForgetReaderW(SCARDCONTEXT, LPCWSTR); -LONG WINAPI SCardForgetReaderGroupA(SCARDCONTEXT, LPCSTR); -LONG WINAPI SCardForgetReaderGroupW(SCARDCONTEXT, LPCWSTR); -LONG WINAPI SCardFreeMemory(SCARDCONTEXT, LPCVOID); -LONG WINAPI SCardGetAttrib(SCARDHANDLE, DWORD, LPBYTE, LPDWORD); -LONG WINAPI SCardGetCardTypeProviderNameA(SCARDCONTEXT, LPCSTR, DWORD, LPSTR, LPDWORD); -LONG WINAPI SCardGetCardTypeProviderNameW(SCARDCONTEXT, LPCWSTR, DWORD, LPWSTR, LPDWORD); -LONG WINAPI SCardGetProviderIdA(SCARDCONTEXT, LPCSTR, LPGUID); -LONG WINAPI SCardGetProviderIdW(SCARDCONTEXT, LPCWSTR, LPGUID); -LONG WINAPI SCardGetStatusChangeA(SCARDCONTEXT, DWORD, LPSCARD_READERSTATEA, DWORD); -LONG WINAPI SCardGetStatusChangeW(SCARDCONTEXT, DWORD, LPSCARD_READERSTATEW, DWORD); -LONG WINAPI SCardIntroduceCardTypeA(SCARDCONTEXT, LPCSTR, LPCGUID, LPCGUID, DWORD, LPCBYTE, LPCBYTE, DWORD); -LONG WINAPI SCardIntroduceCardTypeW(SCARDCONTEXT, LPCWSTR, LPCGUID, LPCGUID, DWORD, LPCBYTE, LPCBYTE, DWORD); -LONG WINAPI SCardIntroduceReaderA(SCARDCONTEXT, LPCSTR, LPCSTR); -LONG WINAPI SCardIntroduceReaderW(SCARDCONTEXT, LPCWSTR, LPCWSTR); -LONG WINAPI SCardIntroduceReaderGroupA(SCARDCONTEXT, LPCSTR); -LONG WINAPI SCardIntroduceReaderGroupW(SCARDCONTEXT, LPCWSTR); -LONG WINAPI SCardIsValidContext(SCARDCONTEXT); -LONG WINAPI SCardListCardsA(SCARDCONTEXT, LPCBYTE, LPCGUID, DWORD, LPCSTR, LPDWORD); -LONG WINAPI SCardListCardsW(SCARDCONTEXT, LPCBYTE, LPCGUID, DWORD, LPCWSTR, LPDWORD); -LONG WINAPI SCardListInterfacesA(SCARDCONTEXT, LPCSTR, LPGUID, LPDWORD); -LONG WINAPI SCardListInterfacesW(SCARDCONTEXT, LPCWSTR, LPGUID, LPDWORD); -LONG WINAPI SCardListReaderGroupsA(SCARDCONTEXT, LPSTR, LPDWORD); -LONG WINAPI SCardListReaderGroupsW(SCARDCONTEXT, LPWSTR, LPDWORD); -LONG WINAPI SCardListReadersA(SCARDCONTEXT, LPCSTR, LPSTR, LPDWORD); -LONG WINAPI SCardListReadersW(SCARDCONTEXT, LPCWSTR, LPWSTR, LPDWORD); -LONG WINAPI SCardLocateCardsA(SCARDCONTEXT, LPCSTR, LPSCARD_READERSTATEA, DWORD); -LONG WINAPI SCardLocateCardsW(SCARDCONTEXT, LPCWSTR, LPSCARD_READERSTATEW, DWORD); -LONG WINAPI SCardLocateCardsByATRA(SCARDCONTEXT, LPSCARD_ATRMASK, DWORD, LPSCARD_READERSTATEA, DWORD); -LONG WINAPI SCardLocateCardsByATRW(SCARDCONTEXT, LPSCARD_ATRMASK, DWORD, LPSCARD_READERSTATEW, DWORD); -LONG WINAPI SCardReconnect(SCARDHANDLE, DWORD, DWORD, DWORD, LPDWORD); -LONG WINAPI SCardReleaseContext(SCARDCONTEXT); -VOID WINAPI SCardReleaseStartedEvent(HANDLE); -LONG WINAPI SCardRemoveReaderFromGroupA(SCARDCONTEXT, LPCSTR, LPCSTR); -LONG WINAPI SCardRemoveReaderFromGroupW(SCARDCONTEXT, LPCWSTR, LPCWSTR); -LONG WINAPI SCardSetAttrib(SCARDHANDLE, DWORD, LPCBYTE, DWORD); -LONG WINAPI SCardSetCardTypeProviderNameA(SCARDCONTEXT, LPCSTR, DWORD, LPCSTR); -LONG WINAPI SCardSetCardTypeProviderNameW(SCARDCONTEXT, LPCWSTR, DWORD, LPCWSTR); -LONG WINAPI SCardState(SCARDHANDLE, LPDWORD, LPDWORD, LPBYTE, LPDWORD); -LONG WINAPI SCardStatusA(SCARDHANDLE, LPSTR, LPDWORD, LPDWORD, LPDWORD, LPBYTE, LPDWORD); -LONG WINAPI SCardStatusW(SCARDHANDLE, LPWSTR, LPDWORD, LPDWORD, LPDWORD, LPBYTE, LPDWORD); -LONG WINAPI SCardTransmit(SCARDHANDLE, LPCSCARD_IO_REQUEST, LPCBYTE, DWORD, LPSCARD_IO_REQUEST, LPBYTE, LPDWORD); - -#ifndef _DISABLE_TIDENTS - -#ifdef UNICODE -typedef struct SCARD_READERSTATEW SCARD_READERSTATE, *PSCARD_READERSTATE, *LPSCARD_READERSTATE; -#define SCardAddReaderToGroup SCardAddReaderToGroupW -#define SCardConnect SCardConnectW -#define SCardForgetCardType SCardForgetCardTypeW -#define SCardForgetReader SCardForgetReaderW -#define SCardForgetReaderGroup SCardForgetReaderGroupW -#define SCardGetCardTypeProviderName SCardGetCardTypeProviderNameW -#define SCardGetProviderId SCardGetProviderIdW -#define SCardGetStatusChange SCardGetStatusChangeW -#define SCardIntroduceCardType SCardIntroduceCardTypeW -#define SCardIntroduceReader SCardIntroduceReaderW -#define SCardIntroduceReaderGroup SCardIntroduceReaderGroupW -#define SCardListCards SCardListCardsW -#define SCardListInterfaces SCardListInterfacesW -#define SCardListReaderGroups SCardListReaderGroupsW -#define SCardListReaders SCardListReadersW -#define SCardLocateCards SCardLocateCardsW -#define SCardLocateCardsByATR SCardLocateCardsByATRW -#define SCardRemoveReaderFromGroup SCardRemoveReaderFromGroupW -#define SCardSetCardTypeProviderName SCardSetCardTypeProviderNameW -#define SCardStatus SCardStatusW -#else /* !UNICODE */ -typedef struct SCARD_READERSTATEA SCARD_READERSTATE, *PSCARD_READERSTATE, *LPSCARD_READERSTATE; -#define SCardAddReaderToGroup SCardAddReaderToGroupA -#define SCardConnect SCardConnectA -#define SCardForgetCardType SCardForgetCardTypeA -#define SCardForgetReader SCardForgetReaderA -#define SCardForgetReaderGroup SCardForgetReaderGroupA -#define SCardGetCardTypeProviderName SCardGetCardTypeProviderNameA -#define SCardGetProviderId SCardGetProviderIdA -#define SCardGetStatusChange SCardGetStatusChangeA -#define SCardIntroduceCardType SCardIntroduceCardTypeA -#define SCardIntroduceReader SCardIntroduceReaderA -#define SCardIntroduceReaderGroup SCardIntroduceReaderGroupA -#define SCardListCards SCardListCardsA -#define SCardListInterfaces SCardListInterfacesA -#define SCardListReaderGroups SCardListReaderGroupsA -#define SCardListReaders SCardListReadersA -#define SCardLocateCards SCardLocateCardsA -#define SCardLocateCardsByATR SCardLocateCardsByATRA -#define SCardRemoveReaderFromGroup SCardRemoveReaderFromGroupA -#define SCardSetCardTypeProviderName SCardSetCardTypeProviderNameA -#define SCardStatus SCardStatusA -#endif /* UNICODE */ - -#endif /* _DISABLE_TIDENTS */ - -extern const SCARD_IO_REQUEST g_rgSCardT0Pci; -extern const SCARD_IO_REQUEST g_rgSCardT1Pci; -extern const SCARD_IO_REQUEST g_rgSCardRawPci; +HANDLE WINAPI SCardAccessStartedEvent(void); +LONG WINAPI SCardAddReaderToGroupA(SCARDCONTEXT,LPCSTR,LPCSTR); +LONG WINAPI SCardAddReaderToGroupW(SCARDCONTEXT,LPCWSTR,LPCWSTR); +#define SCardAddReaderToGroup WINELIB_NAME_AW(SCardAddReaderToGroup) +LONG WINAPI SCardBeginTransaction(SCARDHANDLE); +LONG WINAPI SCardCancel(SCARDCONTEXT); +LONG WINAPI SCardConnectA(SCARDCONTEXT,LPCSTR,DWORD,DWORD,LPSCARDHANDLE,LPDWORD); +LONG WINAPI SCardConnectW(SCARDCONTEXT,LPCWSTR,DWORD,DWORD,LPSCARDHANDLE,LPDWORD); +#define SCardConnect WINELIB_NAME_AW(SCardConnect) +LONG WINAPI SCardControl(SCARDHANDLE,DWORD,LPCVOID,DWORD,LPVOID,DWORD,LPDWORD); +LONG WINAPI SCardDisconnect(SCARDHANDLE,DWORD); +LONG WINAPI SCardEndTransaction(SCARDHANDLE,DWORD); +LONG WINAPI SCardEstablishContext(DWORD,LPCVOID,LPCVOID,LPSCARDCONTEXT); +LONG WINAPI SCardForgetCardTypeA(SCARDCONTEXT,LPCSTR); +LONG WINAPI SCardForgetCardTypeW(SCARDCONTEXT,LPCWSTR); +#define SCardForgetCardType WINELIB_NAME_AW(SCardForgetCardType) +LONG WINAPI SCardForgetReaderA(SCARDCONTEXT,LPCSTR); +LONG WINAPI SCardForgetReaderW(SCARDCONTEXT,LPCWSTR); +#define SCardForgetReader WINELIB_NAME_AW(SCardForgetReader) +LONG WINAPI SCardForgetReaderGroupA(SCARDCONTEXT,LPCSTR); +LONG WINAPI SCardForgetReaderGroupW(SCARDCONTEXT,LPCWSTR); +#define SCardForgetReaderGroup WINELIB_NAME_AW(SCardForgetReaderGroup) +LONG WINAPI SCardFreeMemory(SCARDCONTEXT,LPCVOID); +LONG WINAPI SCardGetAttrib(SCARDHANDLE,DWORD,LPBYTE,LPDWORD); +LONG WINAPI SCardGetCardTypeProviderNameA(SCARDCONTEXT,LPCSTR,DWORD,LPSTR,LPDWORD); +LONG WINAPI SCardGetCardTypeProviderNameW(SCARDCONTEXT,LPCWSTR,DWORD,LPWSTR,LPDWORD); +#define SCardGetCardTypeProviderName WINELIB_NAME_AW(SCardGetCardTypeProviderName) +LONG WINAPI SCardGetProviderIdA(SCARDCONTEXT,LPCSTR,LPGUID); +LONG WINAPI SCardGetProviderIdW(SCARDCONTEXT,LPCWSTR,LPGUID); +#define SCardGetProviderId WINELIB_NAME_AW(SCardGetProviderId) +LONG WINAPI SCardGetStatusChangeA(SCARDCONTEXT,DWORD,LPSCARD_READERSTATEA,DWORD); +LONG WINAPI SCardGetStatusChangeW(SCARDCONTEXT,DWORD,LPSCARD_READERSTATEW,DWORD); +#define SCardGetStatusChange WINELIB_NAME_AW(SCardGetStatusChange) +LONG WINAPI SCardIntroduceCardTypeA(SCARDCONTEXT,LPCSTR,LPCGUID,LPCGUID,DWORD,LPCBYTE,LPCBYTE,DWORD); +LONG WINAPI SCardIntroduceCardTypeW(SCARDCONTEXT,LPCWSTR,LPCGUID,LPCGUID,DWORD,LPCBYTE,LPCBYTE,DWORD); +#define SCardIntroduceCardType WINELIB_NAME_AW(SCardIntroduceCardType) +LONG WINAPI SCardIntroduceReaderA(SCARDCONTEXT,LPCSTR,LPCSTR); +LONG WINAPI SCardIntroduceReaderW(SCARDCONTEXT,LPCWSTR,LPCWSTR); +#define SCardIntroduceReader WINELIB_NAME_AW(SCardIntroduceReader) +LONG WINAPI SCardIntroduceReaderGroupA(SCARDCONTEXT,LPCSTR); +LONG WINAPI SCardIntroduceReaderGroupW(SCARDCONTEXT,LPCWSTR); +#define SCardIntroduceReaderGroup WINELIB_NAME_AW(SCardIntroduceReaderGroup) +LONG WINAPI SCardIsValidContext(SCARDCONTEXT); +LONG WINAPI SCardListCardsA(SCARDCONTEXT,LPCBYTE,LPCGUID,DWORD,LPSTR,LPDWORD); +LONG WINAPI SCardListCardsW(SCARDCONTEXT,LPCBYTE,LPCGUID,DWORD,LPWSTR,LPDWORD); +#define SCardListCards WINELIB_NAME_AW(SCardListCards) +LONG WINAPI SCardListInterfacesA(SCARDCONTEXT,LPCSTR,LPGUID,LPDWORD); +LONG WINAPI SCardListInterfacesW(SCARDCONTEXT,LPCWSTR,LPGUID,LPDWORD); +#define SCardListInterfaces WINELIB_NAME_AW(SCardListInterfaces) +LONG WINAPI SCardListReadersA(SCARDCONTEXT,LPCSTR,LPSTR,LPDWORD); +LONG WINAPI SCardListReadersW(SCARDCONTEXT,LPCWSTR,LPWSTR,LPDWORD); +#define SCardListReaders WINELIB_NAME_AW(SCardListReaders) +LONG WINAPI SCardListReaderGroupsA(SCARDCONTEXT,LPSTR,LPDWORD); +LONG WINAPI SCardListReaderGroupsW(SCARDCONTEXT,LPWSTR,LPDWORD); +#define SCardListReaderGroups WINELIB_NAME_AW(SCardListReaderGroups) +LONG WINAPI SCardLocateCardsA(SCARDCONTEXT,LPCSTR,LPSCARD_READERSTATEA,DWORD); +LONG WINAPI SCardLocateCardsW(SCARDCONTEXT,LPCWSTR,LPSCARD_READERSTATEW,DWORD); +#define SCardLocateCards WINELIB_NAME_AW(SCardLocateCards) +LONG WINAPI SCardLocateCardsByATRA(SCARDCONTEXT,LPSCARD_ATRMASK,DWORD,LPSCARD_READERSTATEA,DWORD); +LONG WINAPI SCardLocateCardsByATRW(SCARDCONTEXT,LPSCARD_ATRMASK,DWORD,LPSCARD_READERSTATEW,DWORD); +#define SCardLocateCardsByATR WINELIB_NAME_AW(SCardLocateCardsByATR) +LONG WINAPI SCardReconnect(SCARDHANDLE,DWORD,DWORD,DWORD,LPDWORD); +LONG WINAPI SCardReleaseContext(SCARDCONTEXT); +void WINAPI SCardReleaseStartedEvent(HANDLE); +LONG WINAPI SCardRemoveReaderFromGroupA(SCARDCONTEXT,LPCSTR,LPCSTR); +LONG WINAPI SCardRemoveReaderFromGroupW(SCARDCONTEXT,LPCWSTR,LPCWSTR); +#define SCardRemoveReaderFromGroup WINELIB_NAME_AW(SCardRemoveReaderFromGroup) +LONG WINAPI SCardSetAttrib(SCARDHANDLE,DWORD,LPCBYTE,DWORD); +LONG WINAPI SCardSetCardTypeProviderNameA(SCARDCONTEXT,LPCSTR,DWORD,LPCSTR); +LONG WINAPI SCardSetCardTypeProviderNameW(SCARDCONTEXT,LPCWSTR,DWORD,LPCWSTR); +#define SCardSetCardTypeProviderName WINELIB_NAME_AW(SCardSetCardTypeProviderName) +LONG WINAPI SCardState(SCARDHANDLE,LPDWORD,LPDWORD,LPBYTE,LPDWORD); +LONG WINAPI SCardStatusA(SCARDHANDLE,LPSTR,LPDWORD,LPDWORD,LPDWORD,LPBYTE,LPDWORD); +LONG WINAPI SCardStatusW(SCARDHANDLE,LPWSTR,LPDWORD,LPDWORD,LPDWORD,LPBYTE,LPDWORD); +#define SCardStatus WINELIB_NAME_AW(SCardStatus) +LONG WINAPI SCardTransmit(SCARDHANDLE,LPCSCARD_IO_REQUEST,LPCBYTE,DWORD,LPSCARD_IO_REQUEST,LPBYTE,LPDWORD); #ifdef __cplusplus } #endif -#endif /* __WINSCARD_H */ -/* EOF */ +#endif /* __WINE_WINSCARD_H */ Modified: trunk/reactos/include/psdk/winsmcrd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winsmcrd.h?re… ============================================================================== --- trunk/reactos/include/psdk/winsmcrd.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winsmcrd.h [iso-8859-1] Sat Dec 27 07:28:36 2008 @@ -35,7 +35,7 @@ BYTE bIns; BYTE P1; BYTE P2; - BYTE P3 + BYTE P3; } SCARD_T0_COMMAND, *PSCARD_T0_COMMAND, *LPSCARD_T0_COMMAND; typedef struct _SCARD_T0_REQUEST @@ -55,7 +55,7 @@ SCARD_IO_REQUEST ioRequest; } SCARD_T1_REQUEST, *PSCARD_T1_REQUEST, *LPSCARD_T1_REQUEST; -#define FILE_DEVICE_SMARTCARD (0x00000031) +#define FILE_DEVICE_SMARTCARD 49 #define SCARD_ATR_LENGTH (0x21)

15 years, 10 months

[cwittich] 38387: sync hlink with wine 1.1.11

by cwittich＠svn.reactos.org

Author: cwittich Date: Sat Dec 27 07:09:48 2008 New Revision: 38387 URL: http://svn.reactos.org/svn/reactos?rev=38387&view=rev Log: sync hlink with wine 1.1.11 Modified: trunk/reactos/dll/win32/hlink/link.c Modified: trunk/reactos/dll/win32/hlink/link.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/link.c?rev… ============================================================================== --- trunk/reactos/dll/win32/hlink/link.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hlink/link.c [iso-8859-1] Sat Dec 27 07:09:48 2008 @@ -441,14 +441,14 @@ static HRESULT WINAPI IHlink_fnSetAdditonalParams(IHlink* iface, LPCWSTR pwzAdditionalParams) { - FIXME("\n"); + TRACE("Not implemented in native IHlink\n"); return E_NOTIMPL; } static HRESULT WINAPI IHlink_fnGetAdditionalParams(IHlink* iface, LPWSTR* ppwzAdditionalParams) { - FIXME("\n"); + TRACE("Not implemented in native IHlink\n"); return E_NOTIMPL; }

15 years, 10 months

[cwittich] 38386: sync fusion with wine 1.1.11

by cwittich＠svn.reactos.org

Author: cwittich Date: Sat Dec 27 07:08:23 2008 New Revision: 38386 URL: http://svn.reactos.org/svn/reactos?rev=38386&view=rev Log: sync fusion with wine 1.1.11 Modified: trunk/reactos/dll/win32/fusion/assembly.c Modified: trunk/reactos/dll/win32/fusion/assembly.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/assembly.… ============================================================================== --- trunk/reactos/dll/win32/fusion/assembly.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/assembly.c [iso-8859-1] Sat Dec 27 07:08:23 2008 @@ -502,7 +502,7 @@ ULONG currofs; currofs = offset; - assembly->tableshdr = (METADATATABLESHDR *)assembly_data_offset(assembly, currofs); + assembly->tableshdr = assembly_data_offset(assembly, currofs); if (!assembly->tableshdr) return E_FAIL; @@ -514,7 +514,7 @@ sizeof(DWORD) : sizeof(WORD); currofs += sizeof(METADATATABLESHDR); - assembly->numrows = (DWORD *)assembly_data_offset(assembly, currofs); + assembly->numrows = assembly_data_offset(assembly, currofs); if (!assembly->numrows) return E_FAIL; @@ -628,9 +628,9 @@ return hr; } else if (!lstrcmpA(stream, "#Strings") || !lstrcmpA(stream, "Strings")) - assembly->strings = (BYTE *)assembly_data_offset(assembly, ofs); + assembly->strings = assembly_data_offset(assembly, ofs); else if (!lstrcmpA(stream, "#Blob") || !lstrcmpA(stream, "Blob")) - assembly->blobs = (BYTE *)assembly_data_offset(assembly, ofs); + assembly->blobs = assembly_data_offset(assembly, ofs); ptr += lstrlenA(stream) + 1; ptr = (BYTE *)(((UINT_PTR)ptr + 3) & ~3); /* align on DWORD boundary */ @@ -883,7 +883,7 @@ if (offset == -1) return E_FAIL; - asmtbl = (ASSEMBLYTABLE *)assembly_data_offset(assembly, offset); + asmtbl = assembly_data_offset(assembly, offset); if (!asmtbl) return E_FAIL;

15 years, 10 months

[cwittich] 38385: sync atl with wine 1.1.11

by cwittich＠svn.reactos.org

Author: cwittich Date: Sat Dec 27 07:06:42 2008 New Revision: 38385 URL: http://svn.reactos.org/svn/reactos?rev=38385&view=rev Log: sync atl with wine 1.1.11 Modified: trunk/reactos/dll/win32/atl/atl_ax.c trunk/reactos/dll/win32/atl/registrar.c Modified: trunk/reactos/dll/win32/atl/atl_ax.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl_ax.c?rev… ============================================================================== --- trunk/reactos/dll/win32/atl/atl_ax.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl/atl_ax.c [iso-8859-1] Sat Dec 27 07:06:42 2008 @@ -117,7 +117,7 @@ */ -static ULONG WINAPI IOCS_AddRef(IOCS *This) +static ULONG IOCS_AddRef(IOCS *This) { ULONG ref = InterlockedIncrement(&This->ref); @@ -132,7 +132,7 @@ #define THIS2IOLEINPLACEFRAME(This) ((IOleInPlaceFrame*)&This->lpOleInPlaceFrameVtbl) #define THIS2IOLECONTROLSITE(This) ((IOleControlSite*)&This->lpOleControlSiteVtbl) -static HRESULT WINAPI IOCS_QueryInterface(IOCS *This, REFIID riid, void **ppv) +static HRESULT IOCS_QueryInterface(IOCS *This, REFIID riid, void **ppv) { *ppv = NULL; @@ -166,7 +166,7 @@ } static HRESULT IOCS_Detach( IOCS *This ); -static ULONG WINAPI IOCS_Release(IOCS *This) +static ULONG IOCS_Release(IOCS *This) { ULONG ref = InterlockedDecrement(&This->ref); @@ -752,7 +752,7 @@ if ( This->hWnd ) { SetWindowLongPtrW( This->hWnd, GWLP_WNDPROC, (ULONG_PTR) This->OrigWndProc ); - SetWindowLongPtrW( This->hWnd, GWLP_USERDATA, (LONG_PTR) NULL ); + SetWindowLongPtrW( This->hWnd, GWLP_USERDATA, 0 ); This->hWnd = NULL; } if ( This->control ) @@ -1244,7 +1244,7 @@ hgl = LoadResource (hInst, hrsrc); if ( !hgl ) return NULL; - ptr = (LPCDLGTEMPLATEW)LockResource ( hgl ); + ptr = LockResource ( hgl ); if (!ptr) { FreeResource( hgl ); Modified: trunk/reactos/dll/win32/atl/registrar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/registrar.c?… ============================================================================== --- trunk/reactos/dll/win32/atl/registrar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl/registrar.c [iso-8859-1] Sat Dec 27 07:06:42 2008 @@ -242,7 +242,7 @@ strbuf_write(buf->str, &name, -1); }else if(key_type == DO_DELETE) { TRACE("Deleting %s\n", debugstr_w(buf->str)); - lres = RegDeleteTreeW(parent_key, buf->str); + RegDeleteTreeW(parent_key, buf->str); }else { if(key_type == FORCE_REMOVE) RegDeleteTreeW(parent_key, buf->str); @@ -439,7 +439,7 @@ if(hins) { src = FindResourceW(hins, szID, szType); if(src) { - regstra = (LPSTR)LoadResource(hins, src); + regstra = LoadResource(hins, src); reslen = SizeofResource(hins, src); if(regstra) { len = MultiByteToWideChar(CP_ACP, 0, regstra, reslen, NULL, 0)+1;

15 years, 10 months

← Newer
1
...
8
9
10
11
12
13
14
...
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 December 2008