Ros-diffs June 2014

ros-diffs@reactos.org

15 participants
157 discussions

[aandrejevic] 63580: [NTOS:MM] MmUnmapViewOfCacheSegment expects DeleteInProgress to be FALSE and the address space to be unlocked. Allow unmapping memory areas which belong to the cache.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Mon Jun 9 18:21:03 2014 New Revision: 63580 URL: http://svn.reactos.org/svn/reactos?rev=63580&view=rev Log: [NTOS:MM] MmUnmapViewOfCacheSegment expects DeleteInProgress to be FALSE and the address space to be unlocked. Allow unmapping memory areas which belong to the cache. Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Mon Jun 9 18:21:03 2014 @@ -4090,14 +4090,21 @@ return(STATUS_UNSUCCESSFUL); } - MemoryArea->DeleteInProgress = TRUE; Section = MemoryArea->Data.SectionData.Section; Segment = MemoryArea->Data.SectionData.Segment; #ifdef NEWCC - if (Segment->Flags & MM_DATAFILE_SEGMENT) - return MmUnmapViewOfCacheSegment(AddressSpace, BaseAddress); + if (Segment->Flags & MM_DATAFILE_SEGMENT) + { + MmUnlockAddressSpace(AddressSpace); + Status = MmUnmapViewOfCacheSegment(AddressSpace, BaseAddress); + MmLockAddressSpace(AddressSpace); + + return Status; + } #endif + + MemoryArea->DeleteInProgress = TRUE; MmLockSectionSegment(Segment); @@ -4151,7 +4158,8 @@ MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, BaseAddress); if (MemoryArea == NULL || - MemoryArea->Type != MEMORY_AREA_SECTION_VIEW || + ((MemoryArea->Type != MEMORY_AREA_SECTION_VIEW) && + (MemoryArea->Type != MEMORY_AREA_CACHE)) || MemoryArea->DeleteInProgress) { if (MemoryArea) NT_ASSERT(MemoryArea->Type != MEMORY_AREA_OWNED_BY_ARM3); @@ -4159,11 +4167,9 @@ return STATUS_NOT_MAPPED_VIEW; } - MemoryArea->DeleteInProgress = TRUE; - Section = MemoryArea->Data.SectionData.Section; - if (Section->AllocationAttributes & SEC_IMAGE) + if ((Section != NULL) && (Section->AllocationAttributes & SEC_IMAGE)) { ULONG i; ULONG NrSegments; @@ -4175,6 +4181,8 @@ ImageSectionObject = Section->ImageSection; SectionSegments = ImageSectionObject->Segments; NrSegments = ImageSectionObject->NrSegments; + + MemoryArea->DeleteInProgress = TRUE; /* Search for the current segment within the section segments * and calculate the image base address */

10 years, 6 months

[pschweitzer] 63579: [KERNEL32] - Move CopyFileExW() implementation to BasepCopyFileExW() - Call BasepCopyFileExW() from CopyFileExW() - Implement PrivCopyFileExW() using BasepCopyFileExW() TODO: F...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon Jun 9 16:53:39 2014 New Revision: 63579 URL: http://svn.reactos.org/svn/reactos?rev=63579&view=rev Log: [KERNEL32] - Move CopyFileExW() implementation to BasepCopyFileExW() - Call BasepCopyFileExW() from CopyFileExW() - Implement PrivCopyFileExW() using BasepCopyFileExW() TODO: Fix BasepCopyFileExW() implementation Modified: trunk/reactos/dll/win32/kernel32/client/file/copy.c Modified: trunk/reactos/dll/win32/kernel32/client/file/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/copy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/copy.c [iso-8859-1] Mon Jun 9 16:53:39 2014 @@ -191,20 +191,16 @@ return errCode; } - -/* - * @implemented - */ -BOOL -WINAPI -CopyFileExW ( - LPCWSTR lpExistingFileName, - LPCWSTR lpNewFileName, - LPPROGRESS_ROUTINE lpProgressRoutine, - LPVOID lpData, - BOOL *pbCancel, - DWORD dwCopyFlags -) +BOOL +BasepCopyFileExW(IN LPCWSTR lpExistingFileName, + IN LPCWSTR lpNewFileName, + IN LPPROGRESS_ROUTINE lpProgressRoutine OPTIONAL, + IN LPVOID lpData OPTIONAL, + IN LPBOOL pbCancel OPTIONAL, + IN DWORD dwCopyFlags, + IN DWORD dwBasepFlags, + OUT LPHANDLE lpExistingHandle, + OUT LPHANDLE lpNewHandle) { NTSTATUS errCode; HANDLE FileHandleSource, FileHandleDest; @@ -307,6 +303,53 @@ return RC; } +/* + * @implemented + */ +BOOL +WINAPI +CopyFileExW(IN LPCWSTR lpExistingFileName, + IN LPCWSTR lpNewFileName, + IN LPPROGRESS_ROUTINE lpProgressRoutine OPTIONAL, + IN LPVOID lpData OPTIONAL, + IN LPBOOL pbCancel OPTIONAL, + IN DWORD dwCopyFlags) +{ + BOOL Ret; + HANDLE ExistingHandle, NewHandle; + + ExistingHandle = INVALID_HANDLE_VALUE; + NewHandle = INVALID_HANDLE_VALUE; + + _SEH2_TRY + { + Ret = BasepCopyFileExW(lpExistingFileName, + lpNewFileName, + lpProgressRoutine, + lpData, + pbCancel, + dwCopyFlags, + 0, + &ExistingHandle, + &NewHandle); + } + _SEH2_FINALLY + { + if (ExistingHandle != INVALID_HANDLE_VALUE) + { + CloseHandle(ExistingHandle); + } + + if (NewHandle != INVALID_HANDLE_VALUE) + { + CloseHandle(NewHandle); + } + } + _SEH2_END; + + return Ret; +} + /* * @implemented @@ -404,17 +447,53 @@ */ BOOL WINAPI -PrivCopyFileExW ( - LPCWSTR lpExistingFileName, - LPCWSTR lpNewFileName, - LPPROGRESS_ROUTINE lpProgressRoutine, - LPVOID lpData, - BOOL *pbCancel, - DWORD dwCopyFlags -) -{ - UNIMPLEMENTED; - return FALSE; +PrivCopyFileExW(IN LPCWSTR lpExistingFileName, + IN LPCWSTR lpNewFileName, + IN LPPROGRESS_ROUTINE lpProgressRoutine, + IN LPVOID lpData, + IN LPBOOL pbCancel, + IN DWORD dwCopyFlags) +{ + BOOL Ret; + HANDLE ExistingHandle, NewHandle; + + ExistingHandle = INVALID_HANDLE_VALUE; + NewHandle = INVALID_HANDLE_VALUE; + + /* Check for incompatible flags */ + if (dwCopyFlags & COPY_FILE_FAIL_IF_EXISTS && dwCopyFlags & BASEP_COPY_REPLACE) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + _SEH2_TRY + { + Ret = BasepCopyFileExW(lpExistingFileName, + lpNewFileName, + lpProgressRoutine, + lpData, + pbCancel, + dwCopyFlags & BASEP_COPY_PUBLIC_MASK, + dwCopyFlags & BASEP_COPY_BASEP_MASK, + &ExistingHandle, + &NewHandle); + } + _SEH2_FINALLY + { + if (ExistingHandle != INVALID_HANDLE_VALUE) + { + CloseHandle(ExistingHandle); + } + + if (NewHandle != INVALID_HANDLE_VALUE) + { + CloseHandle(NewHandle); + } + } + _SEH2_END; + + return Ret; } /* EOF */

10 years, 6 months

[pschweitzer] 63578: [KERNEL32] - Add defines for internal flags for BasepCopyFileExW(). - Add prototype for BasepCopyFileExW(). Based on documentation by Alex.

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon Jun 9 16:48:59 2014 New Revision: 63578 URL: http://svn.reactos.org/svn/reactos?rev=63578&view=rev Log: [KERNEL32] - Add defines for internal flags for BasepCopyFileExW(). - Add prototype for BasepCopyFileExW(). Based on documentation by Alex. Modified: trunk/reactos/dll/win32/kernel32/include/kernel32.h 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] Mon Jun 9 16:48:59 2014 @@ -131,6 +131,17 @@ extern WaitForInputIdleType UserWaitForInputIdleRoutine; +/* Flags for PrivCopyFileExW && BasepCopyFileExW */ +#define BASEP_COPY_METADATA 0x10 +#define BASEP_COPY_SACL 0x20 +#define BASEP_COPY_OWNER_AND_GROUP 0x40 +#define BASEP_COPY_DIRECTORY 0x80 +#define BASEP_COPY_BACKUP_SEMANTICS 0x100 +#define BASEP_COPY_REPLACE 0x200 +#define BASEP_COPY_SKIP_DACL 0x400 +#define BASEP_COPY_PUBLIC_MASK 0xF +#define BASEP_COPY_BASEP_MASK 0xFFFFFFF0 + /* GLOBAL VARIABLES **********************************************************/ extern BOOL bIsFileApiAnsi; @@ -422,6 +433,18 @@ IN ULONG FileAttributes ); +BOOL +BasepCopyFileExW( + IN LPCWSTR lpExistingFileName, + IN LPCWSTR lpNewFileName, + IN LPPROGRESS_ROUTINE lpProgressRoutine OPTIONAL, + IN LPVOID lpData OPTIONAL, + IN LPBOOL pbCancel OPTIONAL, + IN DWORD dwCopyFlags, + IN DWORD dwBasepFlags, + OUT LPHANDLE lpExistingHandle, + OUT LPHANDLE lpNewHandle +); /* FIXME: This is EXPORTED! It should go in an external kernel32.h header */ VOID

10 years, 6 months

[akhaldi] 63577: [WIN32K] * Improve FLOATOBJ_Set{0, 1}. By Timo.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Jun 9 13:36:20 2014 New Revision: 63577 URL: http://svn.reactos.org/svn/reactos?rev=63577&view=rev Log: [WIN32K] * Improve FLOATOBJ_Set{0,1}. By Timo. Modified: trunk/reactos/win32ss/gdi/eng/floatobj.h Modified: trunk/reactos/win32ss/gdi/eng/floatobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/floatobj.h… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/floatobj.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/floatobj.h [iso-8859-1] Mon Jun 9 13:36:20 2014 @@ -63,8 +63,8 @@ #define FLOATOBJ_16 {0x40000000, 0x00000006} #define FLOATOBJ_1_16 {0x40000000, 0xfffffffe} -#define FLOATOBJ_Set0(fo) (fo)->ul1 = 0; (fo)->ul2 = 0; -#define FLOATOBJ_Set1(fo) (fo)->ul1 = 0x40000000; (fo)->ul2 = 2; +#define FLOATOBJ_Set0(fo) do { (fo)->ul1 = 0; (fo)->ul2 = 0; } while (0) +#define FLOATOBJ_Set1(fo) do { (fo)->ul1 = 0x40000000; (fo)->ul2 = 2; } while (0) #else

10 years, 6 months

[akhaldi] 63576: [WIN32K/FREETYPE] * Consider current WorldTransform in ExtTextOutW. * Brought to you by Manuel "Tarnyko" Bachmann. Fix improved by Timo Kreuzer and me. CORE-8306 #resolve #comment ...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Jun 9 13:31:38 2014 New Revision: 63576 URL: http://svn.reactos.org/svn/reactos?rev=63576&view=rev Log: [WIN32K/FREETYPE] * Consider current WorldTransform in ExtTextOutW. * Brought to you by Manuel "Tarnyko" Bachmann. Fix improved by Timo Kreuzer and me. CORE-8306 #resolve #comment Fixed in r63576. Thanks! Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Mon Jun 9 13:31:38 2014 @@ -18,6 +18,8 @@ #include <ftbitmap.h> #include <ftoutln.h> #include <ftwinfnt.h> + +#include <gdi/eng/floatobj.h> #define NDEBUG #include <debug.h> @@ -3228,6 +3230,7 @@ USHORT DxShift; PMATRIX pmxWorldToDevice; LONG fixAscender, fixDescender; + FLOATOBJ Scale; // TODO: Write test-cases to exactly match real Windows in different // bad parameters (e.g. does Windows check the DC or the RECT first?). @@ -3671,8 +3674,13 @@ } else { - TextLeft += Dx[i<<DxShift] << 6; - DPRINT("New TextLeft2: %I64d\n", TextLeft); + Scale = pdcattr->mxWorldToDevice.efM11; + if (_FLOATOBJ_Equal0(&Scale)) + FLOATOBJ_Set1(&Scale); + + FLOATOBJ_MulLong(&Scale, Dx[i<<DxShift] << 6); // do the shift before multiplying to preserve precision + TextLeft += FLOATOBJ_GetLong(&Scale); + DPRINT("New TextLeft2: %I64d\n", TextLeft); } if (DxShift)

10 years, 6 months

[ekohl] 63575: [NET] Convert help and usage texts to string resources.

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Jun 9 12:56:05 2014 New Revision: 63575 URL: http://svn.reactos.org/svn/reactos?rev=63575&view=rev Log: [NET] Convert help and usage texts to string resources. Modified: trunk/reactos/base/applications/network/net/cmdHelpMsg.c trunk/reactos/base/applications/network/net/cmdPause.c trunk/reactos/base/applications/network/net/cmdStop.c trunk/reactos/base/applications/network/net/help.c trunk/reactos/base/applications/network/net/lang/en-US.rc trunk/reactos/base/applications/network/net/main.c trunk/reactos/base/applications/network/net/resource.h Modified: trunk/reactos/base/applications/network/net/cmdHelpMsg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/cmdHelpMsg.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/cmdHelpMsg.c [iso-8859-1] Mon Jun 9 12:56:05 2014 @@ -19,14 +19,14 @@ if (argc < 3) { - puts("Usage: NET HELPMSG <Error Code>"); + PrintResourceString(IDS_HELPMSG_SYNTAX); return 1; } errNum = wcstol(argv[2], &endptr, 10); if (*endptr != 0) { - puts("Usage: NET HELPMSG <Error Code>"); + PrintResourceString(IDS_HELPMSG_SYNTAX); return 1; } Modified: trunk/reactos/base/applications/network/net/cmdPause.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/cmdPause.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/cmdPause.c [iso-8859-1] Mon Jun 9 12:56:05 2014 @@ -18,7 +18,7 @@ if (argc != 3) { - puts("Usage: NET PAUSE <Service Name>"); + PrintResourceString(IDS_PAUSE_SYNTAX); return 1; } Modified: trunk/reactos/base/applications/network/net/cmdStop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/cmdStop.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/cmdStop.c [iso-8859-1] Mon Jun 9 12:56:05 2014 @@ -19,8 +19,7 @@ if (argc != 3) { - /* FIXME: Print usage message! */ - printf("Usage: NET STOP <Service name>\n"); + PrintResourceString(IDS_STOP_SYNTAX); return 1; } Modified: trunk/reactos/base/applications/network/net/help.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/help.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/help.c [iso-8859-1] Mon Jun 9 12:56:05 2014 @@ -13,184 +13,150 @@ { if (argc != 3) { - return 0; + PrintResourceString(IDS_HELP_SYNTAX); + return 0; } - if (_wcsicmp(argv[2],L"ACCOUNTS")==0) + if (_wcsicmp(argv[2],L"ACCOUNTS") == 0) { PrintResourceString(IDS_ACCOUNTS_HELP); return 0; } - if (_wcsicmp(argv[2],L"COMPUTER")==0) + if (_wcsicmp(argv[2],L"COMPUTER") == 0) { - puts("COMPUTER"); - puts("help text"); + PrintResourceString(IDS_COMPUTER_HELP); return 0; } - if (_wcsicmp(argv[2],L"CONFIG")==0) + if (_wcsicmp(argv[2],L"CONFIG") == 0) { - puts("CONFIG"); - puts("help text"); + PrintResourceString(IDS_CONFIG_HELP); return 0; } - if (_wcsicmp(argv[2],L"CONTINUE")==0) + if (_wcsicmp(argv[2],L"CONTINUE") == 0) { PrintResourceString(IDS_CONTINUE_HELP); return 0; } - if (_wcsicmp(argv[2],L"FILE")==0) + if (_wcsicmp(argv[2],L"FILE") == 0) { - puts("FILE"); - puts("help text"); + PrintResourceString(IDS_FILE_HELP); return 0; } - if (_wcsicmp(argv[2],L"GROUP")==0) + if (_wcsicmp(argv[2],L"GROUP") == 0) { - puts("GROUP"); - puts("help text"); + PrintResourceString(IDS_GROUP_HELP); return 0; } - if (_wcsicmp(argv[2],L"HELP")==0) + if (_wcsicmp(argv[2],L"HELPMSG") == 0) { - puts("HELP"); - puts("help text"); + PrintResourceString(IDS_HELPMSG_HELP); return 0; } - if (_wcsicmp(argv[2],L"HELPMSG")==0) + if (_wcsicmp(argv[2],L"LOCALGROUP") == 0) { - puts("HELPMSG"); - puts("help text"); + PrintResourceString(IDS_LOCALGROUP_HELP); return 0; } - if (_wcsicmp(argv[2],L"LOCALGROUP")==0) + if (_wcsicmp(argv[2],L"NAME") == 0) { - puts("LOCALGROUP"); - puts("help text"); + PrintResourceString(IDS_NAME_HELP); return 0; } - if (_wcsicmp(argv[2],L"NAME")==0) + if (_wcsicmp(argv[2],L"PAUSE") == 0) { - puts("NAME"); - puts("help text"); + PrintResourceString(IDS_PAUSE_HELP); return 0; } - if (_wcsicmp(argv[2],L"PRINT")==0) + if (_wcsicmp(argv[2],L"PRINT") == 0) { - puts("PRINT"); - puts("help text"); + PrintResourceString(IDS_PRINT_HELP); return 0; } - if (_wcsicmp(argv[2],L"SEND")==0) + if (_wcsicmp(argv[2],L"SEND") == 0) { - puts("SEND"); - puts("help text"); + PrintResourceString(IDS_SEND_HELP); return 0; } - if (_wcsicmp(argv[2],L"SESSION")==0) + if (_wcsicmp(argv[2],L"SESSION") == 0) { - puts("SESSION"); - puts("help text"); + PrintResourceString(IDS_SESSION_HELP); return 0; } - if (_wcsicmp(argv[2],L"SHARE")==0) + if (_wcsicmp(argv[2],L"SHARE") == 0) { - puts("SHARE"); - puts("help text"); + PrintResourceString(IDS_SHARE_HELP); return 0; } - if (_wcsicmp(argv[2],L"START")==0) + if (_wcsicmp(argv[2],L"START") == 0) { - puts("START"); - puts("help text"); + PrintResourceString(IDS_START_HELP); return 0; } - if (_wcsicmp(argv[2],L"STATISTICS")==0) + if (_wcsicmp(argv[2],L"STATISTICS") == 0) { - puts("STATISTICS"); - puts("help text"); + PrintResourceString(IDS_STATISTICS_HELP); return 0; } - if (_wcsicmp(argv[2],L"STOP")==0) + if (_wcsicmp(argv[2],L"STOP") == 0) { - puts("STOP"); - puts("help text"); + PrintResourceString(IDS_STOP_HELP); return 0; } - if (_wcsicmp(argv[2],L"TIME")==0) + if (_wcsicmp(argv[2],L"TIME") == 0) { - puts("TIME"); - puts("help text"); + PrintResourceString(IDS_TIME_HELP); return 0; } - if (_wcsicmp(argv[2],L"USE")==0) + if (_wcsicmp(argv[2],L"USE") == 0) { - puts("USE"); - puts("help text"); + PrintResourceString(IDS_USE_HELP); return 0; } - if (_wcsicmp(argv[2],L"USER")==0) + if (_wcsicmp(argv[2],L"USER") == 0) { - puts("USER"); - puts("help text"); + PrintResourceString(IDS_USER_HELP); return 0; } - if (_wcsicmp(argv[2],L"VIEW")==0) + if (_wcsicmp(argv[2],L"VIEW") == 0) { - puts("VIEW"); - puts("help text"); + PrintResourceString(IDS_VIEW_HELP); return 0; } - help(); +#if 0 + if (_wcsicmp(argv[2],L"SERVICES") == 0) + { + return 0; + } + + if (_wcsicmp(argv[2],L"SYNTAX") == 0) + { + return 0; + } +#endif + + PrintResourceString(IDS_HELP_SYNTAX); + return 0; } -VOID help(VOID) -{ - puts("NET ACCOUNTS"); - puts("NET COMPUTER"); - puts("NET CONFIG"); - puts("NET CONFIG SERVER"); - puts("NET CONFIG WORKSTATION"); - puts("NET CONTINUE"); - puts("NET FILE"); - puts("NET GROUP"); - - puts("NET HELP"); - puts("NET HELPMSG"); - puts("NET LOCALGROUP"); - puts("NET NAME"); - puts("NET PAUSE"); - puts("NET PRINT"); - puts("NET SEND"); - puts("NET SESSION"); - - puts("NET SHARE"); - puts("NET START"); - puts("NET STATISTICS"); - puts("NET STOP"); - puts("NET TIME"); - puts("NET USE"); - puts("NET USER"); - puts("NET VIEW"); -} Modified: trunk/reactos/base/applications/network/net/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/lang/en-US.rc [iso-8859-1] Mon Jun 9 12:56:05 2014 @@ -5,7 +5,59 @@ IDS_ACCOUNTS_SYNTAX "Usage:\nNET ACCOUNTS [/FORCELOGOFF:{Minutes|NO}] [/MINPWLEN:Length]\n\ [/MAXPWAGE:{Days|UNLIMITED}] [/MINPWAGE:Days]\n\ [/UNIQUEPW:Count] [/DOMAIN]\n" - IDS_ACCOUNTS_HELP "ACCOUNTS\nhelp text" + IDS_ACCOUNTS_HELP "ACCOUNTS\n..." + IDS_COMPUTER_SYNTAX "Usage:\nNET COMPUTER ..." + IDS_COMPUTER_HELP "COMPUTER\n..." + IDS_CONFIG_SYNTAX "Usage:\nNET CONFIG ..." + IDS_CONFIG_HELP "CONFIG\n..." IDS_CONTINUE_SYNTAX "Usage:\nNET CONTINUE <Service Name>" - IDS_CONTINUE_HELP "CONTINUE\nhelp text" + IDS_CONTINUE_HELP "CONTINUE\n..." + IDS_FILE_SYNTAX "Usage:\nNET FILE ..." + IDS_FILE_HELP "FILE\n..." + IDS_GROUP_SYNTAX "Usage:\nNET GROUP ..." + IDS_GROUP_HELP "GROUP\n..." + IDS_HELPMSG_SYNTAX "Usage:\nNET HELPMSG <Error Code>" + IDS_HELPMSG_HELP "HELPMSG\n..." + IDS_LOCALGROUP_SYNTAX "Usage:\nNET LOCALGROUP ..." + IDS_LOCALGROUP_HELP "LOCALGROUP\n..." + IDS_NAME_SYNTAX "Usage:\nNET NAME ..." + IDS_NAME_HELP "NAME\n..." + IDS_PRINT_SYNTAX "Usage:\nNET PRINT ..." + IDS_PRINT_HELP "PRINT\n..." + IDS_PAUSE_SYNTAX "Usage:\nNET PAUSE <Service Name>" + IDS_PAUSE_HELP "PAUSE\n..." + IDS_SEND_SYNTAX "Usage:\nNET SEND ..." + IDS_SEND_HELP "SEND\n..." + IDS_SESSION_SYNTAX "Usage:\nNET SESSION ..." + IDS_SESSION_HELP "SESSION\n..." + IDS_SHARE_SYNTAX "Usage:\nNET SHARE ..." + IDS_SHARE_HELP "SHARE\n..." + IDS_START_SYNTAX "Usage:\nNET START ..." + IDS_START_HELP "START\n..." + IDS_STATISTICS_SYNTAX "Usage:\nNET STATISTICS ..." + IDS_STATISTICS_HELP "STATISTICS\n..." + IDS_STOP_SYNTAX "Usage:\nNET STOP <Service name>" + IDS_STOP_HELP "STOP\n..." + IDS_TIME_SYNTAX "Usage:\nNET TIME ..." + IDS_TIME_HELP "TIME\n..." + IDS_USE_SYNTAX "Usage:\nNET USE ..." + IDS_USE_HELP "USE\n..." + IDS_USER_SYNTAX "Usage:\nNET USER ..." + IDS_USER_HELP "USER\n..." + IDS_VIEW_SYNTAX "Usage:\nNET VIEW ..." + IDS_VIEW_HELP "VIEW\n..." + IDS_HELP_SYNTAX "Usage:\nNET HELP <Command>\n - or -\nNET <Command> /HELP\n\n\ + The following commands are available:\n\n\ + NET ACCOUNTS NET HELP NET SHARE\n\ + NET COMPUTER NET HELPMSG NET START\n\ + NET CONFIG NET LOCALGROUP NET STATISTICS\n\ + NET CONFIG SERVER NET NAME NET STOP\n\ + NET CONFIG WORKSTATION NET PAUSE NET TIME\n\ + NET CONTINUE NET PRINT NET USE\n\ + NET FILE NET SEND NET USER\n\ + NET GROUP NET SESSION NET VIEW\n\n\ + ..." + IDS_NET_SYNTAX "Usage:\nNET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP |\n\ + HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION |\n\ + SHARE | START | STATISTICS | STOP | TIME | USE | NET USER | VIEW ]\n" END Modified: trunk/reactos/base/applications/network/net/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/main.c [iso-8859-1] Mon Jun 9 12:56:05 2014 @@ -30,8 +30,8 @@ {L"helpmsg", cmdHelpMsg}, {L"localgroup", unimplemented}, {L"name", unimplemented}, + {L"pause", cmdPause}, {L"print", unimplemented}, - {L"pause", cmdPause}, {L"send", unimplemented}, {L"session", unimplemented}, {L"share", unimplemented}, @@ -67,7 +67,7 @@ if (argc < 2) { - help(); + PrintResourceString(IDS_NET_SYNTAX); return 1; } @@ -80,7 +80,7 @@ } } - help(); + PrintResourceString(IDS_NET_SYNTAX); return 1; } Modified: trunk/reactos/base/applications/network/net/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/resource.h [iso-8859-1] Mon Jun 9 12:56:05 2014 @@ -1,6 +1,46 @@ #pragma once -#define IDS_ACCOUNTS_SYNTAX 100 -#define IDS_ACCOUNTS_HELP 101 -#define IDS_CONTINUE_SYNTAX 102 -#define IDS_CONTINUE_HELP 103 +#define IDS_ACCOUNTS_SYNTAX 100 +#define IDS_ACCOUNTS_HELP 101 +#define IDS_COMPUTER_SYNTAX 102 +#define IDS_COMPUTER_HELP 103 +#define IDS_CONFIG_SYNTAX 104 +#define IDS_CONFIG_HELP 105 +#define IDS_CONTINUE_SYNTAX 106 +#define IDS_CONTINUE_HELP 107 +#define IDS_FILE_SYNTAX 108 +#define IDS_FILE_HELP 109 +#define IDS_GROUP_SYNTAX 110 +#define IDS_GROUP_HELP 111 +#define IDS_HELPMSG_SYNTAX 112 +#define IDS_HELPMSG_HELP 113 +#define IDS_LOCALGROUP_SYNTAX 114 +#define IDS_LOCALGROUP_HELP 115 +#define IDS_NAME_SYNTAX 116 +#define IDS_NAME_HELP 117 +#define IDS_PAUSE_SYNTAX 118 +#define IDS_PAUSE_HELP 119 +#define IDS_PRINT_SYNTAX 120 +#define IDS_PRINT_HELP 121 +#define IDS_SEND_SYNTAX 122 +#define IDS_SEND_HELP 123 +#define IDS_SESSION_SYNTAX 124 +#define IDS_SESSION_HELP 125 +#define IDS_SHARE_SYNTAX 126 +#define IDS_SHARE_HELP 127 +#define IDS_START_SYNTAX 128 +#define IDS_START_HELP 129 +#define IDS_STATISTICS_SYNTAX 130 +#define IDS_STATISTICS_HELP 131 +#define IDS_STOP_SYNTAX 132 +#define IDS_STOP_HELP 133 +#define IDS_TIME_SYNTAX 134 +#define IDS_TIME_HELP 135 +#define IDS_USE_SYNTAX 136 +#define IDS_USE_HELP 137 +#define IDS_USER_SYNTAX 138 +#define IDS_USER_HELP 139 +#define IDS_VIEW_SYNTAX 140 +#define IDS_VIEW_HELP 141 +#define IDS_HELP_SYNTAX 142 +#define IDS_NET_SYNTAX 143

10 years, 6 months

[ekohl] 63574: [USETUP] Add the create logical partition page.

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Jun 9 01:49:24 2014 New Revision: 63574 URL: http://svn.reactos.org/svn/reactos?rev=63574&view=rev Log: [USETUP] Add the create logical partition page. Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/lang/bg-BG.h trunk/reactos/base/setup/usetup/lang/cs-CZ.h trunk/reactos/base/setup/usetup/lang/de-DE.h trunk/reactos/base/setup/usetup/lang/el-GR.h trunk/reactos/base/setup/usetup/lang/en-US.h trunk/reactos/base/setup/usetup/lang/es-ES.h trunk/reactos/base/setup/usetup/lang/et-EE.h trunk/reactos/base/setup/usetup/lang/fr-FR.h trunk/reactos/base/setup/usetup/lang/he-IL.h trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/ja-JP.h trunk/reactos/base/setup/usetup/lang/lt-LT.h trunk/reactos/base/setup/usetup/lang/nl-NL.h trunk/reactos/base/setup/usetup/lang/pl-PL.h trunk/reactos/base/setup/usetup/lang/pt-BR.h trunk/reactos/base/setup/usetup/lang/ro-RO.h trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sk-SK.h trunk/reactos/base/setup/usetup/lang/sq-AL.h trunk/reactos/base/setup/usetup/lang/sv-SE.h trunk/reactos/base/setup/usetup/lang/tr-TR.h trunk/reactos/base/setup/usetup/lang/uk-UA.h trunk/reactos/base/setup/usetup/mui.h trunk/reactos/base/setup/usetup/partlist.c trunk/reactos/base/setup/usetup/partlist.h Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Mon Jun 9 01:49:24 2014 @@ -2131,8 +2131,146 @@ static PAGE_NUMBER CreateLogicalPartitionPage(PINPUT_RECORD Ir) { - - return SELECT_PARTITION_PAGE; + PDISKENTRY DiskEntry; + PPARTENTRY PartEntry; + BOOLEAN Quit; + BOOLEAN Cancel; + CHAR InputBuffer[50]; + ULONG MaxSize; + ULONGLONG PartSize; + ULONGLONG DiskSize; + ULONGLONG SectorCount; + PCHAR Unit; + + if (PartitionList == NULL || + PartitionList->CurrentDisk == NULL || + PartitionList->CurrentPartition == NULL) + { + /* FIXME: show an error dialog */ + return QUIT_PAGE; + } + + DiskEntry = PartitionList->CurrentDisk; + PartEntry = PartitionList->CurrentPartition; + + CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); + + CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_CHOOSE_NEW_LOGICAL_PARTITION)); + + DiskSize = DiskEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; +#if 0 + if (DiskSize >= 10737418240) /* 10 GB */ + { + DiskSize = DiskSize / 1073741824; + Unit = MUIGetString(STRING_GB); + } + else +#endif + { + DiskSize = DiskSize / 1048576; + if (DiskSize == 0) + DiskSize = 1; + + Unit = MUIGetString(STRING_MB); + } + + if (DiskEntry->DriverName.Length > 0) + { + CONSOLE_PrintTextXY(6, 10, + MUIGetString(STRING_HDINFOPARTCREATE), + DiskSize, + Unit, + DiskEntry->DiskNumber, + DiskEntry->Port, + DiskEntry->Bus, + DiskEntry->Id, + &DiskEntry->DriverName); + } + else + { + CONSOLE_PrintTextXY(6, 10, + MUIGetString(STRING_HDDINFOUNK1), + DiskSize, + Unit, + DiskEntry->DiskNumber, + DiskEntry->Port, + DiskEntry->Bus, + DiskEntry->Id); + } + + CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDDSIZE)); + +#if 0 + CONSOLE_PrintTextXY(8, 10, "Maximum size of the new partition is %I64u MB", + PartitionList->CurrentPartition->SectorCount * DiskEntry->BytesPerSector / 1048576); +#endif + + CONSOLE_SetStatusText(MUIGetString(STRING_CREATEPARTITION)); + + PartEntry = PartitionList->CurrentPartition; + while (TRUE) + { + MaxSize = (PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector) / 1048576; /* in MBytes (rounded) */ + + if (MaxSize > PARTITION_MAXSIZE) + MaxSize = PARTITION_MAXSIZE; + + ShowPartitionSizeInputBox(12, 14, xScreen - 12, 17, /* left, top, right, bottom */ + MaxSize, InputBuffer, &Quit, &Cancel); + + if (Quit == TRUE) + { + if (ConfirmQuit (Ir) == TRUE) + { + return QUIT_PAGE; + } + } + else if (Cancel == TRUE) + { + return SELECT_PARTITION_PAGE; + } + else + { + PartSize = atoi(InputBuffer); + + if (PartSize < 1) + { + /* Too small */ + continue; + } + + if (PartSize > MaxSize) + { + /* Too large */ + continue; + } + + /* Convert to bytes */ + if (PartSize == MaxSize) + { + /* Use all of the unpartitioned disk space */ + SectorCount = PartEntry->SectorCount.QuadPart; + } + else + { + /* Calculate the sector count from the size in MB */ + SectorCount = PartSize * 1048576 / DiskEntry->BytesPerSector; + + /* But never get larger than the unpartitioned disk space */ + if (SectorCount > PartEntry->SectorCount.QuadPart) + SectorCount = PartEntry->SectorCount.QuadPart; + } + + DPRINT("Partition size: %I64u bytes\n", PartSize); + + CreateLogicalPartition(PartitionList, + SectorCount); + + return SELECT_PARTITION_PAGE; + } + } + + return CREATE_LOGICAL_PARTITION_PAGE; } Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bg-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] Mon Jun 9 01:49:24 2014 @@ -1664,6 +1664,8 @@ // "§¡à «¨ áâ¥ ¤ áê§¤ ¤¥â¥ ®¢ ¤ï« "}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "You have chosen to create an extended partition on"}, + {STRING_CHOOSE_NEW_LOGICAL_PARTITION, + "You have chosen to create a logical partition on"}, {STRING_HDDSIZE, "ê¢¥¤¥â¥ à §¬¥à ®¢¨ï ¤ï« (¢ ¬¥£ ¡ ©â¨)."}, {STRING_CREATEPARTITION, Modified: trunk/reactos/base/setup/usetup/lang/cs-CZ.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/cs-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] Mon Jun 9 01:49:24 2014 @@ -1660,6 +1660,8 @@ // "Zvolili jste vytvoýen¡ novho odd¡lu na"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "You have chosen to create an extended partition on"}, + {STRING_CHOOSE_NEW_LOGICAL_PARTITION, + "You have chosen to create a logical partition on"}, {STRING_HDDSIZE, "Zadejte velikost novho odd¡lu v megabajtech."}, {STRING_CREATEPARTITION, Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] Mon Jun 9 01:49:24 2014 @@ -466,7 +466,7 @@ "nutzbaren Setups.", TEXT_STYLE_NORMAL }, - { + { 6, 14, "Die Reparaturfunktionen sind noch nicht implementiert.", @@ -915,7 +915,7 @@ "Benutzen Sie die Entf-TASTE, um Zeichen zu lschen.", TEXT_STYLE_NORMAL }, - { + { 6, 17, "Besttigen Sie die Eingabe mit der EINGABETASTE.", @@ -1398,7 +1398,7 @@ { //ERROR_UPDATE_DISPLAY_SETTINGS, "Die Registrierungseintrge der Anzeigeeinstellungen\n" - "konnten nicht aktualisiert werden.", + "konnten nicht aktualisiert werden.", "EINGABETASTER = Computer neu starten" }, { @@ -1439,7 +1439,7 @@ { //ERROR_COPY_QUEUE, "Die Liste mit den zu kopierenden Dateien\n" - "konnte nicht gefunden werden.\n", + "konnte nicht gefunden werden.\n", "EINGABETASTE = Computer neu starten" }, { @@ -1654,6 +1654,8 @@ "Eine primre Partition soll hier erstellt werden:"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "Eine erweiterte Partition soll hier erstellt werden:"}, + {STRING_CHOOSE_NEW_LOGICAL_PARTITION, + "Ein logisches Laufwerk soll hier erstellt werden:"}, {STRING_HDDSIZE, "Bitte geben Sie die Gráe der neuen Partition in Megabyte ein."}, {STRING_CREATEPARTITION, Modified: trunk/reactos/base/setup/usetup/lang/el-GR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/el-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] Mon Jun 9 01:49:24 2014 @@ -1676,6 +1676,8 @@ // "§ ¢â¥« ¤ £ ¦¬¨ã©« â¤ ¤â¦ partition on"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "You have chosen to create an extended partition on"}, + {STRING_CHOOSE_NEW_LOGICAL_PARTITION, + "You have chosen to create a logical partition on"}, {STRING_HDDSIZE, "¨¡¢é é©« «¦ £â¦ª «¦¬ partition © megabytes."}, {STRING_CREATEPARTITION, Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] Mon Jun 9 01:49:24 2014 @@ -1648,6 +1648,8 @@ "You have chosen to create a primary partition on"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "You have chosen to create an extended partition on"}, + {STRING_CHOOSE_NEW_LOGICAL_PARTITION, + "You have chosen to create a logical partition on"}, {STRING_HDDSIZE, "Please enter the size of the new partition in megabytes."}, {STRING_CREATEPARTITION, Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] Mon Jun 9 01:49:24 2014 @@ -1658,6 +1658,8 @@ // "Ha elegido crear una nueva partici¢n en"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "You have chosen to create an extended partition on"}, + {STRING_CHOOSE_NEW_LOGICAL_PARTITION, + "You have chosen to create a logical partition on"}, {STRING_HDDSIZE, "Por favor, introduzca el tama¤o de la nueva partici¢n en megabytes."}, {STRING_CREATEPARTITION, Modified: trunk/reactos/base/setup/usetup/lang/et-EE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/et-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] Mon Jun 9 01:49:24 2014 @@ -1649,6 +1649,8 @@ // "Oled valinud kettale uue partitsiooni loomise"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "You have chosen to create an extended partition on"}, + {STRING_CHOOSE_NEW_LOGICAL_PARTITION, + "You have chosen to create a logical partition on"}, {STRING_HDDSIZE, "Sisesta uue partitsiooni suurus megabaitides."}, {STRING_CREATEPARTITION, Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] Mon Jun 9 01:49:24 2014 @@ -1662,6 +1662,8 @@ "Vous avez choisi de crer une partition primaire sur"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "Vous avez choisi de crer une partition tendue sur"}, + {STRING_CHOOSE_NEW_LOGICAL_PARTITION, + "You have chosen to create a logical partition on"}, {STRING_HDDSIZE, "Veuillez entrer la taille de la nouvelle partition en mgaoctets."}, {STRING_CREATEPARTITION, Modified: trunk/reactos/base/setup/usetup/lang/he-IL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/he-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/he-IL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/he-IL.h [iso-8859-1] Mon Jun 9 01:49:24 2014 @@ -1650,6 +1650,8 @@ "You have chosen to create a primary partition on"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "You have chosen to create an extended partition on"}, + {STRING_CHOOSE_NEW_LOGICAL_PARTITION, + "You have chosen to create a logical partition on"}, {STRING_HDDSIZE, "Please enter the size of the new partition in megabytes."}, {STRING_CREATEPARTITION, Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] Mon Jun 9 01:49:24 2014 @@ -1653,6 +1653,8 @@ // "Avete scelto di creare una nuova partizione su"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "You have chosen to create an extended partition on"}, + {STRING_CHOOSE_NEW_LOGICAL_PARTITION, + "You have chosen to create a logical partition on"}, {STRING_HDDSIZE, "Indicare la dimensione della nuova partizione in megabyte."}, {STRING_CREATEPARTITION, Modified: trunk/reactos/base/setup/usetup/lang/ja-JP.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ja-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] Mon Jun 9 01:49:24 2014 @@ -1652,6 +1652,8 @@ // "±À×¼² Êß°Ã¨¼®Ý¦ Â·ÞÆ »¸¾²½Ù ºÄ¶Þ ¾ÝÀ¸ »ÚÏ¼À:"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "You have chosen to create an extended partition on"}, + {STRING_CHOOSE_NEW_LOGICAL_PARTITION, + "You have chosen to create a logical partition on"}, {STRING_HDDSIZE, "±À×¼² Êß°Ã¨¼®ÝÉ »²½Þ¦ Ò¶ÞÊÞ²Ä ÀÝ²ÃÞ Æ³Ø®¸ ¼Ã¸ÀÞ»²¡"}, {STRING_CREATEPARTITION, Modified: trunk/reactos/base/setup/usetup/lang/lt-LT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/lt-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] Mon Jun 9 01:49:24 2014 @@ -1659,6 +1659,8 @@ "You have chosen to create a primary partition on"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "You have chosen to create an extended partition on"}, + {STRING_CHOOSE_NEW_LOGICAL_PARTITION, + "You have chosen to create a logical partition on"}, {STRING_HDDSIZE, "Please enter the size of the new partition in megabytes."}, {STRING_CREATEPARTITION, Modified: trunk/reactos/base/setup/usetup/lang/nl-NL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/nl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] Mon Jun 9 01:49:24 2014 @@ -1697,6 +1697,8 @@ // "U wilt een nieuwe partitie aanmaken op"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "You have chosen to create an extended partition on"}, + {STRING_CHOOSE_NEW_LOGICAL_PARTITION, + "You have chosen to create a logical partition on"}, {STRING_HDDSIZE, "Voert u de grootte van de nieuwe partitie in in megabytes."}, {STRING_CREATEPARTITION, Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] Mon Jun 9 01:49:24 2014 @@ -1661,6 +1661,8 @@ // "Wybrane: utworzenie nowej partycji na"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "You have chosen to create an extended partition on"}, + {STRING_CHOOSE_NEW_LOGICAL_PARTITION, + "You have chosen to create a logical partition on"}, {STRING_HDDSIZE, "Prosz© wprowadzi rozmiar nowej partycji w megabajtach."}, {STRING_CREATEPARTITION, Modified: trunk/reactos/base/setup/usetup/lang/pt-BR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pt-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pt-BR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pt-BR.h [iso-8859-1] Mon Jun 9 01:49:24 2014 @@ -1688,6 +1688,8 @@ // "Voc solicitou a criaÆo de uma nova partiÆo em"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "You have chosen to create an extended partition on"}, + {STRING_CHOOSE_NEW_LOGICAL_PARTITION, + "You have chosen to create a logical partition on"}, {STRING_HDDSIZE, "Por favor, insira o tamanho da nova partiÆo em megabytes (MB)."}, {STRING_CREATEPARTITION, Modified: trunk/reactos/base/setup/usetup/lang/ro-RO.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ro-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ro-RO.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ro-RO.h [iso-8859-1] Mon Jun 9 01:49:24 2014 @@ -1729,6 +1729,8 @@ // "Aîi ales crearea unei noi partiîii pe"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "You have chosen to create an extended partition on"}, + {STRING_CHOOSE_NEW_LOGICAL_PARTITION, + "You have chosen to create a logical partition on"}, {STRING_HDDSIZE, "Introduceîi mÇrimea noii partiîii n megaocteîi."}, {STRING_CREATEPARTITION, Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] Mon Jun 9 01:49:24 2014 @@ -1653,6 +1653,8 @@ // "ë å®â¨â¥ á®§¤ âì ®¢ë© à §¤¥« "}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "You have chosen to create an extended partition on"}, + {STRING_CHOOSE_NEW_LOGICAL_PARTITION, + "You have chosen to create a logical partition on"}, {STRING_HDDSIZE, "®¦ «ã©áâ , ¢¢¥¤¨â¥ à §¬¥à ®¢®£® à §¤¥« ¢ ¬¥£ ¡ ©â å."}, {STRING_CREATEPARTITION, Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] Mon Jun 9 01:49:24 2014 @@ -1663,6 +1663,8 @@ // "Zvolili ste vytvorenie novej oblasti na"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "You have chosen to create an extended partition on"}, + {STRING_CHOOSE_NEW_LOGICAL_PARTITION, + "You have chosen to create a logical partition on"}, {STRING_HDDSIZE, "Zadajte, pros¡m, vekos novej oblasti v megabajtoch."}, {STRING_CREATEPARTITION, Modified: trunk/reactos/base/setup/usetup/lang/sq-AL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sq-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sq-AL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sq-AL.h [iso-8859-1] Mon Jun 9 01:49:24 2014 @@ -1655,6 +1655,8 @@ "Ju keni zgjedhur pr t krijuar nj ndarje t re n"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "You have chosen to create an extended partition on"}, + {STRING_CHOOSE_NEW_LOGICAL_PARTITION, + "You have chosen to create a logical partition on"}, {STRING_HDDSIZE, "Ju lutem, jepini madhsin e particionit t ri n megabajt."}, {STRING_CREATEPARTITION, Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sv-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] Mon Jun 9 01:49:24 2014 @@ -1658,6 +1658,8 @@ // "Du har valt att skapa en ny partiton p"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "You have chosen to create an extended partition on"}, + {STRING_CHOOSE_NEW_LOGICAL_PARTITION, + "You have chosen to create a logical partition on"}, {STRING_HDDSIZE, "Vnligen skriv in storleken av den nya partitionen i megabytes."}, {STRING_CREATEPARTITION, Modified: trunk/reactos/base/setup/usetup/lang/tr-TR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/tr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/tr-TR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/tr-TR.h [iso-8859-1] Mon Jun 9 01:49:24 2014 @@ -1626,6 +1626,8 @@ // "Yeni bir blm oluturmay setiniz."}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "You have chosen to create an extended partition on"}, + {STRING_CHOOSE_NEW_LOGICAL_PARTITION, + "You have chosen to create a logical partition on"}, {STRING_HDDSIZE, "Oluturulacak blmn bykl§n megaoklu olarak giriniz."}, {STRING_CREATEPARTITION, Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/uk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] Mon Jun 9 01:49:24 2014 @@ -1658,6 +1658,8 @@ // "¨ å®ç¥â¥ áâ¢®à¨â¨ ®¢¨© à®§¤i« "}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "You have chosen to create an extended partition on"}, + {STRING_CHOOSE_NEW_LOGICAL_PARTITION, + "You have chosen to create a logical partition on"}, {STRING_HDDSIZE, "ã¤ì-« áª , ¢¢¥¤iâì à®§¬ià ®¢®£® à®§¤i«ã ¢ ¬¥£ ¡ ©â å."}, {STRING_CREATEPARTITION, Modified: trunk/reactos/base/setup/usetup/mui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.h?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/mui.h [iso-8859-1] Mon Jun 9 01:49:24 2014 @@ -105,6 +105,7 @@ #define STRING_PARTITIONSIZE 4 #define STRING_CHOOSENEWPARTITION 5 #define STRING_CHOOSE_NEW_EXTENDED_PARTITION 57 +#define STRING_CHOOSE_NEW_LOGICAL_PARTITION 61 #define STRING_HDDSIZE 6 #define STRING_CREATEPARTITION 7 #define STRING_PARTFORMAT 8 Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Mon Jun 9 01:49:24 2014 @@ -2578,6 +2578,32 @@ VOID +CreateLogicalPartition( + PPARTLIST List, + ULONGLONG SectorCount) +{ +// PDISKENTRY DiskEntry; + PPARTENTRY PartEntry; +// PPARTENTRY NewPartEntry; + + DPRINT1("CreateLogicalPartition(%I64u)\n", SectorCount); + + if (List == NULL || + List->CurrentDisk == NULL || + List->CurrentPartition == NULL || + List->CurrentPartition->IsPartitioned == TRUE) + { + return; + } + +// DiskEntry = List->CurrentDisk; + PartEntry = List->CurrentPartition; + + DPRINT1("Current partition sector count: %I64u\n", PartEntry->SectorCount.QuadPart); +} + + +VOID DeleteCurrentPartition( PPARTLIST List) { Modified: trunk/reactos/base/setup/usetup/partlist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.h [iso-8859-1] Mon Jun 9 01:49:24 2014 @@ -231,6 +231,11 @@ ULONGLONG PartitionSize); VOID +CreateLogicalPartition( + PPARTLIST List, + ULONGLONG PartitionSize); + +VOID DeleteCurrentPartition( PPARTLIST List);

10 years, 6 months

[hbelusca] 63573: [CONSRV]: Use InterlockedExchange16 to exchange Begin and End COORD structure members.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jun 8 23:02:40 2014 New Revision: 63573 URL: http://svn.reactos.org/svn/reactos?rev=63573&view=rev Log: [CONSRV]: Use InterlockedExchange16 to exchange Begin and End COORD structure members. Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] Sun Jun 8 23:02:40 2014 @@ -12,7 +12,7 @@ /* INCLUDES *******************************************************************/ #include <consrv.h> - +#include <intrin.h> #include <windowsx.h> #define NDEBUG @@ -694,17 +694,8 @@ /* Exchange Begin / End if Begin > End lexicographically */ if (Begin->Y > End->Y || (Begin->Y == End->Y && Begin->X > End->X)) { - SHORT tmp; - - // End->X = InterlockedExchange16(&Begin->X, End->X); - tmp = Begin->X; - Begin->X = End->X; - End->X = tmp; - - // End->Y = InterlockedExchange16(&Begin->Y, End->Y); - tmp = Begin->Y; - Begin->Y = End->Y; - End->Y = tmp; + End->X = _InterlockedExchange16(&Begin->X, End->X); + End->Y = _InterlockedExchange16(&Begin->Y, End->Y); } }

10 years, 6 months

[hbelusca] 63572: [CRT/INTRIN_X86] Add InterlockedExchange8/16 for GCC. Reviewed by Timo.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jun 8 22:28:35 2014 New Revision: 63572 URL: http://svn.reactos.org/svn/reactos?rev=63572&view=rev Log: [CRT/INTRIN_X86] Add InterlockedExchange8/16 for GCC. Reviewed by Timo. Modified: trunk/reactos/include/crt/mingw32/intrin_x86.h Modified: trunk/reactos/include/crt/mingw32/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mingw32/intrin… ============================================================================== --- trunk/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] Sun Jun 8 22:28:35 2014 @@ -150,6 +150,8 @@ __INTRIN_INLINE short _InterlockedCompareExchange16(volatile short * const Destination, const short Exchange, const short Comperand); __INTRIN_INLINE long _InterlockedCompareExchange(volatile long * const Destination, const long Exchange, const long Comperand); __INTRIN_INLINE void * _InterlockedCompareExchangePointer(void * volatile * const Destination, void * const Exchange, void * const Comperand); +__INTRIN_INLINE char _InterlockedExchange8(volatile char * const Target, const char Value); +__INTRIN_INLINE short _InterlockedExchange16(volatile short * const Target, const short Value); __INTRIN_INLINE long _InterlockedExchange(volatile long * const Target, const long Value); __INTRIN_INLINE void * _InterlockedExchangePointer(void * volatile * const Target, void * const Value); __INTRIN_INLINE long _InterlockedExchangeAdd16(volatile short * const Addend, const short Value); @@ -199,25 +201,39 @@ return (void *)__sync_val_compare_and_swap(Destination, Comperand, Exchange); } -__INTRIN_INLINE long _InterlockedExchange(volatile long * const Target, const long Value) +__INTRIN_INLINE char _InterlockedExchange8(volatile char * const Target, const char Value) { /* NOTE: __sync_lock_test_and_set would be an acquire barrier, so we force a full barrier */ __sync_synchronize(); return __sync_lock_test_and_set(Target, Value); } -#if defined(_M_AMD64) -__INTRIN_INLINE long long _InterlockedExchange64(volatile long long * const Target, const long long Value) +__INTRIN_INLINE short _InterlockedExchange16(volatile short * const Target, const short Value) { /* NOTE: __sync_lock_test_and_set would be an acquire barrier, so we force a full barrier */ __sync_synchronize(); return __sync_lock_test_and_set(Target, Value); } + +__INTRIN_INLINE long _InterlockedExchange(volatile long * const Target, const long Value) +{ + /* NOTE: __sync_lock_test_and_set would be an acquire barrier, so we force a full barrier */ + __sync_synchronize(); + return __sync_lock_test_and_set(Target, Value); +} + +#if defined(_M_AMD64) +__INTRIN_INLINE long long _InterlockedExchange64(volatile long long * const Target, const long long Value) +{ + /* NOTE: __sync_lock_test_and_set would be an acquire barrier, so we force a full barrier */ + __sync_synchronize(); + return __sync_lock_test_and_set(Target, Value); +} #endif __INTRIN_INLINE void * _InterlockedExchangePointer(void * volatile * const Target, void * const Value) { - /* NOTE: ditto */ + /* NOTE: __sync_lock_test_and_set would be an acquire barrier, so we force a full barrier */ __sync_synchronize(); return (void *)__sync_lock_test_and_set(Target, Value); } @@ -347,6 +363,8 @@ __INTRIN_INLINE short _InterlockedCompareExchange16(volatile short * const Destination, const short Exchange, const short Comperand); __INTRIN_INLINE long _InterlockedCompareExchange(volatile long * const Destination, const long Exchange, const long Comperand); __INTRIN_INLINE void * _InterlockedCompareExchangePointer(void * volatile * const Destination, void * const Exchange, void * const Comperand); +__INTRIN_INLINE char _InterlockedExchange8(volatile char * const Target, const char Value); +__INTRIN_INLINE short _InterlockedExchange16(volatile short * const Target, const short Value); __INTRIN_INLINE long _InterlockedExchange(volatile long * const Target, const long Value); __INTRIN_INLINE void * _InterlockedExchangePointer(void * volatile * const Target, void * const Value); __INTRIN_INLINE long _InterlockedExchangeAdd16(volatile short * const Addend, const short Value); @@ -394,6 +412,20 @@ { void * retval = (void *)Comperand; __asm__("lock; cmpxchgl %k[Exchange], %[Destination]" : [retval] "=a" (retval) : "[retval]" (retval), [Destination] "m" (*Destination), [Exchange] "q" (Exchange) : "memory"); + return retval; +} + +__INTRIN_INLINE char _InterlockedExchange8(volatile char * const Target, const char Value) +{ + char retval = Value; + __asm__("xchgb %[retval], %[Target]" : [retval] "+r" (retval) : [Target] "m" (*Target) : "memory"); + return retval; +} + +__INTRIN_INLINE short _InterlockedExchange16(volatile short * const Target, const short Value) +{ + short retval = Value; + __asm__("xchgw %[retval], %[Target]" : [retval] "+r" (retval) : [Target] "m" (*Target) : "memory"); return retval; }

10 years, 6 months

[akhaldi] 63571: [OLE32] * Reorder some exports, add some missing ones and remove the ones that do not exist in native. CORE-8174

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jun 8 19:25:14 2014 New Revision: 63571 URL: http://svn.reactos.org/svn/reactos?rev=63571&view=rev Log: [OLE32] * Reorder some exports, add some missing ones and remove the ones that do not exist in native. CORE-8174 Modified: trunk/reactos/dll/win32/ole32/ole32.spec Modified: trunk/reactos/dll/win32/ole32/ole32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32.spec… ============================================================================== --- trunk/reactos/dll/win32/ole32/ole32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/ole32.spec [iso-8859-1] Sun Jun 8 19:25:14 2014 @@ -1,51 +1,72 @@ +# CoVrfCheckThreadState +# CoVrfGetThreadState +# CoVrfReleaseThreadState +# PropVariantChangeType @ stdcall BindMoniker(ptr long ptr ptr) @ stdcall CLIPFORMAT_UserFree(ptr ptr) @ stdcall CLIPFORMAT_UserMarshal(ptr ptr ptr) @ stdcall CLIPFORMAT_UserSize(ptr long ptr) @ stdcall CLIPFORMAT_UserUnmarshal(ptr ptr ptr) +# CLSIDFromOle1Class @ stdcall CLSIDFromProgID(wstr ptr) @ stdcall CLSIDFromProgIDEx(wstr ptr) @ stdcall CLSIDFromString(wstr ptr) @ stdcall CoAddRefServerProcess() @ stdcall CoAllowSetForegroundWindow(ptr ptr) @ stdcall CoBuildVersion() +# CoCancelCall @ stdcall CoCopyProxy(ptr ptr) @ stdcall CoCreateFreeThreadedMarshaler(ptr ptr) @ stdcall CoCreateGuid(ptr) @ stdcall CoCreateInstance(ptr ptr long ptr ptr) @ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) +# CoCreateObjectInContext +# CoDeactivateObject +# CoDisableCallCancellation @ stdcall CoDisconnectObject(ptr long) @ stdcall CoDosDateTimeToFileTime(long long ptr) kernel32.DosDateTimeToFileTime +# CoEnableCallCancellation @ stdcall CoFileTimeNow(ptr) @ stdcall CoFileTimeToDosDateTime(ptr ptr ptr) kernel32.FileTimeToDosDateTime @ stdcall CoFreeAllLibraries() @ stdcall CoFreeLibrary(long) @ stdcall CoFreeUnusedLibraries() @ stdcall CoFreeUnusedLibrariesEx(long long) +# CoGetApartmentID @ stdcall CoGetCallContext(ptr ptr) @ stdcall CoGetCallerTID(ptr) +# CoGetCancelObject @ stdcall CoGetClassObject(ptr long ptr ptr ptr) +# CoGetClassVersion +# CoGetComCatalog @ stdcall CoGetContextToken(ptr) @ stdcall CoGetCurrentLogicalThreadId(ptr) @ stdcall CoGetCurrentProcess() @ stdcall CoGetDefaultContext(long ptr ptr) @ stdcall CoGetInstanceFromFile(ptr ptr ptr long long wstr long ptr) @ stdcall CoGetInstanceFromIStorage(ptr ptr ptr long ptr long ptr) +# CoGetInterceptor +# CoGetInterceptorFromTypeInfo @ stdcall CoGetInterfaceAndReleaseStream(ptr ptr ptr) @ stdcall CoGetMalloc(long ptr) @ stdcall CoGetMarshalSizeMax(ptr ptr ptr long ptr long) +# CoGetModuleType @ stdcall CoGetObject(wstr ptr ptr ptr) @ stdcall CoGetObjectContext(ptr ptr) @ stdcall CoGetPSClsid(ptr ptr) +# CoGetProcessIdentifier @ stdcall CoGetStandardMarshal(ptr ptr long ptr long ptr) @ stdcall CoGetState(ptr) -@ stub CoGetTIDFromIPID +# CoGetStdMarshalEx +# CoGetSystemSecurityPermissions @ stdcall CoGetTreatAsClass(ptr ptr) @ stdcall CoImpersonateClient() @ stdcall CoInitialize(ptr) @ stdcall CoInitializeEx(ptr long) @ stdcall CoInitializeSecurity(ptr long ptr ptr long long ptr long ptr) @ stdcall CoInitializeWOW(long long) +# CoInstall +# CoInvalidateRemoteMachineBindings @ stdcall CoIsHandlerConnected(ptr) @ stdcall CoIsOle1Class (ptr) @ stdcall CoLoadLibrary(wstr long) @@ -53,10 +74,13 @@ @ stdcall CoMarshalHresult(ptr long) @ stdcall CoMarshalInterThreadInterfaceInStream(ptr ptr ptr) @ stdcall CoMarshalInterface(ptr ptr ptr long ptr long) +# CoPopServiceDomain +# CoPushServiceDomain @ stub CoQueryAuthenticationServices @ stdcall CoQueryClientBlanket(ptr ptr ptr ptr ptr ptr ptr) @ stdcall CoQueryProxyBlanket(ptr ptr ptr ptr ptr ptr ptr ptr) @ stub CoQueryReleaseObject +# CoReactivateObject @ stdcall CoRegisterChannelHook(ptr ptr) @ stdcall CoRegisterClassObject(ptr ptr long long ptr) @ stdcall CoRegisterInitializeSpy(ptr ptr) @@ -68,10 +92,12 @@ @ stdcall CoReleaseMarshalData(ptr) @ stdcall CoReleaseServerProcess() @ stdcall CoResumeClassObjects() +# CoRetireServer @ stdcall CoRevertToSelf() @ stdcall CoRevokeClassObject(long) @ stdcall CoRevokeInitializeSpy(int64) @ stdcall CoRevokeMallocSpy() +# CoSetCancelObject @ stdcall CoSetProxyBlanket(ptr long long ptr long long ptr long) @ stdcall CoSetState(ptr) @ stdcall CoSuspendClassObjects() @@ -79,12 +105,17 @@ @ stdcall CoTaskMemAlloc(long) @ stdcall CoTaskMemFree(ptr) @ stdcall CoTaskMemRealloc(ptr long) +# CoTestCancel @ stdcall CoTreatAsClass(ptr ptr) @ stdcall CoUninitialize() @ stub CoUnloadingWOW @ stdcall CoUnmarshalHresult(ptr ptr) @ stdcall CoUnmarshalInterface(ptr ptr ptr) @ stdcall CoWaitForMultipleHandles(long long long ptr ptr) +# ComPs_NdrDllCanUnloadNow +# ComPs_NdrDllGetClassObject +# ComPs_NdrDllRegisterProxy +# ComPs_NdrDllUnregisterProxy @ stdcall CreateAntiMoniker(ptr) @ stdcall CreateBindCtx(long ptr) @ stdcall CreateClassMoniker(ptr ptr) @@ -98,12 +129,13 @@ @ stub CreateObjrefMoniker @ stdcall CreateOleAdviseHolder(ptr) @ stdcall CreatePointerMoniker(ptr ptr) +# CreateStdProgressIndicator @ stdcall CreateStreamOnHGlobal(ptr long ptr) +# DcomChannelSetHResult @ stdcall DllDebugObjectRPCHook(long ptr) -@ stdcall DllGetClassObject (ptr ptr ptr) +@ stdcall DllGetClassObject(ptr ptr ptr) @ stub DllGetClassObjectWOW @ stdcall -private DllRegisterServer() -@ stdcall -private DllUnregisterServer() @ stdcall DoDragDrop(ptr ptr long ptr) @ stub EnableHookObject @ stdcall FmtIdToPropStgName(ptr wstr) @@ -164,8 +196,8 @@ @ stdcall HWND_UserMarshal(ptr ptr ptr) @ stdcall HWND_UserSize(ptr long ptr) @ stdcall HWND_UserUnmarshal(ptr ptr ptr) +# HkOleRegisterObject @ stdcall IIDFromString(wstr ptr) -@ stub I_RemoteMain @ stdcall IsAccelerator(long long ptr long) @ stdcall IsEqualGUID(ptr ptr) @ stub IsValidIid @@ -260,15 +292,19 @@ @ stdcall StgCreateDocfile(wstr long long ptr) @ stdcall StgCreateDocfileOnILockBytes(ptr long long ptr) @ stdcall StgCreatePropSetStg(ptr long ptr) +# StgCreatePropStg @ stdcall StgCreateStorageEx(wstr long long long ptr ptr ptr ptr) @ stub StgGetIFillLockBytesOnFile @ stub StgGetIFillLockBytesOnILockBytes @ stdcall StgIsStorageFile(wstr) @ stdcall StgIsStorageILockBytes(ptr) @ stub StgOpenAsyncDocfileOnIFillLockBytes +# StgOpenPropStg @ stdcall StgOpenStorage(wstr ptr long ptr long ptr) @ stdcall StgOpenStorageEx(wstr long long long ptr ptr ptr ptr) +# StgOpenStorageOnHandle @ stdcall StgOpenStorageOnILockBytes(ptr ptr long long long ptr) +# StgPropertyLengthAsVariant @ stdcall StgSetTimes(wstr ptr ptr ptr ) @ stdcall StringFromCLSID(ptr ptr) @ stdcall StringFromGUID2(ptr ptr long)

10 years, 6 months

← Newer
1
...
8
9
10
11
12
13
14
15
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2014