Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 37418: Remove even more stubs
by tkreuzer＠svn.reactos.org 17 Nov '08

17 Nov '08

Author: tkreuzer Date: Mon Nov 17 13:48:00 2008 New Revision: 37418 URL: http://svn.reactos.org/svn/reactos?rev=37418&view=rev Log: Remove even more stubs Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c [iso-8859-1] Mon Nov 17 13:48:00 2008 @@ -5,97 +5,30 @@ #define STUB(x) void x() {FrLdrDbgPrint("Sorry, %s is only a stub!\n", __FUNCTION__);} -STUB(ExAcquireResourceLock) -STUB(ExAcquireRundownProtection) -STUB(ExAcquireRundownProtectionCacheAware) -STUB(ExAcquireRundownProtectionCacheAwareEx) -STUB(ExAcquireRundownProtectionEx) -STUB(ExAllocateFromNPagedLookasideList) -STUB(ExAllocateFromPagedLookasideList) -STUB(ExpEnvironmentLock) -STUB(ExEventObjectType) -STUB(ExpFirmwareTableResource) -STUB(ExFreeToPagedLookasideList) -STUB(ExInitializeRundownProtection) -STUB(ExQueryDepthSList) -STUB(ExRaiseException) -STUB(ExRaiseStatus) -STUB(ExReInitializeRundownProtection) -STUB(ExReInitializeRundownProtectionCacheAware) -STUB(ExReleaseResourceLock) -STUB(ExReleaseRundownProtection) -STUB(ExReleaseRundownProtectionCacheAware) -STUB(ExReleaseRundownProtectionCacheAwareEx) -STUB(ExReleaseRundownProtectionEx) -STUB(ExRundownCompleted) -STUB(ExRundownCompletedCacheAware) -STUB(ExSemaphoreObjectType) -STUB(ExSystemLookasideListHead) -STUB(ExWaitForRundownProtectionRelease) -STUB(ExWaitForRundownProtectionReleaseCacheAware) -STUB(ExpFirmwareTableProviderListHead) -STUB(FsRtlAddBaseMcbEntry) -STUB(FsRtlGetNextBaseMcbEntry) -STUB(FsRtlInitializeBaseMcb) -STUB(FsRtlLegalAnsiCharacterArray) -STUB(FsRtlLookupBaseMcbEntry) -STUB(FsRtlLookupLastBaseMcbEntry) -STUB(FsRtlLookupLastBaseMcbEntryAndIndex) -STUB(FsRtlNumberOfRunsInBaseMcb) -STUB(FsRtlRemoveBaseMcbEntry) -STUB(FsRtlResetBaseMcb) -STUB(FsRtlSplitBaseMcb) -STUB(FsRtlTruncateBaseMcb) -STUB(FsRtlUninitializeBaseMcb) -STUB(IoCompletionType) -STUB(IoCompletionPacketLookaside) -STUB(IoFileObjectType) -STUB(IoForwardAndCatchIrp) -STUB(IoIs32bitProcess) -STUB(IoWMIDeviceObjectToProviderId) STUB(KeActiveProcessors) -STUB(KeBugcheckCallbackListHead) -STUB(KiBugCheckData) -STUB(KeBugcheckReasonCallbackListHead) STUB(KeConnectInterrupt) STUB(KeContextToTrapFrame) STUB(KeDisableInterrupts) STUB(KeDisconnectInterrupt) -STUB(KeEnterCriticalRegion) -STUB(KeEnterGuardedRegion) -STUB(KeExpandKernelStackAndCallout) STUB(KeFeatureBits) STUB(KeFlushEntireTb) -STUB(KeGenericCallDpc) STUB(KeGetRecommendedSharedDataAlignment) -STUB(KeGetCurrentProcessorNumber) STUB(KeInitializeInterrupt) STUB(KeInvalidateAllCaches) -STUB(KeIsWaitListEmpty) -STUB(KeLastBranchMSR) -STUB(KeLeaveCriticalRegion) -STUB(KeLeaveGuardedRegion) STUB(KeProcessorArchitecture) STUB(KeProcessorLevel) STUB(KeProcessorRevision) STUB(KeQueryActiveProcessors) -STUB(KeQueryMultiThreadProcessorSet) -STUB(KeQueryPrcbAddress) STUB(KeRaiseUserException) -STUB(KeReadStateMutex) STUB(KeRestoreFloatingPointState) STUB(KeSaveFloatingPointState) STUB(KeSaveStateForHibernate) STUB(KeSetDmaIoCoherency) -STUB(KeSignalCallDpcDone) -STUB(KeSignalCallDpcSynchronize) STUB(KeSwitchKernelStack) STUB(KeSynchronizeExecution) STUB(KeUpdateRunTime) STUB(KeUpdateSystemTime) STUB(KeUserModeCallback) -STUB(KeWaitForMutexObject) -STUB(KiCpuId) STUB(KiComputeTimerTableIndex) STUB(KiDispatchException) STUB(KiIdleLoop) @@ -104,81 +37,14 @@ STUB(KiSystemService) STUB(KdbEnterDebuggerException) STUB(KdbpCliModuleLoaded) -STUB(KdbpSafeReadMemory) STUB(KdbpCliInit) -STUB(KdDebuggerEnabled) -STUB(KdDebuggerNotPresent) -STUB(KdpEnableSafeMem) STUB(KdpGdbStubInit) -STUB(MiGetUserPageDirectoryCount) -STUB(MiNonPagedPoolLength) -STUB(MiNonPagedPoolStart) -STUB(MiFreeDescriptor) -STUB(MiFreeDescriptorOrg) -STUB(MmPfnDatabase) -STUB(MmHighestPhysicalPage) -STUB(MmNumberOfPhysicalPages) -STUB(MmMapLockedPage) -STUB(MmStats) -STUB(MmCommitSessionMappedView) -STUB(MmCreateMirror) -STUB(MmIsIoSpaceActive) -STUB(MmLockPagableImageSection) STUB(NtContinue) STUB(NtCallbackReturn) STUB(NtRaiseException) STUB(NtSetLdtEntries) STUB(NtVdmControl) -STUB(ObDeleteCapturedInsertInfo) -STUB(ObSetHandleAttributes) -STUB(PfxFindPrefix) -STUB(PfxInitialize) -STUB(PfxInsertPrefix) -STUB(PfxRemovePrefix) -STUB(PsGetCurrentProcess) -STUB(PsGetCurrentProcessWow64Process) -STUB(PsGetCurrentThread) -STUB(PsGetCurrentThreadProcess) -STUB(PsGetCurrentThreadProcessId) -STUB(PsGetCurrentThreadTeb) -STUB(PsGetCurrentThreadWin32ThreadAndEnterCriticalRegion) -STUB(PsGetProcessSessionIdEx) -STUB(PsGetProcessWow64Process) -STUB(PsProcessType) -STUB(PsThreadType) -STUB(PsWrapApcWow64Thread) STUB(PspGetOrSetContextKernelRoutine) -STUB(RtlAnsiStringToUnicodeSize) -STUB(RtlCopyMemory) -STUB(RtlCopyMemoryNonTemporal) STUB(RtlGetCallersAddress) -STUB(RtlOemStringToUnicodeSize) -STUB(RtlPcToFileHeader) -STUB(RtlRestoreContext) -STUB(RtlTraceDatabaseAdd) -STUB(RtlTraceDatabaseCreate) -STUB(RtlTraceDatabaseDestroy) -STUB(RtlTraceDatabaseEnumerate) -STUB(RtlTraceDatabaseFind) -STUB(RtlTraceDatabaseLock) -STUB(RtlTraceDatabaseUnlock) -STUB(RtlTraceDatabaseValidate) -STUB(RtlUnicodeStringToAnsiSize) -STUB(RtlUnicodeStringToOemSize) STUB(RtlUnwind) STUB(RtlpGetStackLimits) -STUB(SeReportSecurityEvent) -STUB(SeSetAuditParameter) -STUB(SeTokenObjectType) -STUB(VfFailDeviceNode) -STUB(VfFailDriver) -STUB(VfFailSystemBIOS) -STUB(VfIsVerificationEnabled) -STUB(WmiFlushTrace) -STUB(WmiGetClock) -STUB(WmiQueryTrace) -STUB(WmiStartTrace) -STUB(WmiStopTrace) -STUB(WmiTraceFastEvent) -STUB(WmiUpdateTrace) -

1 0

[tkreuzer] 37417: remove more stubs
by tkreuzer＠svn.reactos.org 17 Nov '08

17 Nov '08

Author: tkreuzer Date: Mon Nov 17 13:26:58 2008 New Revision: 37417 URL: http://svn.reactos.org/svn/reactos?rev=37417&view=rev Log: remove more stubs Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c [iso-8859-1] Mon Nov 17 13:26:58 2008 @@ -149,17 +149,11 @@ STUB(PsWrapApcWow64Thread) STUB(PspGetOrSetContextKernelRoutine) STUB(RtlAnsiStringToUnicodeSize) -STUB(RtlCompareMemory) -STUB(RtlCompareMemoryUlong) STUB(RtlCopyMemory) STUB(RtlCopyMemoryNonTemporal) -STUB(RtlFillMemory) -STUB(RtlFillMemoryUlong) STUB(RtlGetCallersAddress) -STUB(RtlMoveMemory) STUB(RtlOemStringToUnicodeSize) STUB(RtlPcToFileHeader) -STUB(RtlPrefetchMemoryNonTemporal) STUB(RtlRestoreContext) STUB(RtlTraceDatabaseAdd) STUB(RtlTraceDatabaseCreate) @@ -172,7 +166,6 @@ STUB(RtlUnicodeStringToAnsiSize) STUB(RtlUnicodeStringToOemSize) STUB(RtlUnwind) -STUB(RtlZeroMemory) STUB(RtlpGetStackLimits) STUB(SeReportSecurityEvent) STUB(SeSetAuditParameter)

1 0

[ekohl] 37416: Sync to wine-1.1.1: - Alexandre Julliard <julliard@winehq.org> Thu, 26 Jun 2008 widl: [default] is an allowed attribute for union fields. (Note: This patch was already applied before in order not to break ReactOS.) - Alexandre Julliard <julliard@winehq.org> Tue, 1 Jul 2008 widl: Add some support for unencapsulated unions that need a conformance descriptor. - Rob Shearman <robertshearman@gmail.com> Tue, 1 Jul 2008 widl: Increment the buffer offset by 8 for embedded pointers inside
by ekohl＠svn.reactos.org 17 Nov '08

17 Nov '08

Author: ekohl Date: Mon Nov 17 13:07:03 2008 New Revision: 37416 URL: http://svn.reactos.org/svn/reactos?rev=37416&view=rev Log: Sync to wine-1.1.1: - Alexandre Julliard <julliard(a)winehq.org> Thu, 26 Jun 2008 widl: [default] is an allowed attribute for union fields. (Note: This patch was already applied before in order not to break ReactOS.) - Alexandre Julliard <julliard(a)winehq.org> Tue, 1 Jul 2008 widl: Add some support for unencapsulated unions that need a conformance descriptor. - Rob Shearman <robertshearman(a)gmail.com> Tue, 1 Jul 2008 widl: Increment the buffer offset by 8 for embedded pointers inside varying arrays in varying structures. The 8 bytes are for the variance and offset and are added just before the array, as seen in the marshalling code in rpcrt4. No offset needs to be added for non-varying structures since the buffer mark is set after the conformance in marshalled or unmarshalled. - Rob Shearman <robertshearman(a)gmail.com> Tue, 1 Jul 2008 widl: Check that the structure has been defined in check_remoting_args. - Dan Hipschman <dsh(a)linux.ucla.edu> Tue, 1 Jul 2008 widl: Implement type redefinition checks. This allows widl to catch type redefinitions and report an error, like MIDL. However, this does a better job than MIDL since it also reports the location of the originial definition, like GCC. - Dan Hipschman <dsh(a)linux.ucla.edu> Tue, 1 Jul 2008 widl: Factor a small part of the grammar. - Rob Shearman <robertshearman(a)gmail.com> Thu, 3 Jul 2008 widl: Consolidate top-level parameter conformance/variance expression writing into a separate function. Descend through as many pointer types as necessary to find the fundamental type and determine whether it needs a top-level parameter conformance/variance expression to be written. Add support for writing top-level parameter conformance/variance expressions for non-encapsulated unions. - Rob Shearman <robertshearman(a)gmail.com> Fri, 4 Jul 2008 widl: Rename find_type_helper, find_type and find_type2 to find_type, find_type_error and find_type_error2 respectively. - Rob Shearman <robertshearman(a)gmail.com> Fri, 4 Jul 2008 widl: Remove some unnecessary calls to duptype. - Alexandre Julliard <julliard(a)winehq.org> Mon, 7 Jul 2008 widl: Fix a couple of uninitialized variable compiler warnings. - Alexandre Julliard <julliard(a)winehq.org> Mon, 7 Jul 2008 Add noinput directive to all lex files to avoid a compiler warning. Note: Two patches are missing because they implement code to generate MIDL-incompatible SEH support code. Unfortunately I think it is almost time to fork WIDL because later patches implement even more incompatibilities. :-( Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/tools/widl/parser.l trunk/reactos/tools/widl/parser.tab.c trunk/reactos/tools/widl/parser.tab.h trunk/reactos/tools/widl/parser.y trunk/reactos/tools/widl/parser.yy.c trunk/reactos/tools/widl/typegen.c trunk/reactos/tools/widl/typelib.c trunk/reactos/tools/widl/widltypes.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… Modified: trunk/reactos/tools/widl/parser.l URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.l?rev=37… Modified: trunk/reactos/tools/widl/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.c?re… Modified: trunk/reactos/tools/widl/parser.tab.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.h?re… Modified: trunk/reactos/tools/widl/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.y?rev=37… Modified: trunk/reactos/tools/widl/parser.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.yy.c?rev… Modified: trunk/reactos/tools/widl/typegen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.c?rev=3… Modified: trunk/reactos/tools/widl/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typelib.c?rev=3… Modified: trunk/reactos/tools/widl/widltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widltypes.h?rev…

1 0

[mkupfer] 37415: - fix a brace mistake
by mkupfer＠svn.reactos.org 17 Nov '08

17 Nov '08

Author: mkupfer Date: Mon Nov 17 12:40:36 2008 New Revision: 37415 URL: http://svn.reactos.org/svn/reactos?rev=37415&view=rev Log: - fix a brace mistake Modified: trunk/reactos/base/setup/reactos/reactos.c Modified: trunk/reactos/base/setup/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… ============================================================================== --- trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] Mon Nov 17 12:40:36 2008 @@ -225,9 +225,9 @@ break; } break; + } default: break; - } } return FALSE; @@ -355,10 +355,10 @@ default: break; } + } break; default: break; - } } return FALSE; @@ -411,10 +411,10 @@ default: break; } + } break; default: break; - } } return FALSE; @@ -505,10 +505,10 @@ default: break; } + } break; default: break; - } } return FALSE; @@ -665,9 +665,9 @@ break; } break; + } default: break; - } } return FALSE; @@ -701,7 +701,7 @@ WM_SETFONT, (WPARAM)hTitleFont, (LPARAM)TRUE);*/ -} + } break; case WM_NOTIFY: { @@ -716,10 +716,9 @@ break; } break; + } default: break; - } - } return FALSE; } @@ -768,10 +767,10 @@ default: break; } + } break; default: break; - } } return FALSE; @@ -839,9 +838,9 @@ break; } break; + } default: break; - } } return FALSE;

1 0

[mkupfer] 37414: - add summary page to check settings before start installation - add disabled driver button for future use
by mkupfer＠svn.reactos.org 17 Nov '08

17 Nov '08

Author: mkupfer Date: Mon Nov 17 12:23:06 2008 New Revision: 37414 URL: http://svn.reactos.org/svn/reactos?rev=37414&view=rev Log: - add summary page to check settings before start installation - add disabled driver button for future use Modified: trunk/reactos/base/setup/reactos/lang/de-DE.rc trunk/reactos/base/setup/reactos/lang/en-US.rc trunk/reactos/base/setup/reactos/reactos.c trunk/reactos/base/setup/reactos/resource.h Modified: trunk/reactos/base/setup/reactos/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/de… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/de-DE.rc [iso-8859-1] Mon Nov 17 12:23:06 2008 @@ -60,12 +60,13 @@ LISTBOX IDC_PARTITION, 20,12,278,142,LBS_HASSTRINGS | WS_VSCROLL PUSHBUTTON "&Create", IDC_PARTCREATE, 20,155,50,15 PUSHBUTTON "&Delete", IDC_PARTDELETE, 76,155,50,15 + PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 162,155,50,15, WS_DISABLED PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 218,155,80,15 LTEXT "Click Next to start the installation process.", IDC_STATIC, 10, 180 ,277, 20 END IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 -STYLE WS_VISIBLE|WS_CAPTION|WS_SYSMENU|WS_THICKFRAME +STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME CAPTION "Advanced Partition Settings" FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/base/setup/reactos/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/en… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/en-US.rc [iso-8859-1] Mon Nov 17 12:23:06 2008 @@ -60,12 +60,13 @@ LISTBOX IDC_PARTITION, 20,12,278,142,LBS_HASSTRINGS | WS_VSCROLL PUSHBUTTON "&Create", IDC_PARTCREATE, 20,155,50,15 PUSHBUTTON "&Delete", IDC_PARTDELETE, 76,155,50,15 - PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 218,155,80,15 + PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 162,155,50,15 + PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 218,155,80,15, WS_DISABLED LTEXT "Click Next to start the installation process.", IDC_STATIC, 10, 180 ,277, 20 END IDD_PARTITION DIALOGEX DISCARDABLE 0, 0, 145, 90 -STYLE WS_VISIBLE|WS_CAPTION|WS_SYSMENU|WS_THICKFRAME +STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME CAPTION "Create Partition" FONT 8, "MS Shell Dlg" BEGIN @@ -81,7 +82,7 @@ END IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 -STYLE WS_VISIBLE|WS_CAPTION|WS_SYSMENU|WS_THICKFRAME +STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME CAPTION "Advanced Partition Settings" FONT 8, "MS Shell Dlg" BEGIN @@ -94,6 +95,14 @@ CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE PUSHBUTTON "&Cancel", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE +END + +IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Installation summary", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 @@ -137,6 +146,8 @@ IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup boot loader" IDS_RESTARTTITLE "First stage of setup finished" IDS_RESTARTSUBTITLE "The first stage of setup has been completed, restart to continue with second stage" + IDS_SUMMARYTITLE "Installation Summary" + IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device" IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install Reactos. Really quit?" IDS_ABORTSETUP2 "Abort installation?" END Modified: trunk/reactos/base/setup/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… ============================================================================== --- trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] Mon Nov 17 12:23:06 2008 @@ -674,6 +674,57 @@ } static INT_PTR CALLBACK +SummaryDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + switch (uMsg) + { + case WM_INITDIALOG: + { + HWND hwndControl; + DWORD dwStyle; + + hwndControl = GetParent(hwndDlg); + + dwStyle = GetWindowLong(hwndControl, GWL_STYLE); + SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); + + hwndControl = GetDlgItem(GetParent(hwndDlg), IDCANCEL); + ShowWindow (hwndControl, SW_HIDE); + EnableWindow (hwndControl, FALSE); + + /* Set title font */ + /*SendDlgItemMessage(hwndDlg, + IDC_STARTTITLE, + WM_SETFONT, + (WPARAM)hTitleFont, + (LPARAM)TRUE);*/ +} + break; + case WM_NOTIFY: + { + LPNMHDR lpnm = (LPNMHDR)lParam; + + switch (lpnm->code) + { + case PSN_SETACTIVE: + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT | PSWIZB_BACK); + break; + default: + break; + } + break; + default: + break; + } + + } + return FALSE; +} + +static INT_PTR CALLBACK ProcessDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, @@ -995,7 +1046,7 @@ int nCmdShow) { PROPSHEETHEADER psh; - HPROPSHEETPAGE ahpsp[7]; + HPROPSHEETPAGE ahpsp[8]; PROPSHEETPAGE psp = {0}; UINT nPages = 0; hInstance = hInst; @@ -1052,7 +1103,7 @@ psp.pszTemplate = MAKEINTRESOURCE(IDD_DEVICEPAGE); ahpsp[nPages++] = CreatePropertySheetPage(&psp); - /* Create install device settings page / boot method / install directory*/ + /* Create install device settings page / boot method / install directory */ psp.dwSize = sizeof(PROPSHEETPAGE); psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_DRIVETITLE); @@ -1061,6 +1112,17 @@ psp.lParam = 0; psp.pfnDlgProc = DriveDlgProc; psp.pszTemplate = MAKEINTRESOURCE(IDD_DRIVEPAGE); + ahpsp[nPages++] = CreatePropertySheetPage(&psp); + + /* Create summary page */ + psp.dwSize = sizeof(PROPSHEETPAGE); + psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; + psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_SUMMARYTITLE); + psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDS_SUMMARYSUBTITLE); + psp.hInstance = hInst; + psp.lParam = 0; + psp.pfnDlgProc = SummaryDlgProc; + psp.pszTemplate = MAKEINTRESOURCE(IDD_SUMMARYPAGE); ahpsp[nPages++] = CreatePropertySheetPage(&psp); } Modified: trunk/reactos/base/setup/reactos/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/resourc… ============================================================================== --- trunk/reactos/base/setup/reactos/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/resource.h [iso-8859-1] Mon Nov 17 12:23:06 2008 @@ -56,7 +56,10 @@ #define IDC_PARTSIZE 2045 #define IDC_UNIT 2046 #define IDC_FSTYPE 2047 - +#define IDD_SUMMARYPAGE 2048 +#define IDS_SUMMARYTITLE 2049 +#define IDS_SUMMARYSUBTITLE 2050 +#define IDC_DEVICEDRIVER 2051 #define IDI_MAIN 3000

1 0

[gschneider] 37413: Remove old locations
by gschneider＠svn.reactos.org 17 Nov '08

17 Nov '08

Author: gschneider Date: Mon Nov 17 11:28:58 2008 New Revision: 37413 URL: http://svn.reactos.org/svn/reactos?rev=37413&view=rev Log: Remove old locations Removed: trunk/rostests/tests/bitblt/ trunk/rostests/tests/dibtest/ trunk/rostests/tests/icontest/ trunk/rostests/tests/palbitblt/ trunk/rostests/tests/patblt/ trunk/rostests/tests/stretchblt/

1 0

[gschneider] 37412: - Restructure dib related tests, 2nd try. - Change build files accordingly
by gschneider＠svn.reactos.org 17 Nov '08

17 Nov '08

Author: gschneider Date: Mon Nov 17 11:28:14 2008 New Revision: 37412 URL: http://svn.reactos.org/svn/reactos?rev=37412&view=rev Log: - Restructure dib related tests, 2nd try. - Change build files accordingly Added: trunk/rostests/dibtests/bitblt/ trunk/rostests/dibtests/bitblt/bitblt.c (with props) trunk/rostests/dibtests/bitblt/bitblt.rbuild (with props) trunk/rostests/dibtests/bitblt/bitblt.rc (with props) trunk/rostests/dibtests/bitblt/lena.bmp (with props) trunk/rostests/dibtests/dibtest/ trunk/rostests/dibtests/dibtest/dibtest.c (with props) trunk/rostests/dibtests/dibtest/dibtest.rbuild (with props) trunk/rostests/dibtests/icontest/ trunk/rostests/dibtests/icontest/icon.ico (with props) trunk/rostests/dibtests/icontest/icontest.c (with props) trunk/rostests/dibtests/icontest/icontest.rbuild (with props) trunk/rostests/dibtests/icontest/icontest.rc (with props) trunk/rostests/dibtests/icontest/resource.h (with props) trunk/rostests/dibtests/palbitblt/ trunk/rostests/dibtests/palbitblt/pal.c (with props) trunk/rostests/dibtests/palbitblt/palbitblt.rbuild (with props) trunk/rostests/dibtests/patblt/ trunk/rostests/dibtests/patblt/Penguin.bmp (with props) trunk/rostests/dibtests/patblt/patblt.cpp (with props) trunk/rostests/dibtests/patblt/patblt.rbuild (with props) trunk/rostests/dibtests/stretchblt/ trunk/rostests/dibtests/stretchblt/lena.bmp (with props) trunk/rostests/dibtests/stretchblt/stretchblt.cpp (with props) trunk/rostests/dibtests/stretchblt/stretchblt.rbuild (with props) Modified: trunk/rostests/dibtests/directory.rbuild trunk/rostests/directory.rbuild trunk/rostests/tests/directory.rbuild Added: trunk/rostests/dibtests/bitblt/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/bitblt/bitblt.c?… ============================================================================== --- trunk/rostests/dibtests/bitblt/bitblt.c (added) +++ trunk/rostests/dibtests/bitblt/bitblt.c [iso-8859-1] Mon Nov 17 11:28:14 2008 @@ -1,0 +1,139 @@ + +/* + * Windows 2000 Graphics API Black Book + * (BitBlt Bitmap Rendering Demo) + * + * Created by Damon Chandler <dmc27(a)ee.cornell.edu> + * Updates can be downloaded at: <www.coriolis.com> + * + * Please do not hesistate to e-mail me at dmc27(a)ee.cornell.edu + * if you have any questions about this code. + */ + + +#include <windows.h> +#include <string.h> + +HINSTANCE HInst; +const char* WndClassName = "GMainWnd"; +LRESULT CALLBACK MainWndProc(HWND HWnd, UINT Msg, WPARAM WParam, + LPARAM LParam); + + +int APIENTRY WinMain(HINSTANCE HInstance, HINSTANCE HPrevInstance, + LPTSTR lpCmdLine, int nCmdShow) +{ + WNDCLASS wc; + MSG msg; + + HInst = HInstance; + + memset(&wc, 0, sizeof(WNDCLASS)); + + wc.style = CS_VREDRAW | CS_HREDRAW | CS_DBLCLKS; + wc.lpfnWndProc = MainWndProc; + wc.hInstance = HInstance; + wc.hCursor = LoadCursor(NULL, (LPCTSTR)IDC_ARROW); + /* wc.hbrBackground = reinterpret_cast<HBRUSH>(COLOR_BTNFACE + 1); */ + wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); + wc.lpszClassName = WndClassName; + + if (RegisterClass(&wc)) + { + HWND HWnd = + CreateWindow( + WndClassName, TEXT("BitBlt Bitmap Rendering Demo"), + WS_OVERLAPPED | WS_SYSMENU | WS_CAPTION | + WS_VISIBLE | WS_CLIPSIBLINGS, + 0, 0, 220, 230, + NULL, NULL, HInst, NULL + ); + + if (HWnd) + { + ShowWindow(HWnd, nCmdShow); + UpdateWindow(HWnd); + + while (GetMessage(&msg, NULL, 0, 0)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + } + } + return 0; +} + +/* image related */ +BITMAP bmp; +LPCSTR filename = TEXT("lena.bmp"); +HDC HMemDC = NULL; +HBITMAP HOldBmp = NULL; + +LRESULT CALLBACK MainWndProc(HWND HWnd, UINT Msg, WPARAM WParam, + LPARAM LParam) +{ + switch (Msg) + { + case WM_CREATE: + { + /* create a memory DC */ + HMemDC = CreateCompatibleDC(NULL); + if (HMemDC) + { + /* load a bitmap from file */ + HBITMAP HBmp = + /* static_cast<HBITMAP> */( + LoadImage(HInst, MAKEINTRESOURCE(1000), IMAGE_BITMAP, + 0, 0, 0) + ); + if (HBmp) + { + /* extract dimensions of the bitmap */ + GetObject(HBmp, sizeof(BITMAP), &bmp); + + /* associate the bitmap with the memory DC */ + /* HOldBmp = static_cast<HBITMAP> */ + (SelectObject(HMemDC, HBmp) + ); + } + } + } + case WM_PAINT: + { + PAINTSTRUCT ps; + const HDC Hdc = BeginPaint(HWnd, &ps); +#if 0 + try +#endif + { + + /* TODO: add palette support (see Chapter 9)... */ + + + BitBlt(Hdc, 20, 15, + bmp.bmWidth, bmp.bmHeight, + HMemDC, 0, 0, + SRCCOPY); + } +#if 0 + catch (...) +#endif + { + EndPaint(HWnd, &ps); + } + EndPaint(HWnd, &ps); + break; + } + case WM_DESTROY: + { + /* clean up */ + DeleteObject(SelectObject(HMemDC, HOldBmp)); + DeleteDC(HMemDC); + + PostQuitMessage(0); + return 0; + } + } + return DefWindowProc(HWnd, Msg, WParam, LParam); +} Propchange: trunk/rostests/dibtests/bitblt/bitblt.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/dibtests/bitblt/bitblt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/bitblt/bitblt.rb… ============================================================================== --- trunk/rostests/dibtests/bitblt/bitblt.rbuild (added) +++ trunk/rostests/dibtests/bitblt/bitblt.rbuild [iso-8859-1] Mon Nov 17 11:28:14 2008 @@ -1,0 +1,9 @@ +<module name="bitblt" type="win32gui" installbase="bin" installname="bitblt.exe"> + <define name="__USE_W32API" /> + <include base="bitblt">.</include> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <file>bitblt.c</file> + <file>bitblt.rc</file> +</module> Propchange: trunk/rostests/dibtests/bitblt/bitblt.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/dibtests/bitblt/bitblt.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/bitblt/bitblt.rc… ============================================================================== --- trunk/rostests/dibtests/bitblt/bitblt.rc (added) +++ trunk/rostests/dibtests/bitblt/bitblt.rc [iso-8859-1] Mon Nov 17 11:28:14 2008 @@ -1,0 +1,2 @@ +1000 BITMAP MOVEABLE PURE "lena.bmp" + Propchange: trunk/rostests/dibtests/bitblt/bitblt.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/dibtests/bitblt/lena.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/bitblt/lena.bmp?… ============================================================================== Binary file - no diff available. Propchange: trunk/rostests/dibtests/bitblt/lena.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rostests/dibtests/dibtest/dibtest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/dibtest/dibtest.… ============================================================================== --- trunk/rostests/dibtests/dibtest/dibtest.c (added) +++ trunk/rostests/dibtests/dibtest/dibtest.c [iso-8859-1] Mon Nov 17 11:28:14 2008 @@ -1,0 +1,196 @@ +#include <windows.h> +#include <stdio.h> +#include <stdlib.h> + +#define CELL_SIZE 10 + +static RGBQUAD Colors[] = +{ + { 0x00, 0x00, 0x00, 0x00 }, // black + { 0x00, 0x00, 0x80, 0x00 }, // red + { 0x00, 0x80, 0x00, 0x00 }, // green + { 0x00, 0x80, 0x80, 0x00 }, // brown + { 0x80, 0x00, 0x00, 0x00 }, // blue + { 0x80, 0x00, 0x80, 0x00 }, // magenta + { 0x80, 0x80, 0x00, 0x00 }, // cyan + { 0x80, 0x80, 0x80, 0x00 }, // dark gray + { 0xc0, 0xc0, 0xc0, 0x00 }, // light gray + { 0x00, 0x00, 0xFF, 0x00 }, // bright red + { 0x00, 0xFF, 0x00, 0x00 }, // bright green + { 0x00, 0xFF, 0xFF, 0x00 }, // bright yellow + { 0xFF, 0x00, 0x00, 0x00 }, // bright blue + { 0xFF, 0x00, 0xFF, 0x00 }, // bright magenta + { 0xFF, 0xFF, 0x00, 0x00 }, // bright cyan + { 0xFF, 0xFF, 0xFF, 0x00 } // bright white +}; + +LRESULT WINAPI MainWndProc(HWND, UINT, WPARAM, LPARAM); + +int WINAPI +WinMain(HINSTANCE hInstance, + HINSTANCE hPrevInstance, + LPSTR lpszCmdLine, + int nCmdShow) +{ + WNDCLASS wc; + MSG msg; + HWND hWnd; + + wc.lpszClassName = "DibTestClass"; + wc.lpfnWndProc = MainWndProc; + wc.style = CS_VREDRAW | CS_HREDRAW; + wc.hInstance = hInstance; + wc.hIcon = LoadIcon(NULL, (LPCTSTR)IDI_APPLICATION); + wc.hCursor = LoadCursor(NULL, (LPCTSTR)IDC_ARROW); + wc.hbrBackground = (HBRUSH)GetStockObject(GRAY_BRUSH); + wc.lpszMenuName = NULL; + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; + if (RegisterClass(&wc) == 0) + { + fprintf(stderr, "RegisterClass failed (last error 0x%lX)\n", + GetLastError()); + return(1); + } + + hWnd = CreateWindow("DibTestClass", + "DIB Test", + WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, + CW_USEDEFAULT, + 25 * CELL_SIZE + 5, + 25 * CELL_SIZE + 20, + NULL, + NULL, + hInstance, + NULL); + if (hWnd == NULL) + { + fprintf(stderr, "CreateWindow failed (last error 0x%lX)\n", + GetLastError()); + return(1); + } + + ShowWindow(hWnd, nCmdShow); + + while(GetMessage(&msg, NULL, 0, 0)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + + return msg.wParam; +} + +static void PaintCells(HDC WindowDC, WORD BitCount1, WORD BitCount2, + int XDest, int YDest) +{ + HBRUSH Brush; + RECT Rect; + UINT row, col; + BITMAPINFO *BitmapInfo; + HBITMAP DIB1, DIB2; + HDC DC1, DC2; + + BitmapInfo = malloc(sizeof(BITMAPINFO) + 15 * sizeof(RGBQUAD)); + BitmapInfo->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + BitmapInfo->bmiHeader.biWidth = 4 * CELL_SIZE + 9; + BitmapInfo->bmiHeader.biHeight = -(4 * CELL_SIZE + 9); // it's top down (since BI_RGB is used, the sign is operative of direction) + BitmapInfo->bmiHeader.biPlanes = 1; + BitmapInfo->bmiHeader.biBitCount = BitCount1; + BitmapInfo->bmiHeader.biCompression = BI_RGB; + BitmapInfo->bmiHeader.biSizeImage = 0; + BitmapInfo->bmiHeader.biXPelsPerMeter = 0; + BitmapInfo->bmiHeader.biYPelsPerMeter = 0; + BitmapInfo->bmiHeader.biClrUsed = 16; + BitmapInfo->bmiHeader.biClrImportant = 16; + for (col = 0; col < 16; col++) { + BitmapInfo->bmiColors[col] = Colors[col]; + } + DIB1 = CreateDIBSection(NULL, BitmapInfo, DIB_RGB_COLORS, NULL, NULL, 0); + DC1 = CreateCompatibleDC(NULL); + SelectObject(DC1, DIB1); + + BitmapInfo->bmiHeader.biBitCount = BitCount2; + DIB2 = CreateDIBSection(NULL, BitmapInfo, DIB_RGB_COLORS, NULL, NULL, 0); + DC2 = CreateCompatibleDC(NULL); + SelectObject(DC2, DIB2); + free(BitmapInfo); + + /* Now paint on the first bitmap */ + for (row = 0; row < 4; row++) + { + for (col = 0; col < 4; col++) + { + Brush = CreateSolidBrush(RGB(Colors[4 * row + col].rgbRed, + Colors[4 * row + col].rgbGreen, + Colors[4 * row + col].rgbBlue)); + Rect.left = CELL_SIZE * col + 5; + Rect.top = CELL_SIZE * row + 5; + Rect.right = Rect.left + CELL_SIZE; + Rect.bottom = Rect.top + CELL_SIZE; + FillRect(DC1, &Rect, Brush); + DeleteObject(Brush); + } + } + + /* Copy the first bitmap to the second */ + BitBlt(DC2, 4, 4, 4 * CELL_SIZE, 4 * CELL_SIZE, DC1, 5, 5, SRCCOPY); + + /* Show results on screen */ + BitBlt(WindowDC, XDest, YDest, 4 * CELL_SIZE, 4 * CELL_SIZE, DC2, 4, 4, SRCCOPY); +} + +LRESULT CALLBACK MainWndProc(HWND Wnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + PAINTSTRUCT ps; + HDC WindowDC; + + switch(msg) + { + case WM_PAINT: + WindowDC = BeginPaint(Wnd, &ps); + + PaintCells(WindowDC, 4, 4, 0, 0); + PaintCells(WindowDC, 4, 8, 5 * CELL_SIZE, 0); + PaintCells(WindowDC, 4, 16, 10 * CELL_SIZE, 0); + PaintCells(WindowDC, 4, 24, 15 * CELL_SIZE, 0); + PaintCells(WindowDC, 4, 32, 20 * CELL_SIZE, 0); + + PaintCells(WindowDC, 8, 4, 0, 5 * CELL_SIZE); + PaintCells(WindowDC, 8, 8, 5 * CELL_SIZE, 5 * CELL_SIZE); + PaintCells(WindowDC, 8, 16, 10 * CELL_SIZE, 5 * CELL_SIZE); + PaintCells(WindowDC, 8, 24, 15 * CELL_SIZE, 5 * CELL_SIZE); + PaintCells(WindowDC, 8, 32, 20 * CELL_SIZE, 5 * CELL_SIZE); + + PaintCells(WindowDC, 16, 4, 0, 10 * CELL_SIZE); + PaintCells(WindowDC, 16, 8, 5 * CELL_SIZE, 10 * CELL_SIZE); + PaintCells(WindowDC, 16, 16, 10 * CELL_SIZE, 10 * CELL_SIZE); + PaintCells(WindowDC, 16, 24, 15 * CELL_SIZE, 10 * CELL_SIZE); + PaintCells(WindowDC, 16, 32, 20 * CELL_SIZE, 10 * CELL_SIZE); + + PaintCells(WindowDC, 24, 4, 0, 15 * CELL_SIZE); + PaintCells(WindowDC, 24, 8, 5 * CELL_SIZE, 15 * CELL_SIZE); + PaintCells(WindowDC, 24, 16, 10 * CELL_SIZE, 15 * CELL_SIZE); + PaintCells(WindowDC, 24, 24, 15 * CELL_SIZE, 15 * CELL_SIZE); + PaintCells(WindowDC, 24, 32, 20 * CELL_SIZE, 15 * CELL_SIZE); + + PaintCells(WindowDC, 32, 4, 0, 20 * CELL_SIZE); + PaintCells(WindowDC, 32, 8, 5 * CELL_SIZE, 20 * CELL_SIZE); + PaintCells(WindowDC, 32, 16, 10 * CELL_SIZE, 20 * CELL_SIZE); + PaintCells(WindowDC, 32, 24, 15 * CELL_SIZE, 20 * CELL_SIZE); + PaintCells(WindowDC, 32, 32, 20 * CELL_SIZE, 20 * CELL_SIZE); + + EndPaint(Wnd, &ps); + break; + + case WM_DESTROY: + PostQuitMessage(0); + break; + + default: + return DefWindowProc(Wnd, msg, wParam, lParam); + } + + return 0; +} Propchange: trunk/rostests/dibtests/dibtest/dibtest.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/dibtests/dibtest/dibtest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/dibtest/dibtest.… ============================================================================== --- trunk/rostests/dibtests/dibtest/dibtest.rbuild (added) +++ trunk/rostests/dibtests/dibtest/dibtest.rbuild [iso-8859-1] Mon Nov 17 11:28:14 2008 @@ -1,0 +1,7 @@ +<module name="dibtest" type="win32gui" installbase="bin" installname="dibtest.exe"> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <file>dibtest.c</file> +</module> Propchange: trunk/rostests/dibtests/dibtest/dibtest.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/dibtests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/directory.rbuild… ============================================================================== --- trunk/rostests/dibtests/directory.rbuild [iso-8859-1] (original) +++ trunk/rostests/dibtests/directory.rbuild [iso-8859-1] Mon Nov 17 11:28:14 2008 @@ -1,8 +1,29 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> + <directory name="alphablend"> + <xi:include href="alphablend/alphablend.rbuild" /> + </directory> + <directory name="bitblt"> + <xi:include href="bitblt/bitblt.rbuild" /> + </directory> <directory name="bltrop"> <xi:include href="bltrop/bltrop.rbuild" /> + </directory> + <directory name="dibtest"> + <xi:include href="dibtest/dibtest.rbuild" /> + </directory> + <directory name="icontest"> + <xi:include href="icontest/icontest.rbuild" /> + </directory> + <directory name="palbitblt"> + <xi:include href="palbitblt/palbitblt.rbuild" /> + </directory> + <directory name="patblt"> + <xi:include href="patblt/patblt.rbuild" /> + </directory> + <directory name="stretchblt"> + <xi:include href="stretchblt/stretchblt.rbuild" /> </directory> <directory name="vbltest"> <xi:include href="vbltest/vbltest.rbuild" /> Added: trunk/rostests/dibtests/icontest/icon.ico URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/icontest/icon.ic… ============================================================================== Binary file - no diff available. Propchange: trunk/rostests/dibtests/icontest/icon.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rostests/dibtests/icontest/icontest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/icontest/icontes… ============================================================================== --- trunk/rostests/dibtests/icontest/icontest.c (added) +++ trunk/rostests/dibtests/icontest/icontest.c [iso-8859-1] Mon Nov 17 11:28:14 2008 @@ -1,0 +1,208 @@ +#include <windows.h> +#include "resource.h" +#include <string.h> +#include <stdio.h> + +ULONG __cdecl DbgPrint(IN PCH Format, IN ...); + +const char titleDrwIco[] = "DrawIcon Output"; +const char titleMask[] = "Mask(AND image)"; +const char titleXor[] = "XOR(color image)"; +const char file[] = "Icon from file:"; +const char res[] = "Icon from Resorce:"; +const char cursor[] = "Current Cursor:"; +const char cursormask[] = "Cursor Mask Bitmap"; +const char cursorcolor[] = "Cursor Color Bitmap"; + +HFONT tf; +HINSTANCE hInst; + +LRESULT WINAPI MainWndProc(HWND, UINT, WPARAM, LPARAM); + +int WINAPI +WinMain(HINSTANCE hInstance, + HINSTANCE hPrevInstance, + LPSTR lpszCmdLine, + int nCmdShow) +{ + WNDCLASS wc; + MSG msg; + HWND hWnd; + + hInst = hInstance; + + #ifdef _GetCursorInfo + GetCursorInfo = (GETCURSORINFO)GetProcAddress(GetModuleHandleW(L"user32.dll"), "GetCursorInfo"); + #endif + + wc.lpszClassName = "IconTestClass"; + wc.lpfnWndProc = MainWndProc; + wc.style = CS_VREDRAW | CS_HREDRAW; + wc.hInstance = hInstance; + wc.hIcon = LoadIcon(NULL, (LPCTSTR)IDI_APPLICATION); + wc.hCursor = LoadCursor(NULL, (LPCTSTR)IDC_ARROW); + wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); + wc.lpszMenuName = NULL; + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; + if (RegisterClass(&wc) == 0) + { + DbgPrint("RegisterClass failed (last error 0x%X)\n", GetLastError()); + return(1); + } + + hWnd = CreateWindow("IconTestClass", + "Icon Test", + WS_OVERLAPPEDWINDOW|WS_HSCROLL|WS_VSCROLL, + CW_USEDEFAULT, + CW_USEDEFAULT, + 480, + 480, + NULL, + NULL, + hInstance, + NULL); + if (hWnd == NULL) + { + DbgPrint("CreateWindow failed (last error 0x%X)\n", GetLastError()); + return(1); + } + + tf = CreateFontA(14,0, 0, TA_BASELINE, FW_NORMAL, FALSE, FALSE, FALSE, + ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, + DEFAULT_QUALITY, FIXED_PITCH|FF_DONTCARE, "Timmons"); + + ShowWindow(hWnd, nCmdShow); + + SetTimer(hWnd, 1, 1000, NULL); + + while(GetMessage(&msg, NULL, 0, 0)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + + return msg.wParam; +} + +LRESULT CALLBACK MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + PAINTSTRUCT ps; + HDC hDC; + HICON hIcon; + HGDIOBJ hOld; + HDC hMemDC; + CURSORINFO cursorinfo; + ICONINFO iconinfo; + BITMAP bmp; + RECT rc; + CHAR str[20]; + + switch(msg) + { + case WM_PAINT: + hDC = BeginPaint(hWnd, &ps); + SelectObject(hDC, tf); + SetBkMode(hDC, TRANSPARENT); + + TextOut(hDC, 160, 10, file, strlen(file)); + TextOut(hDC, 15, 85, titleDrwIco, strlen(titleDrwIco)); + TextOut(hDC, 160, 85, titleMask, strlen(titleMask)); + TextOut(hDC, 300, 85, titleXor, strlen(titleXor)); + + hIcon = LoadImage(NULL, "icon.ico", IMAGE_ICON, 0, 0, LR_DEFAULTSIZE|LR_LOADFROMFILE); + DrawIcon(hDC,50,50,hIcon); + + hMemDC = CreateCompatibleDC(hDC); + GetIconInfo(hIcon, &iconinfo); + DestroyIcon(hIcon); + + hOld = SelectObject(hMemDC, iconinfo.hbmMask); + BitBlt(hDC, 200, 50, 32, 32, hMemDC, 0, 0, SRCCOPY); + SelectObject(hMemDC, iconinfo.hbmColor); + BitBlt(hDC, 350, 50, 32, 32, hMemDC, 0, 0, SRCCOPY); + + DeleteObject(iconinfo.hbmMask); + DeleteObject(iconinfo.hbmColor); + + TextOut(hDC, 145, 150, res, strlen(res)); + TextOut(hDC, 15, 225, titleDrwIco, strlen(titleDrwIco)); + TextOut(hDC, 160, 225, titleMask, strlen(titleMask)); + TextOut(hDC, 300, 225, titleXor, strlen(titleXor)); + + hIcon = LoadImage(hInst, MAKEINTRESOURCE(IDI_ICON), IMAGE_ICON, 0, 0, LR_DEFAULTSIZE); + DrawIcon(hDC,50,190,hIcon); + + GetIconInfo(hIcon, &iconinfo); + DestroyIcon(hIcon); + + SelectObject(hMemDC, iconinfo.hbmMask); + BitBlt(hDC, 200, 190, 32, 32, hMemDC, 0, 0, SRCCOPY); + SelectObject(hMemDC, iconinfo.hbmColor); + BitBlt(hDC, 350, 190, 32, 32, hMemDC, 0, 0, SRCCOPY); + + DeleteObject(iconinfo.hbmMask); + DeleteObject(iconinfo.hbmColor); + + cursorinfo.cbSize = sizeof(CURSORINFO); + if(GetCursorInfo(&cursorinfo)) + { + if(cursorinfo.hCursor && cursorinfo.flags) + { + TextOut(hDC, 160, 290, cursor, strlen(cursor)); + DrawIcon(hDC, 50, 330, cursorinfo.hCursor); + GetIconInfo(cursorinfo.hCursor, &iconinfo); + TextOut(hDC, 15, 365, titleDrwIco, strlen(titleDrwIco)); + + sprintf(str, "Hotspot: %ld; %ld", iconinfo.xHotspot, iconinfo.yHotspot); + TextOut(hDC, 15, 380, str, strlen(str)); + + if(iconinfo.hbmMask) + { + GetObjectW(iconinfo.hbmMask, sizeof(BITMAP), &bmp); + SelectObject(hMemDC, iconinfo.hbmMask); + BitBlt(hDC, 200, 330, bmp.bmWidth, bmp.bmHeight, hMemDC, 0, 0, SRCCOPY); + DeleteObject(iconinfo.hbmMask); + TextOut(hDC, 160, 365 - 32 + bmp.bmHeight, cursormask, strlen(cursormask)); + + sprintf(str, "%dBPP", bmp.bmBitsPixel); + TextOut(hDC, 160, 380 - 32 + bmp.bmHeight, str, strlen(str)); + } + + if(iconinfo.hbmColor) + { + GetObjectW(iconinfo.hbmColor, sizeof(BITMAP), &bmp); + SelectObject(hMemDC, iconinfo.hbmColor); + BitBlt(hDC, 350, 330, bmp.bmWidth, bmp.bmHeight, hMemDC, 0, 0, SRCCOPY); + DeleteObject(iconinfo.hbmColor); + TextOut(hDC, 300, 365 - 32 + bmp.bmHeight, cursorcolor, strlen(cursorcolor)); + + sprintf(str, "%dBPP", bmp.bmBitsPixel); + TextOut(hDC, 300, 380 - 32 + bmp.bmHeight, str, strlen(str)); + } + } + } + + SelectObject(hMemDC, hOld); + + DeleteObject(hMemDC); + EndPaint(hWnd, &ps); + break; + + case WM_TIMER: + rc.left = 0; + rc.top = 330; + rc.right = 480; + rc.bottom = 480; + InvalidateRect(hWnd, &rc, TRUE); + break; + + case WM_DESTROY: + PostQuitMessage(0); + break; + + default: + return DefWindowProc(hWnd, msg, wParam, lParam); + } + return 0; +} Propchange: trunk/rostests/dibtests/icontest/icontest.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/dibtests/icontest/icontest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/icontest/icontes… ============================================================================== --- trunk/rostests/dibtests/icontest/icontest.rbuild (added) +++ trunk/rostests/dibtests/icontest/icontest.rbuild [iso-8859-1] Mon Nov 17 11:28:14 2008 @@ -1,0 +1,10 @@ +<module name="icontest" type="win32gui" installbase="bin" installname="icontest.exe"> + <define name="__USE_W32API" /> + <include base="icontest">.</include> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <library>ntdll</library> + <file>icontest.c</file> + <file>icontest.rc</file> +</module> Propchange: trunk/rostests/dibtests/icontest/icontest.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/dibtests/icontest/icontest.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/icontest/icontes… ============================================================================== --- trunk/rostests/dibtests/icontest/icontest.rc (added) +++ trunk/rostests/dibtests/icontest/icontest.rc [iso-8859-1] Mon Nov 17 11:28:14 2008 @@ -1,0 +1,4 @@ +#include <windows.h> +#include "resource.h" + +IDI_ICON ICON DISCARDABLE "icon.ico" Propchange: trunk/rostests/dibtests/icontest/icontest.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/dibtests/icontest/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/icontest/resourc… ============================================================================== --- trunk/rostests/dibtests/icontest/resource.h (added) +++ trunk/rostests/dibtests/icontest/resource.h [iso-8859-1] Mon Nov 17 11:28:14 2008 @@ -1,0 +1,1 @@ +#define IDI_ICON 101 Propchange: trunk/rostests/dibtests/icontest/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/dibtests/palbitblt/pal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/palbitblt/pal.c?… ============================================================================== --- trunk/rostests/dibtests/palbitblt/pal.c (added) +++ trunk/rostests/dibtests/palbitblt/pal.c [iso-8859-1] Mon Nov 17 11:28:14 2008 @@ -1,0 +1,201 @@ +/* The idea of this test app is inspired from tutorial * + * found at http://www.theparticle.com/pgraph.html * + * * + * Developed by: Aleksey Bragin <aleksey(a)studiocerebral.com> * + * Version: 1.0 */ + +#include <windows.h> +#include <stdlib.h> + +#define W_WIDTH 320 +#define W_HEIGHT 240 + +// special version of BITMAPINFO and LOGPALETTE for max of 256 palette entries +typedef struct +{ + BITMAPINFOHEADER bmiHeader; + RGBQUAD bmiColors[256]; +} BITMAPINFO256; + +typedef struct { + WORD palVersion; + WORD palNumEntries; + PALETTEENTRY palPalEntry[256]; +} LOGPALETTE256; + +// The only global variable --- contents of the DIBitmap +BYTE* dibits; + +void GeneratePalette(RGBQUAD* p) +{ + int i; + for(i=0;i<256;i++) + { + p[i].rgbRed = i; + p[i].rgbGreen = i; + p[i].rgbBlue = i; + p[i].rgbReserved = 0; + } +} + +void DoBlt(HBITMAP hBM) +{ + HDC hDC,Context; + HWND ActiveWindow; + RECT dest; + HBITMAP dflBmp; + + if((ActiveWindow = GetActiveWindow()) == NULL) + return; + + hDC = GetDC(ActiveWindow); + GetClientRect(ActiveWindow,&dest); + + Context = CreateCompatibleDC(0); + dflBmp = SelectObject(Context, hBM); + BitBlt(hDC, 0, 0, dest.right, dest.bottom, Context, 0, 0, SRCCOPY); + SelectObject(Context, dflBmp); + DeleteDC(Context); + DeleteObject(dflBmp); + ReleaseDC(ActiveWindow, hDC); +} + +void UpdatePalette(HBITMAP hBM){ + int i,y; + static unsigned int c=0; + + for(i=0;i<W_WIDTH;i++){ + for(y=0;y<=W_HEIGHT-1;y++) + dibits[y*320+i] = c % 256; + + if (c > 512) + c = 0; + else + c++; // It's operation of incrementing of c variable, not reference of a cool OO language :-) + } + + DoBlt(hBM); +} + +void InitBitmap(HANDLE *hBM){ + HPALETTE PalHan; + HWND ActiveWindow; + HDC hDC; + RGBQUAD palette[256]; + int i; + BITMAPINFO256 bmInf; + LOGPALETTE256 palInf; + + ActiveWindow = GetActiveWindow(); + hDC = GetDC(ActiveWindow); + + bmInf.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bmInf.bmiHeader.biWidth = W_WIDTH; + bmInf.bmiHeader.biHeight = -abs(W_HEIGHT); + bmInf.bmiHeader.biPlanes = 1; + bmInf.bmiHeader.biBitCount = 8; + bmInf.bmiHeader.biCompression = BI_RGB; + bmInf.bmiHeader.biSizeImage = 0; + bmInf.bmiHeader.biXPelsPerMeter = 0; + bmInf.bmiHeader.biYPelsPerMeter = 0; + bmInf.bmiHeader.biClrUsed = 256; + bmInf.bmiHeader.biClrImportant = 256; + + GeneratePalette(palette); + + for(i=0;i<256;i++) + bmInf.bmiColors[i] = palette[i]; + + palInf.palVersion = 0x300; + palInf.palNumEntries = 256; + for(i=0;i<256;i++){ + palInf.palPalEntry[i].peRed = palette[i].rgbRed; + palInf.palPalEntry[i].peGreen = palette[i].rgbGreen; + palInf.palPalEntry[i].peBlue = palette[i].rgbBlue; + palInf.palPalEntry[i].peFlags = PC_NOCOLLAPSE; + } + + // Create palette + PalHan = CreatePalette((LOGPALETTE*)&palInf); + + // Select it into hDC + SelectPalette(hDC,PalHan,FALSE); + + // Realize palette in hDC + RealizePalette(hDC); + + // Delete handle to palette + DeleteObject(PalHan); + + // Create dib section + *hBM = CreateDIBSection(hDC,(BITMAPINFO*)&bmInf, + DIB_RGB_COLORS,(void**)&dibits,0,0); + + // Release dc + ReleaseDC(ActiveWindow,hDC); +} + +LRESULT CALLBACK WndProc(HWND hWnd,UINT msg, WPARAM wParam,LPARAM lParam) +{ + switch(msg){ + case WM_DESTROY: + PostQuitMessage(0); + return 0; + default: + return DefWindowProc(hWnd,msg,wParam,lParam); + } +} + + + +int WINAPI WinMain(HINSTANCE hInstance,HINSTANCE hPrevInstance, LPSTR lpszCmdParam,int nCmdShow) +{ + WNDCLASS WndClass; + HWND hWnd; + MSG msg; + char szName[] = "Palette BitBlt test"; + BOOL exit = FALSE; + HBITMAP hBM; + + // Create and register window class (not modified!!!!!!!!!!!1) + WndClass.style = CS_HREDRAW|CS_VREDRAW|CS_OWNDC; + WndClass.lpfnWndProc = WndProc; + WndClass.cbClsExtra = 0; + WndClass.cbWndExtra = 0; + WndClass.hbrBackground = NULL;//GetStockObject(BLACK_BRUSH); + WndClass.hIcon = NULL;//LoadIcon(hInstance,NULL); + WndClass.hCursor = NULL;//LoadCursor(NULL,IDC_ARROW); + WndClass.hInstance = hInstance; + WndClass.lpszClassName = szName; + WndClass.lpszMenuName = 0; + + RegisterClass(&WndClass); + + // Create and show window (change styles !!!!!!!!) + hWnd = CreateWindow(szName, "ReactOS palette bitblt test", + WS_CAPTION|WS_MINIMIZEBOX|WS_SYSMENU, + CW_USEDEFAULT,CW_USEDEFAULT,W_WIDTH,W_HEIGHT, + 0,0,hInstance,0); + ShowWindow(hWnd,nCmdShow); + + // Prepare bitmap to be bitblt + InitBitmap(&hBM); + + // Main message loop + while (!exit) + { + UpdatePalette(hBM); + Sleep(200); + + if(PeekMessage(&msg,0,0,0,PM_NOREMOVE) == TRUE) + { + if (!GetMessage(&msg,0,0,0)) + exit = TRUE; + + TranslateMessage(&msg); + DispatchMessage(&msg); + } + } + + return msg.wParam; +} Propchange: trunk/rostests/dibtests/palbitblt/pal.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/dibtests/palbitblt/palbitblt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/palbitblt/palbit… ============================================================================== --- trunk/rostests/dibtests/palbitblt/palbitblt.rbuild (added) +++ trunk/rostests/dibtests/palbitblt/palbitblt.rbuild [iso-8859-1] Mon Nov 17 11:28:14 2008 @@ -1,0 +1,7 @@ +<module name="palbitblt" type="win32gui" installbase="bin" installname="palbitblt.exe" allowwarnings="true" stdlib="host"> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <file>pal.c</file> +</module> Propchange: trunk/rostests/dibtests/palbitblt/palbitblt.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/dibtests/patblt/Penguin.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/patblt/Penguin.b… ============================================================================== Binary file - no diff available. Propchange: trunk/rostests/dibtests/patblt/Penguin.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rostests/dibtests/patblt/patblt.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/patblt/patblt.cp… ============================================================================== --- trunk/rostests/dibtests/patblt/patblt.cpp (added) +++ trunk/rostests/dibtests/patblt/patblt.cpp [iso-8859-1] Mon Nov 17 11:28:14 2008 @@ -1,0 +1,270 @@ + +// ------------------------------------------------------------------ +// Windows 2000 Graphics API Black Book +// Chapter 2 - Listing 2.1 (PatBlt Tracking Rect Demo) +// +// Created by Damon Chandler <dmc27(a)ee.cornell.edu> +// Updates can be downloaded at: <www.coriolis.com> +// +// Please do not hesistate to e-mail me at dmc27(a)ee.cornell.edu +// if you have any questions about this code. +// ------------------------------------------------------------------ + + +//>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> +#include <windows.h> +//<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< + + +HINSTANCE HInst; +const char* WndClassName = "GMainWnd"; +LRESULT CALLBACK MainWndProc(HWND HWnd, UINT Msg, WPARAM WParam, + LPARAM LParam); + + +int APIENTRY WinMain(HINSTANCE HInstance, HINSTANCE, LPTSTR, + int nCmdShow) +{ + HInst = HInstance; + + WNDCLASS wc; + memset(&wc, 0, sizeof(WNDCLASS)); + + wc.style = CS_VREDRAW | CS_HREDRAW; + wc.lpszClassName = WndClassName; + wc.lpfnWndProc = MainWndProc; + wc.hInstance = HInstance; + wc.hCursor = LoadCursor(NULL, IDC_ARROW); + wc.hbrBackground = static_cast<HBRUSH>( + GetStockObject(BLACK_BRUSH) + ); + + if (RegisterClass(&wc)) + { + HWND HWnd = + CreateWindow(WndClassName, + TEXT("PatBlt Tracking Rect Demo"), + WS_OVERLAPPEDWINDOW | WS_CAPTION | + WS_VISIBLE | WS_CLIPCHILDREN, + CW_USEDEFAULT, CW_USEDEFAULT, 640, 480, + NULL, NULL, HInst, NULL); + + if (HWnd) + { + ShowWindow(HWnd, nCmdShow); + UpdateWindow(HWnd); + + MSG msg; + while (GetMessage(&msg, NULL, 0, 0)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + } + } + return 0; +} +//------------------------------------------------------------------ + + +// image related +HDC HMemDC = NULL; +HBITMAP HOldBmp = NULL; +const char* filename = "PENGUIN.BMP"; +RECT RImage = {225, 110, 225, 110}; + +// tracking related +bool is_tracking = false; +HDC HScreenDC = NULL; +POINT PMouse = {0, 0}; +RECT RTrack = {0, 0, 0, 0}; +const int line_width = 5; + + +// utility function to map to/from window coordinates +void MapRect(IN HWND HWndFrom, IN HWND HWndTo, IN OUT RECT& RMap) +{ + MapWindowPoints( + HWndFrom, HWndTo, + reinterpret_cast<LPPOINT>(&RMap), 2 + ); +} +//------------------------------------------------------------------ + + +// utility function that uses the PatBlt function to +// render a tracking rectangle +void RenderTrackingRect(IN HDC HDestDC, IN const RECT& RRender) +{ + const int width = RRender.right - RRender.left; + const int height = RRender.bottom - RRender.top; + const DWORD dwROP3 = DSTINVERT; // experiment with others + + // render top bar + PatBlt(HDestDC, + RRender.left, RRender.top, + width, line_width, + dwROP3); + // render bottom bar + PatBlt(HDestDC, + RRender.left, RRender.bottom - line_width, + width, line_width, + dwROP3); + // render left bar + PatBlt(HDestDC, + RRender.left, RRender.top + line_width, + line_width, height - (2 * line_width), + dwROP3); + // render right bar + PatBlt(HDestDC, + RRender.right - line_width, RRender.top + line_width, + line_width, height - (2 * line_width), + dwROP3); + +} +//------------------------------------------------------------------ + + +LRESULT CALLBACK MainWndProc(HWND HWnd, UINT Msg, WPARAM WParam, + LPARAM LParam) +{ + switch (Msg) + { + case WM_CREATE: + { + // create a memory DC + HMemDC = CreateCompatibleDC(NULL); + if (HMemDC) + { + // load the penguin bitmap + HBITMAP HBmp = static_cast<HBITMAP>( + LoadImage(HInst, filename, IMAGE_BITMAP, 0, 0, + LR_LOADFROMFILE | LR_DEFAULTSIZE) + ); + if (HBmp) + { + // get the bitmap's dimensions + BITMAP bmp; + if (GetObject(HBmp, sizeof(BITMAP), &bmp)) + { + RImage.right += bmp.bmWidth; + RImage.bottom += bmp.bmHeight; + + // realize the bitmap + HOldBmp = static_cast<HBITMAP>( + SelectObject(HMemDC, HBmp) + ); + } + else DeleteObject(HBmp); + } + } + break; + } + case WM_LBUTTONDOWN: + { + PMouse.x = LOWORD(LParam); + PMouse.y = HIWORD(LParam); + + RECT RClient; + if (PtInRect(&RImage, PMouse) && + GetClientRect(HWnd, &RClient)) + { + MapRect(HWnd, HWND_DESKTOP, RClient); + ClipCursor(&RClient); + + // grab a handle to the screen DC and clip + // all output to the client area of our window + HScreenDC = GetDC(NULL); + HRGN HClipRgn = CreateRectRgnIndirect(&RClient); + SelectClipRgn(HScreenDC, HClipRgn); + DeleteObject(HClipRgn); + + CopyRect(&RTrack, &RImage); + MapRect(HWnd, HWND_DESKTOP, RTrack); + + // render the first tracking rect + RenderTrackingRect(HScreenDC, RTrack); + is_tracking = true; + } + break; + } + case WM_MOUSEMOVE: + { + if (HScreenDC && is_tracking) + { + POINT PCurrent = {LOWORD(LParam), HIWORD(LParam)}; + const int dX = PCurrent.x - PMouse.x; + const int dY = PCurrent.y - PMouse.y; + + // erase the previous rectangle + RenderTrackingRect(HScreenDC, RTrack); + // update the postion + OffsetRect(&RTrack, dX, dY); + // render the new tracking rectangle + RenderTrackingRect(HScreenDC, RTrack); + + // update the mouse position + memcpy(&PMouse, &PCurrent, sizeof(POINT)); + } + break; + } + case WM_LBUTTONUP: + { + // clean up + if (is_tracking) + { + is_tracking = false; + SelectClipRgn(HScreenDC, NULL); + ReleaseDC(NULL, HScreenDC); + + InvalidateRect(HWnd, &RImage, true); + CopyRect(&RImage, &RTrack); + MapRect(HWND_DESKTOP, HWnd, RImage); + InvalidateRect(HWnd, &RImage, true); + + ClipCursor(NULL); + } + break; + } + case WM_PAINT: + { + PAINTSTRUCT ps; + HDC Hdc = BeginPaint(HWnd, &ps); + try + { + // + // TODO: Add palette support... + // + + // render the penguin + BitBlt(Hdc, RImage.left, RImage.top, + RImage.right - RImage.left, + RImage.bottom - RImage.top, + HMemDC, 0, 0, + SRCCOPY); + } + catch (...) + { + EndPaint(HWnd, &ps); + } + EndPaint(HWnd, &ps); + break; + } + case WM_DESTROY: + { + // clean up + if (HOldBmp) + { + DeleteObject(SelectObject(HMemDC, HOldBmp)); + } + if (HMemDC) + { + DeleteDC(HMemDC); + } + PostQuitMessage(0); + return 0; + } + } + return DefWindowProc(HWnd, Msg, WParam, LParam); +} +//------------------------------------------------------------------ Propchange: trunk/rostests/dibtests/patblt/patblt.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/dibtests/patblt/patblt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/patblt/patblt.rb… ============================================================================== --- trunk/rostests/dibtests/patblt/patblt.rbuild (added) +++ trunk/rostests/dibtests/patblt/patblt.rbuild [iso-8859-1] Mon Nov 17 11:28:14 2008 @@ -1,0 +1,7 @@ +<module name="patblt" type="win32gui" installbase="bin" installname="patblt.exe" allowwarnings="true" stdlib="host"> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <file>patblt.cpp</file> +</module> Propchange: trunk/rostests/dibtests/patblt/patblt.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/dibtests/stretchblt/lena.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/stretchblt/lena.… ============================================================================== Binary file - no diff available. Propchange: trunk/rostests/dibtests/stretchblt/lena.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rostests/dibtests/stretchblt/stretchblt.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/stretchblt/stret… ============================================================================== --- trunk/rostests/dibtests/stretchblt/stretchblt.cpp (added) +++ trunk/rostests/dibtests/stretchblt/stretchblt.cpp [iso-8859-1] Mon Nov 17 11:28:14 2008 @@ -1,0 +1,380 @@ + +// ------------------------------------------------------------------ +// Windows 2000 Graphics API Black Book +// Chapter 1 - Listing 1.5 (StretchBlt Zooming Demo) +// +// Created by Damon Chandler <dmc27(a)ee.cornell.edu> +// Updates can be downloaded at: <www.coriolis.com> +// +// Please do not hesistate to e-mail me at dmc27(a)ee.cornell.edu +// if you have any questions about this code. +// ------------------------------------------------------------------ + +// Modified by Aleksey Bragin (aleksey at studiocerebral.com) +// to support non-uniform scaling, and output via sretchdibits +// (type something in the command line to invoke this mode, +// in future it will be source BPP) + +//>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> +#include <windows.h> +#include <stdio.h> +//<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< + + +HWND HListBox = NULL; +HWND VListBox = NULL; +const int ID_LISTBOX = 101; +const int ID_LISTBOX2 = 102; +BOOL useDIBits=FALSE; // How to display the image - via StretchDIBits + +HINSTANCE HInst; +HINSTANCE HPrevInst; +TCHAR *cmdline; +const char* WndClassName = "GMainWnd"; +LRESULT CALLBACK MainWndProc(HWND HWnd, UINT Msg, WPARAM WParam, + LPARAM LParam); + + +int APIENTRY WinMain(HINSTANCE HInstance, HINSTANCE HPrevInstance, + LPTSTR lpCmdLine, int nCmdShow) +{ + HInst = HInstance; + HPrevInst = HPrevInstance; + cmdline = lpCmdLine; + + WNDCLASS wc; + memset(&wc, 0, sizeof(WNDCLASS)); + + wc.style = CS_VREDRAW | CS_HREDRAW | CS_DBLCLKS; + wc.lpfnWndProc = MainWndProc; + wc.hInstance = HInstance; + wc.hCursor = LoadCursor(NULL, IDC_ARROW); + wc.hbrBackground = reinterpret_cast<HBRUSH>(COLOR_BTNFACE + 1); + wc.lpszClassName = WndClassName; + + if (RegisterClass(&wc)) + { + HWND HWnd = + CreateWindow(WndClassName, TEXT("StretchBlt NonUniform Zooming Demo"), + WS_OVERLAPPEDWINDOW | WS_CAPTION | + WS_VISIBLE | WS_CLIPSIBLINGS, + 0, 0, 675, 560, + NULL, NULL, HInst, NULL); + + if (HWnd) + { + HListBox = + CreateWindowEx(WS_EX_CLIENTEDGE, "LISTBOX", "", + LBS_NOTIFY | WS_CHILD | WS_VISIBLE, + 530, 5, 130, 150, HWnd, + reinterpret_cast<HMENU>(ID_LISTBOX), + HInst, NULL); + VListBox = + CreateWindowEx(WS_EX_CLIENTEDGE, "LISTBOX", "", + LBS_NOTIFY | WS_CHILD | WS_VISIBLE, + 530, 5+170, 130, 150, HWnd, + reinterpret_cast<HMENU>(ID_LISTBOX2), + HInst, NULL); + + if (HListBox && VListBox) + { +// horizontal zoom + SNDMSG(HListBox, LB_ADDSTRING, 0, + reinterpret_cast<LPARAM>("Zoom 25%")); + SNDMSG(HListBox, LB_ADDSTRING, 0, + reinterpret_cast<LPARAM>("Zoom 50%")); + SNDMSG(HListBox, LB_ADDSTRING, 0, + reinterpret_cast<LPARAM>("Zoom 75%")); + SNDMSG(HListBox, LB_ADDSTRING, 0, + reinterpret_cast<LPARAM>("Zoom 100%")); + SNDMSG(HListBox, LB_ADDSTRING, 0, + reinterpret_cast<LPARAM>("Zoom 125%")); + SNDMSG(HListBox, LB_ADDSTRING, 0, + reinterpret_cast<LPARAM>("Zoom 150%")); + SNDMSG(HListBox, LB_ADDSTRING, 0, + reinterpret_cast<LPARAM>("Zoom 200%")); + SNDMSG(HListBox, LB_ADDSTRING, 0, + reinterpret_cast<LPARAM>("Zoom 300%")); +// vertical zoom + SNDMSG(VListBox, LB_ADDSTRING, 0, + reinterpret_cast<LPARAM>("Zoom 25%")); + SNDMSG(VListBox, LB_ADDSTRING, 0, + reinterpret_cast<LPARAM>("Zoom 50%")); + SNDMSG(VListBox, LB_ADDSTRING, 0, + reinterpret_cast<LPARAM>("Zoom 75%")); + SNDMSG(VListBox, LB_ADDSTRING, 0, + reinterpret_cast<LPARAM>("Zoom 100%")); + SNDMSG(VListBox, LB_ADDSTRING, 0, + reinterpret_cast<LPARAM>("Zoom 125%")); + SNDMSG(VListBox, LB_ADDSTRING, 0, + reinterpret_cast<LPARAM>("Zoom 150%")); + SNDMSG(VListBox, LB_ADDSTRING, 0, + reinterpret_cast<LPARAM>("Zoom 200%")); + SNDMSG(VListBox, LB_ADDSTRING, 0, + reinterpret_cast<LPARAM>("Zoom 300%")); + + } + + ShowWindow(HWnd, nCmdShow); + UpdateWindow(HWnd); + + MSG msg; + while (GetMessage(&msg, NULL, 0, 0)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + } + } + return 0; +} +//------------------------------------------------------------------ + + +// image related +BITMAP bmp; +BITMAPINFO bmInfo; +char *bbits = NULL; // bitmap bits +const char* filename = "LENA.BMP"; +HDC HMemDC = NULL; +HBITMAP HOldBmp = NULL; + +// zooming related +float zoom_factor_h = 0.5; +float zoom_factor_v = 0.5; +RECT RDest = {5, 5, 0, 0}; +enum {ID_ZOOM25, ID_ZOOM50, ID_ZOOM75, ID_ZOOM100, + ID_ZOOM125, ID_ZOOM150, ID_ZOOM200, ID_ZOOM300}; + +LRESULT CALLBACK MainWndProc(HWND HWnd, UINT Msg, WPARAM WParam, + LPARAM LParam) +{ + switch (Msg) + { + case WM_CREATE: + { + // check commandline + if (strlen(cmdline) != 0) + { + + useDIBits = TRUE; + } + else + useDIBits = FALSE; + + // create a memory DC + HMemDC = CreateCompatibleDC(NULL); + if (HMemDC) + { + // load a bitmap from file + HBITMAP HBmp = + static_cast<HBITMAP>( + LoadImage(HInst, filename, IMAGE_BITMAP, + 0, 0, LR_LOADFROMFILE) + ); + if (HBmp) + { + // extract dimensions of the bitmap + GetObject(HBmp, sizeof(BITMAP), &bmp); + + // fill the BITMAPINFO stucture for further use by StretchDIBits + bmInfo.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bmInfo.bmiHeader.biWidth = bmp.bmWidth; + bmInfo.bmiHeader.biHeight = bmp.bmHeight; + bmInfo.bmiHeader.biPlanes = 1;//bmp.bmPlanes; + bmInfo.bmiHeader.biBitCount = bmp.bmBitsPixel; + bmInfo.bmiHeader.biCompression = BI_RGB; + bmInfo.bmiHeader.biSizeImage = 0; + bmInfo.bmiHeader.biXPelsPerMeter = 0; + bmInfo.bmiHeader.biClrImportant = 0; + bmInfo.bmiHeader.biClrUsed = 0; + + // associate the bitmap with the memory DC + HOldBmp = static_cast<HBITMAP>( + SelectObject(HMemDC, HBmp) + ); + + if (useDIBits) + { + bbits = new char[bmp.bmHeight*bmp.bmWidthBytes*(bmp.bmBitsPixel / 8)]; + //GetDIBits(HMemDC, HBmp, 0, bmp.bmHeight, bbits, &bmInfo, DIB_RGB_COLORS); + + // Here goes a temp hack, since GetDIBits doesn't exist in ReactOS yet + FILE *f = fopen(filename, "rb"); + BITMAPFILEHEADER bmpHeader; + + fread(&bmpHeader, sizeof(BITMAPFILEHEADER), 1, f); + fread(&bmInfo, sizeof(BITMAPINFO), 1, f); + fseek(f, bmpHeader.bfOffBits, SEEK_SET); + fread(bbits, bmp.bmHeight*bmp.bmWidthBytes*(bmp.bmBitsPixel / 8), 1, f); + + fclose(f); + } + } + } + } + case WM_COMMAND: + { + if (WParam == MAKEWPARAM(ID_LISTBOX, LBN_SELCHANGE) || + WParam == MAKEWPARAM(ID_LISTBOX2, LBN_SELCHANGE)) + { + switch (SNDMSG(HListBox, LB_GETCURSEL, 0, 0)) + { + case ID_ZOOM25: zoom_factor_h = 0.25; break; + case ID_ZOOM50: zoom_factor_h = 0.50; break; + case ID_ZOOM75: zoom_factor_h = 0.75; break; + case ID_ZOOM100: zoom_factor_h = 1.00; break; + case ID_ZOOM125: zoom_factor_h = 1.25; break; + case ID_ZOOM150: zoom_factor_h = 1.50; break; + case ID_ZOOM200: zoom_factor_h = 2.00; break; + case ID_ZOOM300: zoom_factor_h = 3.00; break; + } + + switch (SNDMSG(VListBox, LB_GETCURSEL, 0, 0)) + { + case ID_ZOOM25: zoom_factor_v = 0.25; break; + case ID_ZOOM50: zoom_factor_v = 0.50; break; + case ID_ZOOM75: zoom_factor_v = 0.75; break; + case ID_ZOOM100: zoom_factor_v = 1.00; break; + case ID_ZOOM125: zoom_factor_v = 1.25; break; + case ID_ZOOM150: zoom_factor_v = 1.50; break; + case ID_ZOOM200: zoom_factor_v = 2.00; break; + case ID_ZOOM300: zoom_factor_v = 3.00; break; + } + + // calculate the new width and height + const int new_width = + static_cast<int>(zoom_factor_h * bmp.bmWidth); + const int new_height = + static_cast<int>(zoom_factor_v * bmp.bmHeight); + + // is zooming in? + bool zoom_in = (new_width > RDest.right - RDest.left); + + // caculate the area that needs to be updated + RECT RUpdate = { + RDest.left, RDest.top, + RDest.left + max(new_width, RDest.right - RDest.left), + RDest.top + max(new_height, RDest.bottom - RDest.top) + }; + + // adjust the dimenstions of the + // destination rectangle + RDest.right = RDest.left + new_width; + RDest.bottom = RDest.top + new_height; + + // create an update region from the XOR combination + // of the update and destination rectangles + HRGN HUpdateRgn = CreateRectRgnIndirect(&RUpdate); + HRGN HDestRgn = CreateRectRgnIndirect(&RDest); + int result = + CombineRgn(HUpdateRgn, HUpdateRgn, HDestRgn, RGN_XOR); + + // incite a repaint + if (result != NULLREGION && result != ERROR) + { + InvalidateRgn(HWnd, HUpdateRgn, true); + RedrawWindow(HWnd, &RDest, NULL, RDW_NOERASE | RDW_INVALIDATE); + } + else if (result == NULLREGION) + { + InvalidateRect(HWnd, &RUpdate, zoom_in ? false : true); + } + + // clean up + DeleteObject(HUpdateRgn); + DeleteObject(HDestRgn); + } + break; + } + case WM_PAINT: + { + PAINTSTRUCT ps; + const HDC Hdc = BeginPaint(HWnd, &ps); +#if 0 + try +#endif + { + // + // TODO: add palette support (see Chapter 9)... + // + if (useDIBits) + { + if (RDest.right - RDest.left > 0) + { + if (zoom_factor_h < 1.0 || zoom_factor_v < 1.0) + { + SetStretchBltMode(Hdc, COLORONCOLOR); + } + + // render the zoomed image + StretchDIBits(Hdc, RDest.left, RDest.top, + RDest.right - RDest.left, + RDest.bottom - RDest.top, + 0, 0, + bmp.bmWidth, bmp.bmHeight, + bbits, &bmInfo, + DIB_RGB_COLORS, + SRCCOPY); + } + } + else + { + if (RDest.right - RDest.left > 0) + { + + // use BitBlt when not zooming + if (zoom_factor_h == 1.0 && zoom_factor_v == 1.0) + { + BitBlt(Hdc, RDest.left, RDest.top, + RDest.right - RDest.left, + RDest.bottom - RDest.top, + HMemDC, 0, 0, + SRCCOPY); + } + else + { + if (zoom_factor_h < 1.0 || zoom_factor_v < 1.0) + { + SetStretchBltMode(Hdc, COLORONCOLOR); + } + + // render the zoomed image + StretchBlt(Hdc, RDest.left, RDest.top, + RDest.right - RDest.left, + RDest.bottom - RDest.top, + HMemDC, 0, 0, + bmp.bmWidth, bmp.bmHeight, + SRCCOPY); + } + } + } + } +#if 0 + catch (...) +#endif + { + EndPaint(HWnd, &ps); + } + EndPaint(HWnd, &ps); + break; + } + case WM_DESTROY: + { + // clean up + DeleteObject(SelectObject(HMemDC, HOldBmp)); + DeleteDC(HMemDC); + + if (bbits) + delete[] bbits; + + PostQuitMessage(0); + return 0; + } + } + return DefWindowProc(HWnd, Msg, WParam, LParam); +} +//------------------------------------------------------------------ + + + Propchange: trunk/rostests/dibtests/stretchblt/stretchblt.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/dibtests/stretchblt/stretchblt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/stretchblt/stret… ============================================================================== --- trunk/rostests/dibtests/stretchblt/stretchblt.rbuild (added) +++ trunk/rostests/dibtests/stretchblt/stretchblt.rbuild [iso-8859-1] Mon Nov 17 11:28:14 2008 @@ -1,0 +1,7 @@ +<module name="stretchblt" type="win32gui" installbase="bin" installname="stretchblt.exe" stdlib="host"> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <file>stretchblt.cpp</file> +</module> Propchange: trunk/rostests/dibtests/stretchblt/stretchblt.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/directory.rbuild?rev=3741… ============================================================================== --- trunk/rostests/directory.rbuild [iso-8859-1] (original) +++ trunk/rostests/directory.rbuild [iso-8859-1] Mon Nov 17 11:28:14 2008 @@ -3,6 +3,9 @@ <group xmlns:xi="http://www.w3.org/2001/XInclude"> <directory name="drivers"> <xi:include href="drivers/directory.rbuild" /> + </directory> + <directory name="dibtests"> + <xi:include href="dibtests/directory.rbuild" /> </directory> <directory name="dxtest"> <xi:include href="dxtest/directory.rbuild" /> Modified: trunk/rostests/tests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/directory.rbuild?re… ============================================================================== --- trunk/rostests/tests/directory.rbuild [iso-8859-1] (original) +++ trunk/rostests/tests/directory.rbuild [iso-8859-1] Mon Nov 17 11:28:14 2008 @@ -7,9 +7,6 @@ <directory name="alive"> <xi:include href="alive/alive.rbuild" /> </directory> - <directory name="alphablend"> - <xi:include href="alphablend/alphablend.rbuild" /> - </directory> <directory name="apc"> <xi:include href="apc/apc.rbuild" /> </directory> @@ -25,9 +22,6 @@ <directory name="bench"> <xi:include href="bench/bench.rbuild" /> </directory> - <directory name="bitblt"> - <xi:include href="bitblt/bitblt.rbuild" /> - </directory> <directory name="button"> <xi:include href="button/button.rbuild" /> </directory> @@ -55,9 +49,6 @@ <directory name="create-links"> <xi:include href="create-links/create-links.rbuild" /> </directory> - <directory name="dibtest"> - <xi:include href="dibtest/dibtest.rbuild" /> - </directory> <directory name="dirdlg"> <xi:include href="dirdlg/dirdlg.rbuild" /> </directory> @@ -115,9 +106,6 @@ <directory name="hivetest"> <xi:include href="hivetest/hivetest.rbuild" /> </directory> - <directory name="icontest"> - <xi:include href="icontest/icontest.rbuild" /> - </directory> <directory name="Imagelistviewer"> <xi:include href="Imagelistviewer/imagelistviewer.rbuild" /> </directory> @@ -177,12 +165,6 @@  - <directory name="palbitblt"> - <xi:include href="palbitblt/palbitblt.rbuild" /> - </directory> - <directory name="patblt"> - <xi:include href="patblt/patblt.rbuild" /> - </directory> <directory name="polytest"> <xi:include href="polytest/polytest.rbuild" /> </directory> @@ -228,9 +210,6 @@ <directory name="statst2"> <xi:include href="statst2/statst2.rbuild" /> </directory> - <directory name="stretchblt"> - <xi:include href="stretchblt/stretchblt.rbuild" /> - </directory> <directory name="subclass"> <xi:include href="subclass/subclass.rbuild" /> </directory>

1 0

[gschneider] 37411: Moved dib tests remotely
by gschneider＠svn.reactos.org 17 Nov '08

17 Nov '08

Author: gschneider Date: Mon Nov 17 10:59:01 2008 New Revision: 37411 URL: http://svn.reactos.org/svn/reactos?rev=37411&view=rev Log: Moved dib tests remotely Added: trunk/rostests/dibtests/alphablend/ - copied from r37410, trunk/rostests/tests/alphablend/ Removed: trunk/rostests/tests/alphablend/

1 0

[tkreuzer] 37410: ntoskrnl: - Use generic Interlocked functions for amd64, too - use generic rbuild file (2 hax left) - add baseaddress for ntoskrnl - update and sort amd64stubs
by tkreuzer＠svn.reactos.org 17 Nov '08

17 Nov '08

Author: tkreuzer Date: Mon Nov 17 10:24:37 2008 New Revision: 37410 URL: http://svn.reactos.org/svn/reactos?rev=37410&view=rev Log: ntoskrnl: - Use generic Interlocked functions for amd64, too - use generic rbuild file (2 hax left) - add baseaddress for ntoskrnl - update and sort amd64stubs Removed: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-amd64hack.rbuild Modified: branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c branches/ros-amd64-bringup/reactos/ntoskrnl/ex/fastinterlck.c branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-generic.rbuild branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl.rbuild Modified: branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/React… ============================================================================== --- branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild [iso-8859-1] Mon Nov 17 10:24:37 2008 @@ -214,7 +214,7 @@ </directory> <directory name="ntoskrnl"> - <xi:include href="ntoskrnl/ntoskrnl-amd64hack.rbuild" /> + <xi:include href="ntoskrnl/ntoskrnl.rbuild" /> </directory>  -  -  - <file>kdb_keyboard.c</file> - <file>kdb_serial.c</file> - <if property="ARCH" value="amd64"> - <directory name="amd64"> - <file>kdb.c</file> - </directory> - </if> - </if> - <if property="DBG_OR_KDBG" value="true"> - <file>kdb_symbols.c</file> - </if> - </directory> - <directory name="kd"> - <directory name="wrappers"> - <file>bochs.c</file> - <if property="ARCH" value="i386"> - <file>gdbstub.c</file> - </if> - <if property="ARCH" value="powerpc"> - <file>gdbstub_powerpc.c</file> - </if> - <file>kdbg.c</file> - </directory> - <file>kdinit.c</file> - <file>kdio.c</file> - <file>kdmain.c</file> - </directory> - </if> - <if property="_WINKD_" value ="1"> - <directory name="kd64"> - <file>kdapi.c</file> - <file>kdbreak.c</file> - <file>kddata.c</file> - <file>kdinit.c</file> - <file>kdlock.c</file> - <file>kdprint.c</file> - <file>kdtrap.c</file> - </directory> - </if> - <directory name="lpc"> - <file>close.c</file> - <file>complete.c</file> - <file>connect.c</file> - <file>create.c</file> - <file>listen.c</file> - <file>port.c</file> - <file>reply.c</file> - <file>send.c</file> - </directory> - <directory name="mm"> - <if property="ARCH" value="i386"> - <directory name="i386"> - <file>page.c</file> - </directory> - </if> - <if property="ARCH" value="arm"> - <directory name="arm"> - <file>stubs.c</file> - </directory> - </if> - <if property="ARCH" value="powerpc"> - <directory name="powerpc"> - <file>pfault.c</file> - <file>page.c</file> - </directory> - </if> - <if property="ARCH" value="amd64"> - <directory name="amd64"> - <file>page.c</file> - </directory> - </if> - <file>anonmem.c</file> - <file>balance.c</file> - <file>cont.c</file> - <file>drvlck.c</file> - <file>freelist.c</file> - <file>iospace.c</file> - <file>kmap.c</file> - <file>marea.c</file> - <file>mdlsup.c</file> - <file>mm.c</file> - <file>mminit.c</file> - <file>mpw.c</file> - <file>ncache.c</file> - <file>npool.c</file> - <file>pagefile.c</file> - <file>pageop.c</file> - <file>pe.c</file> - <file>physical.c</file> - <file>pool.c</file> - <file>ppool.c</file> - <file>procsup.c</file> - <file>region.c</file> - <file>rmap.c</file> - <file>section.c</file> - <file>sysldr.c</file> - <file>verifier.c</file> - <file>virtual.c</file> - <file>wset.c</file> - <if property="_ELF_" value="1"> - <file>elf32.c</file> - <file>elf64.c</file> - </if> - </directory> - <directory name="ob"> - <file>obdir.c</file> - <file>obinit.c</file> - <file>obhandle.c</file> - <file>obname.c</file> - <file>oblife.c</file> - <file>obref.c</file> - <file>obsdcach.c</file> - <file>obsecure.c</file> - <file>oblink.c</file> - <file>obwait.c</file> - </directory> - <directory name="po"> - <file>power.c</file> - <file>events.c</file> - </directory> - <directory name="ps"> - <if property="ARCH" value="i386"> - <directory name="i386"> - <file>psctx.c</file> - </directory> - </if> - <if property="ARCH" value="arm"> - <directory name="arm"> - <file>psctx.c</file> - </directory> - </if> - <file>debug.c</file> - <file>job.c</file> - <file>kill.c</file> - <file>psnotify.c</file> - <file>process.c</file> - <file>psmgr.c</file> - <file>query.c</file> - <file>quota.c</file> - <file>security.c</file> - <file>state.c</file> - <file>thread.c</file> - <file>win32.c</file> - </directory> - <directory name="rtl"> - <if property="ARCH" value="arm"> - <directory name="arm"> - <file>rtlexcpt.c</file> - </directory> - </if> - <file>libsupp.c</file> - <file>misc.c</file> - </directory> - <directory name="se"> - <file>access.c</file> - <file>acl.c</file> - <file>audit.c</file> - <file>lsa.c</file> - <file>priv.c</file> - <file>sd.c</file> - <file>semgr.c</file> - <file>sid.c</file> - <file>token.c</file> - </directory> - <directory name="vdm"> - <if property="ARCH" value="i386"> - <file>vdmmain.c</file> - <file>vdmexec.c</file> - </if> - </directory> - <directory name="wmi"> - <file>wmi.c</file> - </directory> - <file>ntoskrnl.rc</file> - <linkerscript>ntoskrnl_$(ARCH).lnk</linkerscript> -</module> - Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Mon Nov 17 10:24:37 2008 @@ -36,6 +36,9 @@ <directory name="include"> <pch>ntoskrnl.h</pch> </directory> + <if property="ARCH" value="amd64"> + <file>amd64stubs.c</file> + </if> <directory name="ke"> <if property="ARCH" value="i386"> <directory name="i386"> @@ -85,6 +88,19 @@ <file>thrdini.c</file> <file>ctxswitch.c</file> <file>ctxhelp.S</file> + </directory> + </if> + <if property="ARCH" value="amd64"> + <directory name="amd64"> + <file first="true">boot.S</file> + <file>cpu.c</file> + <file>ctxswitch.S</file> + <file>except.c</file> + <file>irql.c</file> + <file>kiinit.c</file> + <file>spinlock.c</file> + <file>thrdini.c</file> + <file>trap.S</file> </directory> </if> <file>apc.c</file> @@ -122,6 +138,11 @@ </directory> <directory name="config"> <if property="ARCH" value="i386"> + <directory name="i386"> + <file>cmhardwr.c</file> + </directory> + </if> + <if property="ARCH" value="amd64"> <directory name="i386"> <file>cmhardwr.c</file> </directory> @@ -294,11 +315,18 @@ </directory> </if> <if property="KDBG" value="1"> - <file>kdb.c</file> - <file>kdb_cli.c</file> - <file>kdb_expr.c</file> + <ifnot property="ARCH" value="amd64"> + <file>kdb.c</file> + <file>kdb_cli.c</file> + <file>kdb_expr.c</file> + </ifnot> <file>kdb_keyboard.c</file> <file>kdb_serial.c</file> + <if property="ARCH" value="amd64"> + <directory name="amd64"> + <file>kdb.c</file> + </directory> + </if> </if> <if property="DBG_OR_KDBG" value="true"> <file>kdb_symbols.c</file> @@ -355,6 +383,11 @@ <if property="ARCH" value="powerpc"> <directory name="powerpc"> <file>pfault.c</file> + <file>page.c</file> + </directory> + </if> + <if property="ARCH" value="amd64"> + <directory name="amd64"> <file>page.c</file> </directory> </if> Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl.rbuild [iso-8859-1] Mon Nov 17 10:24:37 2008 @@ -1,7 +1,13 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> - <module name="ntoskrnl" type="kernel" installbase="system32" installname="ntoskrnl.exe" allowwarnings="true"> + <ifnot property="ARCH" value="amd64"> + <property name="BASEADDRESS_NTOSKRNL" value="0x80800000" /> + </ifnot> + <if property="ARCH" value="amd64"> + <property name="BASEADDRESS_NTOSKRNL" value="0xfffff80000800000" /> + </if> + <module name="ntoskrnl" type="kernel" installbase="system32" installname="ntoskrnl.exe" baseaddress="${BASEADDRESS_NTOSKRNL}" entrypoint="KiSystemStartup" allowwarnings="true"> <xi:include href="ntoskrnl-generic.rbuild" /> </module> </group>

1 0

[fireball] 37409: - Target device to mount may not have VPB, the driver should get the VPB passed in parameters. - Set target device's VPB to this value. This should not really be done, however our driver heavily depends on target device having this VPB. I don't see any side effects. - With these changes, Windows 2003 is able to boot up to desktop and cleanly shutdown using this driver.
by fireball＠svn.reactos.org 17 Nov '08

17 Nov '08

Author: fireball Date: Mon Nov 17 10:09:31 2008 New Revision: 37409 URL: http://svn.reactos.org/svn/reactos?rev=37409&view=rev Log: - Target device to mount may not have VPB, the driver should get the VPB passed in parameters. - Set target device's VPB to this value. This should not really be done, however our driver heavily depends on target device having this VPB. I don't see any side effects. - With these changes, Windows 2003 is able to boot up to desktop and cleanly shutdown using this driver. Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] Mon Nov 17 10:09:31 2008 @@ -372,6 +372,7 @@ PVFATFCB VolumeFcb = NULL; PVFATCCB Ccb = NULL; PDEVICE_OBJECT DeviceToMount; + PVPB Vpb; UNICODE_STRING NameU = RTL_CONSTANT_STRING(L"\\$$Fat$$"); UNICODE_STRING VolumeNameU = RTL_CONSTANT_STRING(L"\\$$Volume$$"); ULONG HashTableSize; @@ -389,6 +390,7 @@ } DeviceToMount = IrpContext->Stack->Parameters.MountVolume.DeviceObject; + Vpb = IrpContext->Stack->Parameters.MountVolume.Vpb; Status = VfatHasFileSystem (DeviceToMount, &RecognizedFS, &FatInfo); if (!NT_SUCCESS(Status)) @@ -438,7 +440,9 @@ DeviceExt->HashTableSize = HashTableSize; /* use same vpb as device disk */ - DeviceObject->Vpb = DeviceToMount->Vpb; + DeviceObject->Vpb = Vpb; + DeviceToMount->Vpb = Vpb; + Status = VfatMountDevice(DeviceExt, DeviceToMount); if (!NT_SUCCESS(Status)) {

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