Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sir_richard] 49771: [NTOS]: Errr... wow! Another one caught by ARM GCC. I can swear x86 GCC used to catch these. Did someone change warning settings? Anyhow, fix a *f++ which increments the pointe...

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Wed Nov 24 14:47:08 2010 New Revision: 49771 URL: http://svn.reactos.org/svn/reactos?rev=49771&view=rev Log: [NTOS]: Errr... wow! Another one caught by ARM GCC. I can swear x86 GCC used to catch these. Did someone change warning settings? Anyhow, fix a *f++ which increments the pointer, not the value INSIDE the pointer (*f)++. Fixes MiDeleteSystemPageableVm. Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Wed Nov 24 14:47:08 2010 @@ -146,7 +146,7 @@ ASSERT(Pfn1->u1.WsIndex == 0); /* Actual valid, legitimate, pages */ - if (ValidPages) *ValidPages++; + if (ValidPages) (*ValidPages)++; /* Get the page table entry */ PageTableIndex = Pfn1->u4.PteFrame; @@ -305,7 +305,8 @@ IN ULONG_PTR EndingAddress, IN PMMVAD Vad) { - PMMPTE PointerPte, PointerPde, PrototypePte, LastPrototypePte; + PMMPTE PointerPte, PrototypePte, LastPrototypePte; + PMMPDE PointerPde; MMPTE TempPte; PEPROCESS CurrentProcess; KIRQL OldIrql; @@ -1099,7 +1100,8 @@ OUT PVOID *NextVa) { - PMMPTE PointerPte, PointerPde; + PMMPTE PointerPte; + PMMPDE PointerPde; MMPTE TempPte; BOOLEAN DemandZeroPte = TRUE, ValidPte = FALSE; ULONG State = MEM_RESERVE, Protect = 0, LockChange;

14 years, 7 months

[sir_richard] 49770: [NTOS]: Erm, why is it that the ARM compiler detects this obvious bug, but x86 does not? Fix missing ShareCount zeroing when unlocking an MDL.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Wed Nov 24 14:39:23 2010 New Revision: 49770 URL: http://svn.reactos.org/svn/reactos?rev=49770&view=rev Log: [NTOS]: Erm, why is it that the ARM compiler detects this obvious bug, but x86 does not? Fix missing ShareCount zeroing when unlocking an MDL. Modified: trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] Wed Nov 24 14:39:23 2010 @@ -271,7 +271,7 @@ // Pfn1->u3.e1.StartOfAllocation = 0; Pfn1->u3.e1.EndOfAllocation = 0; - Pfn1->u2.ShareCount == 0; + Pfn1->u2.ShareCount = 0; // // Dereference it

14 years, 7 months

[gadamopoulos] 49769: [win32k] - Remove some unused functions

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Wed Nov 24 14:13:12 2010 New Revision: 49769 URL: http://svn.reactos.org/svn/reactos?rev=49769&view=rev Log: [win32k] - Remove some unused functions Modified: trunk/reactos/subsystems/win32/win32k/include/msgqueue.h trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/include/msgqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/msgqueue.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/msgqueue.h [iso-8859-1] Wed Nov 24 14:13:12 2010 @@ -165,9 +165,6 @@ co_MsqWaitForNewMessages(PUSER_MESSAGE_QUEUE MessageQueue, PWND WndFilter, UINT MsgFilterMin, UINT MsgFilterMax); VOID FASTCALL -MsqSendNotifyMessage(PUSER_MESSAGE_QUEUE MessageQueue, - PUSER_SENT_MESSAGE_NOTIFY NotifyMessage); -VOID FASTCALL MsqIncPaintCountQueue(PUSER_MESSAGE_QUEUE Queue); VOID FASTCALL MsqDecPaintCountQueue(PUSER_MESSAGE_QUEUE Queue); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Wed Nov 24 14:13:12 2010 @@ -360,34 +360,6 @@ ExFreeToPagedLookasideList(&MessageLookasideList, Message); } -VOID FASTCALL -co_MsqDispatchSentNotifyMessages(PUSER_MESSAGE_QUEUE MessageQueue) -{ - PLIST_ENTRY ListEntry; - PUSER_SENT_MESSAGE_NOTIFY Message; - - while (!IsListEmpty(&MessageQueue->SentMessagesListHead)) - { - ListEntry = RemoveHeadList(&MessageQueue->SentMessagesListHead); - Message = CONTAINING_RECORD(ListEntry, USER_SENT_MESSAGE_NOTIFY, - ListEntry); - - co_IntCallSentMessageCallback(Message->CompletionCallback, - Message->hWnd, - Message->Msg, - Message->CompletionCallbackContext, - Message->Result); - - } - -} - -BOOLEAN FASTCALL -MsqPeekSentMessages(PUSER_MESSAGE_QUEUE MessageQueue) -{ - return(!IsListEmpty(&MessageQueue->SentMessagesListHead)); -} - BOOLEAN FASTCALL co_MsqDispatchOneSentMessage(PUSER_MESSAGE_QUEUE MessageQueue) { @@ -570,15 +542,6 @@ CurrentEntry = CurrentEntry->Flink; } } -} - -VOID FASTCALL -MsqSendNotifyMessage(PUSER_MESSAGE_QUEUE MessageQueue, - PUSER_SENT_MESSAGE_NOTIFY NotifyMessage) -{ - InsertTailList(&MessageQueue->NotifyMessagesListHead, - &NotifyMessage->ListEntry); - MsqWakeQueue(MessageQueue, QS_SENDMESSAGE); } NTSTATUS FASTCALL Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Wed Nov 24 14:13:12 2010 @@ -656,22 +656,6 @@ return Ret; } -// Move this to user space! -BOOL FASTCALL -IntGetWindowInfo(PWND Wnd, PWINDOWINFO pwi) -{ - pwi->cbSize = sizeof(WINDOWINFO); - pwi->rcWindow = Wnd->rcWindow; - pwi->rcClient = Wnd->rcClient; - pwi->dwStyle = Wnd->style; - pwi->dwExStyle = Wnd->ExStyle; - pwi->dwWindowStatus = (UserGetForegroundWindow() == Wnd->head.h); /* WS_ACTIVECAPTION */ - IntGetWindowBorderMeasures(Wnd, &pwi->cxWindowBorders, &pwi->cyWindowBorders); - pwi->atomWindowType = (Wnd->pcls ? Wnd->pcls->atomClassName : 0); - pwi->wCreatorVersion = 0x400; /* FIXME - return a real version number */ - return TRUE; -} - static BOOL FASTCALL IntSetMenu( PWND Wnd, @@ -799,25 +783,6 @@ Rect->bottom = Window->rcClient.bottom - Window->rcClient.top; } - -#if 0 -HWND FASTCALL -IntGetFocusWindow(VOID) -{ - PUSER_MESSAGE_QUEUE Queue; - PDESKTOP pdo = IntGetActiveDesktop(); - - if( !pdo ) - return NULL; - - Queue = (PUSER_MESSAGE_QUEUE)pdo->ActiveMessageQueue; - - if (Queue == NULL) - return(NULL); - else - return(Queue->FocusWindow); -} -#endif PMENU_OBJECT FASTCALL IntGetSystemMenu(PWND Window, BOOL bRevert, BOOL RetMenu)

14 years, 7 months

[sir_richard] 49768: [ARMLLB]: Delete deprecated folder [ARMLLB]: Add missing UART functionality for ZOOM2. Leverages existing CPORT library.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Wed Nov 24 14:07:56 2010 New Revision: 49768 URL: http://svn.reactos.org/svn/reactos?rev=49768&view=rev Log: [ARMLLB]: Delete deprecated folder [ARMLLB]: Add missing UART functionality for ZOOM2. Leverages existing CPORT library. Added: trunk/reactos/boot/armllb/hw/omap3-zoom2/hwuart.c (with props) Removed: trunk/reactos/boot/armllb/hw/omap3/ Added: trunk/reactos/boot/armllb/hw/omap3-zoom2/hwuart.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/hw/omap3-zoom2… ============================================================================== --- trunk/reactos/boot/armllb/hw/omap3-zoom2/hwuart.c (added) +++ trunk/reactos/boot/armllb/hw/omap3-zoom2/hwuart.c [iso-8859-1] Wed Nov 24 14:07:56 2010 @@ -1,0 +1,62 @@ +/* + * PROJECT: ReactOS Boot Loader + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: boot/armllb/hw/omap3-zoom2/hwuart.c + * PURPOSE: LLB UART Initialization Routines for OMAP3 ZOOM2 + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +#include "precomp.h" +#define SERIAL_REGISTER_STRIDE 2 +#include "lib/cportlib/cport.c" + +/* GLOBALS ********************************************************************/ + +#define SERIAL_TL16CP754C_QUAD0_BASE (PVOID)0x10000000 + +CPPORT LlbHwOmap3UartPorts[4] = +{ + {NULL, 0, 0}, + {NULL, 0, 0}, + {NULL, 0, 0}, + {NULL, 0, 0} +}; + +/* FUNCTIONS ******************************************************************/ + +VOID +NTAPI +LlbHwOmap3UartInitialize(VOID) +{ + CpInitialize(&LlbHwOmap3UartPorts[0], SERIAL_TL16CP754C_QUAD0_BASE, 115200); +} + +VOID +NTAPI +LlbHwUartSendChar(IN CHAR Char) +{ + /* Send the character */ + CpPutByte(&LlbHwOmap3UartPorts[0], Char); +} + +BOOLEAN +NTAPI +LlbHwUartTxReady(VOID) +{ + /* TX output buffer is ready? */ + return TRUE; +} + +ULONG +NTAPI +LlbHwGetUartBase(IN ULONG Port) +{ + if (Port == 0) + { + return 0x10000000; + } + + return 0; +} + +/* EOF */ Propchange: trunk/reactos/boot/armllb/hw/omap3-zoom2/hwuart.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/boot/armllb/hw/omap3-zoom2/hwuart.c ------------------------------------------------------------------------------ svn:executable = *

14 years, 7 months

[tkreuzer] 49767: [KERNEL32] Revert r49761 on Pierre's request

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Nov 24 12:35:51 2010 New Revision: 49767 URL: http://svn.reactos.org/svn/reactos?rev=49767&view=rev Log: [KERNEL32] Revert r49761 on Pierre's request Modified: trunk/reactos/dll/win32/kernel32/include/kernel32.h trunk/reactos/dll/win32/kernel32/kernel32.def trunk/reactos/dll/win32/kernel32/misc/env.c trunk/reactos/dll/win32/kernel32/misc/error.c trunk/reactos/dll/win32/kernel32/misc/ldr.c trunk/reactos/dll/win32/kernel32/misc/utils.c trunk/reactos/dll/win32/kernel32/process/procsup.c Modified: trunk/reactos/dll/win32/kernel32/include/kernel32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/include… ============================================================================== --- trunk/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] Wed Nov 24 12:35:51 2010 @@ -69,6 +69,7 @@ #define SetLastErrorByStatus(x) RtlSetLastWin32ErrorAndNtStatusFromNtStatus((x)) #define GetLastError() NtCurrentTeb()->LastErrorValue +#define SetLastError(x) NtCurrentTeb()->LastErrorValue = (x) typedef struct _CODEPAGE_ENTRY { @@ -191,7 +192,7 @@ PUNICODE_STRING WINAPI -Basep8BitStringToStaticUnicodeString(IN LPCSTR AnsiString); +Basep8BitStringToCachedUnicodeString(IN LPCSTR String); NTSTATUS WINAPI @@ -224,7 +225,3 @@ VOID WINAPI InitCommandLines(VOID); - -VOID -WINAPI -BaseSetLastNTError(IN NTSTATUS Status); Modified: trunk/reactos/dll/win32/kernel32/kernel32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.def [iso-8859-1] Wed Nov 24 12:35:51 2010 @@ -46,7 +46,7 @@ @ stdcall BaseProcessInitPostImport() ; missing in Win 7 @ stdcall BaseQueryModuleData(str str ptr ptr ptr) ;check ;@ stdcall BaseThreadInitThunk ; Win 7 -;@ stdcall BaseSetLastNTError ; Win 7, not 64 bit (present on w2k3 but not exported) +;@ stdcall BaseSetLastNTError ; Win 7, not 64 bit @ stdcall BaseUpdateAppcompatCache(long long long) ;@ stdcall BaseVerifyUnicodeString ; Win 7 ;@ stdcall Basep8BitStringToDynamicUnicodeString ; Win 7 @@ -1211,7 +1211,7 @@ @ stdcall SetHandleInformation(long long long) @ stdcall SetInformationJobObject(long long ptr long) @ stub SetLastConsoleEventActive ; missing in XP SP3 -@ stdcall SetLastError(long) +@ stdcall SetLastError(long) ntdll.RtlSetLastWin32Error @ stub SetLocalPrimaryComputerNameA ; missing in XP SP3 @ stub SetLocalPrimaryComputerNameW ; missing in XP SP3 @ stdcall SetLocalTime(ptr) Modified: trunk/reactos/dll/win32/kernel32/misc/env.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/en… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/env.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/env.c [iso-8859-1] Wed Nov 24 12:35:51 2010 @@ -5,8 +5,6 @@ * FILE: lib/kernel32/misc/env.c * PURPOSE: Environment functions * PROGRAMMER: Ariadne ( ariadne(a)xs4all.nl) - * Emanuele Aliberti - * Thomas Weidenmueller * UPDATE HISTORY: * Created 01/11/98 */ @@ -18,85 +16,6 @@ /* FUNCTIONS ******************************************************************/ - -/* - * @implemented - */ -BOOL -WINAPI -Beep (DWORD dwFreq, DWORD dwDuration) -{ - HANDLE hBeep; - UNICODE_STRING BeepDevice; - OBJECT_ATTRIBUTES ObjectAttributes; - IO_STATUS_BLOCK IoStatusBlock; - BEEP_SET_PARAMETERS BeepSetParameters; - NTSTATUS Status; - - /* check the parameters */ - if ((dwFreq >= 0x25 && dwFreq <= 0x7FFF) || - (dwFreq == 0x0 && dwDuration == 0x0)) - { - /* open the device */ - RtlInitUnicodeString(&BeepDevice, - L"\\Device\\Beep"); - - InitializeObjectAttributes(&ObjectAttributes, - &BeepDevice, - 0, - NULL, - NULL); - - Status = NtCreateFile(&hBeep, - FILE_READ_DATA | FILE_WRITE_DATA, - &ObjectAttributes, - &IoStatusBlock, - NULL, - 0, - FILE_SHARE_READ | FILE_SHARE_WRITE, - FILE_OPEN_IF, - 0, - NULL, - 0); - if (NT_SUCCESS(Status)) - { - /* Set beep data */ - BeepSetParameters.Frequency = dwFreq; - BeepSetParameters.Duration = dwDuration; - - Status = NtDeviceIoControlFile(hBeep, - NULL, - NULL, - NULL, - &IoStatusBlock, - IOCTL_BEEP_SET, - &BeepSetParameters, - sizeof(BEEP_SET_PARAMETERS), - NULL, - 0); - - /* do an alertable wait if necessary */ - if (NT_SUCCESS(Status) && - (dwFreq != 0x0 || dwDuration != 0x0) && dwDuration != MAXDWORD) - { - SleepEx(dwDuration, - TRUE); - } - - NtClose(hBeep); - } - } - else - Status = STATUS_INVALID_PARAMETER; - - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus (Status); - return FALSE; - } - - return TRUE; -} /* * @implemented Modified: trunk/reactos/dll/win32/kernel32/misc/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/er… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/error.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/error.c [iso-8859-1] Wed Nov 24 12:35:51 2010 @@ -1,10 +1,15 @@ -/* +/* $Id$ + * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: dll/win32/kernel32/misc/error.c - * PURPOSE: Error functions - * PROGRAMMER: Pierre Schweitzer (pierre.schweitzer(a)reactos.org) + * PURPOSE: Environment functions + * PROGRAMMER: Emanuele Aliberti + * Thomas Weidenmueller + * UPDATE HISTORY: + * Created 05/10/98 */ + #include <k32.h> @@ -12,34 +17,83 @@ #include <debug.h> -DWORD g_dwLastErrorToBreakOn; +/* + * @implemented + */ +BOOL +WINAPI +Beep (DWORD dwFreq, DWORD dwDuration) +{ + HANDLE hBeep; + UNICODE_STRING BeepDevice; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + BEEP_SET_PARAMETERS BeepSetParameters; + NTSTATUS Status; -/* FUNCTIONS ******************************************************************/ + /* check the parameters */ + if ((dwFreq >= 0x25 && dwFreq <= 0x7FFF) || + (dwFreq == 0x0 && dwDuration == 0x0)) + { + /* open the device */ + RtlInitUnicodeString(&BeepDevice, + L"\\Device\\Beep"); -VOID -WINAPI -SetLastError( - IN DWORD dwErrCode) -{ - if (g_dwLastErrorToBreakOn) - { - /* If we have error to break on and if current matches, break */ - if (g_dwLastErrorToBreakOn == dwErrCode) + InitializeObjectAttributes(&ObjectAttributes, + &BeepDevice, + 0, + NULL, + NULL); + + Status = NtCreateFile(&hBeep, + FILE_READ_DATA | FILE_WRITE_DATA, + &ObjectAttributes, + &IoStatusBlock, + NULL, + 0, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_OPEN_IF, + 0, + NULL, + 0); + if (NT_SUCCESS(Status)) { - DbgBreakPoint(); + /* Set beep data */ + BeepSetParameters.Frequency = dwFreq; + BeepSetParameters.Duration = dwDuration; + + Status = NtDeviceIoControlFile(hBeep, + NULL, + NULL, + NULL, + &IoStatusBlock, + IOCTL_BEEP_SET, + &BeepSetParameters, + sizeof(BEEP_SET_PARAMETERS), + NULL, + 0); + + /* do an alertable wait if necessary */ + if (NT_SUCCESS(Status) && + (dwFreq != 0x0 || dwDuration != 0x0) && dwDuration != MAXDWORD) + { + SleepEx(dwDuration, + TRUE); + } + + NtClose(hBeep); } } + else + Status = STATUS_INVALID_PARAMETER; - /* Set last error */ - NtCurrentTeb()->LastErrorValue = dwErrCode; -} + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus (Status); + return FALSE; + } -VOID -WINAPI -BaseSetLastNTError( - IN NTSTATUS Status) -{ - SetLastError(RtlNtStatusToDosError(Status)); + return TRUE; } /* EOF */ Modified: trunk/reactos/dll/win32/kernel32/misc/ldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ld… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/ldr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/ldr.c [iso-8859-1] Wed Nov 24 12:35:51 2010 @@ -102,18 +102,19 @@ */ BOOL WINAPI -DisableThreadLibraryCalls( - IN HMODULE hLibModule) -{ - NTSTATUS Status; - - Status = LdrDisableThreadCalloutsForDll((PVOID)hLibModule); - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); - return FALSE; - } - return TRUE; +DisableThreadLibraryCalls ( + HMODULE hLibModule + ) +{ + NTSTATUS Status; + + Status = LdrDisableThreadCalloutsForDll ((PVOID)hLibModule); + if (!NT_SUCCESS (Status)) + { + SetLastErrorByStatus (Status); + return FALSE; + } + return TRUE; } @@ -135,17 +136,18 @@ */ HINSTANCE WINAPI -LoadLibraryExA( - LPCSTR lpLibFileName, - HANDLE hFile, - DWORD dwFlags) -{ - PUNICODE_STRING FileNameW; - - if (!(FileNameW = Basep8BitStringToStaticUnicodeString(lpLibFileName))) - return NULL; - - return LoadLibraryExW(FileNameW->Buffer, hFile, dwFlags); +LoadLibraryExA ( + LPCSTR lpLibFileName, + HANDLE hFile, + DWORD dwFlags + ) +{ + PWCHAR FileNameW; + + if (!(FileNameW = FilenameA2W(lpLibFileName, FALSE))) + return FALSE; + + return LoadLibraryExW(FileNameW, hFile, dwFlags); } Modified: trunk/reactos/dll/win32/kernel32/misc/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ut… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/utils.c [iso-8859-1] Wed Nov 24 12:35:51 2010 @@ -57,27 +57,28 @@ */ PUNICODE_STRING WINAPI -Basep8BitStringToStaticUnicodeString(IN LPCSTR String) -{ - PUNICODE_STRING StaticString = &(NtCurrentTeb()->StaticUnicodeString); +Basep8BitStringToCachedUnicodeString(IN LPCSTR String) +{ + PUNICODE_STRING StaticString = &NtCurrentTeb()->StaticUnicodeString; ANSI_STRING AnsiString; NTSTATUS Status; - + + DPRINT("Basep8BitStringToCachedUnicodeString\n"); + /* Initialize an ANSI String */ - if (!NT_SUCCESS(RtlInitAnsiStringEx(&AnsiString, String))) - { - SetLastError(ERROR_FILENAME_EXCED_RANGE); - return NULL; - } - + RtlInitAnsiString(&AnsiString, String); + /* Convert it */ Status = Basep8BitStringToUnicodeString(StaticString, &AnsiString, FALSE); - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); + + /* Handle failure */ + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); return NULL; } - + + /* Return pointer to the string */ return StaticString; } Modified: trunk/reactos/dll/win32/kernel32/process/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… ============================================================================== --- trunk/reactos/dll/win32/kernel32/process/procsup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/process/procsup.c [iso-8859-1] Wed Nov 24 12:35:51 2010 @@ -1558,7 +1558,7 @@ NtCurrentTeb()->StaticUnicodeString.MaximumLength) { /* Cache it in the TEB */ - CommandLine = Basep8BitStringToStaticUnicodeString(lpCommandLine); + CommandLine = Basep8BitStringToCachedUnicodeString(lpCommandLine); } else {

14 years, 7 months

[dreimer] 49766: Updates for Rapps Download Database.

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Nov 24 08:56:20 2010 New Revision: 49766 URL: http://svn.reactos.org/svn/reactos?rev=49766&view=rev Log: Updates for Rapps Download Database. Modified: trunk/reactos/base/applications/rapps/rapps/7zip.txt trunk/reactos/base/applications/rapps/rapps/libreoffice.txt trunk/reactos/base/applications/rapps/rapps/mirandaim.txt trunk/reactos/base/applications/rapps/rapps/mono2.txt trunk/reactos/base/applications/rapps/rapps/openttd.txt Modified: trunk/reactos/base/applications/rapps/rapps/7zip.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/7zip.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/7zip.txt [iso-8859-1] Wed Nov 24 08:56:20 2010 @@ -2,13 +2,13 @@ [Section] Name = 7-Zip -Version = 4.65 +Version = 9.20 Licence = LGPL Description = Utility to create and open 7zip, zip, tar, rar and other archive files. -Size = 0.9M +Size = 1.0M Category = 12 URLSite = http://www.7-zip.org/ -URLDownload = http://ovh.dl.sourceforge.net/project/sevenzip/7-Zip/4.65/7z465.exe +URLDownload = http://ovh.dl.sourceforge.net/project/sevenzip/7-Zip/9.20/7z920.exe CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/libreoffice.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/libreoffice.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/libreoffice.txt [iso-8859-1] Wed Nov 24 08:56:20 2010 @@ -2,13 +2,13 @@ [Section] Name = LibreOffice -Version = 3.3.0 Beta 2 +Version = 3.3.0 Beta 3 Licence = LGPL Description = Former called OpenOffice. Open Source Office Suite. -Size = 318.0MB +Size = 300.0MB Category = 6 URLSite = http://www.documentfoundation.org/ -URLDownload = http://download.documentfoundation.org/libreoffice/testing/3.3.0-beta2/win/… +URLDownload = http://download.documentfoundation.org/libreoffice/testing/3.3.0-beta3/win/… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/mirandaim.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mirandaim.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mirandaim.txt [iso-8859-1] Wed Nov 24 08:56:20 2010 @@ -2,13 +2,13 @@ [Section] Name = Miranda IM -Version = 0.9.10 +Version = 0.9.11 Licence = GPL Description = Open source multiprotocol instant messaging application - May not work completely. Size = 3.0MB Category = 5 URLSite = http://www.miranda-im.org/ -URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.9.10-unicode.exe +URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.9.11-unicode.exe CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/mono2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mono2.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mono2.txt [iso-8859-1] Wed Nov 24 08:56:20 2010 @@ -2,13 +2,13 @@ [Section] Name = Mono .net Development Framework -Version = 2.8 +Version = 2.8.1 Licence = Unknown Description = Open Source .net Framework. -Size = 78MB +Size = 77MB Category = 14 URLSite = http://www.mono-project.com/Main_Page -URLDownload = http://ftp.novell.com/pub/mono/archive/2.8/windows-installer/9/mono-2.8-gtk… +URLDownload = http://ftp.novell.com/pub/mono/archive/2.8.1/windows-installer/3/mono-2.8.1… CDPath = none [Section.0415] Modified: trunk/reactos/base/applications/rapps/rapps/openttd.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/openttd.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/openttd.txt [iso-8859-1] Wed Nov 24 08:56:20 2010 @@ -2,13 +2,13 @@ [Section] Name = OpenTTD -Version = 1.0.4 +Version = 1.0.5 Licence = GPL v2 Description = Open Source clone of the "Transport Tycoon Deluxe" game engine. You need a copy of Transport Tycoon. Size = 3.4MB Category = 4 URLSite = http://www.openttd.org/ -URLDownload = http://cz.binaries.openttd.org/openttd/binaries/releases/1.0.4/openttd-1.0.… +URLDownload = http://cz.binaries.openttd.org/openttd/binaries/releases/1.0.5/openttd-1.0.… CDPath = none [Section.0407]

14 years, 7 months

[tkreuzer] 49765: [CMAKE] Add a number of importlib targets

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Nov 24 08:55:07 2010 New Revision: 49765 URL: http://svn.reactos.org/svn/reactos?rev=49765&view=rev Log: [CMAKE] Add a number of importlib targets Modified: branches/cmake-bringup/dll/directx/dinput8/CMakeLists.txt branches/cmake-bringup/dll/directx/dsound/CMakeLists.txt branches/cmake-bringup/dll/directx/wine/d3d9/CMakeLists.txt branches/cmake-bringup/dll/directx/wine/ddraw/CMakeLists.txt branches/cmake-bringup/dll/win32/comctl32/CMakeLists.txt branches/cmake-bringup/dll/win32/comdlg32/CMakeLists.txt branches/cmake-bringup/dll/win32/devmgr/CMakeLists.txt branches/cmake-bringup/dll/win32/iphlpapi/CMakeLists.txt branches/cmake-bringup/dll/win32/loadperf/CMakeLists.txt branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt branches/cmake-bringup/dll/win32/setupapi/CMakeLists.txt branches/cmake-bringup/dll/win32/shdocvw/CMakeLists.txt branches/cmake-bringup/dll/win32/shell32/CMakeLists.txt branches/cmake-bringup/dll/win32/shlwapi/CMakeLists.txt branches/cmake-bringup/dll/win32/snmpapi/CMakeLists.txt branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt branches/cmake-bringup/dll/win32/version/CMakeLists.txt branches/cmake-bringup/dll/win32/wininet/CMakeLists.txt branches/cmake-bringup/dll/win32/winmm/CMakeLists.txt branches/cmake-bringup/dll/win32/ws2_32/CMakeLists.txt Modified: branches/cmake-bringup/dll/directx/dinput8/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/dinpu… ============================================================================== --- branches/cmake-bringup/dll/directx/dinput8/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/dinput8/CMakeLists.txt [iso-8859-1] Wed Nov 24 08:55:07 2010 @@ -31,4 +31,5 @@ add_dependencies(dinput8 psdk buildno_header) -add_cab_target(dinput8 1) +add_cab_target(dinput8 1) +add_importlib_target(dinput8.spec) Modified: branches/cmake-bringup/dll/directx/dsound/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/dsoun… ============================================================================== --- branches/cmake-bringup/dll/directx/dsound/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/dsound/CMakeLists.txt [iso-8859-1] Wed Nov 24 08:55:07 2010 @@ -38,3 +38,4 @@ add_cab_target(dsound 1) +add_importlib_target(dsound.spec) Modified: branches/cmake-bringup/dll/directx/wine/d3d9/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3d9/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/d3d9/CMakeLists.txt [iso-8859-1] Wed Nov 24 08:55:07 2010 @@ -44,3 +44,4 @@ add_dependencies(d3d9 wineheaders) add_cab_target(d3d9 1) +add_importlib_target(d3d9.spec) Modified: branches/cmake-bringup/dll/directx/wine/ddraw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/ddraw/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/ddraw/CMakeLists.txt [iso-8859-1] Wed Nov 24 08:55:07 2010 @@ -50,4 +50,5 @@ ntdll) add_dependencies(ddraw wineheaders) -add_cab_target(ddraw 1) +add_cab_target(ddraw 1) +add_importlib_target(ddraw.spec) Modified: branches/cmake-bringup/dll/win32/comctl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/comctl3… ============================================================================== --- branches/cmake-bringup/dll/win32/comctl32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/comctl32/CMakeLists.txt [iso-8859-1] Wed Nov 24 08:55:07 2010 @@ -67,3 +67,4 @@ ntdll) add_cab_target(comctl32 1) +add_importlib_target(comctl32.spec) Modified: branches/cmake-bringup/dll/win32/comdlg32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/comdlg3… ============================================================================== --- branches/cmake-bringup/dll/win32/comdlg32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/comdlg32/CMakeLists.txt [iso-8859-1] Wed Nov 24 08:55:07 2010 @@ -39,3 +39,4 @@ add_cab_target(comdlg32 1) +add_importlib_target(comdlg32.spec) Modified: branches/cmake-bringup/dll/win32/devmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/devmgr/… ============================================================================== --- branches/cmake-bringup/dll/win32/devmgr/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/devmgr/CMakeLists.txt [iso-8859-1] Wed Nov 24 08:55:07 2010 @@ -31,3 +31,4 @@ add_pch(devmgr ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_cab_target(devmgr 1) +add_importlib_target(devmgr.spec) Modified: branches/cmake-bringup/dll/win32/iphlpapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/iphlpap… ============================================================================== --- branches/cmake-bringup/dll/win32/iphlpapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/iphlpapi/CMakeLists.txt [iso-8859-1] Wed Nov 24 08:55:07 2010 @@ -31,3 +31,4 @@ add_importlibs(iphlpapi dhcpcsvc advapi32 ws2_32 msvcrt kernel32 ntdll) add_cab_target(iphlpapi 1) +add_importlib_target(iphlpapi.spec) Modified: branches/cmake-bringup/dll/win32/loadperf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/loadper… ============================================================================== --- branches/cmake-bringup/dll/win32/loadperf/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/loadperf/CMakeLists.txt [iso-8859-1] Wed Nov 24 08:55:07 2010 @@ -18,3 +18,4 @@ add_importlibs(loadperf kernel32 ntdll) add_cab_target(loadperf 1) +add_importlib_target(loadperf.spec) Modified: branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ole32/C… ============================================================================== --- branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt [iso-8859-1] Wed Nov 24 08:55:07 2010 @@ -73,4 +73,5 @@ add_importlibs(ole32 advapi32 user32 gdi32 rpcrt4 msvcrt kernel32 ntdll) add_dependencies(ole32 ole32idl) -add_cab_target(ole32 1) +add_cab_target(ole32 1) +add_importlib_target(ole32.spec) Modified: branches/cmake-bringup/dll/win32/setupapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/setupap… ============================================================================== --- branches/cmake-bringup/dll/win32/setupapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/setupapi/CMakeLists.txt [iso-8859-1] Wed Nov 24 08:55:07 2010 @@ -56,3 +56,4 @@ add_cab_target(setupapi 1) +add_importlib_target(setupapi.spec) Modified: branches/cmake-bringup/dll/win32/shdocvw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shdocvw… ============================================================================== --- branches/cmake-bringup/dll/win32/shdocvw/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shdocvw/CMakeLists.txt [iso-8859-1] Wed Nov 24 08:55:07 2010 @@ -52,3 +52,4 @@ add_dependencies(shdocvw shdocvw_v1 shdocvw_def) add_cab_target(shdocvw 1) +add_importlib_target(shdocvw.spec) Modified: branches/cmake-bringup/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… ============================================================================== --- branches/cmake-bringup/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Wed Nov 24 08:55:07 2010 @@ -1,3 +1,6 @@ + +spec2def(shell32.dll shell32.spec) + list(APPEND SOURCE authors.c autocomplete.c @@ -61,8 +64,6 @@ add_definitions(-DCOM_NO_WINDOWS_H) add_definitions(-D_WINE) -spec2def(shell32.dll shell32.spec) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) include_directories(${REACTOS_SOURCE_DIR}/lib/recyclebin) include_directories(${REACTOS_SOURCE_DIR}) @@ -95,5 +96,5 @@ add_cab_target(shell32 1) -add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/shell32.def) +add_importlib_target(shell32.spec) Modified: branches/cmake-bringup/dll/win32/shlwapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shlwapi… ============================================================================== --- branches/cmake-bringup/dll/win32/shlwapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shlwapi/CMakeLists.txt [iso-8859-1] Wed Nov 24 08:55:07 2010 @@ -51,3 +51,4 @@ add_cab_target(shlwapi 1) +add_importlib_target(shlwapi.spec) Modified: branches/cmake-bringup/dll/win32/snmpapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/snmpapi… ============================================================================== --- branches/cmake-bringup/dll/win32/snmpapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/snmpapi/CMakeLists.txt [iso-8859-1] Wed Nov 24 08:55:07 2010 @@ -16,3 +16,4 @@ add_importlibs(snmpapi kernel32 ntdll) add_cab_target(snmpapi 1) +add_importlib_target(snmpapi.spec) Modified: branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/urlmon/… ============================================================================== --- branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt [iso-8859-1] Wed Nov 24 08:55:07 2010 @@ -66,3 +66,4 @@ rpcproxy(urlmon urlmon_urlmon.idl) add_cab_target(urlmon 1) +add_importlib_target(urlmon.spec) Modified: branches/cmake-bringup/dll/win32/version/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/version… ============================================================================== --- branches/cmake-bringup/dll/win32/version/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/version/CMakeLists.txt [iso-8859-1] Wed Nov 24 08:55:07 2010 @@ -1,3 +1,5 @@ + +spec2def(version.dll version.spec) add_definitions(-D__WINESRC__) @@ -8,11 +10,7 @@ install.c resource.c version.rc - version.def) - -if(NOT MSVC) - set_source_files_properties(version.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() + ${CMAKE_CURRENT_BINARY_DIR}/version.def) set_entrypoint(version 0) @@ -20,4 +18,5 @@ add_importlibs(version lz32 kernel32 ntdll) add_dependencies(version psdk buildno_header) -add_cab_target(version 1) +add_cab_target(version 1) +add_importlib_target(version.spec) Modified: branches/cmake-bringup/dll/win32/wininet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/CMakeLists.txt [iso-8859-1] Wed Nov 24 08:55:07 2010 @@ -35,3 +35,4 @@ add_importlibs(wininet mpr shlwapi shell32 user32 advapi32 secur32 crypt32 ws2_32 msvcrt kernel32 ntdll) add_cab_target(wininet 1) +add_importlib_target(wininet.spec) Modified: branches/cmake-bringup/dll/win32/winmm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winmm/C… ============================================================================== --- branches/cmake-bringup/dll/win32/winmm/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winmm/CMakeLists.txt [iso-8859-1] Wed Nov 24 08:55:07 2010 @@ -30,3 +30,4 @@ add_subdirectory(midimap) add_cab_target(winmm 1) +add_importlib_target(winmm.spec) Modified: branches/cmake-bringup/dll/win32/ws2_32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ws2_32/… ============================================================================== --- branches/cmake-bringup/dll/win32/ws2_32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ws2_32/CMakeLists.txt [iso-8859-1] Wed Nov 24 08:55:07 2010 @@ -33,3 +33,4 @@ add_pch(ws2_32 ${CMAKE_CURRENT_SOURCE_DIR}/include/ws2_32.h ${SOURCE}) add_cab_target(ws2_32 1) +add_importlib_target(ws2_32.spec)

14 years, 7 months

[tkreuzer] 49764: [XCOPY] Fix Swedish resource file syntax

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Nov 24 08:51:44 2010 New Revision: 49764 URL: http://svn.reactos.org/svn/reactos?rev=49764&view=rev Log: [XCOPY] Fix Swedish resource file syntax Modified: branches/cmake-bringup/base/applications/cmdutils/xcopy/Sv.rc Modified: branches/cmake-bringup/base/applications/cmdutils/xcopy/Sv.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/xcopy/Sv.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/xcopy/Sv.rc [iso-8859-1] Wed Nov 24 08:51:44 2010 @@ -32,9 +32,7 @@ STRING_PAUSE, "Tryck <enter> fÃ¶r att bÃ¶rja kopiera\n" STRING_SIMCOPY, "%d fil(er) skulle kopieras\n" STRING_COPY, "%d fil(er) kopierade\n" - STRING_QISDIR, "Ãr '%s' ett filnamn eller en katalog\n" \ - "pÃ¥ mÃ¥let?\n" \ - "(F - Fil, K - Katalog)\n" + STRING_QISDIR, "Ãr '%s' ett filnamn eller en katalog\npÃ¥ mÃ¥let?\n(F - Fil, K - Katalog)\n" STRING_SRCPROMPT,"%s? (Ja|Nej)\n" STRING_OVERWRITE,"Skriv Ã¶ver %s? (Ja|Nej|Alla)\n" STRING_COPYFAIL, "Kunde inte kopiera '%s' till '%s'; misslyckades med r/c %d\n"

14 years, 7 months

[tkreuzer] 49763: [PSDK] Fix compilation of ctfutb.idl with widl

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Nov 24 08:48:34 2010 New Revision: 49763 URL: http://svn.reactos.org/svn/reactos?rev=49763&view=rev Log: [PSDK] Fix compilation of ctfutb.idl with widl Modified: branches/cmake-bringup/include/psdk/ctfutb.idl Modified: branches/cmake-bringup/include/psdk/ctfutb.idl URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/ctfu… ============================================================================== --- branches/cmake-bringup/include/psdk/ctfutb.idl [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/ctfutb.idl [iso-8859-1] Wed Nov 24 08:48:34 2010 @@ -18,7 +18,9 @@ #ifndef DO_NO_IMPORTS import "oaidl.idl"; +#ifdef __midl import "msctf.idl"; +#endif #endif interface ITfLangBarEventSink;

14 years, 7 months

[tkreuzer] 49762: [PSDK] - Add a workaround to dispex.idl to prevent sal annotations to be generated. A better solution would be to have definitions in pur headers, but they conflict with external ...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Nov 24 00:27:08 2010 New Revision: 49762 URL: http://svn.reactos.org/svn/reactos?rev=49762&view=rev Log: [PSDK] - Add a workaround to dispex.idl to prevent sal annotations to be generated. A better solution would be to have definitions in pur headers, but they conflict with external c++ headers. - Add a number of missing interfaces - Fix MIDL compilation of mlang, by adding adding a library definition Modified: branches/cmake-bringup/include/psdk/CMakeLists.txt branches/cmake-bringup/include/psdk/activdbg.idl branches/cmake-bringup/include/psdk/ctfutb.idl branches/cmake-bringup/include/psdk/dispex.idl branches/cmake-bringup/include/psdk/mlang.idl branches/cmake-bringup/include/psdk/msctf.idl Modified: branches/cmake-bringup/include/psdk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/CMak… ============================================================================== --- branches/cmake-bringup/include/psdk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/CMakeLists.txt [iso-8859-1] Wed Nov 24 00:27:08 2010 @@ -41,7 +41,9 @@ indexsrv.idl mimeinfo.idl mimeole.idl + mlang.idl mscoree.idl + msctf.idl msdadc.idl mshtmhst.idl mshtml.idl @@ -95,13 +97,11 @@ wtypes.idl xmldom.idl xmldso.idl + ctfutb.idl xmllite.idl) if(NOT MSVC) LIST(APPEND SOURCE - ctfutb.idl - mlang.idl - msctf.idl wincodec.idl wuapi.idl ) Modified: branches/cmake-bringup/include/psdk/activdbg.idl URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/acti… ============================================================================== --- branches/cmake-bringup/include/psdk/activdbg.idl [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/activdbg.idl [iso-8859-1] Wed Nov 24 00:27:08 2010 @@ -615,7 +615,7 @@ [ object, - uuid(51973C38-CB0C-11d0-B5C9-00A0244A0E7A), + uuid(51973c38-cb0c-11d0-b5c9-00a0244a0e7a), pointer_default(unique), local ] @@ -624,6 +624,69 @@ /* FIXME: fill me! */ } +[ + object, + uuid(51973C1a-cb0c-11d0-b5c9-00a0244a0e7a), + pointer_default(unique), + local +] +interface IDebugSyncOperation : IUnknown +{ + /* FIXME: fill me! */ +} + +[ + object, + uuid(51973c1b-cb0c-11d0-b5c9-00a0244a0e7a), + pointer_default(unique), + local +] +interface IDebugAsyncOperation : IUnknown +{ + /* FIXME: fill me! */ +} + +[ + object, + uuid(51973c18-cb0c-11d0-b5c9-00a0244a0e7a), + pointer_default(unique) +] +interface IDebugStackFrameSniffer : IUnknown +{ + /* FIXME: fill me! */ +} + +[ + object, + uuid(51973C36-CB0C-11d0-B5C9-00A0244A0E7A), + pointer_default(unique), + local +] +interface IDebugThreadCall32 : IUnknown +{ + /* FIXME: fill me! */ +} + +[ + object, + uuid(51973C12-CB0C-11d0-B5C9-00A0244A0E7A), + pointer_default(unique) +] +interface IActiveScriptErrorDebug : IActiveScriptError +{ + /* FIXME: fill me! */ +} + +[ + object, + uuid(51973C41-CB0C-11d0-B5C9-00A0244A0E7A), + pointer_default(unique) +] +interface IProvideExpressionContexts : IUnknown +{ + /* FIXME: fill me! */ +} + cpp_quote("#ifndef DISABLE_ACTIVDBG_INTERFACE_WRAPPERS") cpp_quote("#ifdef _WIN64") Modified: branches/cmake-bringup/include/psdk/ctfutb.idl URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/ctfu… ============================================================================== --- branches/cmake-bringup/include/psdk/ctfutb.idl [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/ctfutb.idl [iso-8859-1] Wed Nov 24 00:27:08 2010 @@ -18,11 +18,15 @@ #ifndef DO_NO_IMPORTS import "oaidl.idl"; +import "msctf.idl"; #endif interface ITfLangBarEventSink; interface ITfLangBarItemMgr; interface ITfInputProcessorProfiles; +interface IEnumTfLangBarItems; +interface ITfLangBarItem; +interface ITfLangBarItemSink; [ object, @@ -71,3 +75,156 @@ HRESULT GetShowFloatingStatus( [out] DWORD *pdwFlags); }; + +[ + object, + uuid(18a4e900-e0ae-11d2-afdd-00105a2799b5), + pointer_default(unique) +] +interface ITfLangBarEventSink: IUnknown +{ + HRESULT OnSetFocus( + [in] DWORD dwThreadId); + + HRESULT OnThreadTerminate( + [in] DWORD dwThreadId); + + HRESULT OnThreadItemChange( + [in] DWORD dwThreadId); + + HRESULT OnModalInput( + [in] DWORD dwThreadId, + [in] UINT uMsg, + [in] WPARAM wParam, + [in] LPARAM lParam); + + HRESULT ShowFloating( + [in] DWORD dwFlags); + + HRESULT GetItemFloatingRect( + [in] DWORD dwThreadId, + [in] REFGUID rguid, + [out] RECT *prc); +} + +const ULONG TF_LBI_DESC_MAXLEN = 32; + +typedef [uuid(12a1d29f-a065-440c-9746-eb2002c8bd19)] struct TF_LANGBARITEMINFO +{ + CLSID clsidService; + GUID guidItem; + DWORD dwStyle; + ULONG ulSort; + WCHAR szDescription[TF_LBI_DESC_MAXLEN]; +} TF_LANGBARITEMINFO; + +[ + object, + uuid(ba468c55-9956-4fb1-a59d-52a7dd7cc6aa), + pointer_default(unique), +] +interface ITfLangBarItemMgr : IUnknown +{ + HRESULT EnumItems( + [out] IEnumTfLangBarItems **ppEnum); + + HRESULT GetItem( + [in] REFGUID rguid, + [out] ITfLangBarItem **ppItem); + + HRESULT AddItem( + [in] ITfLangBarItem *punk); + + HRESULT RemoveItem( + [in] ITfLangBarItem *punk); + + HRESULT AdviseItemSink( + [in] ITfLangBarItemSink *punk, + [out] DWORD *pdwCookie, + [in] REFGUID rguidItem); + + HRESULT UnadviseItemSink( + [in] DWORD dwCookie); + + HRESULT GetItemFloatingRect( + [in] DWORD dwThreadId, + [in] REFGUID rguid, + [out] RECT *prc); + + HRESULT GetItemsStatus( + [in] ULONG ulCount, + [in, size_is(ulCount)] const GUID *prgguid, + [out, size_is(ulCount)] DWORD *pdwStatus); + + HRESULT GetItemNum( + [out] ULONG *pulCount); + + HRESULT GetItems( + [in] ULONG ulCount, + [out, size_is(ulCount), length_is(*pcFetched)] ITfLangBarItem **ppItem, + [out, size_is(ulCount), length_is(*pcFetched)] TF_LANGBARITEMINFO *pInfo, + [out, size_is(ulCount), length_is(*pcFetched)] DWORD *pdwStatus, + [in, out, unique] ULONG *pcFetched); + + HRESULT AdviseItemsSink( + [in] ULONG ulCount, + [in, size_is(ulCount)] ITfLangBarItemSink **ppunk, + [in, size_is(ulCount)] const GUID *pguidItem, + [out, size_is(ulCount)] DWORD *pdwCookie); + + HRESULT UnadviseItemsSink( + [in] ULONG ulCount, + [in, size_is(ulCount)] DWORD *pdwCookie); +}; + +[ + object, + uuid(583f34d0-de25-11d2-afdd-00105a2799b5), + pointer_default(unique), +] +interface IEnumTfLangBarItems : IUnknown +{ + HRESULT Clone( + [out] IEnumTfLangBarItems **ppEnum); + + HRESULT Next( + [in] ULONG ulCount, + [out, size_is(ulCount)] ITfLangBarItem **ppItem, + [in, out, unique] ULONG *pcFetched); + + HRESULT Reset(); + + HRESULT Skip( + [in] ULONG ulCount); +} + +[ + object, + uuid(73540d69-edeb-4ee9-96c9-23aa30b25916), + pointer_default(unique), +] +interface ITfLangBarItem : IUnknown +{ + HRESULT GetInfo( + [out] TF_LANGBARITEMINFO *pInfo); + + HRESULT GetStatus( + [out] DWORD *pdwStatus); + + HRESULT Show( + [in] BOOL fShow); + + HRESULT GetTooltipString( + [out] BSTR *pbstrToolTip); +} + +[ + object, + uuid(57dbe1a0-de25-11d2-afdd-00105a2799b5), + pointer_default(unique), +] +interface ITfLangBarItemSink : IUnknown +{ + HRESULT OnUpdate( + [in] DWORD dwFlags); +} Modified: branches/cmake-bringup/include/psdk/dispex.idl URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/disp… ============================================================================== --- branches/cmake-bringup/include/psdk/dispex.idl [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/dispex.idl [iso-8859-1] Wed Nov 24 00:27:08 2010 @@ -15,6 +15,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +// HACK +#define annotation(x) #ifndef DO_NO_IMPORTS import "ocidl.idl"; Modified: branches/cmake-bringup/include/psdk/mlang.idl URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/mlan… ============================================================================== --- branches/cmake-bringup/include/psdk/mlang.idl [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/mlang.idl [iso-8859-1] Wed Nov 24 00:27:08 2010 @@ -24,6 +24,15 @@ cpp_quote("#define CPIOD_PEEK 0x40000000") cpp_quote("#define CPIOD_FORCE_PROMPT 0x80000000") + +[ + uuid(275c23e0-3747-11d0-9fea-00aa003f8646), + lcid(0x0000), + version(0.2) +] +library MultiLanguage +{ + importlib("stdole2.tlb"); [ object, @@ -308,17 +317,17 @@ } [ - object, - uuid(275c23e3-3747-11d0-9fea-00aa003f8646), - pointer_default(unique) + object, + uuid(275c23e3-3747-11d0-9fea-00aa003f8646), + pointer_default(unique) ] interface IEnumCodePage : IUnknown { const USHORT MAX_MIMECP_NAME = 64; const USHORT MAX_MIMECSET_NAME = 50; - typedef enum tagMIMECONTF - { + typedef enum tagMIMECONTF + { MIMECONTF_MAILNEWS = 0x00000001, MIMECONTF_BROWSER = 0x00000002, MIMECONTF_MINIMAL = 0x00000004, @@ -332,7 +341,7 @@ MIMECONTF_MIME_IE4 = 0x10000000, MIMECONTF_MIME_LATEST = 0x20000000, MIMECONTF_MIME_REGISTRY = 0x40000000 - } MIMECONTF; + } MIMECONTF; typedef struct tagMIMECPINFO { DWORD dwFlags; @@ -347,12 +356,12 @@ BYTE bGDICharset; } MIMECPINFO, *PMIMECPINFO; - typedef struct tagMIMECSETINFO - { + typedef struct tagMIMECSETINFO + { UINT uiCodePage; UINT uiInternetEncoding; WCHAR wszCharset[MAX_MIMECSET_NAME]; - } MIMECSETINFO, *PMIMECSETINFO; + } MIMECSETINFO, *PMIMECSETINFO; HRESULT Clone( [out] IEnumCodePage **ppEnum); @@ -362,16 +371,16 @@ [out] PMIMECPINFO rgelt, [out] ULONG *pceltFetched); - HRESULT Reset(); + HRESULT Reset(); HRESULT Skip( [in] ULONG celt); } [ - object, - uuid(d66d6f98-cdaa-11d0-b822-00c04fc9b31f), - pointer_default(unique) + object, + uuid(d66d6f98-cdaa-11d0-b822-00c04fc9b31f), + pointer_default(unique) ] interface IMLangConvertCharset : IUnknown { @@ -417,21 +426,21 @@ }; [ - object, - uuid(3dc39d1d-c030-11d0-b81b-00c04fc9b31f), - pointer_default(unique) + object, + uuid(3dc39d1d-c030-11d0-b81b-00c04fc9b31f), + pointer_default(unique) ] interface IEnumRfc1766 : IUnknown { const USHORT MAX_RFC1766_NAME = 6; const USHORT MAX_LOCALE_NAME = 32; - typedef struct tagRFC1766INFO - { + typedef struct tagRFC1766INFO + { LCID lcid; WCHAR wszRfc1766[MAX_RFC1766_NAME]; WCHAR wszLocaleName[MAX_LOCALE_NAME]; - } RFC1766INFO, *PRFC1766INFO; + } RFC1766INFO, *PRFC1766INFO; HRESULT Clone( [out] IEnumRfc1766 **ppEnum); @@ -448,9 +457,9 @@ } [ - object, - uuid(275c23e1-3747-11d0-9fea-00aa003f8646), - pointer_default(unique) + object, + uuid(275c23e1-3747-11d0-9fea-00aa003f8646), + pointer_default(unique) ] interface IMultiLanguage : IUnknown { @@ -528,19 +537,19 @@ } [ - object, + object, uuid(dccfc164-2b38-11d2-b7ec-00c04f8f5d9a), pointer_default(unique) ] interface IMultiLanguage2 : IUnknown { - typedef struct tagDetectEncodingInfo - { + typedef struct tagDetectEncodingInfo + { UINT nLangID; UINT nCodePage; INT nDocPercent; INT nConfidence; - } DetectEncodingInfo, *pDetectEncodingInfo; + } DetectEncodingInfo, *pDetectEncodingInfo; HRESULT GetNumberOfCodePageInfo( [out] UINT *pcCodePage); @@ -692,14 +701,14 @@ } [ - object, - uuid(4e5868ab-b157-4623-9acc-6a1d9caebe04), - pointer_default(unique) + object, + uuid(4e5868ab-b157-4623-9acc-6a1d9caebe04), + pointer_default(unique) ] interface IMultiLanguage3 : IMultiLanguage2 { - typedef [unique] IMultiLanguage3 *LPMULTILANGUAGE3; - HRESULT DetectOutboundCodePage( + typedef [unique] IMultiLanguage3 *LPMULTILANGUAGE3; + HRESULT DetectOutboundCodePage( [in] DWORD dwFlags, [in] LPCWSTR lpWideCharStr, [in] UINT cchWideChar, @@ -709,7 +718,7 @@ [in, out] UINT *pnDetectedCodePages, [in] WCHAR *lpSpecialChar); - HRESULT DetectOutboundCodePageInIStream( + HRESULT DetectOutboundCodePageInIStream( [in] DWORD dwFlags, [in] IStream *pStrIn, [in] UINT *puiPreferredCodePages, @@ -724,12 +733,14 @@ ] coclass CMultiLanguage { - [default] interface IMultiLanguage; - interface IMLangCodePages; - interface IMLangFontLink; + [default] interface IMultiLanguage; + interface IMLangCodePages; + interface IMLangFontLink; /* interface IMLangLineBreakConsole; */ - interface IMLangFontLink2; -} + interface IMLangFontLink2; +}; + +} // library MultiLanguage cpp_quote("STDAPI LcidToRfc1766A(LCID, LPSTR, INT);") cpp_quote("STDAPI LcidToRfc1766W(LCID, LPWSTR, INT);") Modified: branches/cmake-bringup/include/psdk/msctf.idl URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/msct… ============================================================================== --- branches/cmake-bringup/include/psdk/msctf.idl [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/msctf.idl [iso-8859-1] Wed Nov 24 00:27:08 2010 @@ -1359,3 +1359,142 @@ HRESULT OnKillThreadFocus(); }; + +[ + object, + uuid(101d6610-0990-11d3-8df0-00105a2799b5), + pointer_default(unique) +] +interface ITfFunctionProvider : IUnknown +{ + HRESULT GetType( + [out] GUID *pguid); + + HRESULT GetDescription( + [out] BSTR *pbstrDesc); + + HRESULT GetFunction( + [in] REFGUID rguid, + [in] REFIID riid, + [out, iid_is(riid)] IUnknown **ppunk); +} + +[ + object, + uuid(e4b24db0-0990-11d3-8df0-00105a2799b5), + pointer_default(unique) +] +interface IEnumTfFunctionProviders : IUnknown +{ + HRESULT Clone( + [out] IEnumTfFunctionProviders **ppEnum); + + HRESULT Next( + [in] ULONG ulCount, + [out, size_is(ulCount), length_is(*pcFetch)] ITfFunctionProvider **ppCmdobj, + [out] ULONG *pcFetch); + + HRESULT Reset(); + + HRESULT Skip( + [in] ULONG ulCount); +}; + +[ + object, + uuid(2433bf8e-0f9b-435c-ba2c-180611978c30), + pointer_default(unique) +] +interface ITfContextView : IUnknown +{ + HRESULT GetRangeFromPoint( + [in] TfEditCookie ec, + [in] const POINT *ppt, + [in] DWORD dwFlags, + [out] ITfRange **ppRange); + + HRESULT GetTextExt( + [in] TfEditCookie ec, + [in] ITfRange *pRange, + [out] RECT *prc, + [out] BOOL *pfClipped); + + HRESULT GetScreenExt( + [out] RECT *prc); + + HRESULT GetWnd( + [out] HWND *phwnd); +}; + +[ + object, + uuid(f0c0f8dd-cf38-44e1-bb0f-68cf0d551c78), + pointer_default(unique) +] +interface IEnumTfContextViews : IUnknown +{ + HRESULT Clone( + [out] IEnumTfContextViews **ppEnum); + + HRESULT Next( + [in] ULONG ulCount, + [out, size_is(ulCount), length_is(*pcFetched)] ITfContextView **rgViews, + [out] ULONG *pcFetched); + + HRESULT Reset(); + + HRESULT Skip( + [in] ULONG ulCount); +}; + +[ + object, + uuid(19188cb0-aca9-11d2-afc5-00105a2799b5), + pointer_default(unique) +] +interface IEnumTfProperties : IUnknown +{ + HRESULT Clone( + [out] IEnumTfProperties **ppEnum); + + HRESULT Next( + [in] ULONG ulCount, + [out, size_is(ulCount), length_is(*pcFetched)] ITfProperty **ppProp, + [out] ULONG *pcFetched); + + HRESULT Reset(); + + HRESULT Skip( + [in] ULONG ulCount); +} + +[ + object, + uuid(463a506d-6992-49d2-9b88-93d55e70bb16), + pointer_default(unique) +] +interface ITfRangeBackup : IUnknown +{ + HRESULT Restore( + [in] TfEditCookie ec, + [in] ITfRange *pRange); +}; + +[ + object, + uuid(42d4d099-7c1a-4a89-b836-6c6f22160df0), + pointer_default(unique) +] +interface ITfEditRecord : IUnknown +{ + const DWORD TF_GTP_INCL_TEXT = 0x1; + + HRESULT GetSelectionStatus( + [out] BOOL *pfChanged); + + HRESULT GetTextAndPropertyUpdates( + [in] DWORD dwFlags, + [in, size_is(cProperties)] const GUID **prgProperties, + [in] ULONG cProperties, + [out] IEnumTfRanges **ppEnum); +};

14 years, 7 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs