Ros-diffs February 2007

ros-diffs@reactos.org

16 participants
265 discussions

[ekohl] 25832: Reenable the preview control notification. The user can now select the GUI item clicking it in the preview control.
by ekohl＠svn.reactos.org 17 Feb '07

17 Feb '07

Author: ekohl Date: Sun Feb 18 00:40:39 2007 New Revision: 25832 URL: http://svn.reactos.org/svn/reactos?rev=25832&view=rev Log: Reenable the preview control notification. The user can now select the GUI item clicking it in the preview control. Modified: trunk/reactos/dll/cpl/desk/advappdlg.c trunk/reactos/dll/cpl/desk/appearance.h trunk/reactos/dll/cpl/desk/preview.c trunk/reactos/dll/cpl/desk/preview.h Modified: trunk/reactos/dll/cpl/desk/advappdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/advappdlg.c?r… ============================================================================== --- trunk/reactos/dll/cpl/desk/advappdlg.c (original) +++ trunk/reactos/dll/cpl/desk/advappdlg.c Sun Feb 18 00:40:39 2007 @@ -409,6 +409,27 @@ } +static VOID +SelectComboByElement(HWND hwnd, INT id, LPARAM lParam) +{ + INT nCount; + INT i; + + nCount = SendDlgItemMessage(hwnd, id, CB_GETCOUNT, 0, 0); + if (nCount == CB_ERR) + return; + + for (i = 0; i < nCount; i++) + { + if (SendDlgItemMessage(hwnd, id, CB_GETITEMDATA, (WPARAM)i, 0) == lParam) + { + SendDlgItemMessage(hwnd, id, CB_SETCURSEL, (WPARAM)i, 0); + break; + } + } +} + + INT_PTR CALLBACK AdvAppearanceDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -440,6 +461,13 @@ case IDCANCEL: g->ThemeAdv = g->Theme; EndDialog(hwndDlg, 0); + break; + + case IDC_APPEARANCE_PREVIEW: + SaveCurrentValues(hwndDlg, g); + SelectComboByElement(hwndDlg, IDC_ADVAPPEARANCE_ELEMENT, lParam); + g->CurrentElement = (INT)lParam; + UpdateControls(hwndDlg, g); break; case IDC_ADVAPPEARANCE_ELEMENT: Modified: trunk/reactos/dll/cpl/desk/appearance.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/appearance.h?… ============================================================================== --- trunk/reactos/dll/cpl/desk/appearance.h (original) +++ trunk/reactos/dll/cpl/desk/appearance.h Sun Feb 18 00:40:39 2007 @@ -67,9 +67,9 @@ THEME_PRESET ThemeTemplates[MAX_TEMPLATES]; THEME Theme; THEME ThemeAdv; - int ColorList[NUM_COLORS]; + INT ColorList[NUM_COLORS]; HBITMAP hbmpColor[3]; - int CurrentElement; + INT CurrentElement; COLORREF crCOLOR_BTNFACE; COLORREF crCOLOR_BTNSHADOW; COLORREF crCOLOR_BTNTEXT; @@ -81,7 +81,7 @@ extern const ASSIGNMENT g_Assignment[NUM_ELEMENTS]; extern const TCHAR g_RegColorNames[NUM_COLORS][MAX_COLORNAMELENGTH]; -extern const int g_SizeMetric[NUM_SIZES]; +extern const INT g_SizeMetric[NUM_SIZES]; /* prototypes for appearance.c */ INT_PTR CALLBACK AppearancePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); Modified: trunk/reactos/dll/cpl/desk/preview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/preview.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/desk/preview.c (original) +++ trunk/reactos/dll/cpl/desk/preview.c Sun Feb 18 00:40:39 2007 @@ -441,7 +441,10 @@ if (PtInRect(&pPreviewData->rcDialogButton, pt)) type = IDX_3D_OBJECTS; - SendMessage(GetParent(hwnd), WM_USER, 0, type); + SendMessage(GetParent(hwnd), + WM_COMMAND, + MAKEWPARAM(GetWindowLongPtrW(hwnd, GWLP_ID), 0), + (LPARAM)type); } Modified: trunk/reactos/dll/cpl/desk/preview.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/preview.h?rev… ============================================================================== --- trunk/reactos/dll/cpl/desk/preview.h (original) +++ trunk/reactos/dll/cpl/desk/preview.h Sun Feb 18 00:40:39 2007 @@ -6,22 +6,21 @@ * COPYRIGHT: Copyright 2006, 2007 Eric Kohl */ -#define IDX_3D_OBJECTS 0 -#define IDX_SCROLLBAR 1 -#define IDX_DESKTOP 2 -#define IDX_DIALOG 3 -#define IDX_WINDOW 4 -#define IDX_APPSPACE 5 +#define IDX_DESKTOP 0 +#define IDX_INACTIVE_CAPTION 1 +#define IDX_INACTIVE_BORDER 2 +#define IDX_ACTIVE_CAPTION 3 +#define IDX_ACTIVE_BORDER 4 +#define IDX_MENU 5 #define IDX_SELECTION 6 -#define IDX_MENU 7 +#define IDX_WINDOW 7 +#define IDX_SCROLLBAR 8 +#define IDX_3D_OBJECTS 9 +#define IDX_CAPTION_BUTTON 12 +#define IDX_DIALOG 14 +#define IDX_APPSPACE 16 +#define IDX_QUICKINFO 20 -#define IDX_QUICKINFO 9 -#define IDX_INACTIVE_BORDER 10 -#define IDX_ACTIVE_BORDER 11 - -#define IDX_INACTIVE_CAPTION 15 -#define IDX_ACTIVE_CAPTION 16 -#define IDX_CAPTION_BUTTON 17 #define PVM_GETCYCAPTION (WM_USER+1)

1 0

[tretiakov] 25831: Patch by Alexey Zavyalov (Generex). Implement SetLocaleInfoA, SetLocaleInfoW.
by tretiakov＠svn.reactos.org 17 Feb '07

17 Feb '07

Author: tretiakov Date: Sat Feb 17 18:46:25 2007 New Revision: 25831 URL: http://svn.reactos.org/svn/reactos?rev=25831&view=rev Log: Patch by Alexey Zavyalov (Generex). Implement SetLocaleInfoA, SetLocaleInfoW. Modified: trunk/reactos/dll/win32/kernel32/misc/lang.c Modified: trunk/reactos/dll/win32/kernel32/misc/lang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/la… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/lang.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/lang.c Sat Feb 17 18:46:25 2007 @@ -1394,8 +1394,23 @@ } -/* - * @unimplemented +/********************************************************************** + * @implemented + * RIPPED FROM WINE's dlls\kernel\locale.c ver 0.9.29 + * + * SetLocaleInfoA (KERNEL32.@) + * + * Set the current locale info. + * + * PARAMS + * Locale [I] LCID of the locale + * LCType [I] LCTYPE_ flags from "winnls.h" + * lpLCData [I] Information to set + * + * RETURNS + * Success: TRUE. The information given will be returned by GetLocaleInfoA() + * whenever it is called without LOCALE_NOUSEROVERRIDE. + * Failure: FALSE. Use GetLastError() to determine the cause. */ BOOL STDCALL @@ -1405,13 +1420,39 @@ LPCSTR lpLCData ) { - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - - -/* - * @unimplemented + UINT codepage = CP_ACP; + WCHAR *strW; + DWORD len; + BOOL ret; + + if (!(LCType & LOCALE_USE_CP_ACP)) codepage = get_lcid_codepage( Locale ); + + if (!lpLCData) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + len = MultiByteToWideChar( codepage, 0, lpLCData, -1, NULL, 0 ); + if (!(strW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + { + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return FALSE; + } + MultiByteToWideChar( codepage, 0, lpLCData, -1, strW, len ); + ret = SetLocaleInfoW( Locale, LCType, strW ); + HeapFree( GetProcessHeap(), 0, strW ); + return ret; +} + + +/********************************************************************** + * @implemented + * RIPPED FROM WINE's dlls\kernel\locale.c ver 0.9.29 + * + * SetLocaleInfoW (KERNEL32.@) + * + * See SetLocaleInfoA. + * */ BOOL STDCALL @@ -1421,8 +1462,69 @@ LPCWSTR lpLCData ) { - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + const WCHAR *value; + UNICODE_STRING valueW; + NTSTATUS status; + HANDLE hkey; + + LCType &= 0xffff; + value = RosGetLocaleValueName( LCType ); + + if (!lpLCData || !value) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + + if (LCType == LOCALE_IDATE || LCType == LOCALE_ILDATE) + { + SetLastError( ERROR_INVALID_FLAGS ); + return FALSE; + } + + if (!(hkey = RosCreateRegistryKey())) return FALSE; + RtlInitUnicodeString( &valueW, value ); + status = NtSetValueKey( hkey, &valueW, 0, REG_SZ, (PVOID)lpLCData, (lstrlenW(lpLCData)+1)*sizeof(WCHAR) ); + + if (LCType == LOCALE_SSHORTDATE || LCType == LOCALE_SLONGDATE) + { + /* Set I-value from S value */ + WCHAR *lpD, *lpM, *lpY; + WCHAR szBuff[2]; + + lpD = wcschr(lpLCData, 'd'); + lpM = wcschr(lpLCData, 'M'); + lpY = wcschr(lpLCData, 'y'); + + if (lpD <= lpM) + { + szBuff[0] = '1'; /* D-M-Y */ + } + else + { + if (lpY <= lpM) + szBuff[0] = '2'; /* Y-M-D */ + else + szBuff[0] = '0'; /* M-D-Y */ + } + + szBuff[1] = '\0'; + + if (LCType == LOCALE_SSHORTDATE) + LCType = LOCALE_IDATE; + else + LCType = LOCALE_ILDATE; + + value = RosGetLocaleValueName( LCType ); + + RtlInitUnicodeString( &valueW, value ); + status = NtSetValueKey( hkey, &valueW, 0, REG_SZ, szBuff, sizeof(szBuff) ); + } + + NtClose( hkey ); + + if (status) SetLastError( RtlNtStatusToDosError(status) ); + return !status; }

1 0

[tretiakov] 25830: Patch by Andrey Janzen (virus126). Fix copy\paste bug in calc.
by tretiakov＠svn.reactos.org 17 Feb '07

17 Feb '07

Author: tretiakov Date: Sat Feb 17 18:33:57 2007 New Revision: 25830 URL: http://svn.reactos.org/svn/reactos?rev=25830&view=rev Log: Patch by Andrey Janzen (virus126). Fix copy\paste bug in calc. Modified: trunk/reactos/base/applications/calc/winecalc.c trunk/reactos/base/applications/calc/winecalc.h Modified: trunk/reactos/base/applications/calc/winecalc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/win… ============================================================================== --- trunk/reactos/base/applications/calc/winecalc.c (original) +++ trunk/reactos/base/applications/calc/winecalc.c Sat Feb 17 18:33:57 2007 @@ -476,18 +476,23 @@ if (!(len = _tcslen(calc.display))) return 0; + if (!(s = calc.display)) + return 0; + + if (s[len - 1] == TEXT('.') || s[len - 1] == TEXT(',')) + len--; + if (!(hGlobalMemory = GlobalAlloc(GHND, (len + 1) * sizeof(TCHAR)))) return 0; if (!(pGlobalMemory = GlobalLock(hGlobalMemory))) return 0; - if (!(s = calc.display)) - return 0; - for (i = 0; i < len; i++) *pGlobalMemory++ = *s++; + pGlobalMemory[len - 1] = 0; + GlobalUnlock(hGlobalMemory); // call GetLastError() for exception handling if (!OpenClipboard(hWnd)) @@ -496,7 +501,7 @@ if (!EmptyClipboard()) return 0; - if (!SetClipboardData(CF_TEXT, hGlobalMemory)) + if (!SetClipboardData(CF_TTEXT, hGlobalMemory)) return 0; if (!CloseClipboard()) @@ -514,11 +519,11 @@ HGLOBAL hGlobalMemory; LPTSTR pGlobalMemory; - if (IsClipboardFormatAvailable(CF_TEXT)) { + if (IsClipboardFormatAvailable(CF_TTEXT)) { if (!OpenClipboard(hWnd)) return 0; - if (!(hGlobalMemory = GetClipboardData(CF_TEXT))) + if (!(hGlobalMemory = GetClipboardData(CF_TTEXT))) return 0; if (!(size = GlobalSize(hGlobalMemory))) Modified: trunk/reactos/base/applications/calc/winecalc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/win… ============================================================================== --- trunk/reactos/base/applications/calc/winecalc.h (original) +++ trunk/reactos/base/applications/calc/winecalc.h Sat Feb 17 18:33:57 2007 @@ -19,6 +19,12 @@ */ ////////////////////////////////////////////////////////////////// + +#ifdef UNICODE +#define CF_TTEXT CF_UNICODETEXT +#else +#define CF_TTEXT CF_TEXT +#endif // numerics are defined here for easier porting

1 0

[greatlrd] 25829: adding file dump.c it contain printf stuff to dump some struct to the screen it can make debuging more easy. but if u build reactos with DBG=0 you will not see the dump of the stuct I mabe will add a option to it when u start this tools so it dump data when u use the options.
by greatlrd＠svn.reactos.org 17 Feb '07

17 Feb '07

Author: greatlrd Date: Sat Feb 17 18:01:01 2007 New Revision: 25829 URL: http://svn.reactos.org/svn/reactos?rev=25829&view=rev Log: adding file dump.c it contain printf stuff to dump some struct to the screen it can make debuging more easy. but if u build reactos with DBG=0 you will not see the dump of the stuct I mabe will add a option to it when u start this tools so it dump data when u use the options. Added: trunk/rosapps/dxtest/win32kdxtest/dump.c (with props) Modified: trunk/rosapps/dxtest/win32kdxtest/main.c trunk/rosapps/dxtest/win32kdxtest/test.h trunk/rosapps/dxtest/win32kdxtest/win32kdxtest.rbuild trunk/rosapps/dxtest/win32kdxtest/win32kdxtest_vc8_auto.vcproj Added: trunk/rosapps/dxtest/win32kdxtest/dump.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/dxtest/win32kdxtest/dump.c… ============================================================================== --- trunk/rosapps/dxtest/win32kdxtest/dump.c (added) +++ trunk/rosapps/dxtest/win32kdxtest/dump.c Sat Feb 17 18:01:01 2007 @@ -1,0 +1,222 @@ +/* All testcase are base how windows 2000 sp4 acting */ + + +#include <stdio.h> +#include <windows.h> +#include <wingdi.h> +#include <winddi.h> +#include <d3dnthal.h> + +#include "test.h" + + +void +dump(DD_HALINFO *pHalInfo, char *text) +{ + printf("dumping the DD_HALINFO from %s\n",text); + + if (pHalInfo->dwSize == sizeof(DD_HALINFO_V4)) + { + DD_HALINFO_V4 *pHalInfo4 = (DD_HALINFO_V4 *) pHalInfo; + int t; + + printf("DD_HALINFO Version NT4 found \n"); + printf(" pHalInfo4->dwSize : 0x%08lx\n",(long)pHalInfo4->dwSize); + printf(" pHalInfo4->vmiData->fpPrimary : 0x%08lx\n",(long)pHalInfo4->vmiData.fpPrimary); + printf(" pHalInfo4->vmiData->dwFlags : 0x%08lx\n",(long)pHalInfo4->vmiData.dwFlags); + printf(" pHalInfo4->vmiData->dwDisplayWidth : 0x%08lx\n",(long)pHalInfo4->vmiData.dwDisplayWidth); + printf(" pHalInfo4->vmiData->dwDisplayHeight : 0x%08lx\n",(long)pHalInfo4->vmiData.dwDisplayHeight); + printf(" pHalInfo4->vmiData->lDisplayPitch : 0x%08lx\n",(long)pHalInfo4->vmiData.lDisplayPitch); + + printf(" pHalInfo4->vmiData->ddpfDisplay.dwSize : 0x%08lx\n",(long)pHalInfo4->vmiData.ddpfDisplay.dwSize); + printf(" pHalInfo4->vmiData->ddpfDisplay.dwFlags : 0x%08lx\n",(long)pHalInfo4->vmiData.ddpfDisplay.dwFlags); + printf(" pHalInfo4->vmiData->ddpfDisplay.dwFourCC : 0x%08lx\n",(long)pHalInfo4->vmiData.ddpfDisplay.dwFourCC); + printf(" pHalInfo4->vmiData->ddpfDisplay.dwRGBBitCount : 0x%08lx\n",(long)pHalInfo4->vmiData.ddpfDisplay.dwRGBBitCount); + printf(" pHalInfo4->vmiData->ddpfDisplay.dwRBitMask : 0x%08lx\n",(long)pHalInfo4->vmiData.ddpfDisplay.dwRBitMask); + printf(" pHalInfo4->vmiData->ddpfDisplay.dwGBitMask : 0x%08lx\n",(long)pHalInfo4->vmiData.ddpfDisplay.dwGBitMask); + printf(" pHalInfo4->vmiData->ddpfDisplay.dwBBitMask : 0x%08lx\n",(long)pHalInfo4->vmiData.ddpfDisplay.dwBBitMask); + printf(" pHalInfo4->vmiData->ddpfDisplay.dwRGBAlphaBitMask : 0x%08lx\n",(long)pHalInfo4->vmiData.ddpfDisplay.dwRGBAlphaBitMask); + + printf(" pHalInfo4->vmiData->dwOffscreenAlign : 0x%08lx\n",(long)pHalInfo4->vmiData.dwOffscreenAlign); + printf(" pHalInfo4->vmiData->dwOverlayAlign : 0x%08lx\n",(long)pHalInfo4->vmiData.dwOverlayAlign); + printf(" pHalInfo4->vmiData->dwTextureAlign : 0x%08lx\n",(long)pHalInfo4->vmiData.dwTextureAlign); + printf(" pHalInfo4->vmiData->dwZBufferAlign : 0x%08lx\n",(long)pHalInfo4->vmiData.dwZBufferAlign); + printf(" pHalInfo4->vmiData->dwAlphaAlign : 0x%08lx\n",(long)pHalInfo4->vmiData.dwAlphaAlign); + printf(" pHalInfo4->vmiData->pvPrimary : 0x%08lx\n",(long)pHalInfo4->vmiData.pvPrimary); + + printf(" pHalInfo4->ddCaps.dwSize : 0x%08lx\n",pHalInfo4->ddCaps.dwSize); + printf(" pHalInfo4->ddCaps.dwCaps : 0x%08lx\n",pHalInfo4->ddCaps.dwCaps); + printf(" pHalInfo4->ddCaps.dwCaps2 : 0x%08lx\n",pHalInfo4->ddCaps.dwCaps2); + printf(" pHalInfo4->ddCaps.dwCKeyCaps : 0x%08lx\n",pHalInfo4->ddCaps.dwCKeyCaps); + printf(" pHalInfo4->ddCaps.dwFXCaps : 0x%08lx\n",pHalInfo4->ddCaps.dwFXCaps); + printf(" pHalInfo4->ddCaps.dwFXAlphaCaps : 0x%08lx\n",pHalInfo4->ddCaps.dwFXAlphaCaps); + printf(" pHalInfo4->ddCaps.dwPalCaps : 0x%08lx\n",pHalInfo4->ddCaps.dwPalCaps); + printf(" pHalInfo4->ddCaps.dwSVCaps : 0x%08lx\n",pHalInfo4->ddCaps.dwSVCaps); + printf(" pHalInfo4->ddCaps.dwAlphaBltConstBitDepths : 0x%08lx\n",pHalInfo4->ddCaps.dwAlphaBltConstBitDepths); + printf(" pHalInfo4->ddCaps.dwAlphaBltPixelBitDepths : 0x%08lx\n",pHalInfo4->ddCaps.dwAlphaBltPixelBitDepths); + printf(" pHalInfo4->ddCaps.dwAlphaBltSurfaceBitDepths : 0x%08lx\n",pHalInfo4->ddCaps.dwAlphaBltSurfaceBitDepths); + printf(" pHalInfo4->ddCaps.dwAlphaOverlayConstBitDepths : 0x%08lx\n",pHalInfo4->ddCaps.dwAlphaOverlayConstBitDepths); + printf(" pHalInfo4->ddCaps.dwAlphaOverlayPixelBitDepths : 0x%08lx\n",pHalInfo4->ddCaps.dwAlphaOverlayPixelBitDepths); + printf(" pHalInfo4->ddCaps.dwAlphaOverlaySurfaceBitDepths : 0x%08lx\n",pHalInfo4->ddCaps.dwAlphaOverlaySurfaceBitDepths); + printf(" pHalInfo4->ddCaps.dwZBufferBitDepths : 0x%08lx\n",pHalInfo4->ddCaps.dwZBufferBitDepths); + printf(" pHalInfo4->ddCaps.dwVidMemTotal : 0x%08lx\n",pHalInfo4->ddCaps.dwVidMemTotal); + printf(" pHalInfo4->ddCaps.dwVidMemFree : 0x%08lx\n",pHalInfo4->ddCaps.dwVidMemFree); + printf(" pHalInfo4->ddCaps.dwMaxVisibleOverlays : 0x%08lx\n",pHalInfo4->ddCaps.dwMaxVisibleOverlays); + printf(" pHalInfo4->ddCaps.dwCurrVisibleOverlays : 0x%08lx\n",pHalInfo4->ddCaps.dwCurrVisibleOverlays); + printf(" pHalInfo4->ddCaps.dwNumFourCCCodes : 0x%08lx\n",pHalInfo4->ddCaps.dwNumFourCCCodes); + printf(" pHalInfo4->ddCaps.dwAlignBoundarySrc : 0x%08lx\n",pHalInfo4->ddCaps.dwAlignBoundarySrc); + printf(" pHalInfo4->ddCaps.dwAlignSizeSrc : 0x%08lx\n",pHalInfo4->ddCaps.dwAlignSizeSrc); + printf(" pHalInfo4->ddCaps.dwAlignBoundaryDes : 0x%08lx\n",pHalInfo4->ddCaps.dwAlignBoundaryDest); + printf(" pHalInfo4->ddCaps.dwAlignSizeDest : 0x%08lx\n",pHalInfo4->ddCaps.dwAlignSizeDest); + printf(" pHalInfo4->ddCaps.dwAlignStrideAlign : 0x%08lx\n",pHalInfo4->ddCaps.dwAlignStrideAlign); + for (t=0;t<DD_ROP_SPACE;t++) + { + printf(" pHalInfo4->ddCaps.dwRops[0x%04x] : 0x%08lx\n",t,pHalInfo4->ddCaps.dwRops[t]); + } + printf(" pHalInfo4->ddCaps.ddsCaps.dwCaps : 0x%08lx\n",pHalInfo4->ddCaps.ddsCaps.dwCaps); + printf(" pHalInfo4->ddCaps.dwMinOverlayStretch : 0x%08lx\n",pHalInfo4->ddCaps.dwMinOverlayStretch); + printf(" pHalInfo4->ddCaps.dwMaxOverlayStretch : 0x%08lx\n",pHalInfo4->ddCaps.dwMaxOverlayStretch); + printf(" pHalInfo4->ddCaps.dwMinLiveVideoStretch : 0x%08lx\n",pHalInfo4->ddCaps.dwMinLiveVideoStretch); + printf(" pHalInfo4->ddCaps.dwMaxLiveVideoStretch : 0x%08lx\n",pHalInfo4->ddCaps.dwMaxLiveVideoStretch); + printf(" pHalInfo4->ddCaps.dwMinHwCodecStretch : 0x%08lx\n",pHalInfo4->ddCaps.dwMinHwCodecStretch); + printf(" pHalInfo4->ddCaps.dwMaxHwCodecStretch : 0x%08lx\n",pHalInfo4->ddCaps.dwMaxHwCodecStretch); + printf(" pHalInfo4->ddCaps.dwReserved1 : 0x%08lx\n",pHalInfo4->ddCaps.dwReserved1); + printf(" pHalInfo4->ddCaps.dwReserved2 : 0x%08lx\n",pHalInfo4->ddCaps.dwReserved2); + printf(" pHalInfo4->ddCaps.dwReserved3 : 0x%08lx\n",pHalInfo4->ddCaps.dwReserved3); + printf(" pHalInfo4->ddCaps.dwSVBCaps : 0x%08lx\n",pHalInfo4->ddCaps.dwSVBCaps); + printf(" pHalInfo4->ddCaps.dwSVBCKeyCaps : 0x%08lx\n",pHalInfo4->ddCaps.dwSVBCKeyCaps); + printf(" pHalInfo4->ddCaps.dwSVBFXCaps : 0x%08lx\n",pHalInfo4->ddCaps.dwSVBFXCaps); + for (t=0;t<DD_ROP_SPACE;t++) + { + printf(" pHalInfo4->ddCaps.dwSVBRops[0x%04x] : 0x%08lx\n",t,pHalInfo4->ddCaps.dwSVBRops[t]); + } + printf(" pHalInfo4->ddCaps.dwVSBCaps : 0x%08lx\n",pHalInfo4->ddCaps.dwVSBCaps); + printf(" pHalInfo4->ddCaps.dwVSBCKeyCaps : 0x%08lx\n",pHalInfo4->ddCaps.dwVSBCKeyCaps); + printf(" pHalInfo4->ddCaps.dwVSBFXCaps : 0x%08lx\n",pHalInfo4->ddCaps.dwVSBFXCaps); + for (t=0;t<DD_ROP_SPACE;t++) + { + printf(" pHalInfo4->ddCaps.dwVSBRops[0x%04x] : 0x%08lx\n",t,pHalInfo4->ddCaps.dwVSBRops[t]); + } + printf(" pHalInfo4->ddCaps.dwSSBCaps : 0x%08lx\n",pHalInfo4->ddCaps.dwSSBCaps); + printf(" pHalInfo4->ddCaps.dwSSBCKeyCa : 0x%08lx\n",pHalInfo4->ddCaps.dwSSBCKeyCaps); + printf(" pHalInfo4->ddCaps.dwSSBFXCaps : 0x%08lx\n",pHalInfo4->ddCaps.dwSSBFXCaps); + for (t=0;t<DD_ROP_SPACE;t++) + { + printf(" pHalInfo4->ddCaps.dwSSBRops[0x%04x] : 0x%08lx\n",t,pHalInfo4->ddCaps.dwSSBRops[t]); + } + + printf(" pHalInfo4->ddCaps.dwMaxVideoPorts : 0x%08lx\n",pHalInfo4->ddCaps.dwMaxVideoPorts); + printf(" pHalInfo4->ddCaps.dwCurrVideoPorts : 0x%08lx\n",pHalInfo4->ddCaps.dwCurrVideoPorts); + printf(" pHalInfo4->ddCaps.dwSVBCaps2 : 0x%08lx\n",pHalInfo4->ddCaps.dwSVBCaps2); + + + printf(" pHalInfo4->GetDriverInfo : 0x%08lx\n",(long)pHalInfo4->GetDriverInfo); + printf(" pHalInfo4->dwFlags : 0x%08lx\n",(long)pHalInfo4->dwFlags); + + } + else if (pHalInfo->dwSize == sizeof(DD_HALINFO)) + { + int t; + + printf("DD_HALINFO Version NT 2000/XP/2003 found \n"); + printf(" pHalInfo->dwSize : 0x%08lx\n",(long)pHalInfo->dwSize); + + printf(" pHalInfo->vmiData->fpPrimary : 0x%08lx\n",(long)pHalInfo->vmiData.fpPrimary); + printf(" pHalInfo->vmiData->dwFlags : 0x%08lx\n",(long)pHalInfo->vmiData.dwFlags); + printf(" pHalInfo->vmiData->dwDisplayWidth : 0x%08lx\n",(long)pHalInfo->vmiData.dwDisplayWidth); + printf(" pHalInfo->vmiData->dwDisplayHeight : 0x%08lx\n",(long)pHalInfo->vmiData.dwDisplayHeight); + printf(" pHalInfo->vmiData->lDisplayPitch : 0x%08lx\n",(long)pHalInfo->vmiData.lDisplayPitch); + + printf(" pHalInfo->vmiData->ddpfDisplay.dwSize : 0x%08lx\n",(long)pHalInfo->vmiData.ddpfDisplay.dwSize); + printf(" pHalInfo->vmiData->ddpfDisplay.dwFlags : 0x%08lx\n",(long)pHalInfo->vmiData.ddpfDisplay.dwFlags); + printf(" pHalInfo->vmiData->ddpfDisplay.dwFourCC : 0x%08lx\n",(long)pHalInfo->vmiData.ddpfDisplay.dwFourCC); + printf(" pHalInfo->vmiData->ddpfDisplay.dwRGBBitCount : 0x%08lx\n",(long)pHalInfo->vmiData.ddpfDisplay.dwRGBBitCount); + printf(" pHalInfo->vmiData->ddpfDisplay.dwRBitMask : 0x%08lx\n",(long)pHalInfo->vmiData.ddpfDisplay.dwRBitMask); + printf(" pHalInfo->vmiData->ddpfDisplay.dwGBitMask : 0x%08lx\n",(long)pHalInfo->vmiData.ddpfDisplay.dwGBitMask); + printf(" pHalInfo->vmiData->ddpfDisplay.dwBBitMask : 0x%08lx\n",(long)pHalInfo->vmiData.ddpfDisplay.dwBBitMask); + printf(" pHalInfo->vmiData->ddpfDisplay.dwRGBAlphaBitMask : 0x%08lx\n",(long)pHalInfo->vmiData.ddpfDisplay.dwRGBAlphaBitMask); + + + printf(" pHalInfo->vmiData->dwOffscreenAlign : 0x%08lx\n",(long)pHalInfo->vmiData.dwOffscreenAlign); + printf(" pHalInfo->vmiData->dwOverlayAlign : 0x%08lx\n",(long)pHalInfo->vmiData.dwOverlayAlign); + printf(" pHalInfo->vmiData->dwTextureAlign : 0x%08lx\n",(long)pHalInfo->vmiData.dwTextureAlign); + printf(" pHalInfo->vmiData->dwZBufferAlign : 0x%08lx\n",(long)pHalInfo->vmiData.dwZBufferAlign); + printf(" pHalInfo->vmiData->dwAlphaAlign : 0x%08lx\n",(long)pHalInfo->vmiData.dwAlphaAlign); + printf(" pHalInfo->vmiData->pvPrimary : 0x%08lx\n",(long)pHalInfo->vmiData.pvPrimary); + + printf(" pHalInfo->ddCaps.dwSize : 0x%08lx\n",pHalInfo->ddCaps.dwSize); + printf(" pHalInfo->ddCaps.dwCaps : 0x%08lx\n",pHalInfo->ddCaps.dwCaps); + printf(" pHalInfo->ddCaps.dwCaps2 : 0x%08lx\n",pHalInfo->ddCaps.dwCaps2); + printf(" pHalInfo->ddCaps.dwCKeyCaps : 0x%08lx\n",pHalInfo->ddCaps.dwCKeyCaps); + printf(" pHalInfo->ddCaps.dwFXCaps : 0x%08lx\n",pHalInfo->ddCaps.dwFXCaps); + printf(" pHalInfo->ddCaps.dwFXAlphaCaps : 0x%08lx\n",pHalInfo->ddCaps.dwFXAlphaCaps); + printf(" pHalInfo->ddCaps.dwPalCaps : 0x%08lx\n",pHalInfo->ddCaps.dwPalCaps); + printf(" pHalInfo->ddCaps.dwSVCaps : 0x%08lx\n",pHalInfo->ddCaps.dwSVCaps); + printf(" pHalInfo->ddCaps.dwAlphaBltConstBitDepths : 0x%08lx\n",pHalInfo->ddCaps.dwAlphaBltConstBitDepths); + printf(" pHalInfo->ddCaps.dwAlphaBltPixelBitDepths : 0x%08lx\n",pHalInfo->ddCaps.dwAlphaBltPixelBitDepths); + printf(" pHalInfo->ddCaps.dwAlphaBltSurfaceBitDepths : 0x%08lx\n",pHalInfo->ddCaps.dwAlphaBltSurfaceBitDepths); + printf(" pHalInfo->ddCaps.dwAlphaOverlayConstBitDepths : 0x%08lx\n",pHalInfo->ddCaps.dwAlphaOverlayConstBitDepths); + printf(" pHalInfo->ddCaps.dwAlphaOverlayPixelBitDepths : 0x%08lx\n",pHalInfo->ddCaps.dwAlphaOverlayPixelBitDepths); + printf(" pHalInfo->ddCaps.dwAlphaOverlaySurfaceBitDepths : 0x%08lx\n",pHalInfo->ddCaps.dwAlphaOverlaySurfaceBitDepths); + printf(" pHalInfo->ddCaps.dwZBufferBitDepths : 0x%08lx\n",pHalInfo->ddCaps.dwZBufferBitDepths); + printf(" pHalInfo->ddCaps.dwVidMemTotal : 0x%08lx\n",pHalInfo->ddCaps.dwVidMemTotal); + printf(" pHalInfo->ddCaps.dwVidMemFree : 0x%08lx\n",pHalInfo->ddCaps.dwVidMemFree); + printf(" pHalInfo->ddCaps.dwMaxVisibleOverlays : 0x%08lx\n",pHalInfo->ddCaps.dwMaxVisibleOverlays); + printf(" pHalInfo->ddCaps.dwCurrVisibleOverlays : 0x%08lx\n",pHalInfo->ddCaps.dwCurrVisibleOverlays); + printf(" pHalInfo->ddCaps.dwNumFourCCCodes : 0x%08lx\n",pHalInfo->ddCaps.dwNumFourCCCodes); + printf(" pHalInfo->ddCaps.dwAlignBoundarySrc : 0x%08lx\n",pHalInfo->ddCaps.dwAlignBoundarySrc); + printf(" pHalInfo->ddCaps.dwAlignSizeSrc : 0x%08lx\n",pHalInfo->ddCaps.dwAlignSizeSrc); + printf(" pHalInfo->ddCaps.dwAlignBoundaryDes : 0x%08lx\n",pHalInfo->ddCaps.dwAlignBoundaryDest); + printf(" pHalInfo->ddCaps.dwAlignSizeDest : 0x%08lx\n",pHalInfo->ddCaps.dwAlignSizeDest); + printf(" pHalInfo->ddCaps.dwAlignStrideAlign : 0x%08lx\n",pHalInfo->ddCaps.dwAlignStrideAlign); + for (t=0;t<DD_ROP_SPACE;t++) + { + printf(" pHalInfo->ddCaps.dwRops[0x%04x] : 0x%08lx\n",t,pHalInfo->ddCaps.dwRops[t]); + } + printf(" pHalInfo->ddCaps.ddsCaps.dwCaps : 0x%08lx\n",pHalInfo->ddCaps.ddsCaps.dwCaps); + printf(" pHalInfo->ddCaps.dwMinOverlayStretch : 0x%08lx\n",pHalInfo->ddCaps.dwMinOverlayStretch); + printf(" pHalInfo->ddCaps.dwMaxOverlayStretch : 0x%08lx\n",pHalInfo->ddCaps.dwMaxOverlayStretch); + printf(" pHalInfo->ddCaps.dwMinLiveVideoStretch : 0x%08lx\n",pHalInfo->ddCaps.dwMinLiveVideoStretch); + printf(" pHalInfo->ddCaps.dwMaxLiveVideoStretch : 0x%08lx\n",pHalInfo->ddCaps.dwMaxLiveVideoStretch); + printf(" pHalInfo->ddCaps.dwMinHwCodecStretch : 0x%08lx\n",pHalInfo->ddCaps.dwMinHwCodecStretch); + printf(" pHalInfo->ddCaps.dwMaxHwCodecStretch : 0x%08lx\n",pHalInfo->ddCaps.dwMaxHwCodecStretch); + printf(" pHalInfo->ddCaps.dwReserved1 : 0x%08lx\n",pHalInfo->ddCaps.dwReserved1); + printf(" pHalInfo->ddCaps.dwReserved2 : 0x%08lx\n",pHalInfo->ddCaps.dwReserved2); + printf(" pHalInfo->ddCaps.dwReserved3 : 0x%08lx\n",pHalInfo->ddCaps.dwReserved3); + printf(" pHalInfo->ddCaps.dwSVBCaps : 0x%08lx\n",pHalInfo->ddCaps.dwSVBCaps); + printf(" pHalInfo->ddCaps.dwSVBCKeyCaps : 0x%08lx\n",pHalInfo->ddCaps.dwSVBCKeyCaps); + printf(" pHalInfo->ddCaps.dwSVBFXCaps : 0x%08lx\n",pHalInfo->ddCaps.dwSVBFXCaps); + for (t=0;t<DD_ROP_SPACE;t++) + { + printf(" pHalInfo->ddCaps.dwSVBRops[0x%04x] : 0x%08lx\n",t,pHalInfo->ddCaps.dwSVBRops[t]); + } + printf(" pHalInfo->ddCaps.dwVSBCaps : 0x%08lx\n",pHalInfo->ddCaps.dwVSBCaps); + printf(" pHalInfo->ddCaps.dwVSBCKeyCaps : 0x%08lx\n",pHalInfo->ddCaps.dwVSBCKeyCaps); + printf(" pHalInfo->ddCaps.dwVSBFXCaps : 0x%08lx\n",pHalInfo->ddCaps.dwVSBFXCaps); + for (t=0;t<DD_ROP_SPACE;t++) + { + printf(" pHalInfo->ddCaps.dwVSBRops[0x%04x] : 0x%08lx\n",t,pHalInfo->ddCaps.dwVSBRops[t]); + } + printf(" pHalInfo->ddCaps.dwSSBCaps : 0x%08lx\n",pHalInfo->ddCaps.dwSSBCaps); + printf(" pHalInfo->ddCaps.dwSSBCKeyCa : 0x%08lx\n",pHalInfo->ddCaps.dwSSBCKeyCaps); + printf(" pHalInfo->ddCaps.dwSSBFXCaps : 0x%08lx\n",pHalInfo->ddCaps.dwSSBFXCaps); + for (t=0;t<DD_ROP_SPACE;t++) + { + printf(" pHalInfo->ddCaps.dwSSBRops[0x%04x] : 0x%08lx\n",t,pHalInfo->ddCaps.dwSSBRops[t]); + } + + + + printf(" pHalInfo->GetDriverInfo : 0x%08lx\n",(long)pHalInfo->GetDriverInfo); + printf(" pHalInfo->dwFlags : 0x%08lx\n",(long)pHalInfo->dwFlags); + + printf(" pHalInfo->lpD3DGlobalDriverData : 0x%08lx\n",(long)pHalInfo->lpD3DGlobalDriverData); + printf(" pHalInfo->lpD3DHALCallbacks : 0x%08lx\n",(long)pHalInfo->lpD3DHALCallbacks); + printf(" pHalInfo->lpD3DBufCallbacks : 0x%08lx\n",(long)pHalInfo->lpD3DBufCallbacks); + } + else + { + printf("unkonwn dwSize DD_HALINFO : the size found is 0x%8lx\n",pHalInfo->dwSize); + } +} + Propchange: trunk/rosapps/dxtest/win32kdxtest/dump.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/dxtest/win32kdxtest/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/dxtest/win32kdxtest/main.c… ============================================================================== --- trunk/rosapps/dxtest/win32kdxtest/main.c (original) +++ trunk/rosapps/dxtest/win32kdxtest/main.c Sat Feb 17 18:01:01 2007 @@ -102,15 +102,15 @@ DWORD *puFourCC = NULL; DD_HALINFO HalInfo; - DWORD CallBackFlags = 0; + DWORD CallBackFlags[4]; D3DNTHAL_CALLBACKS D3dCallbacks; D3DNTHAL_GLOBALDRIVERDATA D3dDriverData; DD_D3DBUFCALLBACKS D3dBufferCallbacks; DDSURFACEDESC D3dTextureFormats; - DWORD NumHeaps = 0; + //DWORD NumHeaps = 0; VIDEOMEMORY vmList; - DWORD NumFourCC = 0; - DWORD FourCC = 0; + //DWORD NumFourCC = 0; + //DWORD FourCC = 0; /* clear data */ memset(&vmList,0,sizeof(VIDEOMEMORY)); @@ -119,6 +119,7 @@ memset(&D3dDriverData,0,sizeof(D3DNTHAL_GLOBALDRIVERDATA)); memset(&D3dCallbacks,0,sizeof(D3DNTHAL_CALLBACKS)); memset(&HalInfo,0,sizeof(DD_HALINFO)); + memset(CallBackFlags,0,sizeof(DWORD)*3); printf("Start testing of NtGdiDdQueryDirectDrawObject\n"); @@ -180,6 +181,19 @@ testing_noteq(puFourCC,NULL,fails,"9. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0"); testing_noteq(pHalInfo->dwSize,sizeof(DD_HALINFO),fails,"10. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0"); +#if DBG + dump(pHalInfo, "NtGdiDdQueryDirectDrawObject frist call"); +#endif + + //pCallBackFlags = (DWORD *)&CallBackFlags; + + //retValue = sysNtGdiDdQueryDirectDrawObject( hDirectDrawLocal, NULL, + // pCallBackFlags, puD3dCallbacks, + // puD3dDriverData, puD3dBufferCallbacks, + // puD3dTextureFormats, puNumHeaps, + // puvmList, puNumFourCC, + // puFourCC); + show_status(fails, "NtGdiDdQueryDirectDrawObject\0"); } Modified: trunk/rosapps/dxtest/win32kdxtest/test.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/dxtest/win32kdxtest/test.h… ============================================================================== --- trunk/rosapps/dxtest/win32kdxtest/test.h (original) +++ trunk/rosapps/dxtest/win32kdxtest/test.h Sat Feb 17 18:01:01 2007 @@ -4,7 +4,7 @@ void test_NtGdiDdDeleteDirectDrawObject(HANDLE hDirectDrawLocal); void test_NtGdiDdQueryDirectDrawObject( HANDLE hDirectDrawLocal); - +void dump(DD_HALINFO *pHalInfo, char *text); HANDLE sysNtGdiDdCreateDirectDrawObject(HDC hdc); BOOL sysNtGdiDdDeleteDirectDrawObject( HANDLE hDirectDrawLocal); Modified: trunk/rosapps/dxtest/win32kdxtest/win32kdxtest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/dxtest/win32kdxtest/win32k… ============================================================================== --- trunk/rosapps/dxtest/win32kdxtest/win32kdxtest.rbuild (original) +++ trunk/rosapps/dxtest/win32kdxtest/win32kdxtest.rbuild Sat Feb 17 18:01:01 2007 @@ -8,6 +8,7 @@ <library>user32</library> <library>gdi32</library> <file>main.c</file> + <file>dump.c</file> <file>../../../../dll/win32/gdi32/misc/win32k.S</file> Modified: trunk/rosapps/dxtest/win32kdxtest/win32kdxtest_vc8_auto.vcproj URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/dxtest/win32kdxtest/win32k… ============================================================================== --- trunk/rosapps/dxtest/win32kdxtest/win32kdxtest_vc8_auto.vcproj (original) +++ trunk/rosapps/dxtest/win32kdxtest/win32kdxtest_vc8_auto.vcproj Sat Feb 17 18:01:01 2007 @@ -577,6 +577,10 @@ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;S" > <File + RelativePath=".\dump.c" + > + </File> + <File RelativePath=".\main.c" > </File>

1 0

[weiden] 25828: - Move around definitions to make the code a bit more modular - Use an about menu instead of an button
by weiden＠svn.reactos.org 17 Feb '07

17 Feb '07

Author: weiden Date: Sat Feb 17 12:32:33 2007 New Revision: 25828 URL: http://svn.reactos.org/svn/reactos?rev=25828&view=rev Log: - Move around definitions to make the code a bit more modular - Use an about menu instead of an button Modified: trunk/reactos/base/applications/charmap/about.c trunk/reactos/base/applications/charmap/charmap.c trunk/reactos/base/applications/charmap/lang/en-US.rc trunk/reactos/base/applications/charmap/map.c trunk/reactos/base/applications/charmap/precomp.h trunk/reactos/base/applications/charmap/resource.h Modified: trunk/reactos/base/applications/charmap/about.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/about.c (original) +++ trunk/reactos/base/applications/charmap/about.c Sat Feb 17 12:32:33 2007 @@ -1,7 +1,7 @@ #include <precomp.h> -INT_PTR CALLBACK +static INT_PTR CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, @@ -53,3 +53,12 @@ return FALSE; } + +VOID +ShowAboutDlg(HWND hWndParent) +{ + DialogBox(hInstance, + MAKEINTRESOURCE(IDD_ABOUTBOX), + hWndParent, + AboutDialogProc); +} Modified: trunk/reactos/base/applications/charmap/charmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/charmap.c (original) +++ trunk/reactos/base/applications/charmap/charmap.c Sat Feb 17 12:32:33 2007 @@ -1,12 +1,11 @@ #include <precomp.h> -const TCHAR szMapWndClass[] = TEXT("FontMapWnd"); -const TCHAR szLrgCellWndClass[] = TEXT("LrgCellWnd"); +#define ID_ABOUT 0x1 HINSTANCE hInstance; /* Font-enumeration callback */ -int CALLBACK +static int CALLBACK EnumFontNames(ENUMLOGFONTEX *lpelfe, NEWTEXTMETRICEX *lpntme, DWORD FontType, @@ -120,19 +119,20 @@ } -BOOL CALLBACK +static BOOL CALLBACK DlgProc(HWND hDlg, UINT Message, WPARAM wParam, LPARAM lParam) { - static HICON hSmIcon = NULL; - static HICON hBgIcon = NULL; - switch(Message) { case WM_INITDIALOG: { + HICON hSmIcon; + HICON hBgIcon; + HMENU hSysMenu; + hSmIcon = LoadImage(hInstance, MAKEINTRESOURCE(IDI_ICON), IMAGE_ICON, @@ -159,6 +159,29 @@ IDC_FONTCOMBO)); ChangeMapFont(hDlg); + + hSysMenu = GetSystemMenu(hDlg, + FALSE); + if (hSysMenu != NULL) + { + LPCTSTR lpAboutText = NULL; + + if (LoadString(hInstance, + IDS_ABOUT, + (LPTSTR)&lpAboutText, + 0)) + { + AppendMenu(hSysMenu, + MF_SEPARATOR, + 0, + NULL); + AppendMenu(hSysMenu, + MF_STRING, + ID_ABOUT, + lpAboutText); + } + } + return TRUE; } break; @@ -184,8 +207,15 @@ case IDOK: EndDialog(hDlg, 0); break; - - case IDC_ABOUT: + } + } + break; + + case WM_SYSCOMMAND: + { + switch(wParam) + { + case ID_ABOUT: DialogBox(hInstance, MAKEINTRESOURCE(IDD_ABOUTBOX), hDlg, @@ -199,43 +229,7 @@ return FALSE; } - return TRUE; -} - -BOOL -RegisterControls(HINSTANCE hInstance) -{ - WNDCLASS wc = {0}; - - //wc.style = CS_DBLCLKS; - wc.lpfnWndProc = MapWndProc; - wc.cbWndExtra = sizeof(PMAP); - wc.hInstance = hInstance; - wc.hCursor = LoadCursor(NULL, - (LPTSTR)IDC_ARROW); - wc.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); - wc.lpszClassName = szMapWndClass; - - if (RegisterClass(&wc)) - { - wc.lpfnWndProc = LrgCellWndProc; - wc.cbWndExtra = 0; - wc.lpszClassName = szLrgCellWndClass; - - return RegisterClass(&wc) != 0; - } - return FALSE; -} - -VOID -UnregisterControls(HINSTANCE hInstance) -{ - UnregisterClass(szMapWndClass, - hInstance); - - UnregisterClass(szLrgCellWndClass, - hInstance); } @@ -246,7 +240,7 @@ int iCmd) { INITCOMMONCONTROLSEX iccx; - INT Ret; + INT Ret = 1; hInstance = hInst; @@ -254,14 +248,15 @@ iccx.dwICC = ICC_TAB_CLASSES; InitCommonControlsEx(&iccx); - RegisterControls(hInstance); - - Ret = DialogBox(hInstance, - MAKEINTRESOURCE(IDD_CHARMAP), - NULL, - (DLGPROC)DlgProc); - - UnregisterControls(hInstance); + if (RegisterMapClasses(hInstance)) + { + Ret = DialogBox(hInstance, + MAKEINTRESOURCE(IDD_CHARMAP), + NULL, + (DLGPROC)DlgProc) >= 0; + + UnregisterMapClasses(hInstance); + } return Ret; } Modified: trunk/reactos/base/applications/charmap/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/en-US.rc (original) +++ trunk/reactos/base/applications/charmap/lang/en-US.rc Sat Feb 17 12:32:33 2007 @@ -3,12 +3,11 @@ IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233 CAPTION "Character Map" FONT 8,"MS Sans Serif",0,0 -STYLE WS_BORDER | WS_VISIBLE | WS_SYSMENU +STYLE WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX BEGIN LTEXT "Font :", IDC_STATIC, 6, 7, 24, 9 - COMBOBOX IDC_FONTCOMBO, 36, 5, 196, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS - PUSHBUTTON "Help", IDC_CMHELP, 235, 5, 35, 13 - PUSHBUTTON "?", IDC_ABOUT, 272, 5, 14, 13 + COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS + PUSHBUTTON "Help", IDC_CMHELP, 249, 5, 35, 13 CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156 LTEXT "Characters to copy :", IDC_STATIC, 6, 188, 66, 9 EDITTEXT IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP @@ -32,4 +31,5 @@ STRINGTABLE DISCARDABLE BEGIN IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." + IDS_ABOUT "A&bout..." END Modified: trunk/reactos/base/applications/charmap/map.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/map.c (original) +++ trunk/reactos/base/applications/charmap/map.c Sat Feb 17 12:32:33 2007 @@ -1,5 +1,7 @@ #include <precomp.h> +static const TCHAR szMapWndClass[] = TEXT("FontMapWnd"); +static const TCHAR szLrgCellWndClass[] = TEXT("LrgCellWnd"); static VOID TagFontToCell(PCELL pCell, @@ -482,3 +484,39 @@ return Ret; } + +BOOL +RegisterMapClasses(HINSTANCE hInstance) +{ + WNDCLASS wc = {0}; + + //wc.style = CS_DBLCLKS; + wc.lpfnWndProc = MapWndProc; + wc.cbWndExtra = sizeof(PMAP); + wc.hInstance = hInstance; + wc.hCursor = LoadCursor(NULL, + (LPTSTR)IDC_ARROW); + wc.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); + wc.lpszClassName = szMapWndClass; + + if (RegisterClass(&wc)) + { + wc.lpfnWndProc = LrgCellWndProc; + wc.cbWndExtra = 0; + wc.lpszClassName = szLrgCellWndClass; + + return RegisterClass(&wc) != 0; + } + + return FALSE; +} + +VOID +UnregisterMapClasses(HINSTANCE hInstance) +{ + UnregisterClass(szMapWndClass, + hInstance); + + UnregisterClass(szLrgCellWndClass, + hInstance); +} Modified: trunk/reactos/base/applications/charmap/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/precomp.h (original) +++ trunk/reactos/base/applications/charmap/precomp.h Sat Feb 17 12:32:33 2007 @@ -14,8 +14,6 @@ #define FM_SETFONT (WM_USER + 1) extern HINSTANCE hInstance; -extern const TCHAR szMapWndClass[]; -extern const TCHAR szLrgCellWndClass[]; typedef struct _CELL @@ -41,11 +39,9 @@ INT iPage; } MAP, *PMAP; -BOOL RegisterControls(HINSTANCE hInstance); -VOID UnregisterControls(HINSTANCE hInstance); +VOID ShowAboutDlg(HWND hWndParent); -INT_PTR CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); -LRESULT CALLBACK LrgCellWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); -LRESULT CALLBACK MapWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); +BOOL RegisterMapClasses(HINSTANCE hInstance); +VOID UnregisterMapClasses(HINSTANCE hInstance); #endif /* __DEVMGMT_PRECOMP_H */ Modified: trunk/reactos/base/applications/charmap/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/resource.h (original) +++ trunk/reactos/base/applications/charmap/resource.h Sat Feb 17 12:32:33 2007 @@ -4,15 +4,16 @@ #define IDD_CHARMAP 200 #define IDD_ABOUTBOX 201 + #define IDC_FONTCOMBO 1001 #define IDC_CMHELP 1002 -#define IDC_ABOUT 1003 -#define IDC_FONTMAP 1004 -#define IDC_TEXTBOX 1005 -#define IDC_SELECT 1006 -#define IDC_COPY 1007 -#define IDC_ADVVIEW 1008 -#define IDC_DISPLAY 1009 -#define IDC_SCROLL 1010 -#define IDS_LICENSE 1011 -#define IDC_LICENSE_EDIT 1012 +#define IDC_FONTMAP 1003 +#define IDC_TEXTBOX 1004 +#define IDC_SELECT 1005 +#define IDC_COPY 1006 +#define IDC_ADVVIEW 1007 +#define IDC_DISPLAY 1008 +#define IDC_LICENSE_EDIT 1009 + +#define IDS_LICENSE 1010 +#define IDS_ABOUT 1011

1 0

[gedmurphy] 25827: add to bootcd to highlight the paint issue
by gedmurphy＠svn.reactos.org 17 Feb '07

17 Feb '07

Author: gedmurphy Date: Sat Feb 17 03:23:53 2007 New Revision: 25827 URL: http://svn.reactos.org/svn/reactos?rev=25827&view=rev Log: add to bootcd to highlight the paint issue Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Sat Feb 17 03:23:53 2007 @@ -32,6 +32,7 @@ ; Base files base\applications\cacls\cacls.exe 1 base\applications\calc\calc.exe 1 +base\applications\charmap\charmap.exe 1 base\applications\cmdutils\find\find.exe 1 base\applications\cmdutils\more\more.exe 1 base\applications\control\control.exe 1

1 0

[gedmurphy] 25826: add to build
by gedmurphy＠svn.reactos.org 17 Feb '07

17 Feb '07

Author: gedmurphy Date: Sat Feb 17 03:22:21 2007 New Revision: 25826 URL: http://svn.reactos.org/svn/reactos?rev=25826&view=rev Log: add to build Modified: trunk/reactos/base/applications/applications.rbuild Modified: trunk/reactos/base/applications/applications.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/applicat… ============================================================================== --- trunk/reactos/base/applications/applications.rbuild (original) +++ trunk/reactos/base/applications/applications.rbuild Sat Feb 17 03:22:21 2007 @@ -6,6 +6,9 @@ </directory> <directory name="calc"> <xi:include href="calc/calc.rbuild" /> +</directory> +<directory name="charmap"> + <xi:include href="charmap/charmap.rbuild" /> </directory> <directory name="cmdutils"> <xi:include href="cmdutils/cmdutils.rbuild" />

1 0

[gedmurphy] 25825: - halfplement charmap.exe - tested in ROS, by no means perfect but we cant least see the various glyphs within a font - this app highlights an issue with our paint code (not yet investigated)
by gedmurphy＠svn.reactos.org 17 Feb '07

17 Feb '07

Author: gedmurphy Date: Sat Feb 17 03:13:35 2007 New Revision: 25825 URL: http://svn.reactos.org/svn/reactos?rev=25825&view=rev Log: - halfplement charmap.exe - tested in ROS, by no means perfect but we cant least see the various glyphs within a font - this app highlights an issue with our paint code (not yet investigated) Added: trunk/reactos/base/applications/charmap/ trunk/reactos/base/applications/charmap/about.c trunk/reactos/base/applications/charmap/charmap.c trunk/reactos/base/applications/charmap/charmap.rbuild trunk/reactos/base/applications/charmap/charmap.rc trunk/reactos/base/applications/charmap/lang/ trunk/reactos/base/applications/charmap/lang/en-US.rc trunk/reactos/base/applications/charmap/lrgcell.c trunk/reactos/base/applications/charmap/manifest.xml trunk/reactos/base/applications/charmap/map.c trunk/reactos/base/applications/charmap/precomp.h trunk/reactos/base/applications/charmap/res/ trunk/reactos/base/applications/charmap/res/charmap.ico (with props) trunk/reactos/base/applications/charmap/resource.h trunk/reactos/base/applications/charmap/rsrc.rc Added: trunk/reactos/base/applications/charmap/about.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/about.c (added) +++ trunk/reactos/base/applications/charmap/about.c Sat Feb 17 03:13:35 2007 @@ -1,0 +1,55 @@ +#include <precomp.h> + + +INT_PTR CALLBACK +AboutDialogProc(HWND hDlg, + UINT message, + WPARAM wParam, + LPARAM lParam) +{ + HWND hLicenseEditWnd; + HICON hIcon = NULL; + TCHAR strLicense[700]; + + switch (message) + { + case WM_INITDIALOG: + + hIcon = LoadImage(hInstance, + MAKEINTRESOURCE(IDI_ICON), + IMAGE_ICON, + 16, + 16, + 0); + + SendMessage(hDlg, + WM_SETICON, + ICON_SMALL, + (LPARAM)hIcon); + + hLicenseEditWnd = GetDlgItem(hDlg, + IDC_LICENSE_EDIT); + + LoadString(hInstance, + IDS_LICENSE, + strLicense, + sizeof(strLicense) / sizeof(TCHAR)); + + SetWindowText(hLicenseEditWnd, + strLicense); + return TRUE; + + case WM_COMMAND: + if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL)) + { + DestroyIcon(hIcon); + EndDialog(hDlg, + LOWORD(wParam)); + return TRUE; + } + + break; + } + + return FALSE; +} Added: trunk/reactos/base/applications/charmap/charmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/charmap.c (added) +++ trunk/reactos/base/applications/charmap/charmap.c Sat Feb 17 03:13:35 2007 @@ -1,0 +1,267 @@ +#include <precomp.h> + +const TCHAR szMapWndClass[] = TEXT("FontMapWnd"); +const TCHAR szLrgCellWndClass[] = TEXT("LrgCellWnd"); + +HINSTANCE hInstance; + +/* Font-enumeration callback */ +int CALLBACK +EnumFontNames(ENUMLOGFONTEX *lpelfe, + NEWTEXTMETRICEX *lpntme, + DWORD FontType, + LPARAM lParam) +{ + HWND hwndCombo = (HWND)lParam; + TCHAR *pszName = lpelfe->elfLogFont.lfFaceName; + + /* make sure font doesn't already exist in our list */ + if(SendMessage(hwndCombo, + CB_FINDSTRING, + 0, + (LPARAM)pszName) == CB_ERR) + { + INT idx; + BOOL fFixed; + BOOL fTrueType; + + /* add the font */ + idx = (INT)SendMessage(hwndCombo, + CB_ADDSTRING, + 0, + (LPARAM)pszName); + + /* record the font's attributes (Fixedwidth and Truetype) */ + fFixed = (lpelfe->elfLogFont.lfPitchAndFamily & FIXED_PITCH) ? TRUE : FALSE; + fTrueType = (lpelfe->elfLogFont.lfOutPrecision == OUT_STROKE_PRECIS) ? TRUE : FALSE; + + /* store this information in the list-item's userdata area */ + SendMessage(hwndCombo, + CB_SETITEMDATA, + idx, + MAKEWPARAM(fFixed, fTrueType)); + } + + return 1; +} + + +/* Initialize the font-list by enumeration all system fonts */ +static VOID +FillFontStyleComboList(HWND hwndCombo) +{ + HDC hdc; + LOGFONT lf; + + /* FIXME: for fun, draw each font in its own style */ + HFONT hFont = GetStockObject(DEFAULT_GUI_FONT); + SendMessage(hwndCombo, + WM_SETFONT, + (WPARAM)hFont, + 0); + + lf.lfCharSet = DEFAULT_CHARSET; + lf.lfFaceName[0] = _T('\0'); // all fonts + lf.lfPitchAndFamily = 0; + + hdc = GetDC(hwndCombo); + + /* store the list of fonts in the combo */ + EnumFontFamiliesEx(hdc, + &lf, + (FONTENUMPROC)EnumFontNames, + (LPARAM)hwndCombo, + 0); + + ReleaseDC(hwndCombo, + hdc); + + /* set default to Arial */ + SendMessage(hwndCombo, + CB_SELECTSTRING, + -1, + (LPARAM)_T("Arial")); +} + + +static VOID +ChangeMapFont(HWND hDlg) +{ + HWND hCombo; + HWND hMap; + LPTSTR lpFontName; + INT Len; + + hCombo = GetDlgItem(hDlg, IDC_FONTCOMBO); + + Len = GetWindowTextLength(hCombo); + + if (Len != 0) + { + lpFontName = HeapAlloc(GetProcessHeap(), + 0, + (Len + 1) * sizeof(TCHAR)); + + if (lpFontName) + { + SendMessage(hCombo, + WM_GETTEXT, + 31, + (LPARAM)lpFontName); + + hMap = GetDlgItem(hDlg, IDC_FONTMAP); + + SendMessage(hMap, + FM_SETFONT, + 0, + (LPARAM)lpFontName); + } + } +} + + +BOOL CALLBACK +DlgProc(HWND hDlg, + UINT Message, + WPARAM wParam, + LPARAM lParam) +{ + static HICON hSmIcon = NULL; + static HICON hBgIcon = NULL; + + switch(Message) + { + case WM_INITDIALOG: + { + hSmIcon = LoadImage(hInstance, + MAKEINTRESOURCE(IDI_ICON), + IMAGE_ICON, + 16, + 16, + 0); + hBgIcon = LoadImage(hInstance, + MAKEINTRESOURCE(IDI_ICON), + IMAGE_ICON, + 32, + 32, + 0); + + SendMessage(hDlg, + WM_SETICON, + ICON_SMALL, + (LPARAM)hSmIcon); + SendMessage(hDlg, + WM_SETICON, + ICON_BIG, + (LPARAM)hBgIcon); + + FillFontStyleComboList(GetDlgItem(hDlg, + IDC_FONTCOMBO)); + + ChangeMapFont(hDlg); + } + break; + + case WM_CLOSE: + { + EndDialog(hDlg, 0); + } + break; + + case WM_COMMAND: + { + switch(LOWORD(wParam)) + { + case IDC_FONTCOMBO: + { + if (HIWORD(wParam) == CBN_SELCHANGE) + { + ChangeMapFont(hDlg); + } + } + break; + + case IDOK: + EndDialog(hDlg, 0); + break; + + case IDC_ABOUT: + DialogBox(hInstance, + MAKEINTRESOURCE(IDD_ABOUTBOX), + hDlg, + AboutDialogProc); + break; + } + } + break; + + default: + return FALSE; + } + + return TRUE; +} + +BOOL +RegisterControls(HINSTANCE hInstance) +{ + WNDCLASS wc = {0}; + + //wc.style = CS_DBLCLKS; + wc.lpfnWndProc = MapWndProc; + wc.cbWndExtra = sizeof(PMAP); + wc.hInstance = hInstance; + wc.hCursor = LoadCursor(NULL, + (LPTSTR)IDC_ARROW); + wc.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); + wc.lpszClassName = szMapWndClass; + + if (RegisterClass(&wc)) + { + wc.lpfnWndProc = LrgCellWndProc; + wc.cbWndExtra = 0; + wc.lpszClassName = szLrgCellWndClass; + + return RegisterClass(&wc) != 0; + } + + return FALSE; +} + +VOID +UnregisterControls(HINSTANCE hInstance) +{ + UnregisterClass(szMapWndClass, + hInstance); + + UnregisterClass(szLrgCellWndClass, + hInstance); +} + + +INT WINAPI +WinMain(HINSTANCE hInst, + HINSTANCE hPrev, + LPSTR Cmd, + int iCmd) +{ + INITCOMMONCONTROLSEX iccx; + INT Ret; + + hInstance = hInst; + + iccx.dwSize = sizeof(INITCOMMONCONTROLSEX); + iccx.dwICC = ICC_TAB_CLASSES; + InitCommonControlsEx(&iccx); + + RegisterControls(hInstance); + + Ret = DialogBox(hInstance, + MAKEINTRESOURCE(IDD_CHARMAP), + NULL, + (DLGPROC)DlgProc); + + UnregisterControls(hInstance); + + return Ret; +} Added: trunk/reactos/base/applications/charmap/charmap.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/charmap.rbuild (added) +++ trunk/reactos/base/applications/charmap/charmap.rbuild Sat Feb 17 03:13:35 2007 @@ -1,0 +1,25 @@ +<?xml version="1.0"?> +<rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> + <module name="charmap" type="win32gui" installbase="system32" installname="charmap.exe"> + <include base="charmap">.</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <library>ntdll</library> + <library>gdi32</library> + <library>kernel32</library> + <library>user32</library> + <library>comctl32</library> + <compilationunit name="unit.c"> + <file>about.c</file> + <file>charmap.c</file> + <file>lrgcell.c</file> + <file>map.c</file> + </compilationunit> + <file>charmap.rc</file> + <pch>precomp.h</pch> + </module> +</rbuild> Added: trunk/reactos/base/applications/charmap/charmap.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/charmap.rc (added) +++ trunk/reactos/base/applications/charmap/charmap.rc Sat Feb 17 03:13:35 2007 @@ -1,0 +1,11 @@ +#include <windows.h> +#include <commctrl.h> +#include "resource.h" + + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Character Map\0" +#define REACTOS_STR_INTERNAL_NAME "charmap\0" +#define REACTOS_STR_ORIGINAL_FILENAME "charmap.exe\0" +#include <reactos/version.rc> + +#include "rsrc.rc" Added: trunk/reactos/base/applications/charmap/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/en-US.rc (added) +++ trunk/reactos/base/applications/charmap/lang/en-US.rc Sat Feb 17 03:13:35 2007 @@ -1,0 +1,35 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233 +CAPTION "Character Map" +FONT 8,"MS Sans Serif",0,0 +STYLE WS_BORDER | WS_VISIBLE | WS_SYSMENU +BEGIN + LTEXT "Font :", IDC_STATIC, 6, 7, 24, 9 + COMBOBOX IDC_FONTCOMBO, 36, 5, 196, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS + PUSHBUTTON "Help", IDC_CMHELP, 235, 5, 35, 13 + PUSHBUTTON "?", IDC_ABOUT, 272, 5, 14, 13 + CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156 + LTEXT "Characters to copy :", IDC_STATIC, 6, 188, 66, 9 + EDITTEXT IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "Select", IDC_SELECT, 194, 186, 46, 13 + PUSHBUTTON "Copy", IDC_COPY, 244, 186, 46, 13, WS_DISABLED + //AUTOCHECKBOX "Advanced view", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP + //EDITTEXT IDC_DISPLAY, 8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY +END + +IDD_ABOUTBOX DIALOGEX 22,16,210,182 +CAPTION "About Character Map" +FONT 8,"MS Sans Serif",0,0 +STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + LTEXT "Character Map v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 150, 36 + PUSHBUTTON "Close", IDOK, 75, 162, 44, 15 + ICON IDI_ICON, IDC_STATIC, 10, 10, 7, 30 + EDITTEXT IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." +END Added: trunk/reactos/base/applications/charmap/lrgcell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lrgcell.c (added) +++ trunk/reactos/base/applications/charmap/lrgcell.c Sat Feb 17 03:13:35 2007 @@ -1,0 +1,152 @@ +#include <precomp.h> + + +static HFONT +SetLrgFont(PMAP infoPtr) +{ + LOGFONT lf; + HFONT hFont = NULL; + HDC hdc; + HWND hCombo; + LPTSTR lpFontName; + INT Len; + + hCombo = GetDlgItem(infoPtr->hParent, IDC_FONTCOMBO); + + Len = GetWindowTextLength(hCombo); + + if (Len != 0) + { + lpFontName = HeapAlloc(GetProcessHeap(), + 0, + (Len + 1) * sizeof(TCHAR)); + + if (lpFontName) + { + SendMessage(hCombo, + WM_GETTEXT, + 31, + (LPARAM)lpFontName); + + ZeroMemory(&lf, sizeof(lf)); + + hdc = GetDC(infoPtr->hLrgWnd); + lf.lfHeight = GetDeviceCaps(hdc, + LOGPIXELSY) / 2; + ReleaseDC(infoPtr->hLrgWnd, hdc); + + lf.lfCharSet = DEFAULT_CHARSET; + lstrcpy(lf.lfFaceName, + lpFontName); + + hFont = CreateFontIndirect(&lf); + + HeapFree(GetProcessHeap(), + 0, + lpFontName); + } + } + + return hFont; +} + + +LRESULT CALLBACK +LrgCellWndProc(HWND hwnd, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + PMAP infoPtr; + LRESULT Ret = 0; + static INT cxClient, cyClient; + static RECT rc; + static HFONT hFont = NULL; + + infoPtr = (PMAP)GetWindowLongPtr(hwnd, + GWLP_USERDATA); + + if (infoPtr == NULL && uMsg != WM_CREATE) + { + goto HandleDefaultMessage; + } + + switch (uMsg) + { + case WM_CREATE: + { + infoPtr = (PMAP)(((LPCREATESTRUCT)lParam)->lpCreateParams); + + SetWindowLongPtr(hwnd, + GWLP_USERDATA, + (LONG_PTR)infoPtr); + + hFont = SetLrgFont(infoPtr); + + break; + } + + case WM_SIZE: + { + cxClient = LOWORD(lParam); + cyClient = HIWORD(lParam); + + rc.left = 0; + rc.top = 0; + rc.right = cxClient; + rc.bottom = cyClient; + + break; + } + + case WM_PAINT: + { + PAINTSTRUCT ps; + HDC hdc; + HFONT hOldFont; + + hdc = BeginPaint(hwnd, + &ps); + + Rectangle(hdc, + 0, + 0, + cxClient, + cyClient); + + hOldFont = SelectObject(hdc, hFont); + + DrawText(hdc, + &infoPtr->pActiveCell->ch, + 1, + &rc, + DT_CENTER | DT_VCENTER | DT_SINGLELINE); + + SelectObject(hdc, hOldFont); + + EndPaint(hwnd, + &ps); + + break; + } + + case WM_DESTROY: + { + DeleteObject(hFont); + + break; + } + + default: + { +HandleDefaultMessage: + Ret = DefWindowProc(hwnd, + uMsg, + wParam, + lParam); + break; + } + } + + return Ret; +} Added: trunk/reactos/base/applications/charmap/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/manifest.xml (added) +++ trunk/reactos/base/applications/charmap/manifest.xml Sat Feb 17 03:13:35 2007 @@ -1,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly + xmlns="urn:schemas-microsoft-com:asm.v1" + manifestVersion="1.0"> +<assemblyIdentity + name="Win32 Application.default.App" + processorArchitecture="x86" + version="1.0.0.0" + type="win32"/> +<description>ReactOS Character Map</description> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="x86" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> Added: trunk/reactos/base/applications/charmap/map.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/map.c (added) +++ trunk/reactos/base/applications/charmap/map.c Sat Feb 17 03:13:35 2007 @@ -1,0 +1,484 @@ +#include <precomp.h> + + +static VOID +TagFontToCell(PCELL pCell, + TCHAR ch) +{ + pCell->ch = ch; +} + + +static VOID +SetGrid(PMAP infoPtr) +{ + INT x, y; + + for (y = 0; y < YCELLS; y++) + for (x = 0; x < XCELLS; x++) + { + infoPtr->Cells[y][x].CellExt.left = x * infoPtr->CellSize.cx + 1; + infoPtr->Cells[y][x].CellExt.top = y * infoPtr->CellSize.cy + 1; + infoPtr->Cells[y][x].CellExt.right = (x + 1) * infoPtr->CellSize.cx + 2; + infoPtr->Cells[y][x].CellExt.bottom = (y + 1) * infoPtr->CellSize.cy + 2; + + CopyRect(&infoPtr->Cells[y][x].CellInt, + &infoPtr->Cells[y][x].CellExt); + + InflateRect(&infoPtr->Cells[y][x].CellInt, + -1, + -1); + } +} + +static VOID +DrawActiveCell(PMAP infoPtr, + HDC hdc) +{ + Rectangle(hdc, + infoPtr->pActiveCell->CellInt.left, + infoPtr->pActiveCell->CellInt.top, + infoPtr->pActiveCell->CellInt.right, + infoPtr->pActiveCell->CellInt.bottom); + +} + + +static VOID +DrawGrid(PMAP infoPtr, + HDC hdc) +{ + INT x, y; + + for (y = 0; y < YCELLS; y++) + for (x = 0; x < XCELLS; x++) + { + Rectangle(hdc, + infoPtr->Cells[y][x].CellExt.left, + infoPtr->Cells[y][x].CellExt.top, + infoPtr->Cells[y][x].CellExt.right, + infoPtr->Cells[y][x].CellExt.bottom); + } + + if (infoPtr->pActiveCell) + DrawActiveCell(infoPtr, + hdc); +} + + +static VOID +FillGrid(PMAP infoPtr, + HDC hdc) +{ + //GLYPHSET gs; + HFONT hOldFont; + TCHAR ch; + INT x, y; + + hOldFont = SelectObject(hdc, + infoPtr->hFont); + + for (y = 0; y < YCELLS; y++) + for (x = 0; x < XCELLS; x++) + { + ch = (TCHAR)((256 * infoPtr->iPage) + (XCELLS * y) + x); + + TagFontToCell(&infoPtr->Cells[y][x], ch); + + DrawText(hdc, + &ch, + 1, + &infoPtr->Cells[y][x].CellInt, + DT_CENTER | DT_VCENTER | DT_SINGLELINE); + } + + SelectObject(hdc, + hOldFont); +} + + +static BOOL +CreateLargeCell(PMAP infoPtr) +{ + RECT rLarge; + + CopyRect(&rLarge, + &infoPtr->pActiveCell->CellExt); + + MapWindowPoints(infoPtr->hMapWnd, + infoPtr->hParent, + (LPPOINT)&rLarge, + 2); + + InflateRect(&rLarge, + XLARGE - XCELLS, + YLARGE - YCELLS); + + infoPtr->hLrgWnd = CreateWindowEx(0, + szLrgCellWndClass, + NULL, + WS_CHILDWINDOW | WS_VISIBLE, + rLarge.left, + rLarge.top, + rLarge.right - rLarge.left, + rLarge.bottom - rLarge.top, + infoPtr->hParent, + NULL, + hInstance, + infoPtr); + if (!infoPtr->hLrgWnd) + return FALSE; + + return TRUE; +} + + +static VOID +MoveLargeCell(PMAP infoPtr) +{ + RECT rLarge; + + CopyRect(&rLarge, + &infoPtr->pActiveCell->CellExt); + + MapWindowPoints(infoPtr->hMapWnd, + infoPtr->hParent, + (LPPOINT)&rLarge, + 2); + + InflateRect(&rLarge, + XLARGE - XCELLS, + YLARGE - YCELLS); + + MoveWindow(infoPtr->hLrgWnd, + rLarge.left, + rLarge.top, + rLarge.right - rLarge.left, + rLarge.bottom - rLarge.top, + TRUE); + + InvalidateRect(infoPtr->hLrgWnd, + NULL, + TRUE); +} + + +static VOID +SetFont(PMAP infoPtr, + LPTSTR lpFontName) +{ + HDC hdc; + + if (infoPtr->hFont) + DeleteObject(infoPtr->hFont); + + ZeroMemory(&infoPtr->CurrentFont, + sizeof(LOGFONT)); + + hdc = GetDC(infoPtr->hMapWnd); + infoPtr->CurrentFont.lfHeight = GetDeviceCaps(hdc, + LOGPIXELSY) / 5; + ReleaseDC(infoPtr->hMapWnd, hdc); + + infoPtr->CurrentFont.lfCharSet = DEFAULT_CHARSET; + lstrcpy(infoPtr->CurrentFont.lfFaceName, + lpFontName); + + infoPtr->hFont = CreateFontIndirect(&infoPtr->CurrentFont); + + InvalidateRect(infoPtr->hMapWnd, + NULL, + TRUE); +} + + +static VOID +OnClick(PMAP infoPtr, + WORD ptx, + WORD pty) +{ + POINT pt; + INT x, y; + + pt.x = ptx; + pt.y = pty; + + for (x = 0; x < XCELLS; x++) + for (y = 0; y < YCELLS; y++) + { + if (PtInRect(&infoPtr->Cells[y][x].CellInt, + pt)) + { + /* if the cell is not already active */ + if (!infoPtr->Cells[y][x].bActive) + { + /* set previous active cell to inactive */ + if (infoPtr->pActiveCell) + { + /* invalidate normal cells, required when + * moving a small active cell via keyboard */ + if (!infoPtr->pActiveCell->bLarge) + { + InvalidateRect(infoPtr->hMapWnd, + &infoPtr->pActiveCell->CellInt, + TRUE); + } + + infoPtr->pActiveCell->bActive = FALSE; + infoPtr->pActiveCell->bLarge = FALSE; + } + + /* set new cell to active */ + infoPtr->pActiveCell = &infoPtr->Cells[y][x]; + infoPtr->pActiveCell->bActive = TRUE; + infoPtr->pActiveCell->bLarge = TRUE; + if (infoPtr->hLrgWnd) + MoveLargeCell(infoPtr); + else + CreateLargeCell(infoPtr); + } + else + { + /* flick between large and small */ + if (infoPtr->pActiveCell->bLarge) + { + DestroyWindow(infoPtr->hLrgWnd); + infoPtr->hLrgWnd = NULL; + } + else + { + CreateLargeCell(infoPtr); + } + + infoPtr->pActiveCell->bLarge = (infoPtr->pActiveCell->bLarge) ? FALSE : TRUE; + } + + break; + } + } +} + + +static BOOL +OnCreate(PMAP infoPtr, + HWND hwnd, + HWND hParent) +{ + RECT rc; + BOOL Ret = FALSE; + + infoPtr = HeapAlloc(GetProcessHeap(), + 0, + sizeof(MAP)); + if (infoPtr) + { + SetLastError(0); + SetWindowLongPtr(hwnd, + 0, + (DWORD_PTR)infoPtr); + if (GetLastError() == 0) + { + ZeroMemory(infoPtr, + sizeof(MAP)); + + infoPtr->hMapWnd = hwnd; + infoPtr->hParent = hParent; + + GetClientRect(hwnd, &rc); + infoPtr->ClientSize.cx = rc.right; + infoPtr->ClientSize.cy = rc.bottom; + infoPtr->CellSize.cx = infoPtr->ClientSize.cx / XCELLS; + infoPtr->CellSize.cy = infoPtr->ClientSize.cy / YCELLS; + + infoPtr->pActiveCell = NULL; + + SetGrid(infoPtr); + + SetScrollRange(hwnd, SB_VERT, 0, 255, FALSE); + SetScrollPos(hwnd, SB_VERT, 0, TRUE); + + Ret = TRUE; + } + } + + return Ret; +} + + +static VOID +OnVScroll(PMAP infoPtr, + INT Value, + INT Pos) +{ + switch (Value) + { + case SB_LINEUP: + infoPtr->iPage -= 1; + break; + + case SB_LINEDOWN: + infoPtr->iPage += 1; + break; + + case SB_PAGEUP: + infoPtr->iPage -= 16; + break; + + case SB_PAGEDOWN: + infoPtr->iPage += 16; + break; + + case SB_THUMBPOSITION: + infoPtr->iPage = Pos; + break; + + default: + break; + } + + infoPtr->iPage = max(0, + min(infoPtr->iPage, + 255)); + + SetScrollPos(infoPtr->hMapWnd, + SB_VERT, + infoPtr->iPage, + TRUE); + + InvalidateRect(infoPtr->hMapWnd, + NULL, + TRUE); +} + + +static VOID +OnPaint(PMAP infoPtr, + WPARAM wParam) +{ + PAINTSTRUCT ps; + HDC hdc; + + + if (wParam != 0) + { + if (!GetUpdateRect(infoPtr->hMapWnd, + &ps.rcPaint, + TRUE)) + { + return; + } + hdc = (HDC)wParam; + } + else + { + hdc = BeginPaint(infoPtr->hMapWnd, + &ps); + if (hdc == NULL) + { + return; + } + } + + DrawGrid(infoPtr, + hdc); + + FillGrid(infoPtr, + hdc); + + if (wParam == 0) + { + EndPaint(infoPtr->hMapWnd, + &ps); + } +} + + +LRESULT CALLBACK +MapWndProc(HWND hwnd, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + PMAP infoPtr; + LRESULT Ret = 0; + + infoPtr = (PMAP)GetWindowLongPtr(hwnd, + 0); + + switch (uMsg) + { + case WM_CREATE: + { + if (!OnCreate(infoPtr, + hwnd, + ((LPCREATESTRUCTW)lParam)->hwndParent)) + { + return (LRESULT)-1; + } + + break; + } + + case WM_LBUTTONDOWN: + { + OnClick(infoPtr, + LOWORD(lParam), + HIWORD(lParam)); + + break; + } + + case WM_VSCROLL: + { + OnVScroll(infoPtr, + LOWORD(wParam), + HIWORD(wParam)); + + break; + } + + case FM_SETFONT: + { + LPTSTR lpFontName = (LPTSTR)lParam; + + SetFont(infoPtr, + lpFontName); + + HeapFree(GetProcessHeap(), + 0, + lpFontName); + + break; + } + + case WM_PAINT: + { + OnPaint(infoPtr, + wParam); + break; + } + + case WM_DESTROY: + { + DeleteObject(infoPtr->hFont); + HeapFree(GetProcessHeap(), + 0, + infoPtr); + SetWindowLongPtr(hwnd, + 0, + (DWORD_PTR)NULL); + break; + } + + default: + { + Ret = DefWindowProc(hwnd, + uMsg, + wParam, + lParam); + break; + } + } + + return Ret; +} Added: trunk/reactos/base/applications/charmap/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/precomp.h (added) +++ trunk/reactos/base/applications/charmap/precomp.h Sat Feb 17 03:13:35 2007 @@ -1,0 +1,51 @@ +#ifndef __CHARMAP_PRECOMP_H +#define __CHARMAP_PRECOMP_H +#include <windows.h> +#include <stdio.h> +#include <tchar.h> +#include <commctrl.h> +#include "resource.h" + +#define XCELLS 20 +#define YCELLS 10 +#define XLARGE 45 +#define YLARGE 25 + +#define FM_SETFONT (WM_USER + 1) + +extern HINSTANCE hInstance; +extern const TCHAR szMapWndClass[]; +extern const TCHAR szLrgCellWndClass[]; + + +typedef struct _CELL +{ + RECT CellExt; + RECT CellInt; + BOOL bActive; + BOOL bLarge; + TCHAR ch; +} CELL, *PCELL; + +typedef struct _MAP +{ + HWND hMapWnd; + HWND hParent; + HWND hLrgWnd; + SIZE ClientSize; + SIZE CellSize; + CELL Cells[YCELLS][XCELLS]; + PCELL pActiveCell; + HFONT hFont; + LOGFONT CurrentFont; + INT iPage; +} MAP, *PMAP; + +BOOL RegisterControls(HINSTANCE hInstance); +VOID UnregisterControls(HINSTANCE hInstance); + +INT_PTR CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); +LRESULT CALLBACK LrgCellWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); +LRESULT CALLBACK MapWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); + +#endif /* __DEVMGMT_PRECOMP_H */ Added: trunk/reactos/base/applications/charmap/res/charmap.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/charmap/res/charmap.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/charmap/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/resource.h (added) +++ trunk/reactos/base/applications/charmap/resource.h Sat Feb 17 03:13:35 2007 @@ -1,0 +1,18 @@ +#define IDC_STATIC -1 + +#define IDI_ICON 100 + +#define IDD_CHARMAP 200 +#define IDD_ABOUTBOX 201 +#define IDC_FONTCOMBO 1001 +#define IDC_CMHELP 1002 +#define IDC_ABOUT 1003 +#define IDC_FONTMAP 1004 +#define IDC_TEXTBOX 1005 +#define IDC_SELECT 1006 +#define IDC_COPY 1007 +#define IDC_ADVVIEW 1008 +#define IDC_DISPLAY 1009 +#define IDC_SCROLL 1010 +#define IDS_LICENSE 1011 +#define IDC_LICENSE_EDIT 1012 Added: trunk/reactos/base/applications/charmap/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/rsrc.rc (added) +++ trunk/reactos/base/applications/charmap/rsrc.rc Sat Feb 17 03:13:35 2007 @@ -1,0 +1,11 @@ +#include <windows.h> +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +1 24 DISCARDABLE "manifest.xml" + +IDI_ICON ICON "res/charmap.ico" + +#include "lang/en-US.rc" +

1 0

[greatlrd] 25824: adding more test case for test_NtGdiDdQueryDirectDrawObject not complete yet
by greatlrd＠svn.reactos.org 16 Feb '07

16 Feb '07

Author: greatlrd Date: Fri Feb 16 23:14:24 2007 New Revision: 25824 URL: http://svn.reactos.org/svn/reactos?rev=25824&view=rev Log: adding more test case for test_NtGdiDdQueryDirectDrawObject not complete yet Modified: trunk/rosapps/dxtest/win32kdxtest/main.c Modified: trunk/rosapps/dxtest/win32kdxtest/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/dxtest/win32kdxtest/main.c… ============================================================================== --- trunk/rosapps/dxtest/win32kdxtest/main.c (original) +++ trunk/rosapps/dxtest/win32kdxtest/main.c Fri Feb 16 23:14:24 2007 @@ -1,3 +1,7 @@ + + +/* All testcase are base how windows 2000 sp4 acting */ + #include <stdio.h> /* SDK/DDK/NDK Headers. */ @@ -97,6 +101,25 @@ DWORD *puNumFourCC = NULL; DWORD *puFourCC = NULL; + DD_HALINFO HalInfo; + DWORD CallBackFlags = 0; + D3DNTHAL_CALLBACKS D3dCallbacks; + D3DNTHAL_GLOBALDRIVERDATA D3dDriverData; + DD_D3DBUFCALLBACKS D3dBufferCallbacks; + DDSURFACEDESC D3dTextureFormats; + DWORD NumHeaps = 0; + VIDEOMEMORY vmList; + DWORD NumFourCC = 0; + DWORD FourCC = 0; + + /* clear data */ + memset(&vmList,0,sizeof(VIDEOMEMORY)); + memset(&D3dTextureFormats,0,sizeof(DDSURFACEDESC)); + memset(&D3dBufferCallbacks,0,sizeof(DD_D3DBUFCALLBACKS)); + memset(&D3dDriverData,0,sizeof(D3DNTHAL_GLOBALDRIVERDATA)); + memset(&D3dCallbacks,0,sizeof(D3DNTHAL_CALLBACKS)); + memset(&HalInfo,0,sizeof(DD_HALINFO)); + printf("Start testing of NtGdiDdQueryDirectDrawObject\n"); /* testing NULL */ @@ -106,7 +129,7 @@ puD3dTextureFormats, puNumHeaps, puvmList, puNumFourCC, puFourCC); - testing_noteq(retValue,0,fails,"1. NtGdiDdQueryDirectDrawObject(NULL, ...);\0"); + testing_noteq(retValue,FALSE,fails,"1. NtGdiDdQueryDirectDrawObject(NULL, ...);\0"); testing_noteq(pHalInfo,NULL,fails,"2. NtGdiDdQueryDirectDrawObject(NULL, ...);\0"); testing_noteq(pCallBackFlags,NULL,fails,"3. NtGdiDdQueryDirectDrawObject(NULL, ...);\0"); testing_noteq(puD3dCallbacks,NULL,fails,"4. NtGdiDdQueryDirectDrawObject(NULL, ...);\0"); @@ -123,7 +146,7 @@ puvmList, puNumFourCC, puFourCC); - testing_noteq(retValue,0,fails,"1. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0"); + testing_noteq(retValue,FALSE,fails,"1. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0"); testing_noteq(pHalInfo,NULL,fails,"2. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0"); testing_noteq(pCallBackFlags,NULL,fails,"3. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0"); testing_noteq(puD3dCallbacks,NULL,fails,"4. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0"); @@ -133,8 +156,29 @@ testing_noteq(puNumFourCC,NULL,fails,"8. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0"); testing_noteq(puFourCC,NULL,fails,"9. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0"); - - + /* + * we expect the pHalInfo will be fill in and correct but we expect return value be + * false + */ + + pHalInfo = &HalInfo; + retValue = sysNtGdiDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, + pCallBackFlags, puD3dCallbacks, + puD3dDriverData, puD3dBufferCallbacks, + puD3dTextureFormats, puNumHeaps, + puvmList, puNumFourCC, + puFourCC); + + testing_noteq(retValue,FALSE,fails,"1. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0"); + testing_eq(pHalInfo,NULL,fails,"2. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0"); + testing_noteq(pCallBackFlags,NULL,fails,"3. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0"); + testing_noteq(puD3dCallbacks,NULL,fails,"4. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0"); + testing_noteq(puD3dDriverData,NULL,fails,"5. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0"); + testing_noteq(puD3dBufferCallbacks,NULL,fails,"6. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0"); + testing_noteq(puD3dTextureFormats,NULL,fails,"7. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0"); + testing_noteq(puNumFourCC,NULL,fails,"8. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0"); + testing_noteq(puFourCC,NULL,fails,"9. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0"); + testing_noteq(pHalInfo->dwSize,sizeof(DD_HALINFO),fails,"10. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0"); show_status(fails, "NtGdiDdQueryDirectDrawObject\0"); }

1 0

[ion] 25823: - Delete KD/KDBG directories.
by ion＠svn.reactos.org 16 Feb '07

16 Feb '07

Author: ion Date: Fri Feb 16 21:44:32 2007 New Revision: 25823 URL: http://svn.reactos.org/svn/reactos?rev=25823&view=rev Log: - Delete KD/KDBG directories. Removed: branches/alex-kd-branch/reactos/ntoskrnl/kd/ branches/alex-kd-branch/reactos/ntoskrnl/kdbg/

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
27
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 2007