Ros-diffs February 2014

ros-diffs@reactos.org

17 participants
464 discussions

[akhaldi] 62121: [OPENGL] * Prepare the CMake scripts for PCH. CORE-7716
by akhaldi＠svn.reactos.org 11 Feb '14

11 Feb '14

Author: akhaldi Date: Tue Feb 11 21:29:23 2014 New Revision: 62121 URL: http://svn.reactos.org/svn/reactos?rev=62121&view=rev Log: [OPENGL] * Prepare the CMake scripts for PCH. CORE-7716 Modified: trunk/reactos/dll/opengl/mesa/main/CMakeLists.txt trunk/reactos/dll/opengl/mesa/math/CMakeLists.txt trunk/reactos/dll/opengl/mesa/swrast/CMakeLists.txt trunk/reactos/dll/opengl/mesa/tnl/CMakeLists.txt trunk/reactos/dll/opengl/mesa/vbo/CMakeLists.txt trunk/reactos/dll/opengl/opengl32/CMakeLists.txt Modified: trunk/reactos/dll/opengl/mesa/main/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/CMake… ============================================================================== --- trunk/reactos/dll/opengl/mesa/main/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/main/CMakeLists.txt [iso-8859-1] Tue Feb 11 21:29:23 2014 @@ -72,9 +72,10 @@ version.c viewport.c vtxfmt.c -) + precomp.h) add_library(mesa_main STATIC ${SOURCE}) +add_pch(mesa_main precomp.h SOURCE) if(NOT MSVC) allow_warnings(mesa_main) endif() Modified: trunk/reactos/dll/opengl/mesa/math/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/math/CMake… ============================================================================== --- trunk/reactos/dll/opengl/mesa/math/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/math/CMakeLists.txt [iso-8859-1] Tue Feb 11 21:29:23 2014 @@ -8,6 +8,7 @@ m_translate.c m_vector.c m_xform.c -) + precomp.h) -add_library(mesa_math STATIC ${SOURCE}) +add_library(mesa_math STATIC ${SOURCE}) +add_pch(mesa_math precomp.h SOURCE) Modified: trunk/reactos/dll/opengl/mesa/swrast/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/swrast/CMa… ============================================================================== --- trunk/reactos/dll/opengl/mesa/swrast/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/swrast/CMakeLists.txt [iso-8859-1] Tue Feb 11 21:29:23 2014 @@ -25,9 +25,10 @@ s_texture.c s_triangle.c s_zoom.c -) + precomp.h) add_library(mesa_swrast STATIC ${SOURCE}) +add_pch(mesa_swrast precomp.h SOURCE) if(NOT MSVC) allow_warnings(mesa_swrast) endif() Modified: trunk/reactos/dll/opengl/mesa/tnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/tnl/CMakeL… ============================================================================== --- trunk/reactos/dll/opengl/mesa/tnl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/tnl/CMakeLists.txt [iso-8859-1] Tue Feb 11 21:29:23 2014 @@ -15,6 +15,7 @@ t_vertex.c t_vertex_generic.c t_vertex_sse.c -) + precomp.h) -add_library(mesa_tnl STATIC ${SOURCE}) +add_library(mesa_tnl STATIC ${SOURCE}) +add_pch(mesa_tnl precomp.h SOURCE) Modified: trunk/reactos/dll/opengl/mesa/vbo/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/vbo/CMakeL… ============================================================================== --- trunk/reactos/dll/opengl/mesa/vbo/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/vbo/CMakeLists.txt [iso-8859-1] Tue Feb 11 21:29:23 2014 @@ -15,6 +15,7 @@ vbo_save_api.c vbo_save_draw.c vbo_save_loopback.c -) + precomp.h) -add_library(mesa_vbo STATIC ${SOURCE}) +add_library(mesa_vbo STATIC ${SOURCE}) +add_pch(mesa_vbo precomp.h SOURCE) Modified: trunk/reactos/dll/opengl/opengl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/opengl32/CMakeL… ============================================================================== --- trunk/reactos/dll/opengl/opengl32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/opengl32/CMakeLists.txt [iso-8859-1] Tue Feb 11 21:29:23 2014 @@ -20,9 +20,8 @@ swimpl.c wgl.c wgl_font.c - ${CMAKE_CURRENT_BINARY_DIR}/opengl32_stubs.c - ${CMAKE_CURRENT_BINARY_DIR}/opengl32.def -) + opengl32.h + ${CMAKE_CURRENT_BINARY_DIR}/opengl32_stubs.c) set_source_files_properties(gcrt0.o libgmon.a PROPERTIES EXTERNAL_OBJECT TRUE) @@ -33,7 +32,11 @@ ) endif() -add_library(opengl32 SHARED ${SOURCE} ${opengl32_asm}) +add_library(opengl32 SHARED + ${SOURCE} + ${opengl32_asm} + ${CMAKE_CURRENT_BINARY_DIR}/opengl32.def) + target_link_libraries(opengl32 wine ${PSEH_LIB} @@ -53,4 +56,5 @@ set_module_type(opengl32 win32dll) add_importlibs(opengl32 gdi32 user32 advapi32 msvcrt kernel32 ntdll) +add_pch(opengl32 opengl32.h SOURCE) add_cd_file(TARGET opengl32 DESTINATION reactos/system32 FOR all)

1 0

[tkreuzer] 62120: [NTOSKRNL] Halfplement NtOpenObjectAuditAlarm, Initialize the privilege set in NtAccessCheck
by tkreuzer＠svn.reactos.org 11 Feb '14

11 Feb '14

Author: tkreuzer Date: Tue Feb 11 19:15:53 2014 New Revision: 62120 URL: http://svn.reactos.org/svn/reactos?rev=62120&view=rev Log: [NTOSKRNL] Halfplement NtOpenObjectAuditAlarm, Initialize the privilege set in NtAccessCheck Modified: trunk/reactos/ntoskrnl/se/accesschk.c trunk/reactos/ntoskrnl/se/audit.c Modified: trunk/reactos/ntoskrnl/se/accesschk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/accesschk.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/se/accesschk.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/accesschk.c [iso-8859-1] Tue Feb 11 19:15:53 2014 @@ -602,6 +602,9 @@ ProbeForWrite(PrivilegeSet, *PrivilegeSetLength, sizeof(ULONG)); ProbeForWrite(GrantedAccess, sizeof(ACCESS_MASK), sizeof(ULONG)); ProbeForWrite(AccessStatus, sizeof(NTSTATUS), sizeof(ULONG)); + + /* Initialize the privilege set */ + PrivilegeSet->PrivilegeCount = 0; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { Modified: trunk/reactos/ntoskrnl/se/audit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/audit.c?rev=62… ============================================================================== --- trunk/reactos/ntoskrnl/se/audit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/audit.c [iso-8859-1] Tue Feb 11 19:15:53 2014 @@ -900,23 +900,267 @@ return STATUS_NOT_IMPLEMENTED; } - -NTSTATUS NTAPI -NtOpenObjectAuditAlarm(IN PUNICODE_STRING SubsystemName, - IN PVOID HandleId, - IN PUNICODE_STRING ObjectTypeName, - IN PUNICODE_STRING ObjectName, - IN PSECURITY_DESCRIPTOR SecurityDescriptor, - IN HANDLE ClientToken, - IN ULONG DesiredAccess, - IN ULONG GrantedAccess, - IN PPRIVILEGE_SET Privileges, - IN BOOLEAN ObjectCreation, - IN BOOLEAN AccessGranted, - OUT PBOOLEAN GenerateOnClose) -{ +VOID +NTAPI +SepOpenObjectAuditAlarm( + _In_ PSECURITY_SUBJECT_CONTEXT SubjectContext, + _In_ PUNICODE_STRING SubsystemName, + _In_opt_ PVOID HandleId, + _In_ PUNICODE_STRING ObjectTypeName, + _In_ PUNICODE_STRING ObjectName, + _In_opt_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _In_ PTOKEN ClientToken, + _In_ ACCESS_MASK DesiredAccess, + _In_ ACCESS_MASK GrantedAccess, + _In_opt_ PPRIVILEGE_SET Privileges, + _In_ BOOLEAN ObjectCreation, + _In_ BOOLEAN AccessGranted, + _Out_ PBOOLEAN GenerateOnClose) +{ + DBG_UNREFERENCED_PARAMETER(SubjectContext); + DBG_UNREFERENCED_PARAMETER(SubsystemName); + DBG_UNREFERENCED_PARAMETER(HandleId); + DBG_UNREFERENCED_PARAMETER(ObjectTypeName); + DBG_UNREFERENCED_PARAMETER(ObjectName); + DBG_UNREFERENCED_PARAMETER(SecurityDescriptor); + DBG_UNREFERENCED_PARAMETER(ClientToken); + DBG_UNREFERENCED_PARAMETER(DesiredAccess); + DBG_UNREFERENCED_PARAMETER(GrantedAccess); + DBG_UNREFERENCED_PARAMETER(Privileges); + DBG_UNREFERENCED_PARAMETER(ObjectCreation); + DBG_UNREFERENCED_PARAMETER(AccessGranted); UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + *GenerateOnClose = FALSE; +} + +__kernel_entry +NTSTATUS +NTAPI +NtOpenObjectAuditAlarm( + _In_ PUNICODE_STRING SubsystemName, + _In_opt_ PVOID HandleId, + _In_ PUNICODE_STRING ObjectTypeName, + _In_ PUNICODE_STRING ObjectName, + _In_opt_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _In_ HANDLE ClientTokenHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ ACCESS_MASK GrantedAccess, + _In_opt_ PPRIVILEGE_SET PrivilegeSet, + _In_ BOOLEAN ObjectCreation, + _In_ BOOLEAN AccessGranted, + _Out_ PBOOLEAN GenerateOnClose) +{ + PTOKEN ClientToken; + PSECURITY_DESCRIPTOR CapturedSecurityDescriptor; + UNICODE_STRING CapturedSubsystemName, CapturedObjectTypeName, CapturedObjectName; + ULONG PrivilegeCount, PrivilegeSetSize; + volatile PPRIVILEGE_SET CapturedPrivilegeSet; + BOOLEAN LocalGenerateOnClose; + PVOID CapturedHandleId; + SECURITY_SUBJECT_CONTEXT SubjectContext; + NTSTATUS Status; + PAGED_CODE(); + + /* Only user mode is supported! */ + ASSERT(ExGetPreviousMode() != KernelMode); + + /* Start clean */ + ClientToken = NULL; + CapturedSecurityDescriptor = NULL; + CapturedPrivilegeSet = NULL; + CapturedSubsystemName.Buffer = NULL; + CapturedObjectTypeName.Buffer = NULL; + CapturedObjectName.Buffer = NULL; + + /* Reference the client token */ + Status = ObReferenceObjectByHandle(ClientTokenHandle, + TOKEN_QUERY, + SeTokenObjectType, + UserMode, + (PVOID*)&ClientToken, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to reference token handle %p: %lx\n", + ClientTokenHandle, Status); + return Status; + } + + /* Validate the token's impersonation level */ + if ((ClientToken->TokenType == TokenImpersonation) && + (ClientToken->ImpersonationLevel < SecurityIdentification)) + { + DPRINT1("Invalid impersonation level (%u)\n", ClientToken->ImpersonationLevel); + Status = STATUS_BAD_IMPERSONATION_LEVEL; + goto Cleanup; + } + + /* Check for audit privilege */ + if (!SeSinglePrivilegeCheck(SeAuditPrivilege, UserMode)) + { + DPRINT1("Caller does not have SeAuditPrivilege\n"); + Status = STATUS_PRIVILEGE_NOT_HELD; + goto Cleanup; + } + + /* Check for NULL SecurityDescriptor */ + if (SecurityDescriptor == NULL) + { + /* Nothing to do */ + Status = STATUS_SUCCESS; + goto Cleanup; + } + + /* Capture the security descriptor */ + Status = SeCaptureSecurityDescriptor(SecurityDescriptor, + UserMode, + PagedPool, + FALSE, + &CapturedSecurityDescriptor); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to capture security descriptor!\n"); + goto Cleanup; + } + + _SEH2_TRY + { + /* Check if we have a privilege set */ + if (PrivilegeSet != NULL) + { + /* Probe the basic privilege set structure */ + ProbeForRead(PrivilegeSet, sizeof(PRIVILEGE_SET), sizeof(ULONG)); + + /* Validate privilege count */ + PrivilegeCount = PrivilegeSet->PrivilegeCount; + if (PrivilegeCount > SEP_PRIVILEGE_SET_MAX_COUNT) + { + Status = STATUS_INVALID_PARAMETER; + goto Cleanup; + } + + /* Calculate the size of the PrivilegeSet structure */ + PrivilegeSetSize = FIELD_OFFSET(PRIVILEGE_SET, Privilege[PrivilegeCount]); + + /* Probe the whole structure */ + ProbeForRead(PrivilegeSet, PrivilegeSetSize, sizeof(ULONG)); + + /* Allocate a temp buffer */ + CapturedPrivilegeSet = ExAllocatePoolWithTag(PagedPool, + PrivilegeSetSize, + 'rPeS'); + if (CapturedPrivilegeSet == NULL) + { + DPRINT1("Failed to allocate %u bytes\n", PrivilegeSetSize); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Cleanup; + } + + /* Copy the privileges */ + RtlCopyMemory(CapturedPrivilegeSet, PrivilegeSet, PrivilegeSetSize); + } + + if (HandleId != NULL) + { + ProbeForRead(HandleId, sizeof(PVOID), sizeof(PVOID)); + CapturedHandleId = *(PVOID*)HandleId; + } + + ProbeForWrite(GenerateOnClose, sizeof(BOOLEAN), sizeof(BOOLEAN)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + DPRINT1("Exception while probing parameters: 0x%lx\n", Status); + goto Cleanup; + } + _SEH2_END; + + /* Probe and capture the subsystem name */ + Status = ProbeAndCaptureUnicodeString(&CapturedSubsystemName, + UserMode, + SubsystemName); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to capture subsystem name!\n"); + goto Cleanup; + } + + /* Probe and capture the object type name */ + Status = ProbeAndCaptureUnicodeString(&CapturedObjectTypeName, + UserMode, + ObjectTypeName); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to capture object type name!\n"); + goto Cleanup; + } + + /* Probe and capture the object name */ + Status = ProbeAndCaptureUnicodeString(&CapturedObjectName, + UserMode, + ObjectName); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to capture object name!\n"); + goto Cleanup; + } + + /* Capture the security subject context */ + SeCaptureSubjectContext(&SubjectContext); + + /* Call the internal function */ + SepOpenObjectAuditAlarm(&SubjectContext, + &CapturedSubsystemName, + CapturedHandleId, + &CapturedObjectTypeName, + &CapturedObjectName, + CapturedSecurityDescriptor, + ClientToken, + DesiredAccess, + GrantedAccess, + CapturedPrivilegeSet, + ObjectCreation, + AccessGranted, + &LocalGenerateOnClose); + + /* Release the security subject context */ + SeReleaseSubjectContext(&SubjectContext); + + Status = STATUS_SUCCESS; + + /* Enter SEH to copy the data back to user mode */ + _SEH2_TRY + { + *GenerateOnClose = LocalGenerateOnClose; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + DPRINT1("Exception while copying back data: 0x%lx\n", Status); + } + _SEH2_END; + +Cleanup: + + if (CapturedObjectName.Buffer != NULL) + ReleaseCapturedUnicodeString(&CapturedObjectName, UserMode); + + if (CapturedObjectTypeName.Buffer != NULL) + ReleaseCapturedUnicodeString(&CapturedObjectTypeName, UserMode); + + if (CapturedSubsystemName.Buffer != NULL) + ReleaseCapturedUnicodeString(&CapturedSubsystemName, UserMode); + + if (CapturedSecurityDescriptor != NULL) + SeReleaseSecurityDescriptor(CapturedSecurityDescriptor, UserMode, FALSE); + + if (CapturedPrivilegeSet != NULL) + ExFreePoolWithTag(CapturedPrivilegeSet, 'rPeS'); + + ObDereferenceObject(ClientToken); + + return Status; } @@ -926,12 +1170,12 @@ NtPrivilegedServiceAuditAlarm( _In_opt_ PUNICODE_STRING SubsystemName, _In_opt_ PUNICODE_STRING ServiceName, - _In_ HANDLE ClientToken, + _In_ HANDLE ClientTokenHandle, _In_ PPRIVILEGE_SET Privileges, _In_ BOOLEAN AccessGranted ) { KPROCESSOR_MODE PreviousMode; - PTOKEN Token; + PTOKEN ClientToken; volatile PPRIVILEGE_SET CapturedPrivileges = NULL; UNICODE_STRING CapturedSubsystemName; UNICODE_STRING CapturedServiceName; @@ -948,11 +1192,11 @@ CapturedServiceName.Buffer = NULL; /* Reference the client token */ - Status = ObReferenceObjectByHandle(ClientToken, + Status = ObReferenceObjectByHandle(ClientTokenHandle, TOKEN_QUERY, SeTokenObjectType, PreviousMode, - (PVOID*)&Token, + (PVOID*)&ClientToken, NULL); if (!NT_SUCCESS(Status)) { @@ -961,11 +1205,11 @@ } /* Validate the token's impersonation level */ - if ((Token->TokenType == TokenImpersonation) && - (Token->ImpersonationLevel < SecurityIdentification)) - { - DPRINT1("Invalid impersonation level (%u)\n", Token->ImpersonationLevel); - ObfDereferenceObject(Token); + if ((ClientToken->TokenType == TokenImpersonation) && + (ClientToken->ImpersonationLevel < SecurityIdentification)) + { + DPRINT1("Invalid impersonation level (%u)\n", ClientToken->ImpersonationLevel); + ObDereferenceObject(ClientToken); return STATUS_BAD_IMPERSONATION_LEVEL; } @@ -973,7 +1217,7 @@ if (!SeSinglePrivilegeCheck(SeAuditPrivilege, PreviousMode)) { DPRINT1("Caller does not have SeAuditPrivilege\n"); - ObfDereferenceObject(Token); + ObDereferenceObject(ClientToken); return STATUS_PRIVILEGE_NOT_HELD; } @@ -1053,7 +1297,7 @@ SepAdtPrivilegedServiceAuditAlarm(&SubjectContext, SubsystemName ? &CapturedSubsystemName : NULL, ServiceName ? &CapturedServiceName : NULL, - Token, + ClientToken, SubjectContext.PrimaryToken, CapturedPrivileges, AccessGranted); @@ -1067,11 +1311,14 @@ /* Cleanup resources */ if (CapturedSubsystemName.Buffer != NULL) ReleaseCapturedUnicodeString(&CapturedSubsystemName, PreviousMode); + if (CapturedServiceName.Buffer != NULL) ReleaseCapturedUnicodeString(&CapturedServiceName, PreviousMode); + if (CapturedPrivileges != NULL) - ExFreePoolWithTag(CapturedPrivileges, 0); - ObDereferenceObject(Token); + ExFreePoolWithTag(CapturedPrivileges, 'rPeS'); + + ObDereferenceObject(ClientToken); return Status; }

1 0

[tkreuzer] 62119: [BASEADDRESSES] Change base addresses of a few dlls (ntdll, kernel32, user32, gdi32, advapi32, msvcrt) to avoid conflicts with windows dlls.
by tkreuzer＠svn.reactos.org 11 Feb '14

11 Feb '14

Author: tkreuzer Date: Tue Feb 11 19:08:01 2014 New Revision: 62119 URL: http://svn.reactos.org/svn/reactos?rev=62119&view=rev Log: [BASEADDRESSES] Change base addresses of a few dlls (ntdll, kernel32, user32, gdi32, advapi32, msvcrt) to avoid conflicts with windows dlls. Modified: trunk/reactos/cmake/baseaddress.cmake Modified: trunk/reactos/cmake/baseaddress.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/baseaddress.cmake?re… ============================================================================== --- trunk/reactos/cmake/baseaddress.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/baseaddress.cmake [iso-8859-1] Tue Feb 11 19:08:01 2014 @@ -1,9 +1,9 @@ -set(baseaddress_ntdll 0x77f10000) -set(baseaddress_kernel32 0x77d80000) -set(baseaddress_msvcrt 0x77cd0000) -set(baseaddress_advapi32 0x77c20000) -set(baseaddress_gdi32 0x77bb0000) -set(baseaddress_user32 0x77a20000) +set(baseaddress_ntdll 0x7c920000) # should be above 0x7c920000 +set(baseaddress_kernel32 0x7c800000) # matches w2k3 FRE/CHK @ 0x7c800000 +set(baseaddress_user32 0x77e20000) # not relocatable, avoid conflicts with win +set(baseaddress_gdi32 0x77d80000) +set(baseaddress_advapi32 0x77c80000) +set(baseaddress_msvcrt 0x77b80000) set(baseaddress_dhcpcsvc 0x779d0000) set(baseaddress_dnsapi 0x77980000) set(baseaddress_icmp 0x77950000)

1 0

[gadamopoulos] 62118: - Improve filebrowser a bit and add some FIXMEs to show what should be done later
by gadamopoulos＠svn.reactos.org 11 Feb '14

11 Feb '14

Author: gadamopoulos Date: Tue Feb 11 14:06:26 2014 New Revision: 62118 URL: http://svn.reactos.org/svn/reactos?rev=62118&view=rev Log: - Improve filebrowser a bit and add some FIXMEs to show what should be done later Modified: branches/shell-experiments/base/shell/filebrowser/filebrowser.c branches/shell-experiments/base/shell/rshell/CDesktopBrowser.cpp branches/shell-experiments/base/shell/rshell/CStartMenu.cpp Modified: branches/shell-experiments/base/shell/filebrowser/filebrowser.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/fi… ============================================================================== --- branches/shell-experiments/base/shell/filebrowser/filebrowser.c [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/filebrowser/filebrowser.c [iso-8859-1] Tue Feb 11 14:06:26 2014 @@ -37,7 +37,8 @@ SHOpenNewFrame((LPITEMIDLIST)pidlDrives, NULL, 0, 0); } - Sleep(3000); + /* FIXME: we should wait a bit here and see if a window was created. If not we should exit this process */ + ExitThread(0); return 0; } Modified: branches/shell-experiments/base/shell/rshell/CDesktopBrowser.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CDesktopBrowser.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CDesktopBrowser.cpp [iso-8859-1] Tue Feb 11 14:06:26 2014 @@ -269,19 +269,9 @@ HRESULT STDMETHODCALLTYPE CDesktopBrowser::BrowseObject(LPCITEMIDLIST pidl, UINT wFlags) { - /* - * We should use IShellWindows interface here in order to attempt to - * find an open shell window that shows the requested pidl and activate it - */ - -#if 0 - HMODULE hBrowseui = LoadLibraryW(L"browseui.dll"); - if (hBrowseui) - { - SH_OPEN_NEW_FRAME SHOpenNewFrame = (SH_OPEN_NEW_FRAME)GetProcAddress(hBrowseui, (LPCSTR)103); - return SHOpenNewFrame((LPITEMIDLIST)pidl, NULL, 0, 0); - } -#endif + /* FIXME: Implement executing filebrowser.exe and somehow pass the pidl to it */ + + /* Returning failure here will make windows 7 and 8 to use the default file browser */ return E_FAIL; } Modified: branches/shell-experiments/base/shell/rshell/CStartMenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CStartMenu.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CStartMenu.cpp [iso-8859-1] Tue Feb 11 14:06:26 2014 @@ -300,6 +300,9 @@ if (FAILED(hr)) return NULL; + /* FIXME: Use CLSID_MergedFolder class and IID_IAugmentedShellFolder2 interface here */ + /* CLSID_MergedFolder 26fdc864-be88-46e7-9235-032d8ea5162e */ + /* IID_IAugmentedShellFolder2 8db3b3f4-6cfe-11d1-8ae9-00c04fd918d0 */ hr = SHGetFolderLocation(NULL, CSIDL_STARTMENU, 0, 0, &pidlStartMenu); hr = SHGetDesktopFolder(&shellFolder); hr = shellFolder->BindToObject(pidlStartMenu, NULL, IID_IShellFolder, (void**)&psfStartMenu);

1 0

[bfreisen] 62117: [MSPAINT] restructuring: - put window class initialization where it belongs - add separate window procedure for the scroll box class
by bfreisen＠svn.reactos.org 11 Feb '14

11 Feb '14

Author: bfreisen Date: Tue Feb 11 11:48:15 2014 New Revision: 62117 URL: http://svn.reactos.org/svn/reactos?rev=62117&view=rev Log: [MSPAINT] restructuring: - put window class initialization where it belongs - add separate window procedure for the scroll box class Added: trunk/reactos/base/applications/mspaint/scrollbox.c (with props) trunk/reactos/base/applications/mspaint/scrollbox.h (with props) Modified: trunk/reactos/base/applications/mspaint/CMakeLists.txt trunk/reactos/base/applications/mspaint/main.c trunk/reactos/base/applications/mspaint/palette.c trunk/reactos/base/applications/mspaint/palette.h trunk/reactos/base/applications/mspaint/selection.c trunk/reactos/base/applications/mspaint/selection.h trunk/reactos/base/applications/mspaint/sizebox.c trunk/reactos/base/applications/mspaint/sizebox.h trunk/reactos/base/applications/mspaint/textedit.c trunk/reactos/base/applications/mspaint/textedit.h trunk/reactos/base/applications/mspaint/toolsettings.c trunk/reactos/base/applications/mspaint/toolsettings.h trunk/reactos/base/applications/mspaint/winproc.c trunk/reactos/base/applications/mspaint/winproc.h Modified: trunk/reactos/base/applications/mspaint/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/CMakeLists.txt [iso-8859-1] Tue Feb 11 11:48:15 2014 @@ -8,6 +8,7 @@ mouse.c palette.c registry.c + scrollbox.c selection.c sizebox.c textedit.c Modified: trunk/reactos/base/applications/mspaint/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/main.c [iso-8859-1] Tue Feb 11 11:48:15 2014 @@ -11,6 +11,7 @@ #include "precomp.h" #include "winproc.h" +#include "scrollbox.h" #include "palette.h" #include "toolsettings.h" #include "selection.h" @@ -138,13 +139,6 @@ { HWND hwnd; /* This is the handle for our window */ MSG messages; /* Here messages to the application are saved */ - - WNDCLASSEX wclScroll; - WNDCLASSEX wincl; - WNDCLASSEX wclPal; - WNDCLASSEX wclSettings; - WNDCLASSEX wclSelection; - WNDCLASSEX wclTextEdit; TCHAR progtitle[1000]; TCHAR resstr[100]; @@ -192,113 +186,17 @@ hProgInstance = hThisInstance; - /* Necessary */ + /* initialize common controls library */ InitCommonControls(); - /* initializing and registering the window class used for the main window */ - wincl.hInstance = hThisInstance; - wincl.lpszClassName = _T("WindowsApp"); - wincl.lpfnWndProc = WindowProcedure; - wincl.style = CS_DBLCLKS; - wincl.cbSize = sizeof(WNDCLASSEX); - wincl.hIcon = LoadIcon(hThisInstance, MAKEINTRESOURCE(IDI_APPICON)); - wincl.hIconSm = LoadIcon(hThisInstance, MAKEINTRESOURCE(IDI_APPICON)); - wincl.hCursor = LoadCursor(NULL, IDC_ARROW); - wincl.lpszMenuName = NULL; - wincl.cbClsExtra = 0; - wincl.cbWndExtra = 0; - wincl.hbrBackground = GetSysColorBrush(COLOR_BTNFACE); - RegisterClassEx (&wincl); - - /* initializing and registering the window class used for the scroll box */ - wclScroll.hInstance = hThisInstance; - wclScroll.lpszClassName = _T("Scrollbox"); - wclScroll.lpfnWndProc = WindowProcedure; - wclScroll.style = 0; - wclScroll.cbSize = sizeof(WNDCLASSEX); - wclScroll.hIcon = NULL; - wclScroll.hIconSm = NULL; - wclScroll.hCursor = LoadCursor(NULL, IDC_ARROW); - wclScroll.lpszMenuName = NULL; - wclScroll.cbClsExtra = 0; - wclScroll.cbWndExtra = 0; - wclScroll.hbrBackground = GetSysColorBrush(COLOR_APPWORKSPACE); - RegisterClassEx (&wclScroll); - - /* initializing and registering the window class used for the palette window */ - wclPal.hInstance = hThisInstance; - wclPal.lpszClassName = _T("Palette"); - wclPal.lpfnWndProc = PalWinProc; - wclPal.style = CS_DBLCLKS; - wclPal.cbSize = sizeof(WNDCLASSEX); - wclPal.hIcon = NULL; - wclPal.hIconSm = NULL; - wclPal.hCursor = LoadCursor(NULL, IDC_ARROW); - wclPal.lpszMenuName = NULL; - wclPal.cbClsExtra = 0; - wclPal.cbWndExtra = 0; - wclPal.hbrBackground = GetSysColorBrush(COLOR_BTNFACE); - RegisterClassEx (&wclPal); - - /* initializing and registering the window class for the settings window */ - wclSettings.hInstance = hThisInstance; - wclSettings.lpszClassName = _T("ToolSettings"); - wclSettings.lpfnWndProc = SettingsWinProc; - wclSettings.style = CS_DBLCLKS; - wclSettings.cbSize = sizeof(WNDCLASSEX); - wclSettings.hIcon = NULL; - wclSettings.hIconSm = NULL; - wclSettings.hCursor = LoadCursor(NULL, IDC_ARROW); - wclSettings.lpszMenuName = NULL; - wclSettings.cbClsExtra = 0; - wclSettings.cbWndExtra = 0; - wclSettings.hbrBackground = GetSysColorBrush(COLOR_BTNFACE); - RegisterClassEx (&wclSettings); - - /* initializing and registering the window class for the selection frame */ - wclSelection.hInstance = hThisInstance; - wclSelection.lpszClassName = _T("Selection"); - wclSelection.lpfnWndProc = SelectionWinProc; - wclSelection.style = CS_DBLCLKS; - wclSelection.cbSize = sizeof(WNDCLASSEX); - wclSelection.hIcon = NULL; - wclSelection.hIconSm = NULL; - wclSelection.hCursor = LoadCursor(NULL, IDC_SIZEALL); - wclSelection.lpszMenuName = NULL; - wclSelection.cbClsExtra = 0; - wclSelection.cbWndExtra = 0; - wclSelection.hbrBackground = NULL; - RegisterClassEx (&wclSelection); - - /* initializing and registering the window class for the size boxes */ - wclSettings.hInstance = hThisInstance; - wclSettings.lpszClassName = _T("Sizebox"); - wclSettings.lpfnWndProc = SizeboxWinProc; - wclSettings.style = CS_DBLCLKS; - wclSettings.cbSize = sizeof(WNDCLASSEX); - wclSettings.hIcon = NULL; - wclSettings.hIconSm = NULL; - wclSettings.hCursor = LoadCursor(NULL, IDC_ARROW); - wclSettings.lpszMenuName = NULL; - wclSettings.cbClsExtra = 0; - wclSettings.cbWndExtra = 0; - wclSettings.hbrBackground = GetSysColorBrush(COLOR_HIGHLIGHT); - RegisterClassEx (&wclSettings); - - /* initializing and registering the window class used for the text editor */ - wclTextEdit.hInstance = hThisInstance; - wclTextEdit.lpszClassName = _T("TextEdit"); - wclTextEdit.lpfnWndProc = TextEditWinProc; - wclTextEdit.style = CS_DBLCLKS; - wclTextEdit.cbSize = sizeof(WNDCLASSEX); - wclTextEdit.hIcon = LoadIcon(hThisInstance, MAKEINTRESOURCE(IDI_APPICON)); - wclTextEdit.hIconSm = LoadIcon(hThisInstance, MAKEINTRESOURCE(IDI_APPICON)); - wclTextEdit.hCursor = LoadCursor(NULL, IDC_ARROW); - wclTextEdit.lpszMenuName = NULL; - wclTextEdit.cbClsExtra = 0; - wclTextEdit.cbWndExtra = 0; - wclTextEdit.hbrBackground = GetSysColorBrush(COLOR_BTNFACE); - RegisterClassEx (&wclTextEdit); + /* register application defined window classes */ + RegisterWclMain(); + RegisterWclScrollbox(); + RegisterWclPal(); + RegisterWclSettings(); + RegisterWclSelection(); + RegisterWclSizebox(); + RegisterWclTextEdit(); LoadString(hThisInstance, IDS_DEFAULTFILENAME, filename, SIZEOF(filename)); LoadString(hThisInstance, IDS_WINDOWTITLE, resstr, SIZEOF(resstr)); @@ -307,12 +205,12 @@ /* create main window */ hwnd = - CreateWindowEx(0, _T("WindowsApp"), progtitle, WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, 544, + CreateWindowEx(0, _T("MainWindow"), progtitle, WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, 544, 375, HWND_DESKTOP, NULL, hThisInstance, NULL); hMainWnd = hwnd; hwndMiniature = - CreateWindowEx(WS_EX_PALETTEWINDOW, _T("WindowsApp"), miniaturetitle, + CreateWindowEx(WS_EX_PALETTEWINDOW, _T("MainWindow"), miniaturetitle, WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME, 180, 200, 120, 100, hwnd, NULL, hThisInstance, NULL); @@ -337,7 +235,7 @@ hThisInstance, NULL); hToolBoxContainer = - CreateWindowEx(0, _T("WindowsApp"), _T(""), WS_CHILD | WS_VISIBLE, 2, 2, 52, 350, hwnd, NULL, + CreateWindowEx(0, _T("MainWindow"), _T(""), WS_CHILD | WS_VISIBLE, 2, 2, 52, 350, hwnd, NULL, hThisInstance, NULL); /* creating the 16 bitmap radio buttons and setting the bitmap */ @@ -417,7 +315,7 @@ /* creating the window inside the scroll box, on which the image in hDrawingDC's bitmap is drawn */ hImageArea = - CreateWindowEx(0, _T("Scrollbox"), _T(""), WS_CHILD | WS_VISIBLE, 3, 3, imgXRes, imgYRes, hScrlClient, + CreateWindowEx(0, _T("MainWindow"), _T(""), WS_CHILD | WS_VISIBLE, 3, 3, imgXRes, imgYRes, hScrlClient, NULL, hThisInstance, NULL); hDC = GetDC(hImageArea); Modified: trunk/reactos/base/applications/mspaint/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/palette.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/palette.c [iso-8859-1] Tue Feb 11 11:48:15 2014 @@ -9,8 +9,29 @@ /* INCLUDES *********************************************************/ #include "precomp.h" +#include "palette.h" /* FUNCTIONS ********************************************************/ + +void +RegisterWclPal() +{ + WNDCLASSEX wclPal; + /* initializing and registering the window class used for the palette window */ + wclPal.hInstance = hProgInstance; + wclPal.lpszClassName = _T("Palette"); + wclPal.lpfnWndProc = PalWinProc; + wclPal.style = CS_DBLCLKS; + wclPal.cbSize = sizeof(WNDCLASSEX); + wclPal.hIcon = NULL; + wclPal.hIconSm = NULL; + wclPal.hCursor = LoadCursor(NULL, IDC_ARROW); + wclPal.lpszMenuName = NULL; + wclPal.cbClsExtra = 0; + wclPal.cbWndExtra = 0; + wclPal.hbrBackground = GetSysColorBrush(COLOR_BTNFACE); + RegisterClassEx (&wclPal); +} LRESULT CALLBACK PalWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) Modified: trunk/reactos/base/applications/mspaint/palette.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/palette.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/palette.h [iso-8859-1] Tue Feb 11 11:48:15 2014 @@ -6,4 +6,6 @@ * PROGRAMMERS: Benedikt Freisen */ +void RegisterWclPal(); + LRESULT CALLBACK PalWinProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam); Added: trunk/reactos/base/applications/mspaint/scrollbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/scrollbox.c (added) +++ trunk/reactos/base/applications/mspaint/scrollbox.c [iso-8859-1] Tue Feb 11 11:48:15 2014 @@ -0,0 +1,142 @@ +/* + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL + * FILE: scrollbox.c + * PURPOSE: Functionality surrounding the scroll box window class + * PROGRAMMERS: Benedikt Freisen + */ + +/* INCLUDES *********************************************************/ + +#include "precomp.h" +#include "scrollbox.h" + +/* FUNCTIONS ********************************************************/ + +void +RegisterWclScrollbox() +{ + WNDCLASSEX wclScroll; + /* initializing and registering the window class used for the scroll box */ + wclScroll.hInstance = hProgInstance; + wclScroll.lpszClassName = _T("Scrollbox"); + wclScroll.lpfnWndProc = ScrollboxWinProc; + wclScroll.style = 0; + wclScroll.cbSize = sizeof(WNDCLASSEX); + wclScroll.hIcon = NULL; + wclScroll.hIconSm = NULL; + wclScroll.hCursor = LoadCursor(NULL, IDC_ARROW); + wclScroll.lpszMenuName = NULL; + wclScroll.cbClsExtra = 0; + wclScroll.cbWndExtra = 0; + wclScroll.hbrBackground = GetSysColorBrush(COLOR_APPWORKSPACE); + RegisterClassEx (&wclScroll); +} + +void +UpdateScrollbox() +{ + RECT clientRectScrollbox; + RECT clientRectImageArea; + SCROLLINFO si; + GetClientRect(hScrollbox, &clientRectScrollbox); + GetClientRect(hImageArea, &clientRectImageArea); + si.cbSize = sizeof(SCROLLINFO); + si.fMask = SIF_PAGE | SIF_RANGE; + si.nMax = clientRectImageArea.right + 6 - 1; + si.nMin = 0; + si.nPage = clientRectScrollbox.right; + SetScrollInfo(hScrollbox, SB_HORZ, &si, TRUE); + GetClientRect(hScrollbox, &clientRectScrollbox); + si.nMax = clientRectImageArea.bottom + 6 - 1; + si.nPage = clientRectScrollbox.bottom; + SetScrollInfo(hScrollbox, SB_VERT, &si, TRUE); + MoveWindow(hScrlClient, + -GetScrollPos(hScrollbox, SB_HORZ), -GetScrollPos(hScrollbox, SB_VERT), + max(clientRectImageArea.right + 6, clientRectScrollbox.right), + max(clientRectImageArea.bottom + 6, clientRectScrollbox.bottom), TRUE); +} + +LRESULT CALLBACK +ScrollboxWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + switch (message) + { + case WM_SIZE: + if (hwnd == hScrollbox) + { + UpdateScrollbox(); + } + break; + case WM_HSCROLL: + if (hwnd == hScrollbox) + { + SCROLLINFO si; + si.cbSize = sizeof(SCROLLINFO); + si.fMask = SIF_ALL; + GetScrollInfo(hScrollbox, SB_HORZ, &si); + switch (LOWORD(wParam)) + { + case SB_THUMBTRACK: + case SB_THUMBPOSITION: + si.nPos = HIWORD(wParam); + break; + case SB_LINELEFT: + si.nPos -= 5; + break; + case SB_LINERIGHT: + si.nPos += 5; + break; + case SB_PAGELEFT: + si.nPos -= si.nPage; + break; + case SB_PAGERIGHT: + si.nPos += si.nPage; + break; + } + SetScrollInfo(hScrollbox, SB_HORZ, &si, TRUE); + MoveWindow(hScrlClient, -GetScrollPos(hScrollbox, SB_HORZ), + -GetScrollPos(hScrollbox, SB_VERT), imgXRes * zoom / 1000 + 6, + imgYRes * zoom / 1000 + 6, TRUE); + } + break; + + case WM_VSCROLL: + if (hwnd == hScrollbox) + { + SCROLLINFO si; + si.cbSize = sizeof(SCROLLINFO); + si.fMask = SIF_ALL; + GetScrollInfo(hScrollbox, SB_VERT, &si); + switch (LOWORD(wParam)) + { + case SB_THUMBTRACK: + case SB_THUMBPOSITION: + si.nPos = HIWORD(wParam); + break; + case SB_LINEUP: + si.nPos -= 5; + break; + case SB_LINEDOWN: + si.nPos += 5; + break; + case SB_PAGEUP: + si.nPos -= si.nPage; + break; + case SB_PAGEDOWN: + si.nPos += si.nPage; + break; + } + SetScrollInfo(hScrollbox, SB_VERT, &si, TRUE); + MoveWindow(hScrlClient, -GetScrollPos(hScrollbox, SB_HORZ), + -GetScrollPos(hScrollbox, SB_VERT), imgXRes * zoom / 1000 + 6, + imgYRes * zoom / 1000 + 6, TRUE); + } + break; + + default: + return DefWindowProc(hwnd, message, wParam, lParam); + } + + return 0; +} Propchange: trunk/reactos/base/applications/mspaint/scrollbox.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/mspaint/scrollbox.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/scrollbox.h (added) +++ trunk/reactos/base/applications/mspaint/scrollbox.h [iso-8859-1] Tue Feb 11 11:48:15 2014 @@ -0,0 +1,13 @@ +/* + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL + * FILE: scrollbox.h + * PURPOSE: Functionality surrounding the scroll box window class + * PROGRAMMERS: Benedikt Freisen + */ + +void RegisterWclScrollbox(); + +void UpdateScrollbox(); + +LRESULT CALLBACK ScrollboxWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam); Propchange: trunk/reactos/base/applications/mspaint/scrollbox.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mspaint/selection.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/selection.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/selection.c [iso-8859-1] Tue Feb 11 11:48:15 2014 @@ -37,6 +37,26 @@ POINTS pos; POINTS frac; POINT delta; + +void +RegisterWclSelection() +{ + WNDCLASSEX wclSelection; + /* initializing and registering the window class for the selection frame */ + wclSelection.hInstance = hProgInstance; + wclSelection.lpszClassName = _T("Selection"); + wclSelection.lpfnWndProc = SelectionWinProc; + wclSelection.style = CS_DBLCLKS; + wclSelection.cbSize = sizeof(WNDCLASSEX); + wclSelection.hIcon = NULL; + wclSelection.hIconSm = NULL; + wclSelection.hCursor = LoadCursor(NULL, IDC_SIZEALL); + wclSelection.lpszMenuName = NULL; + wclSelection.cbClsExtra = 0; + wclSelection.cbWndExtra = 0; + wclSelection.hbrBackground = NULL; + RegisterClassEx (&wclSelection); +} BOOL ColorKeyedMaskBlt(HDC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, HDC hdcSrc, int nXSrc, int nYSrc, HBITMAP hbmMask, int xMask, int yMask, DWORD dwRop, COLORREF keyColor) Modified: trunk/reactos/base/applications/mspaint/selection.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/selection.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/selection.h [iso-8859-1] Tue Feb 11 11:48:15 2014 @@ -6,6 +6,8 @@ * PROGRAMMERS: Benedikt Freisen */ +void RegisterWclSelection(); + void ForceRefreshSelectionContents(); LRESULT CALLBACK SelectionWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam); Modified: trunk/reactos/base/applications/mspaint/sizebox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/sizebox.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/sizebox.c [iso-8859-1] Tue Feb 11 11:48:15 2014 @@ -9,12 +9,33 @@ /* INCLUDES *********************************************************/ #include "precomp.h" +#include "sizebox.h" /* FUNCTIONS ********************************************************/ BOOL resizing = FALSE; short xOrig; short yOrig; + +void +RegisterWclSizebox() +{ + WNDCLASSEX wclSizebox; + /* initializing and registering the window class for the size boxes */ + wclSizebox.hInstance = hProgInstance; + wclSizebox.lpszClassName = _T("Sizebox"); + wclSizebox.lpfnWndProc = SizeboxWinProc; + wclSizebox.style = CS_DBLCLKS; + wclSizebox.cbSize = sizeof(WNDCLASSEX); + wclSizebox.hIcon = NULL; + wclSizebox.hIconSm = NULL; + wclSizebox.hCursor = LoadCursor(NULL, IDC_ARROW); + wclSizebox.lpszMenuName = NULL; + wclSizebox.cbClsExtra = 0; + wclSizebox.cbWndExtra = 0; + wclSizebox.hbrBackground = GetSysColorBrush(COLOR_HIGHLIGHT); + RegisterClassEx (&wclSizebox); +} LRESULT CALLBACK SizeboxWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) Modified: trunk/reactos/base/applications/mspaint/sizebox.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/sizebox.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/sizebox.h [iso-8859-1] Tue Feb 11 11:48:15 2014 @@ -6,4 +6,6 @@ * PROGRAMMERS: Benedikt Freisen */ +void RegisterWclSizebox(); + LRESULT CALLBACK SizeboxWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam); Modified: trunk/reactos/base/applications/mspaint/textedit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/textedit.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/textedit.c [iso-8859-1] Tue Feb 11 11:48:15 2014 @@ -9,8 +9,29 @@ /* INCLUDES *********************************************************/ #include "precomp.h" +#include "textedit.h" /* FUNCTIONS ********************************************************/ + +void +RegisterWclTextEdit() +{ + WNDCLASSEX wclTextEdit; + /* initializing and registering the window class used for the text editor */ + wclTextEdit.hInstance = hProgInstance; + wclTextEdit.lpszClassName = _T("TextEdit"); + wclTextEdit.lpfnWndProc = TextEditWinProc; + wclTextEdit.style = CS_DBLCLKS; + wclTextEdit.cbSize = sizeof(WNDCLASSEX); + wclTextEdit.hIcon = LoadIcon(hProgInstance, MAKEINTRESOURCE(IDI_APPICON)); + wclTextEdit.hIconSm = LoadIcon(hProgInstance, MAKEINTRESOURCE(IDI_APPICON)); + wclTextEdit.hCursor = LoadCursor(NULL, IDC_ARROW); + wclTextEdit.lpszMenuName = NULL; + wclTextEdit.cbClsExtra = 0; + wclTextEdit.cbWndExtra = 0; + wclTextEdit.hbrBackground = GetSysColorBrush(COLOR_BTNFACE); + RegisterClassEx (&wclTextEdit); +} LRESULT CALLBACK TextEditWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) Modified: trunk/reactos/base/applications/mspaint/textedit.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/textedit.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/textedit.h [iso-8859-1] Tue Feb 11 11:48:15 2014 @@ -6,4 +6,6 @@ * PROGRAMMERS: Benedikt Freisen */ +void RegisterWclTextEdit(); + LRESULT CALLBACK TextEditWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam); Modified: trunk/reactos/base/applications/mspaint/toolsettings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/toolsettings.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/toolsettings.c [iso-8859-1] Tue Feb 11 11:48:15 2014 @@ -9,10 +9,30 @@ /* INCLUDES *********************************************************/ #include "precomp.h" +#include "toolsettings.h" /* FUNCTIONS ********************************************************/ extern void zoomTo(int, int, int); + +void RegisterWclSettings() +{ + WNDCLASSEX wclSettings; + /* initializing and registering the window class for the settings window */ + wclSettings.hInstance = hProgInstance; + wclSettings.lpszClassName = _T("ToolSettings"); + wclSettings.lpfnWndProc = SettingsWinProc; + wclSettings.style = CS_DBLCLKS; + wclSettings.cbSize = sizeof(WNDCLASSEX); + wclSettings.hIcon = NULL; + wclSettings.hIconSm = NULL; + wclSettings.hCursor = LoadCursor(NULL, IDC_ARROW); + wclSettings.lpszMenuName = NULL; + wclSettings.cbClsExtra = 0; + wclSettings.cbWndExtra = 0; + wclSettings.hbrBackground = GetSysColorBrush(COLOR_BTNFACE); + RegisterClassEx (&wclSettings); +} LRESULT CALLBACK SettingsWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) Modified: trunk/reactos/base/applications/mspaint/toolsettings.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/toolsettings.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/toolsettings.h [iso-8859-1] Tue Feb 11 11:48:15 2014 @@ -6,4 +6,6 @@ * PROGRAMMERS: Benedikt Freisen */ +void RegisterWclSettings(); + LRESULT CALLBACK SettingsWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam); Modified: trunk/reactos/base/applications/mspaint/winproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/winproc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/winproc.c [iso-8859-1] Tue Feb 11 11:48:15 2014 @@ -11,10 +11,32 @@ #include "precomp.h" +#include "winproc.h" #include "dialogs.h" #include "registry.h" +#include "scrollbox.h" /* FUNCTIONS ********************************************************/ + +void +RegisterWclMain() +{ + WNDCLASSEX wclMain; + /* initializing and registering the window class used for the main window */ + wclMain.hInstance = hProgInstance; + wclMain.lpszClassName = _T("MainWindow"); + wclMain.lpfnWndProc = MainWindowProcedure; + wclMain.style = CS_DBLCLKS; + wclMain.cbSize = sizeof(WNDCLASSEX); + wclMain.hIcon = LoadIcon(hProgInstance, MAKEINTRESOURCE(IDI_APPICON)); + wclMain.hIconSm = LoadIcon(hProgInstance, MAKEINTRESOURCE(IDI_APPICON)); + wclMain.hCursor = LoadCursor(NULL, IDC_ARROW); + wclMain.lpszMenuName = NULL; + wclMain.cbClsExtra = 0; + wclMain.cbWndExtra = 0; + wclMain.hbrBackground = GetSysColorBrush(COLOR_BTNFACE); + RegisterClassEx (&wclMain); +} void selectTool(int tool) @@ -212,7 +234,7 @@ BOOL drawing; LRESULT CALLBACK -WindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { switch (message) /* handle the messages */ { @@ -365,93 +387,9 @@ imgXRes * zoom / 1000 + 3, imgYRes * zoom / 1000 + 3, 3, 3, TRUE); } - if ((hwnd == hImageArea) || (hwnd == hScrollbox)) - { - RECT clientRectScrollbox; - RECT clientRectImageArea; - SCROLLINFO si; - GetClientRect(hScrollbox, &clientRectScrollbox); - GetClientRect(hImageArea, &clientRectImageArea); - si.cbSize = sizeof(SCROLLINFO); - si.fMask = SIF_PAGE | SIF_RANGE; - si.nMax = clientRectImageArea.right + 6 - 1; - si.nMin = 0; - si.nPage = clientRectScrollbox.right; - SetScrollInfo(hScrollbox, SB_HORZ, &si, TRUE); - GetClientRect(hScrollbox, &clientRectScrollbox); - si.nMax = clientRectImageArea.bottom + 6 - 1; - si.nPage = clientRectScrollbox.bottom; - SetScrollInfo(hScrollbox, SB_VERT, &si, TRUE); - MoveWindow(hScrlClient, - -GetScrollPos(hScrollbox, SB_HORZ), -GetScrollPos(hScrollbox, SB_VERT), - max(clientRectImageArea.right + 6, clientRectScrollbox.right), - max(clientRectImageArea.bottom + 6, clientRectScrollbox.bottom), TRUE); - } - break; - - case WM_HSCROLL: - if (hwnd == hScrollbox) - { - SCROLLINFO si; - si.cbSize = sizeof(SCROLLINFO); - si.fMask = SIF_ALL; - GetScrollInfo(hScrollbox, SB_HORZ, &si); - switch (LOWORD(wParam)) - { - case SB_THUMBTRACK: - case SB_THUMBPOSITION: - si.nPos = HIWORD(wParam); - break; - case SB_LINELEFT: - si.nPos -= 5; - break; - case SB_LINERIGHT: - si.nPos += 5; - break; - case SB_PAGELEFT: - si.nPos -= si.nPage; - break; - case SB_PAGERIGHT: - si.nPos += si.nPage; - break; - } - SetScrollInfo(hScrollbox, SB_HORZ, &si, TRUE); - MoveWindow(hScrlClient, -GetScrollPos(hScrollbox, SB_HORZ), - -GetScrollPos(hScrollbox, SB_VERT), imgXRes * zoom / 1000 + 6, - imgYRes * zoom / 1000 + 6, TRUE); - } - break; - - case WM_VSCROLL: - if (hwnd == hScrollbox) - { - SCROLLINFO si; - si.cbSize = sizeof(SCROLLINFO); - si.fMask = SIF_ALL; - GetScrollInfo(hScrollbox, SB_VERT, &si); - switch (LOWORD(wParam)) - { - case SB_THUMBTRACK: - case SB_THUMBPOSITION: - si.nPos = HIWORD(wParam); - break; - case SB_LINEUP: - si.nPos -= 5; - break; - case SB_LINEDOWN: - si.nPos += 5; - break; - case SB_PAGEUP: - si.nPos -= si.nPage; - break; - case SB_PAGEDOWN: - si.nPos += si.nPage; - break; - } - SetScrollInfo(hScrollbox, SB_VERT, &si, TRUE); - MoveWindow(hScrlClient, -GetScrollPos(hScrollbox, SB_HORZ), - -GetScrollPos(hScrollbox, SB_VERT), imgXRes * zoom / 1000 + 6, - imgYRes * zoom / 1000 + 6, TRUE); + if (hwnd == hImageArea) + { + UpdateScrollbox(); } break; Modified: trunk/reactos/base/applications/mspaint/winproc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/winproc.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/winproc.h [iso-8859-1] Tue Feb 11 11:48:15 2014 @@ -7,4 +7,6 @@ * PROGRAMMERS: Benedikt Freisen */ -LRESULT CALLBACK WindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam); +void RegisterWclMain(); + +LRESULT CALLBACK MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);

1 0

[akhaldi] 62116: [3RDPARTYDLLS] * Prepare the CMake scripts for PCH. CORE-7716
by akhaldi＠svn.reactos.org 11 Feb '14

11 Feb '14

Author: akhaldi Date: Tue Feb 11 11:12:10 2014 New Revision: 62116 URL: http://svn.reactos.org/svn/reactos?rev=62116&view=rev Log: [3RDPARTYDLLS] * Prepare the CMake scripts for PCH. CORE-7716 Modified: trunk/reactos/dll/3rdparty/libpng/CMakeLists.txt trunk/reactos/dll/3rdparty/libtiff/CMakeLists.txt trunk/reactos/dll/3rdparty/libxslt/CMakeLists.txt Modified: trunk/reactos/dll/3rdparty/libpng/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/CMakeL… ============================================================================== --- trunk/reactos/dll/3rdparty/libpng/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libpng/CMakeLists.txt [iso-8859-1] Tue Feb 11 11:12:10 2014 @@ -9,7 +9,7 @@ ${REACTOS_SOURCE_DIR}/include/reactos/libs/libpng ${REACTOS_SOURCE_DIR}/include/reactos/libs/zlib) -add_library(libpng SHARED +list(APPEND SOURCE png.c pngerror.c pngget.c @@ -24,10 +24,12 @@ pngwio.c pngwrite.c pngwtran.c - pngwutil.c) + pngwutil.c + pngpriv.h) +add_library(libpng SHARED ${SOURCE}) set_module_type(libpng win32dll) target_link_libraries(libpng zlib) add_importlibs(libpng msvcrt kernel32 ntdll) -add_dependencies(libpng psdk) +add_pch(libpng pngpriv.h SOURCE) add_cd_file(TARGET libpng DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/3rdparty/libtiff/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/CMake… ============================================================================== --- trunk/reactos/dll/3rdparty/libtiff/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libtiff/CMakeLists.txt [iso-8859-1] Tue Feb 11 11:12:10 2014 @@ -10,7 +10,7 @@ ${REACTOS_SOURCE_DIR}/include/reactos/libs/libtiff ${REACTOS_SOURCE_DIR}/include/reactos/libs/zlib) -add_library(libtiff SHARED +list(APPEND SOURCE mkg3states.c tif_aux.c tif_close.c @@ -48,12 +48,15 @@ tif_warning.c tif_win32.c tif_write.c - tif_zip.c) + tif_zip.c + precomp.h) +add_library(libtiff SHARED ${SOURCE}) set_module_type(libtiff win32dll) target_link_libraries(libtiff zlib getopt) add_importlibs(libtiff user32 msvcrt kernel32 ntdll) add_dependencies(libtiff psdk) +add_pch(libtiff precomp.h SOURCE) add_cd_file(TARGET libtiff DESTINATION reactos/system32 FOR all) if(NOT MSVC) Modified: trunk/reactos/dll/3rdparty/libxslt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/CMake… ============================================================================== --- trunk/reactos/dll/3rdparty/libxslt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libxslt/CMakeLists.txt [iso-8859-1] Tue Feb 11 11:12:10 2014 @@ -13,7 +13,7 @@ -D_WINSOCKAPI_ -DLIBXML_STATIC) -add_library(libxslt SHARED +list(APPEND SOURCE attributes.c attrvt.c documents.c @@ -32,18 +32,19 @@ variables.c xslt.c xsltlocale.c - xsltutils.c) + xsltutils.c + precomp.h) +add_library(libxslt SHARED ${SOURCE}) set_module_type(libxslt win32dll) target_link_libraries(libxslt libxml2) add_importlibs(libxslt msvcrt ws2_32 kernel32) - if(MSVC) add_importlibs(libxslt ntdll) endif() add_dependencies(libxslt psdk) -add_pch(libxslt libxslt.h) +add_pch(libxslt precomp.h SOURCE) add_cd_file(TARGET libxslt DESTINATION reactos/system32 FOR all) if(NOT MSVC)

1 0

[akhaldi] 62115: [WIN32SS] * Silence some prints.
by akhaldi＠svn.reactos.org 10 Feb '14

10 Feb '14

Author: akhaldi Date: Mon Feb 10 21:11:12 2014 New Revision: 62115 URL: http://svn.reactos.org/svn/reactos?rev=62115&view=rev Log: [WIN32SS] * Silence some prints. Modified: trunk/reactos/win32ss/user/ntuser/hook.c Modified: trunk/reactos/win32ss/user/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/hook.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/hook.c [iso-8859-1] Mon Feb 10 21:11:12 2014 @@ -35,7 +35,7 @@ ppi = PsGetCurrentProcessWin32Process(); - ERR("IntLoadHookModule. Client PID: %p\n", PsGetProcessId(ppi->peProcess)); + TRACE("IntLoadHookModule. Client PID: %p\n", PsGetProcessId(ppi->peProcess)); /* Check if this is the api hook */ if(iHookID == WH_APIHOOK) @@ -155,7 +155,7 @@ return FALSE; } - ERR("UserRegisterUserApiHook. Server PID: %p\n", PsGetProcessId(pti->ppi->peProcess)); + TRACE("UserRegisterUserApiHook. Server PID: %p\n", PsGetProcessId(pti->ppi->peProcess)); /* Register the api hook */ gpsi->dwSRVIFlags |= SRVINFO_APIHOOK;

1 0

[bfreisen] 62114: [MSPAINT] (forgot to add the files...) - Text tool allows text input (I chose a design with separate editor window)
by bfreisen＠svn.reactos.org 10 Feb '14

10 Feb '14

Author: bfreisen Date: Mon Feb 10 20:53:14 2014 New Revision: 62114 URL: http://svn.reactos.org/svn/reactos?rev=62114&view=rev Log: [MSPAINT] (forgot to add the files...) - Text tool allows text input (I chose a design with separate editor window) Added: trunk/reactos/base/applications/mspaint/textedit.c (with props) trunk/reactos/base/applications/mspaint/textedit.h (with props) Added: trunk/reactos/base/applications/mspaint/textedit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/textedit.c (added) +++ trunk/reactos/base/applications/mspaint/textedit.c [iso-8859-1] Mon Feb 10 20:53:14 2014 @@ -0,0 +1,49 @@ +/* + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL + * FILE: base/applications/paint/textedit.c + * PURPOSE: Text editor and font chooser for the text tool + * PROGRAMMERS: Benedikt Freisen + */ + +/* INCLUDES *********************************************************/ + +#include "precomp.h" + +/* FUNCTIONS ********************************************************/ + +LRESULT CALLBACK +TextEditWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + switch (message) + { + case WM_SIZE: + { + RECT clientRect; + GetClientRect(hwnd, &clientRect); + MoveWindow(hwndEditCtl, clientRect.left, clientRect.top, RECT_WIDTH(clientRect), RECT_HEIGHT(clientRect), TRUE); + break; + } + case WM_CLOSE: + ShowWindow(hwnd, SW_HIDE); + break; + case WM_COMMAND: + switch(HIWORD(wParam)) + { + case EN_UPDATE: + { + HeapFree(GetProcessHeap(), 0, textToolText); + textToolTextMaxLen = GetWindowTextLength(hwndEditCtl) + 1; + textToolText = HeapAlloc(GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS, sizeof(TCHAR) * textToolTextMaxLen); + GetWindowText(hwndEditCtl, textToolText, textToolTextMaxLen); + ForceRefreshSelectionContents(); + break; + } + } + break; + default: + return DefWindowProc(hwnd, message, wParam, lParam); + } + + return 0; +} Propchange: trunk/reactos/base/applications/mspaint/textedit.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/mspaint/textedit.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/textedit.h (added) +++ trunk/reactos/base/applications/mspaint/textedit.h [iso-8859-1] Mon Feb 10 20:53:14 2014 @@ -0,0 +1,9 @@ +/* + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL + * FILE: base/applications/paint/textedit.h + * PURPOSE: Text editor and font chooser for the text tool + * PROGRAMMERS: Benedikt Freisen + */ + +LRESULT CALLBACK TextEditWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam); Propchange: trunk/reactos/base/applications/mspaint/textedit.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[bfreisen] 62113: [MSPAINT] - Text tool allows text input (I chose a design with separate editor window)
by bfreisen＠svn.reactos.org 10 Feb '14

10 Feb '14

Author: bfreisen Date: Mon Feb 10 20:49:15 2014 New Revision: 62113 URL: http://svn.reactos.org/svn/reactos?rev=62113&view=rev Log: [MSPAINT] - Text tool allows text input (I chose a design with separate editor window) Modified: trunk/reactos/base/applications/mspaint/CMakeLists.txt trunk/reactos/base/applications/mspaint/globalvar.h trunk/reactos/base/applications/mspaint/main.c trunk/reactos/base/applications/mspaint/winproc.c Modified: trunk/reactos/base/applications/mspaint/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/CMakeLists.txt [iso-8859-1] Mon Feb 10 20:49:15 2014 @@ -10,6 +10,7 @@ registry.c selection.c sizebox.c + textedit.c toolsettings.c winproc.c precomp.h) Modified: trunk/reactos/base/applications/mspaint/globalvar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/globalvar.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/globalvar.h [iso-8859-1] Mon Feb 10 20:49:15 2014 @@ -54,6 +54,8 @@ extern HWND hImageArea; extern HBITMAP hSelBm; extern HBITMAP hSelMask; +extern HWND hwndTextEdit; +extern HWND hwndEditCtl; extern LOGFONT lfTextFont; extern HFONT hfontTextFont; extern LPTSTR textToolText; Modified: trunk/reactos/base/applications/mspaint/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/main.c [iso-8859-1] Mon Feb 10 20:49:15 2014 @@ -15,6 +15,7 @@ #include "toolsettings.h" #include "selection.h" #include "sizebox.h" +#include "textedit.h" /* FUNCTIONS ********************************************************/ @@ -54,9 +55,10 @@ HBITMAP hSelMask; LOGFONT lfTextFont; HFONT hfontTextFont; -/* TODO: add dialog to edit the currently hard-coded text */ -LPTSTR textToolText = _T("Abc\n1234567890"); -int textToolTextMaxLen = SIZEOF(textToolText); +HWND hwndTextEdit; +HWND hwndEditCtl; +LPTSTR textToolText = NULL; +int textToolTextMaxLen = 0; /* array holding palette colors; may be changed by the user during execution */ int palColors[28]; @@ -142,6 +144,7 @@ WNDCLASSEX wclPal; WNDCLASSEX wclSettings; WNDCLASSEX wclSelection; + WNDCLASSEX wclTextEdit; TCHAR progtitle[1000]; TCHAR resstr[100]; @@ -282,6 +285,21 @@ wclSettings.hbrBackground = GetSysColorBrush(COLOR_HIGHLIGHT); RegisterClassEx (&wclSettings); + /* initializing and registering the window class used for the text editor */ + wclTextEdit.hInstance = hThisInstance; + wclTextEdit.lpszClassName = _T("TextEdit"); + wclTextEdit.lpfnWndProc = TextEditWinProc; + wclTextEdit.style = CS_DBLCLKS; + wclTextEdit.cbSize = sizeof(WNDCLASSEX); + wclTextEdit.hIcon = LoadIcon(hThisInstance, MAKEINTRESOURCE(IDI_APPICON)); + wclTextEdit.hIconSm = LoadIcon(hThisInstance, MAKEINTRESOURCE(IDI_APPICON)); + wclTextEdit.hCursor = LoadCursor(NULL, IDC_ARROW); + wclTextEdit.lpszMenuName = NULL; + wclTextEdit.cbClsExtra = 0; + wclTextEdit.cbWndExtra = 0; + wclTextEdit.hbrBackground = GetSysColorBrush(COLOR_BTNFACE); + RegisterClassEx (&wclTextEdit); + LoadString(hThisInstance, IDS_DEFAULTFILENAME, filename, SIZEOF(filename)); LoadString(hThisInstance, IDS_WINDOWTITLE, resstr, SIZEOF(resstr)); _stprintf(progtitle, resstr, filename); @@ -512,6 +530,16 @@ /* by moving the window, the things in WM_SIZE are done */ MoveWindow(hwnd, 100, 100, 600, 450, TRUE); + /* creating the text editor window for the text tool */ + hwndTextEdit = + CreateWindowEx(0, _T("TextEdit"), _T(""), WS_OVERLAPPEDWINDOW, 300, 0, 300, + 200, hwnd, NULL, hThisInstance, NULL); + /* creating the edit control within the editor window */ + hwndEditCtl = + CreateWindowEx(WS_EX_CLIENTEDGE, _T("EDIT"), _T(""), + WS_CHILD | WS_VISIBLE | WS_BORDER | WS_HSCROLL | WS_VSCROLL | ES_MULTILINE | ES_NOHIDESEL | ES_AUTOHSCROLL | ES_AUTOVSCROLL, + 0, 0, 100, 100, hwndTextEdit, NULL, hThisInstance, NULL); + /* Make the window visible on the screen */ ShowWindow (hwnd, nFunsterStil); Modified: trunk/reactos/base/applications/mspaint/winproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/winproc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/winproc.c [iso-8859-1] Mon Feb 10 20:49:15 2014 @@ -24,6 +24,7 @@ pointSP = 0; // resets the point-buffer of the polygon and bezier functions InvalidateRect(hToolSettings, NULL, TRUE); ShowWindow(hTrackbarZoom, (tool == TOOL_ZOOM) ? SW_SHOW : SW_HIDE); + ShowWindow(hwndTextEdit, (tool == TOOL_TEXT) ? SW_SHOW : SW_HIDE); } void @@ -299,17 +300,21 @@ EnableMenuItem(menu, IDM_EDITPASTE, ENABLED_IF(GetClipboardData(CF_BITMAP) != NULL)); CloseClipboard(); break; + case 2: /* View menu */ + CheckMenuItem(menu, IDM_VIEWTOOLBOX, CHECKED_IF(IsWindowVisible(hToolBoxContainer))); + CheckMenuItem(menu, IDM_VIEWCOLORPALETTE, CHECKED_IF(IsWindowVisible(hPalWin))); + CheckMenuItem(menu, IDM_VIEWSTATUSBAR, CHECKED_IF(IsWindowVisible(hStatusBar))); + CheckMenuItem(menu, IDM_FORMATICONBAR, CHECKED_IF(IsWindowVisible(hwndTextEdit))); + EnableMenuItem(menu, IDM_FORMATICONBAR, ENABLED_IF(activeTool == TOOL_TEXT)); + + CheckMenuItem(menu, IDM_VIEWSHOWGRID, CHECKED_IF(showGrid)); + CheckMenuItem(menu, IDM_VIEWSHOWMINIATURE, CHECKED_IF(showMiniature)); + break; case 3: /* Image menu */ EnableMenuItem(menu, IDM_IMAGECROP, ENABLED_IF(IsWindowVisible(hSelection))); CheckMenuItem(menu, IDM_IMAGEDRAWOPAQUE, CHECKED_IF(transpBg == 0)); break; } - CheckMenuItem(menu, IDM_VIEWTOOLBOX, CHECKED_IF(IsWindowVisible(hToolBoxContainer))); - CheckMenuItem(menu, IDM_VIEWCOLORPALETTE, CHECKED_IF(IsWindowVisible(hPalWin))); - CheckMenuItem(menu, IDM_VIEWSTATUSBAR, CHECKED_IF(IsWindowVisible(hStatusBar))); - - CheckMenuItem(menu, IDM_VIEWSHOWGRID, CHECKED_IF(showGrid)); - CheckMenuItem(menu, IDM_VIEWSHOWMINIATURE, CHECKED_IF(showMiniature)); CheckMenuItem(menu, IDM_VIEWZOOM125, CHECKED_IF(zoom == 125)); CheckMenuItem(menu, IDM_VIEWZOOM25, CHECKED_IF(zoom == 250)); @@ -1031,6 +1036,8 @@ ShowWindow(hStatusBar, IsWindowVisible(hStatusBar) ? SW_HIDE : SW_SHOW); alignChildrenToMainWindow(); break; + case IDM_FORMATICONBAR: + ShowWindow(hwndTextEdit, IsWindowVisible(hwndTextEdit) ? SW_HIDE : SW_SHOW); case IDM_VIEWSHOWGRID: showGrid = !showGrid;

1 0

[akhaldi] 62112: [SHELLEXTS] * Prepare the CMake scripts for PCH. CORE-7716
by akhaldi＠svn.reactos.org 10 Feb '14

10 Feb '14

Author: akhaldi Date: Mon Feb 10 20:32:25 2014 New Revision: 62112 URL: http://svn.reactos.org/svn/reactos?rev=62112&view=rev Log: [SHELLEXTS] * Prepare the CMake scripts for PCH. CORE-7716 Modified: trunk/reactos/dll/shellext/deskadp/CMakeLists.txt trunk/reactos/dll/shellext/deskmon/CMakeLists.txt trunk/reactos/dll/shellext/fontext/CMakeLists.txt Modified: trunk/reactos/dll/shellext/deskadp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/CMake… ============================================================================== --- trunk/reactos/dll/shellext/deskadp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskadp/CMakeLists.txt [iso-8859-1] Mon Feb 10 20:32:25 2014 @@ -4,10 +4,13 @@ list(APPEND SOURCE deskadp.c shxiface.c + precomp.h) + +add_library(deskadp SHARED + ${SOURCE} deskadp.rc ${CMAKE_CURRENT_BINARY_DIR}/deskadp.def) -add_library(deskadp SHARED ${SOURCE}) set_module_type(deskadp win32dll UNICODE) target_link_libraries(deskadp uuid) @@ -20,5 +23,5 @@ kernel32 ntdll) -add_pch(deskadp precomp.h) +add_pch(deskadp precomp.h SOURCE) add_cd_file(TARGET deskadp DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/shellext/deskmon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/CMake… ============================================================================== --- trunk/reactos/dll/shellext/deskmon/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskmon/CMakeLists.txt [iso-8859-1] Mon Feb 10 20:32:25 2014 @@ -4,10 +4,13 @@ list(APPEND SOURCE deskmon.c shxiface.c + precomp.h) + +add_library(deskmon SHARED + ${SOURCE} deskmon.rc ${CMAKE_CURRENT_BINARY_DIR}/deskmon.def) -add_library(deskmon SHARED ${SOURCE}) set_module_type(deskmon win32dll UNICODE) target_link_libraries(deskmon uuid) @@ -20,5 +23,5 @@ kernel32 ntdll) -add_pch(deskmon precomp.h) +add_pch(deskmon precomp.h SOURCE) add_cd_file(TARGET deskmon DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/shellext/fontext/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/fontext/CMake… ============================================================================== --- trunk/reactos/dll/shellext/fontext/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/fontext/CMakeLists.txt [iso-8859-1] Mon Feb 10 20:32:25 2014 @@ -1,9 +1,13 @@ spec2def(fontext.dll fontext.spec) -add_library(fontext SHARED +list(APPEND SOURCE fontext.c regsvr.c + fontext.h) + +add_library(fontext SHARED + ${SOURCE} fontext.rc ${CMAKE_CURRENT_BINARY_DIR}/fontext.def) @@ -22,5 +26,5 @@ kernel32 ntdll) -add_pch(fontext fontext.h) +add_pch(fontext fontext.h SOURCE) add_cd_file(TARGET fontext DESTINATION reactos/system32 FOR all)

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
47
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2014