Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 55292: [EHCI] - EHCI controllers support 15 ports as specified
by janderwald＠svn.reactos.org 29 Jan '12

29 Jan '12

Author: janderwald Date: Sun Jan 29 17:25:34 2012 New Revision: 55292 URL: http://svn.reactos.org/svn/reactos?rev=55292&view=rev Log: [EHCI] - EHCI controllers support 15 ports as specified Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.h Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.h [iso-8859-1] Sun Jan 29 17:25:34 2012 @@ -256,7 +256,7 @@ EHCI_HCC_CONTENT HCCParams; ULONG HCCParamsLong; }; - UCHAR PortRoute [8]; + UCHAR PortRoute [15]; } EHCI_CAPS, *PEHCI_CAPS;

1 0

[janderwald] 55291: [USBEHCI] - Rewrite the init routine of EHCI controller - Implement PORT_POWER
by janderwald＠svn.reactos.org 29 Jan '12

29 Jan '12

Author: janderwald Date: Sun Jan 29 17:24:41 2012 New Revision: 55291 URL: http://svn.reactos.org/svn/reactos?rev=55291&view=rev Log: [USBEHCI] - Rewrite the init routine of EHCI controller - Implement PORT_POWER Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] Sun Jan 29 17:24:41 2012 @@ -80,6 +80,13 @@ KIRQL AcquireDeviceLock(void); VOID ReleaseDeviceLock(KIRQL OldLevel); + // set command + VOID SetCommandRegister(PEHCI_USBCMD_CONTENT UsbCmd); + + // get command + VOID GetCommandRegister(PEHCI_USBCMD_CONTENT UsbCmd); + + // local BOOLEAN InterruptService(); @@ -118,11 +125,6 @@ ULONG m_SyncFramePhysAddr; // periodic frame list physical address BOOLEAN m_ResetInProgress[16]; // set when a reset is in progress - // set command - VOID SetCommandRegister(PEHCI_USBCMD_CONTENT UsbCmd); - - // get command - VOID GetCommandRegister(PEHCI_USBCMD_CONTENT UsbCmd); // read register ULONG EHCI_READ_REGISTER_ULONG(ULONG Offset); @@ -336,8 +338,13 @@ m_Capabilities.HCSParamsLong = READ_REGISTER_ULONG((PULONG)((ULONG)ResourceBase + 4)); m_Capabilities.HCCParamsLong = READ_REGISTER_ULONG((PULONG)((ULONG)ResourceBase + 8)); + DPRINT1("Controller has %d Length\n", m_Capabilities.Length); DPRINT1("Controller has %d Ports\n", m_Capabilities.HCSParams.PortCount); DPRINT1("Controller EHCI Version %x\n", m_Capabilities.HCIVersion); + DPRINT1("Controler EHCI Caps HCSParamsLong %x\n", m_Capabilities.HCSParamsLong); + DPRINT1("Controler EHCI Caps HCCParamsLong %x\n", m_Capabilities.HCCParamsLong); + + DPRINT1("Controler EHCI Caps PowerControl %x\n", m_Capabilities.HCSParams.PortPowerControl); if (m_Capabilities.HCSParams.PortRouteRules) { for (Count = 0; Count < m_Capabilities.HCSParams.PortCount; Count++) @@ -518,22 +525,42 @@ ULONG UsbSts, FailSafe; // + // check caps + // + if (m_Capabilities.HCCParams.CurAddrBits) + { + // + // disable 64-bit addressing + // + EHCI_WRITE_REGISTER_ULONG(EHCI_CTRLDSSEGMENT, 0x0); + } + + +#if 1 + // // Stop the controller if its running // UsbSts = EHCI_READ_REGISTER_ULONG(EHCI_USBSTS); if (!(UsbSts & EHCI_STS_HALT)) + { + DPRINT1("Stopping Controller %x\n", UsbSts); StopController(); + } +#endif // // Enable Interrupts and start execution // - EHCI_WRITE_REGISTER_ULONG(EHCI_USBINTR, EHCI_USBINTR_INTE | EHCI_USBINTR_ERR | EHCI_USBINTR_ASYNC | EHCI_USBINTR_HSERR - /*| EHCI_USBINTR_FLROVR*/ | EHCI_USBINTR_PC); - - // - // Assign the AsyncList Register - // - EHCI_WRITE_REGISTER_ULONG(EHCI_ASYNCLISTBASE, AsyncQueueHead->PhysicalAddr); + ULONG Mask = EHCI_USBINTR_INTE | EHCI_USBINTR_ERR | EHCI_USBINTR_ASYNC | EHCI_USBINTR_HSERR | EHCI_USBINTR_PC; + EHCI_WRITE_REGISTER_ULONG(EHCI_USBINTR, Mask); + + KeStallExecutionProcessor(10); + + ULONG Status = EHCI_READ_REGISTER_ULONG(EHCI_USBINTR); + + DPRINT1("Interrupt Mask %x\n", Status); + ASSERT((Status & Mask) == Mask); + // // Assign the SyncList Register @@ -543,13 +570,12 @@ // // Set Schedules to Enable and Interrupt Threshold to 1ms. // - GetCommandRegister(&UsbCmd); + RtlZeroMemory(&UsbCmd, sizeof(EHCI_USBCMD_CONTENT)); + UsbCmd.PeriodicEnable = TRUE; - UsbCmd.IntThreshold = 1; - SetCommandRegister(&UsbCmd); - - GetCommandRegister(&UsbCmd); + UsbCmd.IntThreshold = 0x8; //1ms UsbCmd.Run = TRUE; + UsbCmd.FrameListSize = 0x0; //1024 SetCommandRegister(&UsbCmd); // @@ -566,6 +592,7 @@ } } + if (UsbSts & EHCI_STS_HALT) { DPRINT1("Could not start execution on the controller\n"); @@ -573,17 +600,62 @@ } // + // Assign the AsyncList Register + // + EHCI_WRITE_REGISTER_ULONG(EHCI_ASYNCLISTBASE, AsyncQueueHead->PhysicalAddr); + + // + // get command register + // + GetCommandRegister(&UsbCmd); + + // + // preserve bits + // + UsbCmd.AsyncEnable = TRUE; + + // + // enable async + // + SetCommandRegister(&UsbCmd); + + // + // Wait for execution to start + // + for (FailSafe = 100; FailSafe > 1; FailSafe--) + { + KeStallExecutionProcessor(10); + UsbSts = EHCI_READ_REGISTER_ULONG(EHCI_USBSTS); + + if ((UsbSts & EHCI_STS_ASS)) + { + break; + } + } + + if (!(UsbSts & EHCI_STS_ASS)) + { + DPRINT1("Failed to enable async schedule UsbSts %x\n", UsbSts); + ASSERT(FALSE); + return STATUS_UNSUCCESSFUL; + } + + DPRINT1("UsbSts %x\n", UsbSts); + GetCommandRegister(&UsbCmd); + + DPRINT1("UsbCmd.PeriodicEnable %x\n", UsbCmd.PeriodicEnable); + DPRINT1("UsbCmd.AsyncEnable %x\n", UsbCmd.AsyncEnable); + DPRINT1("UsbCmd.IntThreshold %x\n", UsbCmd.IntThreshold); + DPRINT1("UsbCmd.Run %x\n", UsbCmd.Run); + DPRINT1("UsbCmd.FrameListSize %x\n", UsbCmd.FrameListSize); + + // // Set port routing to EHCI controller // EHCI_WRITE_REGISTER_ULONG(EHCI_CONFIGFLAG, 1); - // - // Enable async - // - GetCommandRegister(&UsbCmd); - UsbCmd.AsyncEnable = TRUE; //FIXME: Need USB Memory Manager - // FIXME: Set framelistsize when periodic is implemented. - SetCommandRegister(&UsbCmd); + + DPRINT1("EHCI Started!\n"); return STATUS_SUCCESS; @@ -854,8 +926,16 @@ } if (Feature == PORT_POWER) - DPRINT1("PORT_POWER Not implemented\n"); - + { + if (m_Capabilities.HCSParams.PortPowerControl) + { + // + // enable port power + // + ULONG Value = EHCI_READ_REGISTER_ULONG(EHCI_PORTSC + (4 * PortId)) | EHCI_PRT_POWER; + EHCI_WRITE_REGISTER_ULONG(EHCI_PORTSC, Value); + } + } return STATUS_SUCCESS; } @@ -982,6 +1062,7 @@ This = (CUSBHardwareDevice*) SystemArgument1; CStatus = (ULONG) SystemArgument2; + DPRINT1("CStatus %x\n", CStatus); // // check for completion of async schedule

1 0

[ion] 55290: [SMSS]: Add a new header which precisely documents the SB and SM packet structure and protocol. These match the Server 2003 SP1 definitions and sizes and would allow a ReactOS SMSS to ...
by ion＠svn.reactos.org 29 Jan '12

29 Jan '12

Author: ion Date: Sun Jan 29 17:16:01 2012 New Revision: 55290 URL: http://svn.reactos.org/svn/reactos?rev=55290&view=rev Log: [SMSS]: Add a new header which precisely documents the SB and SM packet structure and protocol. These match the Server 2003 SP1 definitions and sizes and would allow a ReactOS SMSS to talk to a Windows CSRSS and vice-versa. Added: trunk/reactos/include/reactos/subsys/sm/smmsg.h (with props) Added: trunk/reactos/include/reactos/subsys/sm/smmsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/sm/… ============================================================================== --- trunk/reactos/include/reactos/subsys/sm/smmsg.h (added) +++ trunk/reactos/include/reactos/subsys/sm/smmsg.h [iso-8859-1] Sun Jan 29 17:16:01 2012 @@ -1,0 +1,207 @@ +/* + * PROJECT: ReactOS Windows-Compatible Session Manager + * LICENSE: BSD 2-Clause License + * FILE: include/reactos/subsystems/sm/smmsg.h + * PURPOSE: SMSS (SB and SM) Message Format + * PROGRAMMERS: Alex Ionescu + */ + +// +// There are the APIs that a Client (such as CSRSS) can send to the SMSS Server. +// +// These are called "SM" APIs. +// +// The exact names are not known, but we are basing them on the SmpApiName array +// in the checked build of SMSS, which is probably a close approximation. We add +// "p" to use the similar nomenclature seen/leaked out in the Base CSRSS APIs. +// +// +typedef enum _SMSRV_API_NUMBER +{ + SmpCreateForeignSession, + SmpSessionComplete, + SmpTerminateForeignSession, + SmpExecPgm, + SmpLoadDeferedSubsystem, + SmpStartCsr, + SmpStopCsr, + SmpMaxApiNumber // Based on BasepMaxApiNumber, UserpMaxApiNumber... +} SMSRV_API_NUMBER; + +// +// These are the structures making up the SM_API_MSG packet structure defined +// below. Each one corresponds to an equivalent API from the list above. +// +typedef struct _SM_CREATE_FOREIGN_SESSION_MSG +{ + ULONG NotImplemented; +} SM_CREATE_FOREIGN_SESSION_MSG, *PSM_CREATE_FOREIGN_SESSION_MSG; + +typedef struct _SM_SESSION_COMPLETE_MSG +{ + ULONG SessionId; + NTSTATUS Status; +} SM_SESSION_COMPLETE_MSG, *PSM_SESSION_COMPLETE_MSG; + +typedef struct _SM_TERMINATE_FOREIGN_SESSION_MSG +{ + ULONG NotImplemented; +} SM_TERMINATE_FOREIGN_SESSION_MSG, *PSM_TERMINATE_FOREIGN_SESSION_MSG; + +typedef struct _SM_EXEC_PGM_MSG +{ + RTL_USER_PROCESS_INFORMATION ProcessInformation; + BOOLEAN DebugFlag; +} SM_EXEC_PGM_MSG, *PM_EXEC_PGM_MSG; + +typedef struct _SM_LOAD_DEFERED_SUBSYSTEM_MSG +{ + ULONG Length; + WCHAR Buffer[32]; +} SM_LOAD_DEFERED_SUBSYSTEM_MSG, *PSM_LOAD_DEFERED_SUBSYSTEM_MSG; + +typedef struct _SM_START_CSR_MSG +{ + ULONG MuSessionId; + ULONG Length; + WCHAR Buffer[128]; + HANDLE WindowsSubSysProcessId; + HANDLE SmpInitialCommandProcessId; +} SM_START_CSR_MSG, *PSM_START_CSR_MSG; + +typedef struct _SM_STOP_CSR_MSG +{ + ULONG MuSessionId; +} SM_STOP_CSR_MSG, *PSM_STOP_CSR_MSG; + +// +// This is the actual packet structure sent over LCP to the \SmApiPort +// +typedef struct _SM_API_MSG +{ + PORT_MESSAGE h; + SMSRV_API_NUMBER ApiNumber; + NTSTATUS ReturnValue; + union + { + SM_CREATE_FOREIGN_SESSION_MSG CreateForeignSession; + SM_SESSION_COMPLETE_MSG SessionComplete; + SM_TERMINATE_FOREIGN_SESSION_MSG TerminateForeignComplete; + SM_EXEC_PGM_MSG ExecPgm; + SM_LOAD_DEFERED_SUBSYSTEM_MSG LoadDefered; + SM_START_CSR_MSG StartCsr; + SM_STOP_CSR_MSG StopCsr; + } u; +} SM_API_MSG, *PSM_API_MSG; + +// +// This is the size that Server 2003 SP1 SMSS expects, so make sure we conform. +// +C_ASSERT(sizeof(SM_API_MSG) == 0x130); + +// +// There are the APIs that the SMSS Serve can send to a client (such as CSRSS) +// +// These are called "SB" APIs. +// +// The exact names are unknown but we are basing them on the CsrServerSbApiName +// array in the checked build of CSRSRV which is probably a close approximation. +// We add "p" to use the similar nomenclature seen/leaked out in the Base CSRSS +// APIs. +// +// +typedef enum _SB_API_NUMBER +{ + SbpCreateSession, + SbpTerminateSession, + SbpForeignSessionComplete, + SbpCreateProcess, + SbpMaxApiNumber // Based on BasepMaxApiNumber, UserpMaxApiNumber... +} SB_API_NUMBER; + +// +// These are the structures making up the SB_API_MSG packet structure defined +// below. Each one corresponds to an equivalent API from the list above. +// +typedef struct _SB_CREATE_SESSION_MSG +{ + ULONG SessionId; + RTL_USER_PROCESS_INFORMATION ProcessInfo; +} SB_CREATE_SESSION_MSG, *PSB_CREATE_SESSION_MSG; + +typedef struct _SB_TERMINATE_SESSION_MSG +{ + ULONG SessionId; +} SB_TERMINATE_SESSION_MSG, *PSB_TERMINATE_SESSION_MSG; + +typedef struct _SB_FOREIGN_SESSION_COMPLETE_MSG +{ + ULONG SessionId; +} SB_FOREIGN_SESSION_COMPLETE_MSG, *PSB_FOREIGN_SESSION_COMPLETE_MSG; + +#define SB_PROCESS_FLAGS_DEBUG 0x1 +#define SB_PROCESS_FLAGS_WAIT_ON_THREAD 0x2 +#define SB_PROCESS_FLAGS_RESERVE_1MB 0x8 +#define SB_PROCESS_FLAGS_SKIP_CHECKS 0x20 +typedef struct _SB_CREATE_PROCESS_MSG +{ + union + { + struct + { + PUNICODE_STRING ImageName; + PUNICODE_STRING CurrentDirectory; + PUNICODE_STRING CommandLine; + PUNICODE_STRING DllPath; + ULONG Flags; + ULONG DebugFlags; + } In; + struct + { + HANDLE ProcessHandle; + HANDLE ThreadHandle; + ULONG SubsystemType; + CLIENT_ID ClientId; + } Out; + }; +} SB_CREATE_PROCESS_MSG, *PSB_CREATE_PROCESS_MSG; + +// +// When the server connects to a client, this structure is exchanged +// +typedef struct _SB_CONNECTION_INFO +{ + ULONG SubsystemType; + WCHAR SbApiPortName[120]; +} SB_CONNECTION_INFO, *PSB_CONNECTION_INFO; + +// +// This is the actual packet structure sent over LCP to the \SbApiPort +// +typedef struct _SB_API_MSG +{ + PORT_MESSAGE Header; + union + { + SB_CONNECTION_INFO ConnectionInfo; + struct + { + SB_API_NUMBER ApiNumber; + NTSTATUS ReturnValue; + union + { + SB_CREATE_SESSION_MSG CreateSession; + SB_TERMINATE_SESSION_MSG TerminateSession; + SB_FOREIGN_SESSION_COMPLETE_MSG ForeignSessionComplete; + SB_CREATE_PROCESS_MSG CreateProcess; + }; + }; + }; +} SB_API_MSG, *PSB_API_MSG; + +// +// This is the size that Server 2003 SP1 SMSS expects, so make sure we conform. +// +C_ASSERT(sizeof(SB_CONNECTION_INFO) == 0xF4); +C_ASSERT(sizeof(SB_API_MSG) == 0x110); + Propchange: trunk/reactos/include/reactos/subsys/sm/smmsg.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[gadamopoulos] 55289: [user32] - don't use DbgPrint for error messages
by gadamopoulos＠svn.reactos.org 29 Jan '12

29 Jan '12

Author: gadamopoulos Date: Sun Jan 29 11:13:07 2012 New Revision: 55289 URL: http://svn.reactos.org/svn/reactos?rev=55289&view=rev Log: [user32] - don't use DbgPrint for error messages Modified: trunk/reactos/dll/win32/user32/windows/menu.c Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Sun Jan 29 11:13:07 2012 @@ -2168,14 +2168,14 @@ ncm.cbSize = sizeof(ncm); if(!SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(ncm), &ncm, 0)) { - DbgPrint("MenuInit(): SystemParametersInfoW(SPI_GETNONCLIENTMETRICS) failed!\n"); + ERR("MenuInit(): SystemParametersInfoW(SPI_GETNONCLIENTMETRICS) failed!\n"); return FALSE; } hMenuFont = CreateFontIndirectW(&ncm.lfMenuFont); if(hMenuFont == NULL) { - DbgPrint("MenuInit(): CreateFontIndirectW(hMenuFont) failed!\n"); + ERR("MenuInit(): CreateFontIndirectW(hMenuFont) failed!\n"); return FALSE; } @@ -2183,7 +2183,7 @@ hMenuFontBold = CreateFontIndirectW(&ncm.lfMenuFont); if(hMenuFontBold == NULL) { - DbgPrint("MenuInit(): CreateFontIndirectW(hMenuFontBold) failed!\n"); + ERR("MenuInit(): CreateFontIndirectW(hMenuFontBold) failed!\n"); DeleteObject(hMenuFont); hMenuFont = NULL; return FALSE;

1 0

[gadamopoulos] 55288: [win32k] - Show some error messages in case NtUserSystemParametersInfo fails
by gadamopoulos＠svn.reactos.org 29 Jan '12

29 Jan '12

Author: gadamopoulos Date: Sun Jan 29 10:32:59 2012 New Revision: 55288 URL: http://svn.reactos.org/svn/reactos?rev=55288&view=rev Log: [win32k] - Show some error messages in case NtUserSystemParametersInfo fails Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] Sun Jan 29 10:32:59 2012 @@ -27,6 +27,7 @@ #define REQ_INTERACTIVE_WINSTA(err) \ if (gpwinstaCurrent != InputWindowStation) \ { \ + ERR("NtUserSystemParametersInfo requires interactive window station\n"); \ EngSetLastError(err); \ return 0; \ } @@ -422,7 +423,7 @@ if (!NT_SUCCESS(Status)) { SetLastNtError(Status); - TRACE("SpiMemCopy failed, pvDst=%p, pvSrc=%p, bProtect=%d, bToUser=%d\n", pvDst, pvSrc, bProtect, bToUser); + ERR("SpiMemCopy failed, pvDst=%p, pvSrc=%p, bProtect=%d, bToUser=%d\n", pvDst, pvSrc, bProtect, bToUser); } return NT_SUCCESS(Status); } @@ -1536,6 +1537,7 @@ if (!gbSpiInitialized) { KeRosDumpStackFrames(NULL, 20); + //ASSERT(FALSE); return FALSE; } @@ -1545,7 +1547,8 @@ if (!gpwinstaCurrent) { ERR("UserSystemParametersInfo called without active windowstation.\n"); - //KeRosDumpStackFrames(NULL, 0); + //ASSERT(FALSE); + //return FALSE; } /* Do the actual operation */

1 0

[jimtabor] 55287: - uxtheme is forked.
by jimtabor＠svn.reactos.org 29 Jan '12

29 Jan '12

Author: jimtabor Date: Sun Jan 29 03:28:39 2012 New Revision: 55287 URL: http://svn.reactos.org/svn/reactos?rev=55287&view=rev Log: - uxtheme is forked. 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 [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Jan 29 03:28:39 2012 @@ -167,7 +167,7 @@ reactos/dll/win32/url # Autosync reactos/dll/win32/urlmon # Autosync reactos/dll/win32/usp10 # Synced to Wine-1.3.37 -reactos/dll/win32/uxtheme # Autosync +reactos/dll/win32/uxtheme # Forked reactos/dll/win32/version # Autosync reactos/dll/win32/wer # Autosync reactos/dll/win32/windowscodecs # Autosync

1 0

[akhaldi] 55286: [ODBCCP32_WINETEST] * Sync to Wine 1.3.37.
by akhaldi＠svn.reactos.org 28 Jan '12

28 Jan '12

Author: akhaldi Date: Sat Jan 28 23:15:16 2012 New Revision: 55286 URL: http://svn.reactos.org/svn/reactos?rev=55286&view=rev Log: [ODBCCP32_WINETEST] * Sync to Wine 1.3.37. Modified: trunk/rostests/winetests/odbccp32/misc.c Modified: trunk/rostests/winetests/odbccp32/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/odbccp32/misc.c… ============================================================================== --- trunk/rostests/winetests/odbccp32/misc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/odbccp32/misc.c [iso-8859-1] Sat Jan 28 23:15:16 2012 @@ -86,28 +86,23 @@ bool_ret = SQLInstallDriverManager(NULL, 0, NULL); sql_ret = SQLInstallerErrorW(1, &error_code, NULL, 0, NULL); ok(!bool_ret, "SQLInstallDriverManager unexpectedly succeeded\n"); - todo_wine ok(sql_ret == SQL_SUCCESS_WITH_INFO && error_code == ODBC_ERROR_INVALID_BUFF_LEN, "Expected SQLInstallDriverManager to fail with ODBC_ERROR_INVALID_BUFF_LEN\n"); /* Length smaller than MAX_PATH */ bool_ret = SQLInstallDriverManager(target_path, MAX_PATH / 2, NULL); sql_ret = SQLInstallerErrorW(1, &error_code, NULL, 0, NULL); - todo_wine { ok(!bool_ret, "SQLInstallDriverManager unexpectedly succeeded\n"); ok(sql_ret == SQL_SUCCESS_WITH_INFO && error_code == ODBC_ERROR_INVALID_BUFF_LEN, "Expected SQLInstallDriverManager to fail with ODBC_ERROR_INVALID_BUFF_LEN\n"); - } path_out = 0xcafe; bool_ret = SQLInstallDriverManager(target_path, MAX_PATH / 2, &path_out); sql_ret = SQLInstallerErrorW(1, &error_code, NULL, 0, NULL); - todo_wine { ok(!bool_ret, "SQLInstallDriverManager unexpectedly succeeded\n"); ok(sql_ret == SQL_SUCCESS_WITH_INFO && error_code == ODBC_ERROR_INVALID_BUFF_LEN, "Expected SQLInstallDriverManager to fail with ODBC_ERROR_INVALID_BUFF_LEN\n"); ok(path_out == 0xcafe, "Expected path_out to not have changed\n"); - } /* Length OK */ bool_ret = SQLInstallDriverManager(target_path, MAX_PATH, NULL);

1 0

[akhaldi] 55285: [ODBCCP32] * Sync to Wine 1.3.37.
by akhaldi＠svn.reactos.org 28 Jan '12

28 Jan '12

Author: akhaldi Date: Sat Jan 28 23:15:03 2012 New Revision: 55285 URL: http://svn.reactos.org/svn/reactos?rev=55285&view=rev Log: [ODBCCP32] * Sync to Wine 1.3.37. Modified: trunk/reactos/dll/win32/odbccp32/odbccp32.c trunk/reactos/dll/win32/odbccp32/odbccp32.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/odbccp32/odbccp32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/odbccp32/odbccp3… ============================================================================== --- trunk/reactos/dll/win32/odbccp32/odbccp32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/odbccp32/odbccp32.c [iso-8859-1] Sat Jan 28 23:15:03 2012 @@ -522,8 +522,12 @@ UINT len; WCHAR path[MAX_PATH]; - clear_errors(); TRACE("(%p %d %p)\n", lpszPath, cbPathMax, pcbPathOut); + + if (cbPathMax < MAX_PATH) + return FALSE; + + clear_errors(); len = GetSystemDirectoryW(path, MAX_PATH); @@ -545,8 +549,12 @@ WORD len, cbOut = 0; WCHAR path[MAX_PATH]; - clear_errors(); TRACE("(%p %d %p)\n", lpszPath, cbPathMax, pcbPathOut); + + if (cbPathMax < MAX_PATH) + return FALSE; + + clear_errors(); ret = SQLInstallDriverManagerW(path, MAX_PATH, &cbOut); if (ret) @@ -836,26 +844,26 @@ LPDWORD lpdwUsageCount) { clear_errors(); - FIXME("\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + FIXME("stub\n"); + if (lpdwUsageCount) *lpdwUsageCount = 1; + return TRUE; } BOOL WINAPI SQLRemoveDriver(LPCSTR lpszDriver, BOOL fRemoveDSN, LPDWORD lpdwUsageCount) { clear_errors(); - FIXME("\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + FIXME("stub\n"); + if (lpdwUsageCount) *lpdwUsageCount = 1; + return TRUE; } BOOL WINAPI SQLRemoveDriverManager(LPDWORD pdwUsageCount) { clear_errors(); - FIXME("\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + FIXME("stub\n"); + if (pdwUsageCount) *pdwUsageCount = 1; + return TRUE; } BOOL WINAPI SQLRemoveDSNFromIniW(LPCWSTR lpszDSN) Modified: trunk/reactos/dll/win32/odbccp32/odbccp32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/odbccp32/odbccp3… ============================================================================== --- trunk/reactos/dll/win32/odbccp32/odbccp32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/odbccp32/odbccp32.spec [iso-8859-1] Sat Jan 28 23:15:03 2012 @@ -1,6 +1,6 @@ @ stdcall ODBCCPlApplet( long long ptr ptr) -@ stdcall SQLConfigDataSource(ptr long wstr wstr) -@ stdcall SQLConfigDataSourceW(ptr long str str) +@ stdcall SQLConfigDataSource(ptr long str str) +@ stdcall SQLConfigDataSourceW(ptr long wstr wstr) @ stdcall SQLConfigDriver(ptr long str str ptr long ptr) @ stdcall SQLConfigDriverW(ptr long wstr wstr ptr long ptr) @ stdcall SQLCreateDataSource(ptr str) Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Jan 28 23:15:03 2012 @@ -121,7 +121,7 @@ reactos/dll/win32/ntprint # Synced to Wine-1.3.37 reactos/dll/win32/objsel # Synced to Wine-1.3.37 reactos/dll/win32/odbc32 # Out of sync. Depends on port of Linux ODBC. -reactos/dll/win32/odbccp32 # Autosync +reactos/dll/win32/odbccp32 # Synced to Wine-1.3.37 reactos/dll/win32/ole32 # Autosync reactos/dll/win32/oleacc # Autosync reactos/dll/win32/oleaut32 # Autosync

1 0

[akhaldi] 55284: [MSIMTF] * Sync to Wine 1.3.37.
by akhaldi＠svn.reactos.org 28 Jan '12

28 Jan '12

Author: akhaldi Date: Sat Jan 28 22:42:14 2012 New Revision: 55284 URL: http://svn.reactos.org/svn/reactos?rev=55284&view=rev Log: [MSIMTF] * Sync to Wine 1.3.37. Added: trunk/reactos/dll/win32/msimtf/msimtf.idl (with props) trunk/reactos/dll/win32/msimtf/msimtf.rgs (with props) Removed: trunk/reactos/dll/win32/msimtf/msimtf.inf Modified: trunk/reactos/dll/win32/msimtf/activeimmapp.c trunk/reactos/dll/win32/msimtf/main.c trunk/reactos/dll/win32/msimtf/rsrc.rc trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msimtf/activeimmapp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msimtf/activeimm… ============================================================================== --- trunk/reactos/dll/win32/msimtf/activeimmapp.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msimtf/activeimmapp.c [iso-8859-1] Sat Jan 28 22:42:14 2012 @@ -31,7 +31,6 @@ #include "winuser.h" #include "winerror.h" #include "objbase.h" -#include "advpub.h" #include "dimm.h" #include "imm.h" @@ -42,10 +41,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(msimtf); typedef struct tagActiveIMMApp { - const IActiveIMMAppVtbl *vtbl; + IActiveIMMApp IActiveIMMApp_iface; LONG refCount; } ActiveIMMApp; +static inline ActiveIMMApp *impl_from_IActiveIMMApp(IActiveIMMApp *iface) +{ + return CONTAINING_RECORD(iface, ActiveIMMApp, IActiveIMMApp_iface); +} + static void ActiveIMMApp_Destructor(ActiveIMMApp* This) { TRACE("\n"); @@ -55,7 +59,7 @@ static HRESULT WINAPI ActiveIMMApp_QueryInterface (IActiveIMMApp* iface, REFIID iid, LPVOID *ppvOut) { - ActiveIMMApp *This = (ActiveIMMApp*)iface; + ActiveIMMApp *This = impl_from_IActiveIMMApp(iface); *ppvOut = NULL; if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_IActiveIMMApp)) @@ -75,13 +79,13 @@ static ULONG WINAPI ActiveIMMApp_AddRef(IActiveIMMApp* iface) { - ActiveIMMApp *This = (ActiveIMMApp*)iface; + ActiveIMMApp *This = impl_from_IActiveIMMApp(iface); return InterlockedIncrement(&This->refCount); } static ULONG WINAPI ActiveIMMApp_Release(IActiveIMMApp* iface) { - ActiveIMMApp *This = (ActiveIMMApp*)iface; + ActiveIMMApp *This = impl_from_IActiveIMMApp(iface); ULONG ret; ret = InterlockedDecrement(&This->refCount); @@ -808,7 +812,7 @@ ActiveIMMApp_EnumInputContext }; -HRESULT ActiveIMMApp_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) +DECLSPEC_HIDDEN HRESULT ActiveIMMApp_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) { ActiveIMMApp *This; if (pUnkOuter) @@ -818,7 +822,7 @@ if (This == NULL) return E_OUTOFMEMORY; - This->vtbl = &ActiveIMMAppVtbl; + This->IActiveIMMApp_iface.lpVtbl = &ActiveIMMAppVtbl; This->refCount = 1; TRACE("returning %p\n",This); Modified: trunk/reactos/dll/win32/msimtf/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msimtf/main.c?re… ============================================================================== --- trunk/reactos/dll/win32/msimtf/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msimtf/main.c [iso-8859-1] Sat Jan 28 22:42:14 2012 @@ -27,9 +27,8 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "winreg.h" -#include "advpub.h" #include "ole2.h" +#include "rpcproxy.h" #include "dimm.h" #include "wine/debug.h" @@ -60,10 +59,15 @@ } typedef struct { - const IClassFactoryVtbl *lpClassFactoryVtbl; + IClassFactory IClassFactory_iface; HRESULT (*cf)(IUnknown*,IUnknown**); } ClassFactory; + +static inline ClassFactory *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, ClassFactory, IClassFactory_iface); +} static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) @@ -100,7 +104,7 @@ static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown *pOuter, REFIID riid, void **ppv) { - ClassFactory *This = (ClassFactory*)iface; + ClassFactory *This = impl_from_IClassFactory(iface); HRESULT ret; IUnknown *obj; TRACE("(%p, %p, %s, %p)\n", iface, pOuter, debugstr_guid(riid), ppv); @@ -135,7 +139,7 @@ { if(IsEqualGUID(&CLSID_CActiveIMM, rclsid)) { static ClassFactory cf = { - &ClassFactoryVtbl, + { &ClassFactoryVtbl }, ActiveIMMApp_Constructor, }; @@ -154,59 +158,12 @@ return S_FALSE; } -#define INF_SET_CLSID(clsid) \ - do \ - { \ - static CHAR name[] = "CLSID_" #clsid; \ - \ - pse[i].pszName = name; \ - clsids[i++] = &CLSID_ ## clsid; \ - } while (0) - -static HRESULT register_server(BOOL doregister) -{ - HRESULT hres; - HMODULE hAdvpack; - HRESULT (WINAPI *pRegInstall)(HMODULE hm, LPCSTR pszSection, const STRTABLEA* pstTable); - STRTABLEA strtable; - STRENTRYA pse[1]; - static CLSID const *clsids[34]; - unsigned int i = 0; - - static const WCHAR wszAdvpack[] = {'a','d','v','p','a','c','k','.','d','l','l',0}; - - INF_SET_CLSID(CActiveIMM); - - for(i = 0; i < sizeof(pse)/sizeof(pse[0]); i++) { - pse[i].pszValue = HeapAlloc(GetProcessHeap(), 0, 39); - sprintf(pse[i].pszValue, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", - clsids[i]->Data1, clsids[i]->Data2, clsids[i]->Data3, clsids[i]->Data4[0], - clsids[i]->Data4[1], clsids[i]->Data4[2], clsids[i]->Data4[3], clsids[i]->Data4[4], - clsids[i]->Data4[5], clsids[i]->Data4[6], clsids[i]->Data4[7]); - } - - strtable.cEntries = sizeof(pse)/sizeof(pse[0]); - strtable.pse = pse; - - hAdvpack = LoadLibraryW(wszAdvpack); - pRegInstall = (void *)GetProcAddress(hAdvpack, "RegInstall"); - - hres = pRegInstall(msimtf_instance, doregister ? "RegisterDll" : "UnregisterDll", &strtable); - - for(i=0; i < sizeof(pse)/sizeof(pse[0]); i++) - HeapFree(GetProcessHeap(), 0, pse[i].pszValue); - - return hres; -} - -#undef INF_SET_CLSID - /*********************************************************************** * DllRegisterServer (msimtf.@) */ HRESULT WINAPI DllRegisterServer(void) { - return register_server(TRUE); + return __wine_register_resources( msimtf_instance ); } /*********************************************************************** @@ -214,5 +171,5 @@ */ HRESULT WINAPI DllUnregisterServer(void) { - return register_server(FALSE); + return __wine_unregister_resources( msimtf_instance ); } Added: trunk/reactos/dll/win32/msimtf/msimtf.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msimtf/msimtf.id… ============================================================================== --- trunk/reactos/dll/win32/msimtf/msimtf.idl (added) +++ trunk/reactos/dll/win32/msimtf/msimtf.idl [iso-8859-1] Sat Jan 28 22:42:14 2012 @@ -1,0 +1,38 @@ +/* + * COM Classes for msimtf + * + * Copyright 2010 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +[ + helpstring("CActiveIMMApp"), + threading(apartment), + uuid(4955dd33-b159-11d0-8fcf-00aa006bcc59) +] +coclass CActiveIMM { interface IActiveIMMApp; } + +[ + threading(apartment), + uuid(c1ee01f2-b3b6-4a6a-9ddd-e988c088ec82) +] +coclass CActiveIMMAppEx { interface IActiveIMMApp; } + +[ + threading(apartment), + uuid(50d5107a-d278-4871-8989-f4ceaaf59cfc) +] +coclass CActiveIMMAppEx_Trident { interface IActiveIMMApp; } Propchange: trunk/reactos/dll/win32/msimtf/msimtf.idl ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/reactos/dll/win32/msimtf/msimtf.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msimtf/msimtf.in… ============================================================================== --- trunk/reactos/dll/win32/msimtf/msimtf.inf [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msimtf/msimtf.inf (removed) @@ -1,26 +1,0 @@ -[version] -Signature="$CHICAGO$" - - -[RegisterDll] -AddReg=Classes.Reg - - -[UnregisterDll] -DelReg=Classes.Reg - - -[Classes.Reg] -HKCR,"CLSID\%CLSID_CActiveIMM%",,,"CActiveIMMApp" -HKCR,"CLSID\%CLSID_CActiveIMM%\InProcServer32",,,"msimtf.dll" -HKCR,"CLSID\%CLSID_CActiveIMM%\InProcServer32","ThreadingModel",,"Apartment" -HKCR,"CLSID\%CLSID_CActiveIMMAppEx_Trident%",,,"CActiveIMMAppEx_Trident" -HKCR,"CLSID\%CLSID_CActiveIMMAppEx_Trident%\InProcServer32",,,"msimtf.dll" -HKCR,"CLSID\%CLSID_CActiveIMMAppEx_Trident%\InProcServer32","ThreadingModel",,"Apartment" -HKCR,"CLSID\%CLSID_CActiveIMMAppEx%",,,"CActiveIMMAppEx" -HKCR,"CLSID\%CLSID_CActiveIMMAppEx%\InProcServer32",,,"msimtf.dll" -HKCR,"CLSID\%CLSID_CActiveIMMAppEx%\InProcServer32","ThreadingModel",,"Apartment" - -[Strings] -CLSID_CActiveIMMAppEx_Trident={50D5107A-D278-4871-8989-F4CEAAF59CFC} -CLSID_CActiveIMMAppEx="{C1EE01F2-B3B6-4A6A-9DDD-E988C088EC82}" Added: trunk/reactos/dll/win32/msimtf/msimtf.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msimtf/msimtf.rg… ============================================================================== --- trunk/reactos/dll/win32/msimtf/msimtf.rgs (added) +++ trunk/reactos/dll/win32/msimtf/msimtf.rgs [iso-8859-1] Sat Jan 28 22:42:14 2012 @@ -1,0 +1,21 @@ +HKCR +{ + NoRemove Interface + { + } + NoRemove CLSID + { + '{4955DD33-B159-11D0-8FCF-00AA006BCC59}' = s 'CActiveIMMApp' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } + } + '{C1EE01F2-B3B6-4A6A-9DDD-E988C088EC82}' = s 'CActiveIMMAppEx' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } + } + '{50D5107A-D278-4871-8989-F4CEAAF59CFC}' = s 'CActiveIMMAppEx_Trident' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } + } + } +} Propchange: trunk/reactos/dll/win32/msimtf/msimtf.rgs ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/msimtf/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msimtf/rsrc.rc?r… ============================================================================== --- trunk/reactos/dll/win32/msimtf/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msimtf/rsrc.rc [iso-8859-1] Sat Jan 28 22:42:14 2012 @@ -1,20 +1,1 @@ -/* - * Copyright 2007 Jacek Caban for CodeWeavers - * - * 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 - */ - -/* @makedep: msimtf.inf */ -REGINST REGINST msimtf.inf +1 WINE_REGISTRY msimtf.rgs Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Jan 28 22:42:14 2012 @@ -103,7 +103,7 @@ reactos/dll/win32/mshtml # Autosync reactos/dll/win32/msimg32 # Autosync reactos/dll/win32/msi # Autosync -reactos/dll/win32/msimtf # Autosync +reactos/dll/win32/msimtf # Synced to Wine-1.3.37 reactos/dll/win32/msisip # Synced to Wine-1.3.37 reactos/dll/win32/msisys.ocx # Autosync reactos/dll/win32/msnet32 # Autosync

1 0

[akhaldi] 55283: [STDOLE32.TLB] * Sync to Wine 1.3.37.
by akhaldi＠svn.reactos.org 28 Jan '12

28 Jan '12

Author: akhaldi Date: Sat Jan 28 22:22:11 2012 New Revision: 55283 URL: http://svn.reactos.org/svn/reactos?rev=55283&view=rev Log: [STDOLE32.TLB] * Sync to Wine 1.3.37. Added: trunk/reactos/dll/win32/stdole32.tlb/stdole32.tlb.rgs (with props) Modified: trunk/reactos/dll/win32/stdole32.tlb/CMakeLists.txt trunk/reactos/dll/win32/stdole32.tlb/rsrc.rc trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/stdole32.tlb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/stdole32.tlb/CMa… ============================================================================== --- trunk/reactos/dll/win32/stdole32.tlb/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/stdole32.tlb/CMakeLists.txt [iso-8859-1] Sat Jan 28 22:22:11 2012 @@ -4,17 +4,16 @@ add_typelib(std_ole_v1.idl) +set_rc_compiler() spec2def(stdole32.tlb stdole32.tlb.spec) list(APPEND SOURCE rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/stdole32.def) - + set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/std_ole_v1.tlb) add_library(stdole32.tlb SHARED ${SOURCE}) - set_module_type(stdole32.tlb module) set_target_properties(stdole32.tlb PROPERTIES SUFFIX "") - add_cd_file(TARGET stdole32.tlb DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/stdole32.tlb/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/stdole32.tlb/rsr… ============================================================================== --- trunk/reactos/dll/win32/stdole32.tlb/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/stdole32.tlb/rsrc.rc [iso-8859-1] Sat Jan 28 22:22:11 2012 @@ -29,3 +29,5 @@ /* @makedep: std_ole_v1.tlb */ 1 TYPELIB std_ole_v1.tlb + +2 WINE_REGISTRY stdole32.tlb.rgs Added: trunk/reactos/dll/win32/stdole32.tlb/stdole32.tlb.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/stdole32.tlb/std… ============================================================================== --- trunk/reactos/dll/win32/stdole32.tlb/stdole32.tlb.rgs (added) +++ trunk/reactos/dll/win32/stdole32.tlb/stdole32.tlb.rgs [iso-8859-1] Sat Jan 28 22:22:11 2012 @@ -1,0 +1,20 @@ +HKCR +{ + NoRemove Typelib + { + NoRemove '{00020430-0000-0000-C000-000000000046}' + { + '1.0' = s 'OLE Automation' + { + '0' { win32 = s '%MODULE%' } + FLAGS = s '1' + } + } + } + NoRemove Interface + { + } + NoRemove CLSID + { + } +} Propchange: trunk/reactos/dll/win32/stdole32.tlb/stdole32.tlb.rgs ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Jan 28 22:22:11 2012 @@ -157,6 +157,7 @@ reactos/dll/win32/softpub # Autosync reactos/dll/win32/spoolss # Autosync reactos/dll/win32/stdole2.tlb # Synced to Wine-1.3.37 +reactos/dll/win32/stdole32.tlb # Synced to Wine-1.3.37 reactos/dll/win32/sti # Autosync reactos/dll/win32/sxs # Autosync reactos/dll/win32/tapi32 # Autosync

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