Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 56901: SAMLIB: Implement SamQueryInformatioGroup and SamSetInformationGroup. SAMSRV: Implement SamrQueryInformatioGroup and SamrSetInformationGroup.
by ekohl＠svn.reactos.org 15 Jul '12

15 Jul '12

Author: ekohl Date: Sun Jul 15 19:17:19 2012 New Revision: 56901 URL: http://svn.reactos.org/svn/reactos?rev=56901&view=rev Log: SAMLIB: Implement SamQueryInformatioGroup and SamSetInformationGroup. SAMSRV: Implement SamrQueryInformatioGroup and SamrSetInformationGroup. Modified: trunk/reactos/dll/win32/samlib/samlib.c trunk/reactos/dll/win32/samlib/samlib.spec trunk/reactos/dll/win32/samsrv/samrpc.c Modified: trunk/reactos/dll/win32/samlib/samlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.c?… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] Sun Jul 15 19:17:19 2012 @@ -687,6 +687,33 @@ NTSTATUS NTAPI +SamQueryInformationGroup(IN SAM_HANDLE GroupHandle, + IN GROUP_INFORMATION_CLASS GroupInformationClass, + OUT PVOID *Buffer) +{ + NTSTATUS Status; + + TRACE("SamQueryInformationGroup(%p %lu %p)\n", + GroupHandle, GroupInformationClass, Buffer); + + RpcTryExcept + { + Status = SamrQueryInformationGroup((SAMPR_HANDLE)GroupHandle, + GroupInformationClass, + (PSAMPR_GROUP_INFO_BUFFER *)Buffer); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + + +NTSTATUS +NTAPI SamQueryInformationUser(IN SAM_HANDLE UserHandle, IN USER_INFORMATION_CLASS UserInformationClass, OUT PVOID *Buffer) @@ -768,6 +795,33 @@ NTSTATUS NTAPI +SamSetInformationGroup(IN SAM_HANDLE GroupHandle, + IN GROUP_INFORMATION_CLASS GroupInformationClass, + IN PVOID Buffer) +{ + NTSTATUS Status; + + TRACE("SamSetInformationGroup(%p %lu %p)\n", + GroupHandle, GroupInformationClass, Buffer); + + RpcTryExcept + { + Status = SamrSetInformationGroup((SAMPR_HANDLE)GroupHandle, + GroupInformationClass, + Buffer); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + + +NTSTATUS +NTAPI SamSetInformationUser(IN SAM_HANDLE UserHandle, IN USER_INFORMATION_CLASS UserInformationClass, IN PVOID Buffer) Modified: trunk/reactos/dll/win32/samlib/samlib.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.sp… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/samlib.spec [iso-8859-1] Sun Jul 15 19:17:19 2012 @@ -35,7 +35,7 @@ @ stub SamQueryDisplayInformation @ stdcall SamQueryInformationAlias(ptr long ptr) @ stdcall SamQueryInformationDomain(ptr long ptr) -@ stub SamQueryInformationGroup +@ stdcall SamQueryInformationGroup(ptr long ptr) @ stdcall SamQueryInformationUser(ptr long ptr) @ stub SamQuerySecurityObject @ stub SamRemoveMemberFromAlias @@ -45,7 +45,7 @@ @ stub SamRidToSid @ stdcall SamSetInformationAlias(ptr long ptr) @ stdcall SamSetInformationDomain(ptr long ptr) -@ stub SamSetInformationGroup +@ stdcall SamSetInformationGroup(ptr long ptr) @ stdcall SamSetInformationUser(ptr long ptr) @ stub SamSetMemberAttributesOfGroup @ stub SamSetSecurityObject Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Sun Jul 15 19:17:19 2012 @@ -2550,6 +2550,217 @@ } +static NTSTATUS +SampQueryGroupGeneral(PSAM_DB_OBJECT GroupObject, + PSAMPR_GROUP_INFO_BUFFER *Buffer) +{ + PSAMPR_GROUP_INFO_BUFFER InfoBuffer = NULL; + HANDLE MembersKeyHandle = NULL; + SAM_GROUP_FIXED_DATA FixedData; + ULONG Length = 0; + NTSTATUS Status; + + *Buffer = NULL; + + InfoBuffer = midl_user_allocate(sizeof(SAMPR_GROUP_INFO_BUFFER)); + if (InfoBuffer == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + Status = SampGetObjectAttributeString(GroupObject, + L"Name", + &InfoBuffer->General.Name); + if (!NT_SUCCESS(Status)) + { + TRACE("Status 0x%08lx\n", Status); + goto done; + } + + Status = SampGetObjectAttributeString(GroupObject, + L"Description", + &InfoBuffer->General.AdminComment); + if (!NT_SUCCESS(Status)) + { + TRACE("Status 0x%08lx\n", Status); + goto done; + } + + Length = sizeof(SAM_GROUP_FIXED_DATA); + Status = SampGetObjectAttribute(GroupObject, + L"F", + NULL, + (PVOID)&FixedData, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + InfoBuffer->General.Attributes = FixedData.Attributes; + + /* Open the Members subkey */ + Status = SampRegOpenKey(GroupObject->KeyHandle, + L"Members", + KEY_READ, + &MembersKeyHandle); + if (!NT_SUCCESS(Status)) + { + TRACE("Status 0x%08lx\n", Status); + goto done; + } + + /* Retrieve the number of members of the alias */ + Status = SampRegQueryKeyInfo(MembersKeyHandle, + NULL, + &InfoBuffer->General.MemberCount); + if (!NT_SUCCESS(Status)) + { + TRACE("Status 0x%08lx\n", Status); + goto done; + } + + *Buffer = InfoBuffer; + +done: + if (MembersKeyHandle != NULL) + SampRegCloseKey(MembersKeyHandle); + + if (!NT_SUCCESS(Status)) + { + if (InfoBuffer != NULL) + { + if (InfoBuffer->General.Name.Buffer != NULL) + midl_user_free(InfoBuffer->General.Name.Buffer); + + if (InfoBuffer->General.AdminComment.Buffer != NULL) + midl_user_free(InfoBuffer->General.AdminComment.Buffer); + + midl_user_free(InfoBuffer); + } + } + + return Status; +} + + +static NTSTATUS +SampQueryGroupName(PSAM_DB_OBJECT GroupObject, + PSAMPR_GROUP_INFO_BUFFER *Buffer) +{ + PSAMPR_GROUP_INFO_BUFFER InfoBuffer = NULL; + NTSTATUS Status; + + *Buffer = NULL; + + InfoBuffer = midl_user_allocate(sizeof(SAMPR_GROUP_INFO_BUFFER)); + if (InfoBuffer == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + Status = SampGetObjectAttributeString(GroupObject, + L"Name", + &InfoBuffer->Name.Name); + if (!NT_SUCCESS(Status)) + { + TRACE("Status 0x%08lx\n", Status); + goto done; + } + + *Buffer = InfoBuffer; + +done: + if (!NT_SUCCESS(Status)) + { + if (InfoBuffer != NULL) + { + if (InfoBuffer->Name.Name.Buffer != NULL) + midl_user_free(InfoBuffer->Name.Name.Buffer); + + midl_user_free(InfoBuffer); + } + } + + return Status; +} + + +static NTSTATUS +SampQueryGroupAttribute(PSAM_DB_OBJECT GroupObject, + PSAMPR_GROUP_INFO_BUFFER *Buffer) +{ + PSAMPR_GROUP_INFO_BUFFER InfoBuffer = NULL; + SAM_GROUP_FIXED_DATA FixedData; + ULONG Length = 0; + NTSTATUS Status; + + *Buffer = NULL; + + InfoBuffer = midl_user_allocate(sizeof(SAMPR_GROUP_INFO_BUFFER)); + if (InfoBuffer == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + Length = sizeof(SAM_GROUP_FIXED_DATA); + Status = SampGetObjectAttribute(GroupObject, + L"F", + NULL, + (PVOID)&FixedData, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + InfoBuffer->Attribute.Attributes = FixedData.Attributes; + + *Buffer = InfoBuffer; + +done: + if (!NT_SUCCESS(Status)) + { + if (InfoBuffer != NULL) + { + midl_user_free(InfoBuffer); + } + } + + return Status; +} + + +static NTSTATUS +SampQueryGroupAdminComment(PSAM_DB_OBJECT GroupObject, + PSAMPR_GROUP_INFO_BUFFER *Buffer) +{ + PSAMPR_GROUP_INFO_BUFFER InfoBuffer = NULL; + NTSTATUS Status; + + *Buffer = NULL; + + InfoBuffer = midl_user_allocate(sizeof(SAMPR_GROUP_INFO_BUFFER)); + if (InfoBuffer == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + Status = SampGetObjectAttributeString(GroupObject, + L"Description", + &InfoBuffer->AdminComment.AdminComment); + if (!NT_SUCCESS(Status)) + { + TRACE("Status 0x%08lx\n", Status); + goto done; + } + + *Buffer = InfoBuffer; + +done: + if (!NT_SUCCESS(Status)) + { + if (InfoBuffer != NULL) + { + if (InfoBuffer->AdminComment.AdminComment.Buffer != NULL) + midl_user_free(InfoBuffer->AdminComment.AdminComment.Buffer); + + midl_user_free(InfoBuffer); + } + } + + return Status; +} + + /* Function 20 */ NTSTATUS NTAPI @@ -2557,9 +2768,80 @@ IN GROUP_INFORMATION_CLASS GroupInformationClass, OUT PSAMPR_GROUP_INFO_BUFFER *Buffer) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} + PSAM_DB_OBJECT GroupObject; + NTSTATUS Status; + + TRACE("SamrQueryInformationGroup(%p %lu %p)\n", + GroupHandle, GroupInformationClass, Buffer); + + /* Validate the group handle */ + Status = SampValidateDbObject(GroupHandle, + SamDbGroupObject, + GROUP_READ_INFORMATION, + &GroupObject); + if (!NT_SUCCESS(Status)) + return Status; + + switch (GroupInformationClass) + { + case GroupGeneralInformation: + Status = SampQueryGroupGeneral(GroupObject, + Buffer); + break; + + case GroupNameInformation: + Status = SampQueryGroupName(GroupObject, + Buffer); + break; + + case GroupAttributeInformation: + Status = SampQueryGroupAttribute(GroupObject, + Buffer); + break; + + case GroupAdminCommentInformation: + Status = SampQueryGroupAdminComment(GroupObject, + Buffer); + break; + + default: + Status = STATUS_INVALID_INFO_CLASS; + break; + } + + return Status; +} + + +static NTSTATUS +SampSetGroupAttribute(PSAM_DB_OBJECT GroupObject, + PSAMPR_GROUP_INFO_BUFFER Buffer) +{ + SAM_GROUP_FIXED_DATA FixedData; + ULONG Length = 0; + NTSTATUS Status; + + Length = sizeof(SAM_GROUP_FIXED_DATA); + Status = SampGetObjectAttribute(GroupObject, + L"F", + NULL, + (PVOID)&FixedData, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + FixedData.Attributes = Buffer->Attribute.Attributes; + + Status = SampSetObjectAttribute(GroupObject, + L"F", + REG_BINARY, + &FixedData, + Length); + +done: + return Status; +} + /* Function 21 */ NTSTATUS @@ -2568,9 +2850,51 @@ IN GROUP_INFORMATION_CLASS GroupInformationClass, IN PSAMPR_GROUP_INFO_BUFFER Buffer) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} + PSAM_DB_OBJECT GroupObject; + NTSTATUS Status; + + TRACE("SamrSetInformationGroup(%p %lu %p)\n", + GroupHandle, GroupInformationClass, Buffer); + + /* Validate the group handle */ + Status = SampValidateDbObject(GroupHandle, + SamDbGroupObject, + GROUP_WRITE_ACCOUNT, + &GroupObject); + if (!NT_SUCCESS(Status)) + return Status; + + switch (GroupInformationClass) + { + case GroupNameInformation: + Status = SampSetObjectAttribute(GroupObject, + L"Name", + REG_SZ, + Buffer->Name.Name.Buffer, + Buffer->Name.Name.Length + sizeof(WCHAR)); + break; + + case GroupAttributeInformation: + Status = SampSetGroupAttribute(GroupObject, + Buffer); + break; + + case GroupAdminCommentInformation: + Status = SampSetObjectAttribute(GroupObject, + L"Description", + REG_SZ, + Buffer->AdminComment.AdminComment.Buffer, + Buffer->AdminComment.AdminComment.Length + sizeof(WCHAR)); + break; + + default: + Status = STATUS_INVALID_INFO_CLASS; + break; + } + + return Status; +} + /* Function 22 */ NTSTATUS @@ -2622,6 +2946,7 @@ UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } + /* Function 27 */ NTSTATUS @@ -2875,6 +3200,7 @@ return Status; } + /* Function 29 */ NTSTATUS NTAPI @@ -2922,6 +3248,7 @@ return Status; } + /* Function 30 */ NTSTATUS NTAPI @@ -2930,6 +3257,7 @@ UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } + /* Function 31 */ NTSTATUS @@ -3017,6 +3345,7 @@ return Status; } + /* Function 32 */ NTSTATUS

1 0

[ekohl] 56900: [SERVICES] Implement check for SERVICE_WIN32_OWN_PROCESS or SERVICE_WIN32_SHARE_PROCESS type. Patch by Hermes Belusca. See issue #7179 for more details.
by ekohl＠svn.reactos.org 15 Jul '12

15 Jul '12

Author: ekohl Date: Sun Jul 15 18:27:29 2012 New Revision: 56900 URL: http://svn.reactos.org/svn/reactos?rev=56900&view=rev Log: [SERVICES] Implement check for SERVICE_WIN32_OWN_PROCESS or SERVICE_WIN32_SHARE_PROCESS type. Patch by Hermes Belusca. See issue #7179 for more details. Modified: trunk/reactos/base/system/services/database.c trunk/reactos/dll/win32/advapi32/service/sctrl.c trunk/reactos/include/reactos/services/services.h Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Sun Jul 15 18:27:29 2012 @@ -1116,8 +1116,8 @@ DPRINT("ScmSendStartCommand() called\n"); /* Calculate the total length of the start command line */ - PacketSize = sizeof(SCM_CONTROL_PACKET); - PacketSize += (wcslen(Service->lpServiceName) + 1) * sizeof(WCHAR); + PacketSize = sizeof(SCM_CONTROL_PACKET) + + (wcslen(Service->lpServiceName) + 1) * sizeof(WCHAR); /* Calculate the required packet size for the start arguments */ if (argc > 0 && argv != NULL) @@ -1140,7 +1140,9 @@ return ERROR_NOT_ENOUGH_MEMORY; ControlPacket->dwSize = PacketSize; - ControlPacket->dwControl = SERVICE_CONTROL_START; + ControlPacket->dwControl = (Service->Status.dwServiceType & SERVICE_WIN32_OWN_PROCESS) + ? SERVICE_CONTROL_START_OWN + : SERVICE_CONTROL_START_SHARE; ControlPacket->hServiceStatus = (SERVICE_STATUS_HANDLE)Service; ControlPacket->dwServiceNameOffset = sizeof(SCM_CONTROL_PACKET); Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] Sun Jul 15 18:27:29 2012 @@ -47,6 +47,7 @@ LPHANDLER_FUNCTION_EX HandlerFunctionEx; LPVOID HandlerContext; BOOL bUnicode; + BOOL bOwnProcess; } ACTIVE_SERVICE, *PACTIVE_SERVICE; @@ -141,6 +142,9 @@ DWORD i; TRACE("ScLookupServiceByServiceName(%S) called\n", lpServiceName); + + if (lpActiveServices[0].bOwnProcess) + return &lpActiveServices[0]; for (i = 0; i < dwActiveServiceCount; i++) { @@ -488,10 +492,9 @@ static BOOL ScServiceDispatcher(HANDLE hPipe, - PUCHAR lpBuffer, + PSCM_CONTROL_PACKET ControlPacket, DWORD dwBufferSize) { - PSCM_CONTROL_PACKET ControlPacket; DWORD Count; BOOL bResult; DWORD dwRunningServices = 0; @@ -502,18 +505,12 @@ TRACE("ScDispatcherLoop() called\n"); - ControlPacket = HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - 1024); - if (ControlPacket == NULL) - return FALSE; - while (TRUE) { /* Read command from the control pipe */ bResult = ReadFile(hPipe, ControlPacket, - 1024, + dwBufferSize, &Count, NULL); if (bResult == FALSE) @@ -525,13 +522,17 @@ lpServiceName = (LPWSTR)((PBYTE)ControlPacket + ControlPacket->dwServiceNameOffset); TRACE("Service: %S\n", lpServiceName); + if (ControlPacket->dwControl == SERVICE_CONTROL_START_OWN) + lpActiveServices[0].bOwnProcess = TRUE; + lpService = ScLookupServiceByServiceName(lpServiceName); if (lpService != NULL) { /* Execute command */ switch (ControlPacket->dwControl) { - case SERVICE_CONTROL_START: + case SERVICE_CONTROL_START_SHARE: + case SERVICE_CONTROL_START_OWN: TRACE("Start command - recieved SERVICE_CONTROL_START\n"); dwError = ScStartService(lpService, ControlPacket); if (dwError == ERROR_SUCCESS) @@ -832,12 +833,14 @@ * @implemented */ BOOL WINAPI -StartServiceCtrlDispatcherA(const SERVICE_TABLE_ENTRYA * lpServiceStartTable) +StartServiceCtrlDispatcherA(const SERVICE_TABLE_ENTRYA *lpServiceStartTable) { ULONG i; HANDLE hPipe; DWORD dwError; - PUCHAR lpMessageBuffer; + PSCM_CONTROL_PACKET ControlPacket; + DWORD dwBufSize; + BOOL bRet = TRUE; TRACE("StartServiceCtrlDispatcherA() called\n"); @@ -864,50 +867,40 @@ lpActiveServices[i].ThreadParams.A.lpServiceMain = lpServiceStartTable[i].lpServiceProc; lpActiveServices[i].hServiceStatus = 0; lpActiveServices[i].bUnicode = FALSE; + lpActiveServices[i].bOwnProcess = FALSE; } dwError = ScConnectControlPipe(&hPipe); if (dwError != ERROR_SUCCESS) { - /* Free the service table */ - for (i = 0; i < dwActiveServiceCount; i++) - { - RtlFreeUnicodeString(&lpActiveServices[i].ServiceName); - } - RtlFreeHeap(RtlGetProcessHeap(), 0, lpActiveServices); - lpActiveServices = NULL; - dwActiveServiceCount = 0; - return FALSE; - } - - lpMessageBuffer = RtlAllocateHeap(RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, - 256); - if (lpMessageBuffer == NULL) - { - /* Free the service table */ - for (i = 0; i < dwActiveServiceCount; i++) - { - RtlFreeUnicodeString(&lpActiveServices[i].ServiceName); - } - RtlFreeHeap(RtlGetProcessHeap(), 0, lpActiveServices); - lpActiveServices = NULL; - dwActiveServiceCount = 0; - CloseHandle(hPipe); - return FALSE; + bRet = FALSE; + goto done; + } + + dwBufSize = sizeof(SCM_CONTROL_PACKET) + + (MAX_SERVICE_NAME_LENGTH + 1) * sizeof(WCHAR); + + ControlPacket = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + dwBufSize); + if (ControlPacket == NULL) + { + bRet = FALSE; + goto done; } ScCreateStatusBinding(); - ScServiceDispatcher(hPipe, lpMessageBuffer, 256); + ScServiceDispatcher(hPipe, ControlPacket, dwBufSize); ScDestroyStatusBinding(); CloseHandle(hPipe); - /* Free the message buffer */ - RtlFreeHeap(RtlGetProcessHeap(), 0, lpMessageBuffer); - + /* Free the control packet */ + RtlFreeHeap(RtlGetProcessHeap(), 0, ControlPacket); + +done: /* Free the service table */ for (i = 0; i < dwActiveServiceCount; i++) { @@ -917,7 +910,7 @@ lpActiveServices = NULL; dwActiveServiceCount = 0; - return TRUE; + return bRet; } @@ -927,12 +920,14 @@ * @implemented */ BOOL WINAPI -StartServiceCtrlDispatcherW(const SERVICE_TABLE_ENTRYW * lpServiceStartTable) +StartServiceCtrlDispatcherW(const SERVICE_TABLE_ENTRYW *lpServiceStartTable) { ULONG i; HANDLE hPipe; DWORD dwError; - PUCHAR lpMessageBuffer; + PSCM_CONTROL_PACKET ControlPacket; + DWORD dwBufSize; + BOOL bRet = TRUE; TRACE("StartServiceCtrlDispatcherW() called\n"); @@ -959,50 +954,40 @@ lpActiveServices[i].ThreadParams.W.lpServiceMain = lpServiceStartTable[i].lpServiceProc; lpActiveServices[i].hServiceStatus = 0; lpActiveServices[i].bUnicode = TRUE; + lpActiveServices[i].bOwnProcess = FALSE; } dwError = ScConnectControlPipe(&hPipe); if (dwError != ERROR_SUCCESS) { - /* Free the service table */ - for (i = 0; i < dwActiveServiceCount; i++) - { - RtlFreeUnicodeString(&lpActiveServices[i].ServiceName); - } - RtlFreeHeap(RtlGetProcessHeap(), 0, lpActiveServices); - lpActiveServices = NULL; - dwActiveServiceCount = 0; - return FALSE; - } - - lpMessageBuffer = RtlAllocateHeap(RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, - 256); - if (lpMessageBuffer == NULL) - { - /* Free the service table */ - for (i = 0; i < dwActiveServiceCount; i++) - { - RtlFreeUnicodeString(&lpActiveServices[i].ServiceName); - } - RtlFreeHeap(RtlGetProcessHeap(), 0, lpActiveServices); - lpActiveServices = NULL; - dwActiveServiceCount = 0; - CloseHandle(hPipe); - return FALSE; + bRet = FALSE; + goto done; + } + + dwBufSize = sizeof(SCM_CONTROL_PACKET) + + (MAX_SERVICE_NAME_LENGTH + 1) * sizeof(WCHAR); + + ControlPacket = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + dwBufSize); + if (ControlPacket == NULL) + { + bRet = FALSE; + goto done; } ScCreateStatusBinding(); - ScServiceDispatcher(hPipe, lpMessageBuffer, 256); + ScServiceDispatcher(hPipe, ControlPacket, dwBufSize); ScDestroyStatusBinding(); CloseHandle(hPipe); - /* Free the message buffer */ - RtlFreeHeap(RtlGetProcessHeap(), 0, lpMessageBuffer); - + /* Free the control packet */ + RtlFreeHeap(RtlGetProcessHeap(), 0, ControlPacket); + +done: /* Free the service table */ for (i = 0; i < dwActiveServiceCount; i++) { @@ -1012,7 +997,7 @@ lpActiveServices = NULL; dwActiveServiceCount = 0; - return TRUE; + return bRet; } /* EOF */ Modified: trunk/reactos/include/reactos/services/services.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/services/s… ============================================================================== --- trunk/reactos/include/reactos/services/services.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/services/services.h [iso-8859-1] Sun Jul 15 18:27:29 2012 @@ -9,7 +9,15 @@ #ifndef __SERVICES_SERVICES_H__ #define __SERVICES_SERVICES_H__ -#define SERVICE_CONTROL_START 0 +/* + * Internal control codes. + * Neither in the range of public control codes (1-10 and 11-14 or 16 or 32 or 64) + * nor in the range of user-defined control codes (128-255). + */ +/* Start a service that shares a process with other services */ +#define SERVICE_CONTROL_START_SHARE 80 +/* Start a service that runs in its own process */ +#define SERVICE_CONTROL_START_OWN 81 typedef struct _SCM_CONTROL_PACKET {

1 0

[pschweitzer] 56899: [FONTVIEW] Update French translation. Patch by Hermès Belusca - Maito See issue #6803 for more details.
by pschweitzer＠svn.reactos.org 15 Jul '12

15 Jul '12

Author: pschweitzer Date: Sun Jul 15 15:13:19 2012 New Revision: 56899 URL: http://svn.reactos.org/svn/reactos?rev=56899&view=rev Log: [FONTVIEW] Update French translation. Patch by Hermès Belusca - Maito See issue #6803 for more details. Modified: trunk/reactos/base/applications/fontview/lang/fr-FR.rc Modified: trunk/reactos/base/applications/fontview/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/fr-FR.rc [iso-8859-1] Sun Jul 15 15:13:19 2012 @@ -2,12 +2,12 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_INSTALL, "Install" + IDS_INSTALL, "Installer" IDS_PRINT, "Imprimer" - IDS_STRING, "Voix ambiguÃ« d'un cÅur qui au zÃ©phyr prÃ©fÄre les jattes de kiwis. 1234567890" - IDS_OPEN, "Police ouvert..." + IDS_STRING, "Voix ambiguÃ« d'un cÅur qui au zÃ©phyr prÃ©fÃ¨re les jattes de kiwis. 1234567890" + IDS_OPEN, "Ouvrir un fichier police..." IDS_ERROR, "Erreur" IDS_ERROR_NOMEM, "MÃ©moire insuffisante pour terminer l'opÃ©ration." IDS_ERROR_NOFONT, "Le fichier %1 n'est pas un fichier police valide." - IDS_ERROR_NOCLASS, "Impossible d'initialiser la classe de fenÄtre." + IDS_ERROR_NOCLASS, "Impossible d'initialiser la classe de fenÃªtre." END

1 0

[tkreuzer] 56898: [FONTVIEW] - When no file name is passed on the command line, open a file-open-dialog - Halfplement printing - Replace Quit button with install button - Patch by milawynsrealm <sp...
by tkreuzer＠svn.reactos.org 15 Jul '12

15 Jul '12

Author: tkreuzer Date: Sun Jul 15 14:25:19 2012 New Revision: 56898 URL: http://svn.reactos.org/svn/reactos?rev=56898&view=rev Log: [FONTVIEW] - When no file name is passed on the command line, open a file-open-dialog - Halfplement printing - Replace Quit button with install button - Patch by milawynsrealm <spaceseel at gmail got com> See issue #6803 for more details. Modified: trunk/reactos/base/applications/fontview/CMakeLists.txt trunk/reactos/base/applications/fontview/display.c trunk/reactos/base/applications/fontview/display.h trunk/reactos/base/applications/fontview/fontview.c trunk/reactos/base/applications/fontview/fontview.h trunk/reactos/base/applications/fontview/fontview.rc trunk/reactos/base/applications/fontview/lang/bg-BG.rc trunk/reactos/base/applications/fontview/lang/de-DE.rc trunk/reactos/base/applications/fontview/lang/en-US.rc trunk/reactos/base/applications/fontview/lang/es-ES.rc trunk/reactos/base/applications/fontview/lang/fr-FR.rc trunk/reactos/base/applications/fontview/lang/lt-LT.rc trunk/reactos/base/applications/fontview/lang/no-NO.rc trunk/reactos/base/applications/fontview/lang/pl-PL.rc trunk/reactos/base/applications/fontview/lang/pt-BR.rc trunk/reactos/base/applications/fontview/lang/ro-RO.rc trunk/reactos/base/applications/fontview/lang/ru-RU.rc trunk/reactos/base/applications/fontview/lang/sk-SK.rc trunk/reactos/base/applications/fontview/lang/sv-SE.rc trunk/reactos/base/applications/fontview/lang/uk-UA.rc trunk/reactos/base/applications/fontview/lang/zh-CN.rc trunk/reactos/base/applications/fontview/lang/zh-TW.rc trunk/reactos/base/applications/fontview/resource.h Modified: trunk/reactos/base/applications/fontview/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/CMakeLists.txt [iso-8859-1] Sun Jul 15 14:25:19 2012 @@ -6,6 +6,6 @@ fontview.rc) set_module_type(fontview win32gui) -add_importlibs(fontview gdi32 shell32 user32 msvcrt kernel32) +add_importlibs(fontview comdlg32 gdi32 shell32 user32 msvcrt kernel32) add_cd_file(TARGET fontview DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/fontview/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/display.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/display.c [iso-8859-1] Sun Jul 15 14:25:19 2012 @@ -377,6 +377,92 @@ return 0; } +LRESULT +Display_OnPrint(HWND hwnd) +{ + PRINTDLG pfont; + TEXTMETRIC tm; + int copies, yPos; + DISPLAYDATA* pData; + + pData = malloc(sizeof(DISPLAYDATA)); + ZeroMemory(pData, sizeof(DISPLAYDATA)); + + /* Sets up the font layout */ + pData = (DISPLAYDATA*)GetWindowLongPtr(hwnd, GWLP_USERDATA); + + /* Clears the memory before using it */ + ZeroMemory(&pfont, sizeof(pfont)); + + pfont.lStructSize = sizeof(pfont); + pfont.hwndOwner = hwnd; + pfont.hDevMode = NULL; + pfont.hDevNames = NULL; + pfont.Flags = PD_USEDEVMODECOPIESANDCOLLATE | PD_RETURNDC; + pfont.nCopies = 1; + pfont.nFromPage = 0xFFFF; + pfont.nToPage = 0xFFFF; + pfont.nMinPage = 1; + pfont.nMaxPage = 0xFFFF; + + /* Opens up the print dialog box */ + if (PrintDlg(&pfont)) + { + DOCINFO docinfo; + + docinfo.cbSize = sizeof(DOCINFO); + docinfo.lpszDocName = "Printing Font"; + docinfo.lpszOutput = NULL; + docinfo.lpszDatatype = NULL; + docinfo.fwType = 0; + + /* We start printing */ + StartDoc(pfont.hDC, &docinfo); + + /* Grabs the text metrics for the printer */ + GetTextMetrics(pfont.hDC, &tm); + + /* Start out with 0 for the y position for the page */ + yPos = 0; + + /* Starts out with the current page */ + StartPage(pfont.hDC); + + /* Used when printing for more than one copy */ + for (copies = 0; copies < pfont.nCopies; copies++) + { + /* Test output */ + TextOutW(pfont.hDC, 10, yPos, L"Testing...1...2...3", 19); + + /* TODO: Determine if using Display_DrawText() will work for both rendering out to the + window and to the printer output */ + //Display_DrawText(pfont.hDC, pData, yPos); + + /* Ends the current page */ + EndPage(pfont.hDC); + + /* If we are making more than one copy, start a new page */ + if (copies != pfont.nCopies) + { + yPos = 0; + StartPage(pfont.hDC); + } + } + + /* The printing is now over */ + EndDoc(pfont.hDC); + + DeleteDC(pfont.hDC); + } else { + return 0; + } + + /* Frees the memory since we no longer need it for now */ + free(pData); + + return 0; +} + LRESULT CALLBACK DisplayProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { Modified: trunk/reactos/base/applications/fontview/display.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/display.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/display.h [iso-8859-1] Sun Jul 15 14:25:19 2012 @@ -13,3 +13,4 @@ /* Public function */ BOOL Display_InitClass(HINSTANCE hInstance); +LRESULT Display_OnPrint(HWND hwnd); Modified: trunk/reactos/base/applications/fontview/fontview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/fontview.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/fontview.c [iso-8859-1] Sun Jul 15 14:25:19 2012 @@ -24,6 +24,7 @@ HINSTANCE g_hInstance; EXTLOGFONTW g_ExtLogFontW; +LPCWSTR g_fileName; static const WCHAR g_szFontViewClassName[] = L"FontViewWClass"; @@ -92,6 +93,7 @@ WNDCLASSEXW wincl; HINSTANCE hDLL; PGFRI GetFontResourceInfoW; + LPCWSTR fileName; g_hInstance = hThisInstance; @@ -99,14 +101,51 @@ argv = CommandLineToArgvW(GetCommandLineW(), &argc); if (argc < 2) { - ErrorMsgBox(0, IDS_ERROR, IDS_ERROR_BADCMD, argv[1]); - return -1; - } - - /* Try to add the font resource */ - if (!AddFontResourceW(argv[1])) - { - ErrorMsgBox(0, IDS_ERROR, IDS_ERROR_NOFONT, argv[1]); + OPENFILENAMEW fontOpen; + WCHAR szFileName[MAX_PATH] = L""; + HLOCAL dialogTitle = NULL; + + /* Gets the title for the dialog box ready */ + FormatString(FORMAT_MESSAGE_ALLOCATE_BUFFER, + NULL, IDS_OPEN, 0, (LPWSTR)&dialogTitle, 0, NULL); + + /* Clears out any values of fontOpen before we use it */ + ZeroMemory(&fontOpen, sizeof(fontOpen)); + + /* Sets up the open dialog box */ + fontOpen.lStructSize = sizeof(fontOpen); + fontOpen.hwndOwner = NULL; + fontOpen.lpstrFilter = L"TrueType Font (*.ttf)\0*.ttf\0" + L"All Files (*.*)\0*.*\0"; + fontOpen.lpstrFile = szFileName; + fontOpen.lpstrTitle = dialogTitle; + fontOpen.nMaxFile = MAX_PATH; + fontOpen.Flags = OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY; + fontOpen.lpstrDefExt = L"ttf"; + + /* Opens up the Open File dialog box in order to chose a font file. */ + if(GetOpenFileNameW(&fontOpen)) + { + fileName = fontOpen.lpstrFile; + g_fileName = fileName; + } else { + /* If the user decides to close out of the open dialog effectively + exiting the program altogether */ + return 0; + } + + LocalFree(dialogTitle); + } + else + { + /* Try to add the font resource from command line */ + fileName = argv[1]; + g_fileName = fileName; + } + + if (!AddFontResourceW(fileName)) + { + ErrorMsgBox(0, IDS_ERROR, IDS_ERROR_NOFONT, fileName); return -1; } @@ -116,16 +155,16 @@ /* Get the font name */ dwSize = sizeof(g_ExtLogFontW.elfFullName); - if (!GetFontResourceInfoW(argv[1], &dwSize, g_ExtLogFontW.elfFullName, 1)) - { - ErrorMsgBox(0, IDS_ERROR, IDS_ERROR_NOFONT, argv[1]); + if (!GetFontResourceInfoW(fileName, &dwSize, g_ExtLogFontW.elfFullName, 1)) + { + ErrorMsgBox(0, IDS_ERROR, IDS_ERROR_NOFONT, fileName); return -1; } dwSize = sizeof(LOGFONTW); - if (!GetFontResourceInfoW(argv[1], &dwSize, &g_ExtLogFontW.elfLogFont, 2)) - { - ErrorMsgBox(0, IDS_ERROR, IDS_ERROR_NOFONT, argv[1]); + if (!GetFontResourceInfoW(fileName, &dwSize, &g_ExtLogFontW.elfLogFont, 2)) + { + ErrorMsgBox(0, IDS_ERROR, IDS_ERROR_NOFONT, fileName); return -1; } @@ -191,7 +230,7 @@ WCHAR szQuit[MAX_BUTTONNAME]; WCHAR szPrint[MAX_BUTTONNAME]; WCHAR szString[MAX_STRING]; - HWND hDisplay, hButtonQuit, hButtonPrint; + HWND hDisplay, hButtonInstall, hButtonPrint; /* create the display window */ hDisplay = CreateWindowExW( @@ -217,8 +256,8 @@ ShowWindow(hDisplay, SW_SHOWNORMAL); /* Create the quit button */ - LoadStringW(g_hInstance, IDS_QUIT, szQuit, MAX_BUTTONNAME); - hButtonQuit = CreateWindowExW( + LoadStringW(g_hInstance, IDS_INSTALL, szQuit, MAX_BUTTONNAME); + hButtonInstall = CreateWindowExW( 0, /* Extended style */ L"button", /* Classname */ szQuit, /* Title text */ @@ -228,11 +267,11 @@ BUTTON_WIDTH, /* Width */ BUTTON_HEIGHT, /* Height */ hwnd, /* Parent */ - (HMENU)IDC_QUIT, /* Identifier */ + (HMENU)IDC_INSTALL, /* Identifier */ g_hInstance, /* Program Instance handler */ NULL /* Window Creation data */ ); - SendMessage(hButtonQuit, WM_SETFONT, (WPARAM)GetStockObject(DEFAULT_GUI_FONT), (LPARAM)TRUE); + SendMessage(hButtonInstall, WM_SETFONT, (WPARAM)GetStockObject(DEFAULT_GUI_FONT), (LPARAM)TRUE); /* Create the print button */ LoadStringW(g_hInstance, IDS_PRINT, szPrint, MAX_BUTTONNAME); @@ -283,6 +322,26 @@ return 0; } +static LRESULT +MainWnd_OnInstall(HWND hwnd) +{ + DWORD fontExists; + + /* First, we have to find out if the font still exists. */ + fontExists = GetFileAttributes((LPCSTR)g_fileName); + if (fontExists != 0xFFFFFFFF) /* If the file does not exist */ + { + ErrorMsgBox(0, IDS_ERROR, IDS_ERROR_NOFONT, g_fileName); + return -1; + } + + //CopyFile(g_fileName, NULL, TRUE); + + MessageBox(hwnd, TEXT("This function is unimplemented"), TEXT("Unimplemented"), MB_OK); + + return 0; +} + LRESULT CALLBACK MainWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { @@ -300,12 +359,12 @@ case WM_COMMAND: switch(LOWORD(wParam)) { - case IDC_QUIT: - PostQuitMessage (0); /* send a WM_QUIT to the message queue */ + case IDC_INSTALL: + return MainWnd_OnInstall(hwnd); break; case IDC_PRINT: - MessageBox(hwnd, TEXT("This function is unimplemented"), TEXT("Unimplemented"), MB_OK); + return Display_OnPrint(hwnd); break; } break; Modified: trunk/reactos/base/applications/fontview/fontview.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/fontview.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/fontview.h [iso-8859-1] Sun Jul 15 14:25:19 2012 @@ -12,7 +12,7 @@ #define BUTTON_WIDTH 72 #define BUTTON_HEIGHT 21 -#define IDC_QUIT 1001 +#define IDC_INSTALL 1001 #define IDC_PRINT 1002 #define IDC_DISPLAY 1003 Modified: trunk/reactos/base/applications/fontview/fontview.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/fontview.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/fontview.rc [iso-8859-1] Sun Jul 15 14:25:19 2012 @@ -2,6 +2,11 @@ #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Font Viewer\0" +#define REACTOS_STR_INTERNAL_NAME "fontview\0" +#define REACTOS_STR_ORIGINAL_FILENAME "fontview.exe\0" +#include <reactos/version.rc> IDI_TT ICON "ttf.ico" Modified: trunk/reactos/base/applications/fontview/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/bg-BG.rc [iso-8859-1] Sun Jul 15 14:25:19 2012 @@ -2,12 +2,12 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_QUIT, "ÐÐ·ÑÐ¾Ð´" + IDS_INSTALL, "Install" IDS_PRINT, "ÐÐµÑÐ°Ñ" IDS_STRING, "ÐÐ±Ð²Ð³Ð´ ÐµÐ¶Ð·Ð¸Ð¹ ÐºÐ»Ð¼Ð½Ð¾ Ð¿ÑÑÑÑ ÑÑÑÑÑ ÑÑÑÑÑ. 1234567890" + IDS_OPEN, "Open Font..." IDS_ERROR, "ÐÑÐµÑÐºÐ°" IDS_ERROR_NOMEM, "ÐÑÐ¼Ð° Ð´Ð¾ÑÑÐ°ÑÑÑÐ½Ð¾ Ð¼ÑÑÑÐ¾ Ð·Ð° Ð·Ð°Ð²ÑÑÑÐ²Ð°Ð½Ðµ Ð½Ð° Ð´ÐµÐ¹ÑÑÐ²Ð¸ÐµÑÐ¾." IDS_ERROR_NOFONT, "%1 Ð½Ðµ Ðµ ÑÐµÐ´Ð¾Ð²ÐµÐ½ ÑÑÐ¸ÑÑÐ¾Ð² ÑÐ°Ð¹Ð»." IDS_ERROR_NOCLASS, "ÐÐµÑÑÐ¿ÐµÑÐ½Ð¾ Ð¸Ð·Ð¿ÑÐ»Ð½ÐµÐ½Ð¸Ðµ Ð½Ð° ÐºÐ»Ð°ÑÐ° Ð½Ð° Ð¿ÑÐ¾Ð·Ð¾ÑÐµÑÐ°." - IDS_ERROR_BADCMD, "ÐÐµ Ðµ ÑÐºÐ°Ð·Ð°Ð½ ÑÑÐ¸ÑÑÐ¾Ð² ÑÐ°Ð¹Ð».\nÐÐ°Ð¿Ð¸ÑÐ°Ð½Ð¾:\n fontview.exe <font file>" END Modified: trunk/reactos/base/applications/fontview/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/de-DE.rc [iso-8859-1] Sun Jul 15 14:25:19 2012 @@ -2,12 +2,12 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_QUIT, "Fertig" + IDS_INSTALL, "Installieren" IDS_PRINT, "Drucken" IDS_STRING, "Franz jagt im komplett verwahrlosten Taxi quer durch Bayern. 1234567890" + IDS_OPEN, "Schriftartendatei Ã¶ffnen..." IDS_ERROR, "Fehler" IDS_ERROR_NOMEM, "Es steht nicht genÃ¼gend Speicher zur VerfÃ¼gung." IDS_ERROR_NOFONT, "Die angegebene Datei %1 ist keine gÃ¼ltige Schriftartendatei." IDS_ERROR_NOCLASS, "Fehler beim Initialisieren der Fensterklasse." - IDS_ERROR_BADCMD, "Keine Schriftartendatei angegeben.\nSyntax:\n fontview.exe <Schriftdatei>" END Modified: trunk/reactos/base/applications/fontview/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/en-US.rc [iso-8859-1] Sun Jul 15 14:25:19 2012 @@ -2,12 +2,12 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_QUIT, "Quit" + IDS_INSTALL, "Install" IDS_PRINT, "Print" IDS_STRING, "Jackdaws love my big sphinx of quartz. 1234567890" + IDS_OPEN, "Open Font..." IDS_ERROR, "Error" IDS_ERROR_NOMEM, "There's not enough memory to complete the operation." IDS_ERROR_NOFONT, "The file %1 is not a valid font file." IDS_ERROR_NOCLASS, "Could not initialize window class." - IDS_ERROR_BADCMD, "No font file given.\nSyntax:\n fontview.exe <font file>" END Modified: trunk/reactos/base/applications/fontview/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/es-ES.rc [iso-8859-1] Sun Jul 15 14:25:19 2012 @@ -6,12 +6,12 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_QUIT, "Cerrar" + IDS_INSTALL, "Install" IDS_PRINT, "Imprimir" IDS_STRING, "Haz el amor y no la guerra. 1234567890" + IDS_OPEN, "Open Font..." IDS_ERROR, "Error" IDS_ERROR_NOMEM, "No hay memoria suficiente para completar la operaciÃ³n." IDS_ERROR_NOFONT, "El archivo %1 no es un archivo vÃ¡lido de fuente." IDS_ERROR_NOCLASS, "No es posible iniciar la clase." - IDS_ERROR_BADCMD, "No hay archivo de fuente.\nSyntax:\n fontview.exe <font file>" END Modified: trunk/reactos/base/applications/fontview/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/fr-FR.rc [iso-8859-1] Sun Jul 15 14:25:19 2012 @@ -2,12 +2,12 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_QUIT, "Quitter" + IDS_INSTALL, "Install" IDS_PRINT, "Imprimer" IDS_STRING, "Voix ambiguÃ« d'un cÅur qui au zÃ©phyr prÃ©fÄre les jattes de kiwis. 1234567890" + IDS_OPEN, "Police ouvert..." IDS_ERROR, "Erreur" IDS_ERROR_NOMEM, "MÃ©moire insuffisante pour terminer l'opÃ©ration." IDS_ERROR_NOFONT, "Le fichier %1 n'est pas un fichier police valide." IDS_ERROR_NOCLASS, "Impossible d'initialiser la classe de fenÄtre." - IDS_ERROR_BADCMD, "Aucun fichier police transmis.\nSyntaxe:\n fontview.exe <fichier police>" END Modified: trunk/reactos/base/applications/fontview/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/lt-LT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/lt-LT.rc [iso-8859-1] Sun Jul 15 14:25:19 2012 @@ -4,12 +4,12 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_QUIT, "Baigti" + IDS_INSTALL, "Install" IDS_PRINT, "Spausdinti" IDS_STRING, "ABCDEFGHIYJKLMNOPQRSTUVWXZ ÄÄÄÄÄ¯Å¡Å³Å«Å¾ 1234567890" + IDS_OPEN, "Aatvira Å¡riftas..." IDS_ERROR, "Klaida" IDS_ERROR_NOMEM, "UÅ¾duoÄiai uÅ¾baigti, nepakanka atminties." IDS_ERROR_NOFONT, "%1 nÄra teisinga Å¡rifto byla." IDS_ERROR_NOCLASS, "Nepavyko inicijuoti lango klasÄs." - IDS_ERROR_BADCMD, "Nenurodyta Å¡rifto byla.\nSintaksÄ:\n fontview.exe <Å¡rifto byla>" END Modified: trunk/reactos/base/applications/fontview/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/no-NO.rc [iso-8859-1] Sun Jul 15 14:25:19 2012 @@ -2,12 +2,12 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_QUIT, "Avslutt" + IDS_INSTALL, "Install" IDS_PRINT, "Skriv" IDS_STRING, "Jackdaws love my big sphinx of quartz. 1234567890" + IDS_OPEN, "Open Font..." IDS_ERROR, "Feil" IDS_ERROR_NOMEM, "Det er ikke nok minne for Ã¥ fullfÃ¸re oppgaven." IDS_ERROR_NOFONT, "Filen %1 er ikke et gyldig skriftfil." IDS_ERROR_NOCLASS, "Kunne ikke initialise vindu klassen." - IDS_ERROR_BADCMD, "Ingen skriftfil er gitt.\nSyntaks:\n fontview.exe <font file>" END Modified: trunk/reactos/base/applications/fontview/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/pl-PL.rc [iso-8859-1] Sun Jul 15 14:25:19 2012 @@ -10,12 +10,12 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_QUIT, "WyjÅcie" + IDS_INSTALL, "Install" IDS_PRINT, "Drukuj" IDS_STRING, "ZaÅ¼Ã³ÅÄ gÄÅlÄ JaÅºÅ Å¼Ã³ÅwiÄtkiem. 1234567890. !@#$%^&*()_+=-/?" + IDS_OPEN, "Open Font..." IDS_ERROR, "BÅÄd" IDS_ERROR_NOMEM, "Brakuje pamiÄci do ukoÅczenia tej operacji." IDS_ERROR_NOFONT, "Plik %1 nie jest poprawnym plikiem czcionki." IDS_ERROR_NOCLASS, "Nie udaÅo siÄ zainicjowaÄ klasy window." - IDS_ERROR_BADCMD, "Brak pliku czcionki.\nSkÅadnia:\n fontview.exe <plik czcionki>" END Modified: trunk/reactos/base/applications/fontview/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/pt-BR.rc [iso-8859-1] Sun Jul 15 14:25:19 2012 @@ -4,14 +4,14 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_QUIT, "Fechar" + IDS_INSTALL, "Install" IDS_PRINT, "Imprimir" IDS_STRING, "Jackdaws ama minha grande esfinge de quartzo. 1234567890" + IDS_OPEN, "Open Font..." IDS_ERROR, "Erro" IDS_ERROR_NOMEM, "NÃ£o hÃ¡ memÃ³ria suficiente para completar a operaÃ§Ã£o." IDS_ERROR_NOFONT, "O arquivo %1 nÃ£o Ã© um arquivo de fonte vÃ¡lida." IDS_ERROR_NOCLASS, "NÃ£o foi possÃvel inicializar a janela." - IDS_ERROR_BADCMD, "Sem arquivos de fonte.\nSintaxe:\n fontview.exe <arquivo de fonte>" END Modified: trunk/reactos/base/applications/fontview/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/ro-RO.rc [iso-8859-1] Sun Jul 15 14:25:19 2012 @@ -3,12 +3,12 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_QUIT, "IeÈire" - IDS_PRINT, "Imprimare" + IDS_INSTALL, "Install" + IDS_PRINT, "Imprimare" IDS_STRING, "Turubinele eoliene genereazÄ cÃ¢Èiva MJ (cÃ¢Èiva kWâ¢h) Ã®n exces, acoperind Èi necesarul familiei. QY 1234567890" + IDS_OPEN, "Open Font..." IDS_ERROR, "Eroare" IDS_ERROR_NOMEM, "Nu e destulÄ memorie pentru a Ã®ncheia operaÈia." IDS_ERROR_NOFONT, "FiÈierul Â«%1Â» este un fiÈier font deteriorat." IDS_ERROR_NOCLASS, "Nu s-a putut iniÈializa clasa de ferestre." - IDS_ERROR_BADCMD, "Niciun font specificat.\nSintaxÄ:\n fontview.exe <fiÈier font>" END Modified: trunk/reactos/base/applications/fontview/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/ru-RU.rc [iso-8859-1] Sun Jul 15 14:25:19 2012 @@ -4,12 +4,12 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_QUIT, "ÐÑÑÐ¾Ð´" + IDS_INSTALL, "Install" IDS_PRINT, "ÐÐµÑÐ°ÑÑ" IDS_STRING, "Ð ÑÐ°ÑÐ°Ñ ÑÐ³Ð° Ð¶Ð¸Ð» Ð±Ñ ÑÐ¸ÑÑÑÑ? ÐÐ°, Ð½Ð¾ ÑÐ°Ð»ÑÑÐ¸Ð²ÑÐ¹ ÑÐºÐ·ÐµÐ¼Ð¿Ð»ÑÑ! 1234567890" + IDS_OPEN, "Open Font..." IDS_ERROR, "ÐÑÐ¸Ð±ÐºÐ°" IDS_ERROR_NOMEM, "ÐÐµÐ´Ð¾ÑÑÐ°ÑÐ¾ÑÐ½Ð¾ Ð¿Ð°Ð¼ÑÑÐ¸, ÑÑÐ¾Ð±Ñ Ð·Ð°Ð²ÐµÑÑÐ¸ÑÑ Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ñ." IDS_ERROR_NOFONT, "%1 Ð½Ðµ ÑÐ²Ð»ÑÐµÑÑÑ ÐºÐ¾ÑÑÐµÐºÑÐ½ÑÐ¼ ÑÐ°Ð¹Ð»Ð¾Ð¼ ÑÑÐ¸ÑÑÐ°." IDS_ERROR_NOCLASS, "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¸Ð½Ð¸ÑÐ¸Ð°Ð»Ð¸Ð·Ð¸ÑÐ¾Ð²Ð°ÑÑ ÐºÐ»Ð°ÑÑ Ð¾ÐºÐ½Ð°." - IDS_ERROR_BADCMD, "ÐÐµ ÑÐºÐ°Ð·Ð°Ð½ ÑÐ°Ð¹Ð» ÑÑÐ¸ÑÑÐ°.\nÐ¡Ð¸Ð½ÑÐ°ÐºÑÐ¸Ñ:\n fontview.exe <ÑÐ°Ð¹Ð»_ÑÑÐ¸ÑÑÐ°>" END Modified: trunk/reactos/base/applications/fontview/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/sk-SK.rc [iso-8859-1] Sun Jul 15 14:25:19 2012 @@ -7,12 +7,12 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_QUIT, "Hotovo" + IDS_INSTALL, "Install" IDS_PRINT, "TlaÄiÅ¥" IDS_STRING, "KÅdeÄ¾ ÄatÄ¾ov uÄÃ koÅa Å¾raÅ¥ kÃ´ru. 1234567890" + IDS_OPEN, "Open Font..." IDS_ERROR, "Chyba" IDS_ERROR_NOMEM, "Na vykonanie tejto operÃ¡cie nie je dostatok voÄ¾nej pamÃ¤te." IDS_ERROR_NOFONT, "PoÅ¾adovanÃ½ sÃºbor %1 nie je platnÃ½m sÃºborom pÃsiem." IDS_ERROR_NOCLASS, "Nepodarilo sa inicializovaÅ¥ triedu window." - IDS_ERROR_BADCMD, "Nebol zadanÃ½ Å¾iadny sÃºbor pÃsiem.\nPouÅ¾itie:\n fontview.exe <sÃºbor pÃsiem>" END Modified: trunk/reactos/base/applications/fontview/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/sv-SE.rc [iso-8859-1] Sun Jul 15 14:25:19 2012 @@ -9,12 +9,12 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_QUIT, "Avsluta" + IDS_INSTALL, "Install" IDS_PRINT, "Skriv ut" IDS_STRING, "Jackdaws love my big sphinx of quartz. 1234567890" + IDS_OPEN, "Open Font..." IDS_ERROR, "Fel" IDS_ERROR_NOMEM, "Det er inte nog minne fÃ¶r att slutfÃ¶re operationen." IDS_ERROR_NOFONT, "Filen %1 Ã¤r inte en giltig typsnittsfil." IDS_ERROR_NOCLASS, "Kunde inte initialisera Windows klassen." - IDS_ERROR_BADCMD, "Ingen typsnittsfil Ã¤r angiven.\nSyntaxs:\n fontview.exe <typsnittsfil>" END Modified: trunk/reactos/base/applications/fontview/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/uk-UA.rc [iso-8859-1] Sun Jul 15 14:25:19 2012 @@ -10,12 +10,12 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_QUIT, "ÐÐ¸ÑÑÐ´" + IDS_INSTALL, "Install" IDS_PRINT, "ÐÑÑÐº" IDS_STRING, "Ð§ÑÑÑ ÑÑ, Ð´Ð¾ÑÑ, Ð³Ð°? ÐÑÐ¼ÐµÐ´Ð½Ð° Ð¶ ÑÐ¸, Ð¿ÑÐ¾ÑÐ°Ð¹ÑÑ Ð±ÐµÐ· ÒÐ¾Ð»ÑÑÑÐ²! 1234567890" + IDS_OPEN, "Open Font..." IDS_ERROR, "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ°" IDS_ERROR_NOMEM, "ÐÐµÐ´Ð¾ÑÑÐ°ÑÐ½ÑÐ¾ Ð¿Ð°Ð¼'ÑÑÑ Ð´Ð»Ñ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð½Ñ Ð¾Ð¿ÐµÑÐ°ÑÑÑ." IDS_ERROR_NOFONT, "Ð¤Ð°Ð¹Ð» %1 Ð½Ðµ Ñ ÐºÐ¾ÑÐµÐºÑÐ½Ð¸Ð¼ ÑÐ°Ð¹Ð»Ð¾Ð¼ ÑÑÐ¸ÑÑÑ." IDS_ERROR_NOCLASS, "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ ÑÐ½ÑÑÑÐ°Ð»ÑÐ·ÑÐ²Ð°ÑÐ¸ Ð²ÑÐºÐ¾Ð½Ð½Ð¸Ð¹ ÐºÐ»Ð°Ñ." - IDS_ERROR_BADCMD, "ÐÐµ Ð²ÐºÐ°Ð·Ð°Ð½Ð¸Ð¹ ÑÐ°Ð¹Ð» ÑÑÐ¸ÑÑÑ.\nÐ¡Ð¸Ð½ÑÐ°ÐºÑÐ¸Ñ:\n fontview.exe <ÑÐ°Ð¹Ð»_ÑÑÐ¸ÑÑÑ>" END Modified: trunk/reactos/base/applications/fontview/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/zh-CN.rc [iso-8859-1] Sun Jul 15 14:25:19 2012 @@ -10,12 +10,12 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_QUIT, "ç»æ" + IDS_INSTALL, "Install" IDS_PRINT, "åå°" IDS_STRING, "ReactOS ç»ææäººä¸ä¸ªèªç±çæä½ç³»ç»ï¼1234567890" + IDS_OPEN, "Open Font..." IDS_ERROR, "éè¯¯" IDS_ERROR_NOMEM, "æ²¡æè¶³å¤çååæ¥å®ææä½ã" IDS_ERROR_NOFONT, "ï¼1ä¸æ¯ä¸ä¸ªææçåä½æ¡£æ¡ã" IDS_ERROR_NOCLASS, "çªå£æ æ³åå§åã" - IDS_ERROR_BADCMD, "æ²¡ææä¾åä½æä»¶ã\nè¯æ³ï¼\n fontview.exe <åä½æ¡£æ¡>" END Modified: trunk/reactos/base/applications/fontview/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/zh-TW.rc [iso-8859-1] Sun Jul 15 14:25:19 2012 @@ -10,12 +10,12 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_QUIT, "çµæ" + IDS_INSTALL, "Install" IDS_PRINT, "åå°" IDS_STRING, "ReactOS çµ¦ææäººä¸åèªç±çæä½ç³»çµ±ï¼ 1234567890" + IDS_OPEN, "Open Font..." IDS_ERROR, "é¯èª¤" IDS_ERROR_NOMEM, "æ²æè¶³å¤ çè¨æ¶é«ä¾å®ææä½ã" IDS_ERROR_NOFONT, "%1 ä¸æ¯ä¸åææçåé«æªæ¡ã" IDS_ERROR_NOCLASS, "çªå£ç¡æ³åå§åã" - IDS_ERROR_BADCMD, "æ²ææä¾åé«æä»¶ã\nèªæ³ï¼\n fontview.exe <åé«æªæ¡>" END Modified: trunk/reactos/base/applications/fontview/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/resource.h [iso-8859-1] Sun Jul 15 14:25:19 2012 @@ -3,11 +3,11 @@ #define IDS_ERROR_NOMEM 101 #define IDS_ERROR_NOFONT 102 #define IDS_ERROR_NOCLASS 103 -#define IDS_ERROR_BADCMD 104 -#define IDS_QUIT 500 +#define IDS_INSTALL 500 #define IDS_PRINT 501 #define IDS_STRING 502 +#define IDS_OPEN 503 #define IDS_CHARSLOWER 700 #define IDS_CHARSUPPER 701

1 0

[tkreuzer] 56897: [COMDLG32] - Don't modify a dialog template resource directly, instead make a copy of it. - Should be sent to wine (bug #7189) [BROWSEUI] - Remove useless diff file.
by tkreuzer＠svn.reactos.org 15 Jul '12

15 Jul '12

Author: tkreuzer Date: Sun Jul 15 14:16:52 2012 New Revision: 56897 URL: http://svn.reactos.org/svn/reactos?rev=56897&view=rev Log: [COMDLG32] - Don't modify a dialog template resource directly, instead make a copy of it. - Should be sent to wine (bug #7189) [BROWSEUI] - Remove useless diff file. Added: trunk/reactos/dll/win32/comdlg32/comdlg32_ros.diff Removed: trunk/reactos/dll/win32/browseui/browseui_ros.diff Modified: trunk/reactos/dll/win32/comdlg32/filedlg.c Removed: trunk/reactos/dll/win32/browseui/browseui_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… ============================================================================== --- trunk/reactos/dll/win32/browseui/browseui_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/browseui_ros.diff (removed) @@ -1,15 +1,0 @@ -Index: browseui.rbuild -=================================================================== ---- browseui.rbuild (revision 23123) -+++ browseui.rbuild (working copy) -@@ -9,8 +9,8 @@ - <define name="__WINESRC__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> -- <define name="_WIN32_WINNT">0x501</define> -- <define name="WINVER">0x501</define> -+ <define name="_WIN32_WINNT">0x600</define> -+ <define name="WINVER">0x600</define> - <library>wine</library> - <library>ole32</library> - <library>user32</library> Added: trunk/reactos/dll/win32/comdlg32/comdlg32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/comdlg3… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/comdlg32_ros.diff (added) +++ trunk/reactos/dll/win32/comdlg32/comdlg32_ros.diff [iso-8859-1] Sun Jul 15 14:16:52 2012 @@ -1,0 +1,71 @@ +Index: filedlg.c +=================================================================== +--- filedlg.c (Revision 56893) ++++ filedlg.c (Arbeitskopie) +@@ -260,6 +260,8 @@ + HRSRC hRes; + HANDLE hDlgTmpl = 0; + HRESULT hr; ++ DWORD dwSize; ++ LPDLGTEMPLATE hDialogTemplate; + + /* test for missing functionality */ + if (fodInfos->ofnInfos->Flags & UNIMPLEMENTED_FLAGS) +@@ -276,12 +278,17 @@ + return FALSE; + } + if (!(hDlgTmpl = LoadResource(COMDLG32_hInstance, hRes )) || ++ !(dwSize = SizeofResource(COMDLG32_hInstance, hRes )) || ++ !(hDialogTemplate = malloc(dwSize)) || + !(template = LockResource( hDlgTmpl ))) + { + COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE); + return FALSE; + } + ++ /* Copy the read only resource */ ++ memcpy(hDialogTemplate, template, dwSize); ++ + /* msdn: explorer style dialogs permit sizing by default. + * The OFN_ENABLESIZING flag is only needed when a hook or + * custom tmeplate is provided */ +@@ -291,12 +298,12 @@ + + if (fodInfos->ofnInfos->Flags & OFN_ENABLESIZING) + { +- ((LPDLGTEMPLATEW)template)->style |= WS_SIZEBOX; ++ hDialogTemplate->style |= WS_SIZEBOX; + fodInfos->sizedlg.cx = fodInfos->sizedlg.cy = 0; + fodInfos->initial_size.x = fodInfos->initial_size.y = 0; + } + else +- ((LPDLGTEMPLATEW)template)->style &= ~WS_SIZEBOX; ++ hDialogTemplate->style &= ~WS_SIZEBOX; + + + /* old style hook messages */ +@@ -313,19 +320,21 @@ + + if (fodInfos->unicode) + lRes = DialogBoxIndirectParamW(COMDLG32_hInstance, +- template, ++ hDialogTemplate, + fodInfos->ofnInfos->hwndOwner, + FileOpenDlgProc95, + (LPARAM) fodInfos); + else + lRes = DialogBoxIndirectParamA(COMDLG32_hInstance, +- template, ++ hDialogTemplate, + fodInfos->ofnInfos->hwndOwner, + FileOpenDlgProc95, + (LPARAM) fodInfos); +- if (SUCCEEDED(hr)) ++ if (SUCCEEDED(hr)) + OleUninitialize(); + ++ free(hDialogTemplate); ++ + /* Unable to create the dialog */ + if( lRes == -1) + return FALSE; Modified: trunk/reactos/dll/win32/comdlg32/filedlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filedlg… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/filedlg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/filedlg.c [iso-8859-1] Sun Jul 15 14:16:52 2012 @@ -260,6 +260,8 @@ HRSRC hRes; HANDLE hDlgTmpl = 0; HRESULT hr; + DWORD dwSize; + LPDLGTEMPLATE hDialogTemplate; /* test for missing functionality */ if (fodInfos->ofnInfos->Flags & UNIMPLEMENTED_FLAGS) @@ -276,11 +278,16 @@ return FALSE; } if (!(hDlgTmpl = LoadResource(COMDLG32_hInstance, hRes )) || + !(dwSize = SizeofResource(COMDLG32_hInstance, hRes )) || + !(hDialogTemplate = malloc(dwSize)) || !(template = LockResource( hDlgTmpl ))) { COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE); return FALSE; } + + /* Copy the read only resource */ + memcpy(hDialogTemplate, template, dwSize); /* msdn: explorer style dialogs permit sizing by default. * The OFN_ENABLESIZING flag is only needed when a hook or @@ -291,12 +298,12 @@ if (fodInfos->ofnInfos->Flags & OFN_ENABLESIZING) { - ((LPDLGTEMPLATEW)template)->style |= WS_SIZEBOX; + hDialogTemplate->style |= WS_SIZEBOX; fodInfos->sizedlg.cx = fodInfos->sizedlg.cy = 0; fodInfos->initial_size.x = fodInfos->initial_size.y = 0; } else - ((LPDLGTEMPLATEW)template)->style &= ~WS_SIZEBOX; + hDialogTemplate->style &= ~WS_SIZEBOX; /* old style hook messages */ @@ -313,18 +320,20 @@ if (fodInfos->unicode) lRes = DialogBoxIndirectParamW(COMDLG32_hInstance, - template, + hDialogTemplate, fodInfos->ofnInfos->hwndOwner, FileOpenDlgProc95, (LPARAM) fodInfos); else lRes = DialogBoxIndirectParamA(COMDLG32_hInstance, - template, + hDialogTemplate, fodInfos->ofnInfos->hwndOwner, FileOpenDlgProc95, (LPARAM) fodInfos); - if (SUCCEEDED(hr)) + if (SUCCEEDED(hr)) OleUninitialize(); + + free(hDialogTemplate); /* Unable to create the dialog */ if( lRes == -1)

1 0

[ekohl] 56896: SAMLIB: Implement SamCreateGroupInDoamin and SamOpenGroup. SAMSRV: Implement SamrCreateGroupInDomain and SamrOpenGroup.
by ekohl＠svn.reactos.org 15 Jul '12

15 Jul '12

Author: ekohl Date: Sun Jul 15 13:35:40 2012 New Revision: 56896 URL: http://svn.reactos.org/svn/reactos?rev=56896&view=rev Log: SAMLIB: Implement SamCreateGroupInDoamin and SamOpenGroup. SAMSRV: Implement SamrCreateGroupInDomain and SamrOpenGroup. Modified: trunk/reactos/dll/win32/samlib/samlib.c trunk/reactos/dll/win32/samlib/samlib.spec trunk/reactos/dll/win32/samsrv/registry.c trunk/reactos/dll/win32/samsrv/samrpc.c trunk/reactos/dll/win32/samsrv/samsrv.h trunk/reactos/include/ddk/ntsam.h trunk/reactos/include/reactos/idl/sam.idl Modified: trunk/reactos/dll/win32/samlib/samlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.c?… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] Sun Jul 15 13:35:40 2012 @@ -211,6 +211,37 @@ NTSTATUS NTAPI +SamCreateGroupInDomain(IN SAM_HANDLE DomainHandle, + IN PUNICODE_STRING AccountName, + IN ACCESS_MASK DesiredAccess, + OUT PSAM_HANDLE GroupHandle, + OUT PULONG RelativeId) +{ + NTSTATUS Status; + + TRACE("SamCreateGroupInDomain(%p,%p,0x%08x,%p,%p)\n", + DomainHandle, AccountName, DesiredAccess, GroupHandle, RelativeId); + + RpcTryExcept + { + Status = SamrCreateGroupInDomain((SAMPR_HANDLE)DomainHandle, + (PRPC_UNICODE_STRING)AccountName, + DesiredAccess, + (SAMPR_HANDLE *)GroupHandle, + RelativeId); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + + +NTSTATUS +NTAPI SamCreateUserInDomain(IN SAM_HANDLE DomainHandle, IN PUNICODE_STRING AccountName, IN ACCESS_MASK DesiredAccess, @@ -544,6 +575,35 @@ NTSTATUS NTAPI +SamOpenGroup(IN SAM_HANDLE DomainHandle, + IN ACCESS_MASK DesiredAccess, + IN ULONG GroupId, + OUT PSAM_HANDLE GroupHandle) +{ + NTSTATUS Status; + + TRACE("SamOpenGroup(%p,0x%08x,%p,%p)\n", + DomainHandle, DesiredAccess, GroupId, GroupHandle); + + RpcTryExcept + { + Status = SamrOpenGroup((SAMPR_HANDLE)DomainHandle, + DesiredAccess, + GroupId, + (SAMPR_HANDLE *)GroupHandle); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + + +NTSTATUS +NTAPI SamOpenUser(IN SAM_HANDLE DomainHandle, IN ACCESS_MASK DesiredAccess, IN ULONG UserId, Modified: trunk/reactos/dll/win32/samlib/samlib.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.sp… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/samlib.spec [iso-8859-1] Sun Jul 15 13:35:40 2012 @@ -8,7 +8,7 @@ @ stdcall SamConnect(ptr ptr long ptr) @ stub SamConnectWithCreds @ stdcall SamCreateAliasInDomain(ptr ptr long ptr ptr) -@ stub SamCreateGroupInDomain +@ stdcall SamCreateGroupInDomain(ptr ptr long ptr ptr) @ stub SamCreateUser2InDomain @ stdcall SamCreateUserInDomain(ptr ptr long ptr ptr) @ stub SamDeleteAlias @@ -30,7 +30,7 @@ @ stdcall SamLookupNamesInDomain(ptr long ptr ptr ptr) @ stdcall SamOpenAlias(ptr long long ptr) @ stdcall SamOpenDomain(ptr long ptr ptr) -@ stub SamOpenGroup +@ stdcall SamOpenGroup(ptr long long ptr) @ stdcall SamOpenUser(ptr long long ptr) @ stub SamQueryDisplayInformation @ stdcall SamQueryInformationAlias(ptr long ptr) Modified: trunk/reactos/dll/win32/samsrv/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/registry.… ============================================================================== --- trunk/reactos/dll/win32/samsrv/registry.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/registry.c [iso-8859-1] Sun Jul 15 13:35:40 2012 @@ -60,6 +60,36 @@ NTSTATUS +SampRegDeleteKey(IN HANDLE ParentKeyHandle, + IN LPCWSTR KeyName) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING SubKeyName; + HANDLE TargetKey; + NTSTATUS Status; + + RtlInitUnicodeString(&SubKeyName, + (LPWSTR)KeyName); + InitializeObjectAttributes(&ObjectAttributes, + &SubKeyName, + OBJ_CASE_INSENSITIVE, + ParentKeyHandle, + NULL); + Status = NtOpenKey(&TargetKey, + DELETE, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + return Status; + + Status = NtDeleteKey(TargetKey); + + NtClose(TargetKey); + + return Status; +} + + +NTSTATUS SampRegEnumerateSubKey(IN HANDLE KeyHandle, IN ULONG Index, IN ULONG Length, @@ -167,6 +197,20 @@ *ValueCount = FullInfoBuffer.Values; return Status; +} + + +NTSTATUS +SampRegDeleteValue(IN HANDLE KeyHandle, + IN LPWSTR ValueName) +{ + UNICODE_STRING Name; + + RtlInitUnicodeString(&Name, + ValueName); + + return NtDeleteValueKey(KeyHandle, + &Name); } Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Sun Jul 15 13:35:40 2012 @@ -1541,11 +1541,145 @@ OUT SAMPR_HANDLE *GroupHandle, OUT unsigned long *RelativeId) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* Function 10 */ + UNICODE_STRING EmptyString = RTL_CONSTANT_STRING(L""); + SAM_DOMAIN_FIXED_DATA FixedDomainData; + SAM_GROUP_FIXED_DATA FixedGroupData; + PSAM_DB_OBJECT DomainObject; + PSAM_DB_OBJECT GroupObject; + ULONG ulSize; + ULONG ulRid; + WCHAR szRid[9]; + NTSTATUS Status; + + TRACE("SamrCreateGroupInDomain(%p %p %lx %p %p)\n", + DomainHandle, Name, DesiredAccess, GroupHandle, RelativeId); + + /* Validate the domain handle */ + Status = SampValidateDbObject(DomainHandle, + SamDbDomainObject, + DOMAIN_CREATE_GROUP, + &DomainObject); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Get the fixed domain attributes */ + ulSize = sizeof(SAM_DOMAIN_FIXED_DATA); + Status = SampGetObjectAttribute(DomainObject, + L"F", + NULL, + (PVOID)&FixedDomainData, + &ulSize); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Increment the NextRid attribute */ + ulRid = FixedDomainData.NextRid; + FixedDomainData.NextRid++; + + /* Store the fixed domain attributes */ + Status = SampSetObjectAttribute(DomainObject, + L"F", + REG_BINARY, + &FixedDomainData, + ulSize); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + TRACE("RID: %lx\n", ulRid); + + /* Convert the RID into a string (hex) */ + swprintf(szRid, L"%08lX", ulRid); + + /* FIXME: Check whether the group name is already in use */ + + /* Create the group object */ + Status = SampCreateDbObject(DomainObject, + L"Groups", + szRid, + SamDbGroupObject, + DesiredAccess, + &GroupObject); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Add the name alias for the user object */ + Status = SampSetDbObjectNameAlias(DomainObject, + L"Groups", + Name->Buffer, + ulRid); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Initialize fixed user data */ + memset(&FixedGroupData, 0, sizeof(SAM_GROUP_FIXED_DATA)); + FixedGroupData.Version = 1; + + FixedGroupData.GroupId = ulRid; + + /* Set fixed user data attribute */ + Status = SampSetObjectAttribute(GroupObject, + L"F", + REG_BINARY, + (LPVOID)&FixedGroupData, + sizeof(SAM_GROUP_FIXED_DATA)); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Set the Name attribute */ + Status = SampSetObjectAttribute(GroupObject, + L"Name", + REG_SZ, + (LPVOID)Name->Buffer, + Name->MaximumLength); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Set the AdminComment attribute */ + Status = SampSetObjectAttribute(GroupObject, + L"AdminComment", + REG_SZ, + EmptyString.Buffer, + EmptyString.MaximumLength); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + if (NT_SUCCESS(Status)) + { + *GroupHandle = (SAMPR_HANDLE)GroupObject; + *RelativeId = ulRid; + } + + TRACE("returns with status 0x%08lx\n", Status); + + return Status; +} + + +/* Function 11 */ NTSTATUS NTAPI SamrEnumerateGroupsInDomain(IN SAMPR_HANDLE DomainHandle, @@ -1558,6 +1692,7 @@ return STATUS_NOT_IMPLEMENTED; } + /* Function 12 */ NTSTATUS NTAPI @@ -1567,6 +1702,7 @@ OUT SAMPR_HANDLE *UserHandle, OUT unsigned long *RelativeId) { + UNICODE_STRING EmptyString = RTL_CONSTANT_STRING(L""); SAM_DOMAIN_FIXED_DATA FixedDomainData; SAM_USER_FIXED_DATA FixedUserData; PSAM_DB_OBJECT DomainObject; @@ -1684,7 +1820,7 @@ return Status; } - /* Set the name attribute */ + /* Set the Name attribute */ Status = SampSetObjectAttribute(UserObject, L"Name", REG_SZ, @@ -1696,6 +1832,102 @@ return Status; } + /* Set the FullName attribute */ + Status = SampSetObjectAttribute(UserObject, + L"FullName", + REG_SZ, + EmptyString.Buffer, + EmptyString.MaximumLength); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Set the HomeDirectory attribute */ + Status = SampSetObjectAttribute(UserObject, + L"HomeDirectory", + REG_SZ, + EmptyString.Buffer, + EmptyString.MaximumLength); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Set the HomeDirectoryDrive attribute */ + Status = SampSetObjectAttribute(UserObject, + L"HomeDirectoryDrive", + REG_SZ, + EmptyString.Buffer, + EmptyString.MaximumLength); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Set the ScriptPath attribute */ + Status = SampSetObjectAttribute(UserObject, + L"ScriptPath", + REG_SZ, + EmptyString.Buffer, + EmptyString.MaximumLength); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Set the ProfilePath attribute */ + Status = SampSetObjectAttribute(UserObject, + L"ProfilePath", + REG_SZ, + EmptyString.Buffer, + EmptyString.MaximumLength); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Set the AdminComment attribute */ + Status = SampSetObjectAttribute(UserObject, + L"AdminComment", + REG_SZ, + EmptyString.Buffer, + EmptyString.MaximumLength); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Set the UserComment attribute */ + Status = SampSetObjectAttribute(UserObject, + L"UserComment", + REG_SZ, + EmptyString.Buffer, + EmptyString.MaximumLength); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Set the WorkStations attribute */ + Status = SampSetObjectAttribute(UserObject, + L"WorkStations", + REG_SZ, + EmptyString.Buffer, + EmptyString.MaximumLength); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + /* FIXME: Set default user attributes */ if (NT_SUCCESS(Status)) @@ -1708,6 +1940,7 @@ return Status; } + /* Function 13 */ NTSTATUS @@ -1722,6 +1955,7 @@ UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } + /* Function 14 */ NTSTATUS @@ -1807,7 +2041,7 @@ return STATUS_ALIAS_EXISTS; } - /* Create the user object */ + /* Create the alias object */ Status = SampCreateDbObject(DomainObject, L"Aliases", szRid, @@ -2239,6 +2473,7 @@ return Status; } + /* Function 17 */ NTSTATUS NTAPI @@ -2265,6 +2500,7 @@ return STATUS_NOT_IMPLEMENTED; } + /* Function 19 */ NTSTATUS NTAPI @@ -2273,9 +2509,46 @@ IN unsigned long GroupId, OUT SAMPR_HANDLE *GroupHandle) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} + PSAM_DB_OBJECT DomainObject; + PSAM_DB_OBJECT GroupObject; + WCHAR szRid[9]; + NTSTATUS Status; + + TRACE("SamrOpenGroup(%p %lx %lx %p)\n", + DomainHandle, DesiredAccess, GroupId, GroupHandle); + + /* Validate the domain handle */ + Status = SampValidateDbObject(DomainHandle, + SamDbDomainObject, + DOMAIN_LOOKUP, + &DomainObject); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Convert the RID into a string (hex) */ + swprintf(szRid, L"%08lX", GroupId); + + /* Create the group object */ + Status = SampOpenDbObject(DomainObject, + L"Groups", + szRid, + SamDbGroupObject, + DesiredAccess, + &GroupObject); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + *GroupHandle = (SAMPR_HANDLE)GroupObject; + + return STATUS_SUCCESS; +} + /* Function 20 */ NTSTATUS @@ -2674,7 +2947,7 @@ TRACE("SamrAddMemberToAlias(%p %p)\n", AliasHandle, MemberId); - /* Validate the domain handle */ + /* Validate the alias handle */ Status = SampValidateDbObject(AliasHandle, SamDbAliasObject, ALIAS_ADD_MEMBER, Modified: trunk/reactos/dll/win32/samsrv/samsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.h?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] Sun Jul 15 13:35:40 2012 @@ -50,6 +50,13 @@ } SAM_DB_OBJECT, *PSAM_DB_OBJECT; #define SAMP_DB_SIGNATURE 0x87654321 + +typedef struct _SAM_ALIAS_FIXED_DATA +{ + ULONG Version; + ULONG Reserved; + ULONG AliasId; +} SAM_ALIAS_FIXED_DATA, *PSAM_ALIAS_FIXED_DATA; typedef struct _SAM_DOMAIN_FIXED_DATA { @@ -73,6 +80,14 @@ BOOLEAN UasCompatibilityRequired; } SAM_DOMAIN_FIXED_DATA, *PSAM_DOMAIN_FIXED_DATA; +typedef struct _SAM_GROUP_FIXED_DATA +{ + ULONG Version; + ULONG Reserved; + ULONG GroupId; + ULONG Attributes; +} SAM_GROUP_FIXED_DATA, *PSAM_GROUP_FIXED_DATA; + typedef struct _SAM_USER_FIXED_DATA { ULONG Version; @@ -165,6 +180,10 @@ OUT HANDLE KeyHandle); NTSTATUS +SampRegDeleteKey(IN HANDLE ParentKeyHandle, + IN LPCWSTR KeyName); + +NTSTATUS SampRegEnumerateSubKey(IN HANDLE KeyHandle, IN ULONG Index, IN ULONG Length, @@ -180,6 +199,10 @@ SampRegQueryKeyInfo(IN HANDLE KeyHandle, OUT PULONG SubKeyCount, OUT PULONG ValueCount); + +NTSTATUS +SampRegDeleteValue(IN HANDLE KeyHandle, + IN LPWSTR ValueName); NTSTATUS SampRegEnumerateValue(IN HANDLE KeyHandle, Modified: trunk/reactos/include/ddk/ntsam.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntsam.h?rev=56… ============================================================================== --- trunk/reactos/include/ddk/ntsam.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntsam.h [iso-8859-1] Sun Jul 15 13:35:40 2012 @@ -236,6 +236,15 @@ { UNICODE_STRING DomainName; } DOMAIN_NAME_INFORMATION, *PDOMAIN_NAME_INFORMATION; + +typedef enum _GROUP_INFORMATION_CLASS +{ + GroupGeneralInformation = 1, + GroupNameInformation, + GroupAttributeInformation, + GroupAdminCommentInformation, + GroupReplicationInformation +} GROUP_INFORMATION_CLASS; typedef enum _USER_INFORMATION_CLASS { @@ -303,6 +312,14 @@ NTSTATUS NTAPI +SamCreateGroupInDomain(IN SAM_HANDLE DomainHandle, + IN PUNICODE_STRING AccountName, + IN ACCESS_MASK DesiredAccess, + OUT PSAM_HANDLE GroupHandle, + OUT PULONG RelativeId); + +NTSTATUS +NTAPI SamCreateUserInDomain(IN SAM_HANDLE DomainHandle, IN PUNICODE_STRING AccountName, IN ACCESS_MASK DesiredAccess, @@ -373,6 +390,13 @@ NTSTATUS NTAPI +SamOpenGroup(IN SAM_HANDLE DomainHandle, + IN ACCESS_MASK DesiredAccess, + IN ULONG GroupId, + OUT PSAM_HANDLE GroupHandle); + +NTSTATUS +NTAPI SamOpenUser(IN SAM_HANDLE DomainHandle, IN ACCESS_MASK DesiredAccess, IN ULONG UserId, Modified: trunk/reactos/include/reactos/idl/sam.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/sam.id… ============================================================================== --- trunk/reactos/include/reactos/idl/sam.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/sam.idl [iso-8859-1] Sun Jul 15 13:35:40 2012 @@ -382,6 +382,7 @@ RPC_UNICODE_STRING AdminComment; } SAMPR_GROUP_ADM_COMMENT_INFORMATION, *PSAMPR_GROUP_ADM_COMMENT_INFORMATION; +cpp_quote("#ifndef _NTSAM_") typedef enum _GROUP_INFORMATION_CLASS { GroupGeneralInformation = 1, @@ -390,6 +391,7 @@ GroupAdminCommentInformation, GroupReplicationInformation } GROUP_INFORMATION_CLASS; +cpp_quote("#endif") typedef [switch_type(GROUP_INFORMATION_CLASS)] union _SAMPR_GROUP_INFO_BUFFER {

1 0

[ion] 56895: [NTOSKRNL]: Kill deprecated code.
by ion＠svn.reactos.org 15 Jul '12

15 Jul '12

Author: ion Date: Sun Jul 15 13:09:20 2012 New Revision: 56895 URL: http://svn.reactos.org/svn/reactos?rev=56895&view=rev Log: [NTOSKRNL]: Kill deprecated code. Removed: trunk/reactos/ntoskrnl/mm/pageop.c Removed: trunk/reactos/ntoskrnl/mm/pageop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pageop.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pageop.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pageop.c (removed) @@ -1,274 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/mm/pageop.c - * PURPOSE: No purpose listed. - * - * PROGRAMMERS: David Welch (welch(a)cwcom.net) - */ - -/* INCLUDES ****************************************************************/ - -#include <ntoskrnl.h> -#define NDEBUG -#include <debug.h> - -#if defined (ALLOC_PRAGMA) -#pragma alloc_text(INIT, MmInitializePageOp) -#endif - - -/* GLOBALS *******************************************************************/ - -#define PAGEOP_HASH_TABLE_SIZE (32) - -static KSPIN_LOCK MmPageOpHashTableLock; -static PMM_PAGEOP MmPageOpHashTable[PAGEOP_HASH_TABLE_SIZE]; -static NPAGED_LOOKASIDE_LIST MmPageOpLookasideList; - -/* FUNCTIONS *****************************************************************/ - -VOID -NTAPI -MmReleasePageOp(PMM_PAGEOP PageOp) -/* - * FUNCTION: Release a reference to a page operation descriptor - */ -{ - KIRQL oldIrql; - PMM_PAGEOP PrevPageOp; - - KeAcquireSpinLock(&MmPageOpHashTableLock, &oldIrql); - PageOp->ReferenceCount--; - if (PageOp->ReferenceCount > 0) - { - KeReleaseSpinLock(&MmPageOpHashTableLock, oldIrql); - return; - } - (void)InterlockedDecrementUL(&PageOp->MArea->PageOpCount); - PrevPageOp = MmPageOpHashTable[PageOp->Hash]; - if (PrevPageOp == PageOp) - { - MmPageOpHashTable[PageOp->Hash] = PageOp->Next; - KeReleaseSpinLock(&MmPageOpHashTableLock, oldIrql); - ExFreeToNPagedLookasideList(&MmPageOpLookasideList, PageOp); - return; - } - while (PrevPageOp->Next != NULL) - { - if (PrevPageOp->Next == PageOp) - { - PrevPageOp->Next = PageOp->Next; - KeReleaseSpinLock(&MmPageOpHashTableLock, oldIrql); - ExFreeToNPagedLookasideList(&MmPageOpLookasideList, PageOp); - return; - } - PrevPageOp = PrevPageOp->Next; - } - KeReleaseSpinLock(&MmPageOpHashTableLock, oldIrql); - KeBugCheck(MEMORY_MANAGEMENT); -} - -PMM_PAGEOP -NTAPI -MmCheckForPageOp(PMEMORY_AREA MArea, HANDLE Pid, PVOID Address, - PMM_SECTION_SEGMENT Segment, ULONGLONG Offset) -{ - ULONG_PTR Hash; - KIRQL oldIrql; - PMM_PAGEOP PageOp; - - /* - * Calcuate the hash value for pageop structure - */ - if (MArea->Type == MEMORY_AREA_SECTION_VIEW) - { - Hash = (((ULONG_PTR)Segment) | (((ULONG_PTR)Offset) / PAGE_SIZE)); - } - else - { - Hash = (((ULONG_PTR)Pid) | (((ULONG_PTR)Address) / PAGE_SIZE)); - } - Hash = Hash % PAGEOP_HASH_TABLE_SIZE; - - KeAcquireSpinLock(&MmPageOpHashTableLock, &oldIrql); - - /* - * Check for an existing pageop structure - */ - PageOp = MmPageOpHashTable[Hash]; - while (PageOp != NULL) - { - if (MArea->Type == MEMORY_AREA_SECTION_VIEW) - { - if (PageOp->Segment == Segment && - PageOp->Offset == Offset) - { - break; - } - } - else - { - if (PageOp->Pid == Pid && - PageOp->Address == Address) - { - break; - } - } - PageOp = PageOp->Next; - } - - /* - * If we found an existing pageop then increment the reference count - * and return it. - */ - if (PageOp != NULL) - { - PageOp->ReferenceCount++; - KeReleaseSpinLock(&MmPageOpHashTableLock, oldIrql); - return(PageOp); - } - KeReleaseSpinLock(&MmPageOpHashTableLock, oldIrql); - return(NULL); -} - -PMM_PAGEOP -NTAPI -MmGetPageOp(PMEMORY_AREA MArea, HANDLE Pid, PVOID Address, - PMM_SECTION_SEGMENT Segment, ULONGLONG Offset, ULONG OpType, BOOLEAN First) -/* - * FUNCTION: Get a page operation descriptor corresponding to - * the memory area and either the segment, offset pair or the - * pid, address pair. - */ -{ - ULONG_PTR Hash; - KIRQL oldIrql; - PMM_PAGEOP PageOp; - - Address = (PVOID)PAGE_ROUND_DOWN(Address); - Offset = PAGE_ROUND_DOWN(Offset); - - /* Making a page op during marea destruction is illegal */ - ASSERT(!MArea->DeleteInProgress); - - /* - * Calcuate the hash value for pageop structure - */ - if (MArea->Type == MEMORY_AREA_SECTION_VIEW) - { - Hash = (((ULONG_PTR)Segment) | (((ULONG_PTR)Offset) / PAGE_SIZE)); - } - else - { - Hash = (((ULONG_PTR)Pid) | (((ULONG_PTR)Address) / PAGE_SIZE)); - } - Hash = Hash % PAGEOP_HASH_TABLE_SIZE; - - KeAcquireSpinLock(&MmPageOpHashTableLock, &oldIrql); - - /* - * Check for an existing pageop structure - */ - PageOp = MmPageOpHashTable[Hash]; - while (PageOp != NULL) - { - if (MArea->Type == MEMORY_AREA_SECTION_VIEW) - { - if (PageOp->Segment == Segment && - PageOp->Offset == Offset) - { - break; - } - } - else - { - if (PageOp->Pid == Pid && - PageOp->Address == Address) - { - break; - } - } - PageOp = PageOp->Next; - } - - /* - * If we found an existing pageop then increment the reference count - * and return it. - */ - if (PageOp != NULL) - { - if (First) - { - PageOp = NULL; - } - else - { - PageOp->ReferenceCount++; - } - KeReleaseSpinLock(&MmPageOpHashTableLock, oldIrql); - return(PageOp); - } - - /* - * Otherwise add a new pageop. - */ - PageOp = ExAllocateFromNPagedLookasideList(&MmPageOpLookasideList); - if (PageOp == NULL) - { - KeReleaseSpinLock(&MmPageOpHashTableLock, oldIrql); - KeBugCheck(MEMORY_MANAGEMENT); - return(NULL); - } - - if (MArea->Type != MEMORY_AREA_SECTION_VIEW) - { - PageOp->Pid = Pid; - PageOp->Address = Address; - } - else - { - PageOp->Segment = Segment; - PageOp->Offset = Offset; - } - PageOp->ReferenceCount = 1; - PageOp->Next = MmPageOpHashTable[Hash]; - PageOp->Hash = (ULONG)Hash; - PageOp->Thread = PsGetCurrentThread(); - PageOp->Abandoned = FALSE; - PageOp->Status = STATUS_PENDING; - PageOp->OpType = OpType; - PageOp->MArea = MArea; - KeInitializeEvent(&PageOp->CompletionEvent, SynchronizationEvent, FALSE); - MmPageOpHashTable[Hash] = PageOp; - (void)InterlockedIncrementUL(&MArea->PageOpCount); - - KeReleaseSpinLock(&MmPageOpHashTableLock, oldIrql); - return(PageOp); -} - -VOID -INIT_FUNCTION -NTAPI -MmInitializePageOp(VOID) -{ - memset(MmPageOpHashTable, 0, sizeof(MmPageOpHashTable)); - KeInitializeSpinLock(&MmPageOpHashTableLock); - - ExInitializeNPagedLookasideList (&MmPageOpLookasideList, - NULL, - NULL, - 0, - sizeof(MM_PAGEOP), - TAG_MM_PAGEOP, - 50); -} - - - - - - - - -

1 0

[tkreuzer] 56894: [NTOSKRNL] Add amd64 version of MmIsDisabledPage
by tkreuzer＠svn.reactos.org 15 Jul '12

15 Jul '12

Author: tkreuzer Date: Sun Jul 15 12:39:46 2012 New Revision: 56894 URL: http://svn.reactos.org/svn/reactos?rev=56894&view=rev Log: [NTOSKRNL] Add amd64 version of MmIsDisabledPage Modified: trunk/reactos/ntoskrnl/mm/amd64/page.c Modified: trunk/reactos/ntoskrnl/mm/amd64/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/amd64/page.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/amd64/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/amd64/page.c [iso-8859-1] Sun Jul 15 12:39:46 2012 @@ -380,6 +380,16 @@ BOOLEAN NTAPI +MmIsDisabledPage(PEPROCESS Process, PVOID Address) +{ + MMPTE Pte; + Pte.u.Long = MiGetPteValueForProcess(Process, Address); + __debugbreak(); // FIXME + return !Pte.u.Hard.Valid && !(Pte.u.Long & 0x800) && Pte.u.Hard.PageFrameNumber; +} + +BOOLEAN +NTAPI MmIsPageSwapEntry(PEPROCESS Process, PVOID Address) { MMPTE Pte;

1 0

[fireball] 56893: [CMLIB] - Revert 56884, as Timo says 3 is a correct value for this structure.
by fireball＠svn.reactos.org 14 Jul '12

14 Jul '12

Author: fireball Date: Sat Jul 14 20:38:38 2012 New Revision: 56893 URL: http://svn.reactos.org/svn/reactos?rev=56893&view=rev Log: [CMLIB] - Revert 56884, as Timo says 3 is a correct value for this structure. Modified: trunk/reactos/lib/cmlib/cmlib.h Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=5689… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] Sat Jul 14 20:38:38 2012 @@ -151,7 +151,7 @@ typedef struct _CMHIVE { HHIVE Hive; - HANDLE FileHandles[HFILE_TYPE_MAX]; + HANDLE FileHandles[3]; LIST_ENTRY NotifyList; LIST_ENTRY HiveList; EX_PUSH_LOCK HiveLock;

1 0

[akhaldi] 56892: [CMAKE] * Don't make the cab generation in the default build.
by akhaldi＠svn.reactos.org 14 Jul '12

14 Jul '12

Author: akhaldi Date: Sat Jul 14 16:15:59 2012 New Revision: 56892 URL: http://svn.reactos.org/svn/reactos?rev=56892&view=rev Log: [CMAKE] * Don't make the cab generation in the default build. Modified: trunk/reactos/boot/bootdata/packages/CMakeLists.txt Modified: trunk/reactos/boot/bootdata/packages/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/CMa… ============================================================================== --- trunk/reactos/boot/bootdata/packages/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/CMakeLists.txt [iso-8859-1] Sat Jul 14 16:15:59 2012 @@ -39,6 +39,6 @@ COMMAND native-cabman -C ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff -RC ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf -L ${CMAKE_CURRENT_BINARY_DIR} -N -P ${REACTOS_SOURCE_DIR} DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf native-cabman) # Finally, we create the reactos_cab target -add_custom_target(reactos_cab ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab) +add_custom_target(reactos_cab DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab) add_cd_file(TARGET reactos_cab FILE ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf DESTINATION reactos NO_CAB FOR bootcd regtest)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs