Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cfinck] 33786: Implement support for MSG_PEEK. Patch by Art Yerkes with small fix by me to make it working correctly. (verified with a test app)
by cfinck＠svn.reactos.org 31 May '08

31 May '08

Author: cfinck Date: Sat May 31 07:51:22 2008 New Revision: 33786 URL: http://svn.reactos.org/svn/reactos?rev=33786&view=rev Log: Implement support for MSG_PEEK. Patch by Art Yerkes with small fix by me to make it working correctly. (verified with a test app) Modified: trunk/reactos/drivers/network/afd/afd/read.c Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Sat May 31 07:51:22 2008 @@ -85,9 +85,12 @@ MmUnmapLockedPages( Map[i].BufferAddress, Map[i].Mdl ); - FCB->Recv.BytesUsed += BytesToCopy; - *TotalBytesCopied += BytesToCopy; - BytesAvailable -= BytesToCopy; + *TotalBytesCopied += BytesToCopy; + + if (!(RecvReq->TdiFlags & TDI_RECEIVE_PEEK)) { + FCB->Recv.BytesUsed += BytesToCopy; + BytesAvailable -= BytesToCopy; + } } } @@ -405,8 +408,11 @@ MmUnmapLockedPages( Map[0].BufferAddress, Map[0].Mdl ); - FCB->Recv.BytesUsed = 0; - *TotalBytesCopied = BytesToCopy; + *TotalBytesCopied = BytesToCopy; + + if (!RecvReq->TdiFlags & TDI_RECEIVE_PEEK) { + FCB->Recv.BytesUsed = 0; + } } Status = Irp->IoStatus.Status = STATUS_SUCCESS;

1 0

[cfinck] 33785: Stub QuerySecurityPackageInfoA and QuerySecurityPackageInfoW, needed for the wininet Wine sync
by cfinck＠svn.reactos.org 31 May '08

31 May '08

Author: cfinck Date: Sat May 31 07:49:25 2008 New Revision: 33785 URL: http://svn.reactos.org/svn/reactos?rev=33785&view=rev Log: Stub QuerySecurityPackageInfoA and QuerySecurityPackageInfoW, needed for the wininet Wine sync Modified: trunk/reactos/dll/win32/secur32/secur32.def trunk/reactos/dll/win32/secur32/sspi.c Modified: trunk/reactos/dll/win32/secur32/secur32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/secur32.… ============================================================================== --- trunk/reactos/dll/win32/secur32/secur32.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/secur32/secur32.def [iso-8859-1] Sat May 31 07:49:25 2008 @@ -51,8 +51,8 @@ ;QueryCredentialsAttributesA@12 ;QueryCredentialsAttributesW@12 ;@QuerySecurityContextToken -;@QuerySecurityPackageInfoA -;@QuerySecurityPackageInfoW +QuerySecurityPackageInfoA@8 +QuerySecurityPackageInfoW@8 ;RevertSecurityContext@4 ;@SaslAcceptSecurityContext ;@SaslEnumerateProfilesA Modified: trunk/reactos/dll/win32/secur32/sspi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/sspi.c?r… ============================================================================== --- trunk/reactos/dll/win32/secur32/sspi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/secur32/sspi.c [iso-8859-1] Sat May 31 07:49:25 2008 @@ -225,3 +225,25 @@ DPRINT1("%s() not implemented!\n", __FUNCTION__); return ERROR_CALL_NOT_IMPLEMENTED; } + +SECURITY_STATUS +SEC_ENTRY +QuerySecurityPackageInfoA( + SEC_CHAR* pszPackageName, + PSecPkgInfoA* ppPackageInfo +) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +SECURITY_STATUS +SEC_ENTRY +QuerySecurityPackageInfoW( + SEC_WCHAR* pszPackageName, + PSecPkgInfoW* ppPackageInfo +) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +}

1 0

[cfinck] 33784: Use FILE_SHARE_READ | FILE_SHARE_WRITE in CopyFileExW to also copy opened files. Thanks to Christoph for the hint. Behaviour was verified under WinXP SP2.
by cfinck＠svn.reactos.org 31 May '08

31 May '08

Author: cfinck Date: Sat May 31 07:48:51 2008 New Revision: 33784 URL: http://svn.reactos.org/svn/reactos?rev=33784&view=rev Log: Use FILE_SHARE_READ | FILE_SHARE_WRITE in CopyFileExW to also copy opened files. Thanks to Christoph for the hint. Behaviour was verified under WinXP SP2. Modified: trunk/reactos/dll/win32/kernel32/file/copy.c Modified: trunk/reactos/dll/win32/kernel32/file/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/co… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/copy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/copy.c [iso-8859-1] Sat May 31 07:48:51 2008 @@ -215,7 +215,7 @@ FileHandleSource = CreateFileW(lpExistingFileName, GENERIC_READ, - FILE_SHARE_READ, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL|FILE_FLAG_NO_BUFFERING,

1 0

[greatlrd] 33783: revert my last change 1. it break vmware drv, for it align each bitmap row it create 2. diffent behoirs in diffent vm this did show we have more serius bug to fix before we can apply correct fix.
by greatlrd＠svn.reactos.org 31 May '08

31 May '08

Author: greatlrd Date: Sat May 31 07:17:25 2008 New Revision: 33783 URL: http://svn.reactos.org/svn/reactos?rev=33783&view=rev Log: revert my last change 1. it break vmware drv, for it align each bitmap row it create 2. diffent behoirs in diffent vm this did show we have more serius bug to fix before we can apply correct fix. Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Sat May 31 07:17:25 2008 @@ -665,9 +665,7 @@ } else { - ScanLines = min(ScanLines, BitmapObj->SurfObj.sizlBitmap.cy - StartScan); - DestSize.cx = BitmapObj->SurfObj.sizlBitmap.cx; DestSize.cy = ScanLines; @@ -688,9 +686,9 @@ if (Info->bmiHeader.biSize == sizeof(BITMAPINFOHEADER)) { - hDestBitmap = EngCreateBitmap(DestSize, - DIB_GetDIBWidthBytes(DestSize.cx, Info->bmiHeader.biBitCount), + /* DIB_GetDIBWidthBytes(DestSize.cx, Info->bmiHeader.biBitCount), */ + DestSize.cx * (Info->bmiHeader.biBitCount >> 3), /* HACK */ BitmapFormat(Info->bmiHeader.biBitCount, Info->bmiHeader.biCompression), 0 < Info->bmiHeader.biHeight ? 0 : BMF_TOPDOWN, Bits); @@ -1220,12 +1218,7 @@ */ INT FASTCALL DIB_GetDIBWidthBytes (INT width, INT depth) { - /* http://www.osronline.com/DDKx/graphics/gdifncs_9pgn.htm say it must be exacly - * number of byte to next scanline in the bitmap - */ - UINT bytes = ((UINT)(abs(width)) * (UINT)depth) >> 3; - // FIXME : this is wrong return (width * depth + 31) & ~31) >> 3; - return (INT)bytes; + return ((width * depth + 31) & ~31) >> 3; } /***********************************************************************

1 0

[greatlrd] 33782: Fixed bug in DIB_GetDIBWidthBytes accdoing OSR it is number of bytes to next scanline in the bitmap, wine version did align it, that why wrong number of bytes was reported also fixed overflow bug in the math, and make sure if some part of win32k send in negtive width, it will not calc it wrong, Remove one hack in win32k, thx of this, Thx fireball that suggest this functions mabey was wrong
by greatlrd＠svn.reactos.org 31 May '08

31 May '08

Author: greatlrd Date: Sat May 31 06:01:51 2008 New Revision: 33782 URL: http://svn.reactos.org/svn/reactos?rev=33782&view=rev Log: Fixed bug in DIB_GetDIBWidthBytes accdoing OSR it is number of bytes to next scanline in the bitmap, wine version did align it, that why wrong number of bytes was reported also fixed overflow bug in the math, and make sure if some part of win32k send in negtive width, it will not calc it wrong, Remove one hack in win32k, thx of this, Thx fireball that suggest this functions mabey was wrong Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Sat May 31 06:01:51 2008 @@ -665,7 +665,9 @@ } else { + ScanLines = min(ScanLines, BitmapObj->SurfObj.sizlBitmap.cy - StartScan); + DestSize.cx = BitmapObj->SurfObj.sizlBitmap.cx; DestSize.cy = ScanLines; @@ -686,9 +688,9 @@ if (Info->bmiHeader.biSize == sizeof(BITMAPINFOHEADER)) { + hDestBitmap = EngCreateBitmap(DestSize, - /* DIB_GetDIBWidthBytes(DestSize.cx, Info->bmiHeader.biBitCount), */ - DestSize.cx * (Info->bmiHeader.biBitCount >> 3), /* HACK */ + DIB_GetDIBWidthBytes(DestSize.cx, Info->bmiHeader.biBitCount), BitmapFormat(Info->bmiHeader.biBitCount, Info->bmiHeader.biCompression), 0 < Info->bmiHeader.biHeight ? 0 : BMF_TOPDOWN, Bits); @@ -1218,7 +1220,12 @@ */ INT FASTCALL DIB_GetDIBWidthBytes (INT width, INT depth) { - return ((width * depth + 31) & ~31) >> 3; + /* http://www.osronline.com/DDKx/graphics/gdifncs_9pgn.htm say it must be exacly + * number of byte to next scanline in the bitmap + */ + UINT bytes = ((UINT)(abs(width)) * (UINT)depth) >> 3; + // FIXME : this is wrong return (width * depth + 31) & ~31) >> 3; + return (INT)bytes; } /***********************************************************************

1 0

[tkreuzer] 33781: patch by Jeffrey Morlan (mrnobo1024 at yahoo dot com) Testcase for NtGdiSetDIBitsToDeviceInternal See issue #3294 for more details.
by tkreuzer＠svn.reactos.org 31 May '08

31 May '08

Author: tkreuzer Date: Fri May 30 19:04:16 2008 New Revision: 33781 URL: http://svn.reactos.org/svn/reactos?rev=33781&view=rev Log: patch by Jeffrey Morlan (mrnobo1024 at yahoo dot com) Testcase for NtGdiSetDIBitsToDeviceInternal See issue #3294 for more details. Added: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSetDIBitsToDeviceInternal.c (with props) Modified: trunk/rostests/apitests/w32knapi/testlist.c Added: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSetDIBitsToDeviceInternal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSetDIBitsToDeviceInternal.c (added) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSetDIBitsToDeviceInternal.c [iso-8859-1] Fri May 30 19:04:16 2008 @@ -1,0 +1,52 @@ +INT +Test_NtGdiSetDIBitsToDeviceInternal(PTESTINFO pti) +{ + static const DWORD InBits[8] = { 0x81, 0x7E, 0x5A, 0x7E, 0x7E, 0x42, 0x7E, 0x81 }; + DWORD OutBits[8]; + + HWND hWnd = CreateWindowW(L"Static", NULL, WS_VISIBLE, + 100, 100, 200, 200, + NULL, NULL, NULL, NULL); + /* This DC has an nonzero origin */ + HDC hDC = GetDC(hWnd); + struct + { + BITMAPINFOHEADER bmiHeader; + RGBQUAD bmiColors[2]; + } bmi; + int x, y; + + bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bmi.bmiHeader.biWidth = 8; + bmi.bmiHeader.biHeight = -8; + bmi.bmiHeader.biPlanes = 1; + bmi.bmiHeader.biBitCount = 1; + bmi.bmiHeader.biCompression = 0; + bmi.bmiHeader.biSizeImage = 0; + bmi.bmiHeader.biXPelsPerMeter = 0; + bmi.bmiHeader.biYPelsPerMeter = 0; + bmi.bmiHeader.biClrUsed = 0; + bmi.bmiHeader.biClrImportant = 0; + *(DWORD *)&bmi.bmiColors[0] = 0x000000; + *(DWORD *)&bmi.bmiColors[1] = 0xFFFFFF; + + /* The destination coordinates are relative to the DC origin */ + TEST(NtGdiSetDIBitsToDeviceInternal(hDC, 2, 3, 8, 8, 0, 0, 0, 8, + (PVOID)InBits, (BITMAPINFO *)&bmi, DIB_RGB_COLORS, + sizeof(InBits), sizeof(bmi), TRUE, NULL)); + + /* Now get the data from the screen, and see if it matches */ + for (y = 0; y < 8; y++) + { + DWORD Row = 0; + for (x = 0; x < 8; x++) + Row |= (0x80 & GetPixel(hDC, 2 + x, 3 + y)) >> x; + OutBits[y] = Row; + } + TEST(memcmp(InBits, OutBits, sizeof(InBits)) == 0); + + ReleaseDC(hWnd, hDC); + DestroyWindow(hWnd); + + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSetDIBitsToDeviceInternal.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/w32knapi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/testlis… ============================================================================== --- trunk/rostests/apitests/w32knapi/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/testlist.c [iso-8859-1] Fri May 30 19:04:16 2008 @@ -22,6 +22,7 @@ #include "ntgdi/NtGdiSelectFont.c" #include "ntgdi/NtGdiSelectPen.c" #include "ntgdi/NtGdiSetBitmapBits.c" +#include "ntgdi/NtGdiSetDIBitsToDeviceInternal.c" //#include "ntgdi/NtGdiSTROBJ_vEnumStart.c" #include "ntgdi/NtGdiGetDIBits.c" #include "ntgdi/NtGdiGetStockObject.c" @@ -64,6 +65,7 @@ { L"NtGdiGetFontResourceInfoInternalW", Test_NtGdiGetFontResourceInfoInternalW }, { L"NtGdiGetRandomRgn", Test_NtGdiGetRandomRgn }, { L"NtGdiSetBitmapBits", Test_NtGdiSetBitmapBits }, + { L"NtGdiSetDIBitsToDeviceInternal", Test_NtGdiSetDIBitsToDeviceInternal }, { L"NtGdiSelectBitmap", Test_NtGdiSelectBitmap }, { L"NtGdiSelectBrush", Test_NtGdiSelectBrush }, { L"NtGdiSelectFont", Test_NtGdiSelectFont },

1 0

[pschweitzer] 33780: Added more cluster size values. Spotted by GreatLord For more informations: http://support.microsoft.com/kb/140365/en-us
by pschweitzer＠svn.reactos.org 30 May '08

30 May '08

Author: pschweitzer Date: Fri May 30 15:59:56 2008 New Revision: 33780 URL: http://svn.reactos.org/svn/reactos?rev=33780&view=rev Log: Added more cluster size values. Spotted by GreatLord For more informations: http://support.microsoft.com/kb/140365/en-us Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] Fri May 30 15:59:56 2008 @@ -141,7 +141,9 @@ /* Check cluster size */ ClusterSize = BootSector->BPB.BytesPerSector * BootSector->BPB.SectorsPerCluster; if (ClusterSize != 512 && ClusterSize != 1024 && - ClusterSize != 2048 && ClusterSize != 4096) + ClusterSize != 2048 && ClusterSize != 4096 && + ClusterSize != 8192 && ClusterSize != 16384 && + ClusterSize != 32768 && ClusterSize != 65536) { DPRINT1("Cluster size failed: %hu, %hu, %hu\n", BootSector->BPB.BytesPerSector, BootSector->BPB.SectorsPerCluster,

1 0

[pschweitzer] 33779: Check cluster size when mounting a volume
by pschweitzer＠svn.reactos.org 30 May '08

30 May '08

Author: pschweitzer Date: Fri May 30 13:55:05 2008 New Revision: 33779 URL: http://svn.reactos.org/svn/reactos?rev=33779&view=rev Log: Check cluster size when mounting a volume Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] Fri May 30 13:55:05 2008 @@ -45,9 +45,9 @@ { PARTITION_INFORMATION PartitionInfo; DISK_GEOMETRY DiskGeometry; + ULONG ClusterSize, Size, k; PBOOT_SECTOR BootSector; NTSTATUS Status; - ULONG Size, k; DPRINT1("NtfsHasFileSystem() called\n"); @@ -91,7 +91,7 @@ DPRINT1("BytesPerSector: %lu\n", DiskGeometry.BytesPerSector); BootSector = ExAllocatePoolWithTag(NonPagedPool, - DiskGeometry.BytesPerSector, TAG_NTFS); + DiskGeometry.BytesPerSector, TAG_NTFS); if (BootSector == NULL) { return(STATUS_INSUFFICIENT_RESOURCES); @@ -137,6 +137,17 @@ Status = STATUS_UNRECOGNIZED_VOLUME; goto ByeBye; } + } + /* Check cluster size */ + ClusterSize = BootSector->BPB.BytesPerSector * BootSector->BPB.SectorsPerCluster; + if (ClusterSize != 512 && ClusterSize != 1024 && + ClusterSize != 2048 && ClusterSize != 4096) + { + DPRINT1("Cluster size failed: %hu, %hu, %hu\n", BootSector->BPB.BytesPerSector, + BootSector->BPB.SectorsPerCluster, + ClusterSize); + Status = STATUS_UNRECOGNIZED_VOLUME; + goto ByeBye; } ByeBye:

1 0

[dchapyshev] 33778: - Implement parsing font.inf (Now it's possible to specify custom fonts for a language/locale!)
by dchapyshev＠svn.reactos.org 30 May '08

30 May '08

Author: dchapyshev Date: Fri May 30 13:18:36 2008 New Revision: 33778 URL: http://svn.reactos.org/svn/reactos?rev=33778&view=rev Log: - Implement parsing font.inf (Now it's possible to specify custom fonts for a language/locale!) Modified: trunk/reactos/dll/cpl/intl/advanced.c trunk/reactos/dll/cpl/intl/generalp.c trunk/reactos/dll/cpl/intl/intl.h Modified: trunk/reactos/dll/cpl/intl/advanced.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/advanced.c?re… ============================================================================== --- trunk/reactos/dll/cpl/intl/advanced.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/advanced.c [iso-8859-1] Fri May 30 13:18:36 2008 @@ -20,6 +20,8 @@ static LPCPAGE PCPage = NULL; static HINF hIntlInf; +static BOOL bSpain = FALSE; +static HWND hLangList; static BOOL GetSupportedCP(VOID) @@ -29,7 +31,7 @@ LPCPAGE lpCPage; HANDLE hCPage; CPINFOEX cpInfEx; - TCHAR Section[MAX_PATH]; + //TCHAR Section[MAX_PATH]; Count = (UINT) SetupGetLineCount(hIntlInf, _T("CodePages")); if (Count <= 0) return FALSE; @@ -58,12 +60,12 @@ continue; } - _stprintf(Section, _T("%s%d"), _T("CODEPAGE_REMOVE_"), uiCPage); + /*_stprintf(Section, _T("%s%d"), _T("CODEPAGE_REMOVE_"), uiCPage); if ((uiCPage == GetACP()) || (uiCPage == GetOEMCP()) || (!SetupFindFirstLine(hIntlInf, Section, _T("AddReg"), &infCont))) { lpCPage->Status |= (0x0001 | 0x0002); - } + }*/ lpCPage->NextItem = PCPage; PCPage = lpCPage; @@ -81,6 +83,7 @@ lpCP = PCPage; uiCP = _ttol(lpStr); + for (;;) { if (!lpCP) break; @@ -96,7 +99,7 @@ } static VOID -InitLangList(HWND hwndDlg) +InitCodePagesList(HWND hwndDlg) { LPCPAGE lpCPage; INT ItemIndex; @@ -109,7 +112,8 @@ hIntlInf = SetupOpenInfFile(_T("intl.inf"), NULL, INF_STYLE_WIN4, NULL); - if (hIntlInf == INVALID_HANDLE_VALUE) return; + if (hIntlInf == INVALID_HANDLE_VALUE) + return; if (!SetupOpenAppendInfFile(NULL, hIntlInf, NULL)) { @@ -118,11 +122,13 @@ return; } - if (!GetSupportedCP()) return; + if (!GetSupportedCP()) + return; SetupCloseInfFile(hIntlInf); - if (!EnumSystemCodePages(InstalledCPProc, CP_INSTALLED)) return; + if (!EnumSystemCodePages(InstalledCPProc, CP_INSTALLED)) + return; ZeroMemory(&column, sizeof(LV_COLUMN)); column.mask = LVCF_FMT|LVCF_TEXT|LVCF_WIDTH; @@ -167,6 +173,130 @@ } } +static BOOL CALLBACK +LocalesEnumProc(LPTSTR lpLocale) +{ + LCID lcid; + TCHAR lang[255]; + INT index; + BOOL bNoShow = FALSE; + + lcid = _tcstoul(lpLocale, NULL, 16); + + if (lcid == MAKELCID(MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH), SORT_DEFAULT) || + lcid == MAKELCID(MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH_MODERN), SORT_DEFAULT)) + { + if (bSpain == FALSE) + { + LoadString(hApplet, IDS_SPAIN, lang, 255); + bSpain = TRUE; + } + else + { + bNoShow = TRUE; + } + } + else + { + GetLocaleInfo(lcid, LOCALE_SLANGUAGE, lang, sizeof(lang)/sizeof(TCHAR)); + } + + if (bNoShow == FALSE) + { + index = SendMessage(hLangList, + CB_ADDSTRING, + 0, + (LPARAM)lang); + + SendMessage(hLangList, + CB_SETITEMDATA, + index, + (LPARAM)lcid); + } + + return TRUE; +} + +static VOID +InitLanguagesList(HWND hwndDlg) +{ + TCHAR langSel[255]; + + hLangList = GetDlgItem(hwndDlg, IDC_LANGUAGE_COMBO); + + bSpain = FALSE; + EnumSystemLocales(LocalesEnumProc, LCID_SUPPORTED); + + /* Select current locale */ + GetLocaleInfo(GetUserDefaultLCID(), LOCALE_SLANGUAGE, langSel, sizeof(langSel)/sizeof(TCHAR)); + + SendMessage(hLangList, CB_SELECTSTRING, -1, (LPARAM)langSel); +} + +static VOID +GetCurrentDPI(LPTSTR szDPI) +{ + DWORD dwType, dwSize, dwDPI, dwDefDPI = 0x00000060; // Default 96 DPI + HKEY hKey; + + if (RegCreateKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\FontDPI"), 0, NULL, + REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hKey, NULL) != ERROR_SUCCESS) + { + _tcscpy(szDPI, _T("96")); + return; + } + + dwType = REG_DWORD; + dwSize = sizeof(DWORD); + + if (RegQueryValueEx(hKey, _T("LogPixels"), NULL, &dwType, (LPBYTE)&dwDPI, &dwSize) != ERROR_SUCCESS) + { + if (RegSetValueEx(hKey, _T("LogPixels"), 0, REG_DWORD, (LPBYTE)&dwDefDPI, sizeof(DWORD)) == ERROR_SUCCESS) + { + _tcscpy(szDPI, _T("96")); + RegCloseKey(hKey); + return; + } + } + else wsprintf(szDPI, _T("%d"), dwDPI); + + RegCloseKey(hKey); +} + +VOID +SetNonUnicodeLang(HWND hwnd, LCID lcid) +{ + TCHAR szDefCP[5 + 1], szSection[MAX_PATH], szDPI[3 + 1]; + HINF hFontInf; + UINT Count; + + GetLocaleInfo(MAKELCID(lcid, SORT_DEFAULT), LOCALE_IDEFAULTCODEPAGE, szDefCP, sizeof(szDefCP) / sizeof(TCHAR)); + GetCurrentDPI(szDPI); + + wsprintf(szSection, _T("Font.CP%s.%s"), szDefCP, szDPI); + + hFontInf = SetupOpenInfFile(_T("font.inf"), NULL, INF_STYLE_WIN4, NULL); + + if (hFontInf == INVALID_HANDLE_VALUE) + return; + + if (!SetupOpenAppendInfFile(NULL, hFontInf, NULL)) + { + SetupCloseInfFile(hFontInf); + return; + } + + Count = (UINT) SetupGetLineCount(hFontInf, szSection); + if (Count <= 0) return; + + if (!SetupInstallFromInfSection(hwnd, hFontInf, szSection, SPINST_REGISTRY & ~SPINST_FILES, + NULL, NULL, 0, NULL, NULL, NULL, NULL)) + MessageBox(hwnd, _T("Unable to install a new language for programs don't support unicode!"), + NULL, MB_ICONERROR | MB_OK); + + SetupCloseInfFile(hFontInf); +} + /* Property page dialog callback */ INT_PTR CALLBACK AdvancedPageProc(HWND hwndDlg, @@ -178,9 +308,47 @@ { case WM_INITDIALOG: { - InitLangList(hwndDlg); + InitLanguagesList(hwndDlg); + InitCodePagesList(hwndDlg); } break; + + case WM_COMMAND: + { + switch (LOWORD(wParam)) + { + case IDC_LANGUAGE_COMBO: + { + if (HIWORD(wParam) == CBN_SELCHANGE) + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; + } + } + break; + + case WM_NOTIFY: + { + LPNMHDR lpnm = (LPNMHDR)lParam; + + if (lpnm->code == (UINT)PSN_APPLY) + { + LCID lcid; + INT iIndex; + + iIndex = SendMessage(hLangList, CB_GETCURSEL, 0, 0); + if (iIndex == CB_ERR) + break; + + lcid = SendMessage(hLangList, CB_GETITEMDATA, iIndex, 0); + if (lcid == (LCID)CB_ERR) + break; + + SetNonUnicodeLang(hwndDlg, lcid); + PropSheet_UnChanged(GetParent(hwndDlg), hwndDlg); + } + } + break; } return FALSE; Modified: trunk/reactos/dll/cpl/intl/generalp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/generalp.c?re… ============================================================================== --- trunk/reactos/dll/cpl/intl/generalp.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/generalp.c [iso-8859-1] Fri May 30 13:18:36 2008 @@ -422,6 +422,7 @@ /* Set new locale */ SetNewLocale(NewLcid); + SetNonUnicodeLang(hwndDlg, NewLcid); } } break; Modified: trunk/reactos/dll/cpl/intl/intl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.h?rev=33… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/intl.h [iso-8859-1] Fri May 30 13:18:36 2008 @@ -32,6 +32,8 @@ /* advanced.c */ INT_PTR CALLBACK AdvancedPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); +VOID +SetNonUnicodeLang(HWND hwnd, LCID lcid); /* currency.c */ INT_PTR CALLBACK

1 0

[dchapyshev] 33777: - Change in WindowMetrics font to Tahoma - Add Tahome font to bootcd - Add some file association
by dchapyshev＠svn.reactos.org 30 May '08

30 May '08

Author: dchapyshev Date: Fri May 30 13:12:59 2008 New Revision: 33777 URL: http://svn.reactos.org/svn/reactos?rev=33777&view=rev Log: - Change in WindowMetrics font to Tahoma - Add Tahome font to bootcd - Add some file association Modified: trunk/reactos/boot/bootdata/hivecls.inf trunk/reactos/boot/bootdata/hivedef.inf trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/hivecls.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] Fri May 30 13:12:59 2008 @@ -131,6 +131,31 @@ HKCR,".ico","",0x00000000,"icofile" HKCR,"icofile","",0x00000000,"Icon" HKCR,"icofile\DefaultIcon","",0x00000000,"%1" + +; JPEG Images +HKCR,".jpg","",0x00000000,"jpegfile" +HKCR,".jpeg","",0x00000000,"jpegfile" +HKCR,"jpegfile","",0x00000000,"JPEG Image" +HKCR,"jpegfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shimgvw.dll,-1" +HKCR,"jpegfile\shell\open\command","",0x00020000,"rundll32.exe %SystemRoot%\system32\shimgvw.dll,ImageView_Fullscreen %1" + +; Bitmap Images +HKCR,".bmp","",0x00000000,"bmpfile" +HKCR,"bmpfile","",0x00000000,"Bitmap Image" +HKCR,"bmpfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shimgvw.dll,-1" +HKCR,"bmpfile\shell\open\command","",0x00020000,"rundll32.exe %SystemRoot%\system32\shimgvw.dll,ImageView_Fullscreen %1" + +; PNG Images +HKCR,".png","",0x00000000,"pngfile" +HKCR,"pngfile","",0x00000000,"PNG Image" +HKCR,"pngfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shimgvw.dll,-1" +HKCR,"pngfile\shell\open\command","",0x00020000,"rundll32.exe %SystemRoot%\system32\shimgvw.dll,ImageView_Fullscreen %1" + +; GIF Images +HKCR,".gif","",0x00000000,"giffile" +HKCR,"giffile","",0x00000000,"GIF Image" +HKCR,"giffile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shimgvw.dll,-1" +HKCR,"giffile\shell\open\command","",0x00020000,"rundll32.exe %SystemRoot%\system32\shimgvw.dll,ImageView_Fullscreen %1" ; Configuration Files HKCR,".ini","",0x00000000,"inifile" @@ -164,12 +189,23 @@ ; Text Documents HKCR,".log","",0x00000000,"txtfile" HKCR,".txt","",0x00000000,"txtfile" +HKCR,".c","",0x00000000,"txtfile" +HKCR,".cpp","",0x00000000,"txtfile" +HKCR,".h","",0x00000000,"txtfile" +HKCR,".hpp","",0x00000000,"txtfile" HKCR,".txt\shellnew","",0x00000000,"" HKCR,".txt\shellnew","NullFile",0x00020000,"" HKCR,"txtfile","",0x00000000,"Text Document" HKCR,".txt","Content Type",0x00000000,"text/plain" HKCR,"txtfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-152" HKCR,"txtfile\shell\open\command","",0x00020000,"%SystemRoot%\system32\notepad.exe %1" + +; XML Documents +HKCR,".xml","",0x00000000,"xmlfile" +HKCR,"xmlfile","",0x00000000,"XML Document" +HKCR,".xml","Content Type",0x00000000,"text/xml" +HKCR,"xmlfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-151" +HKCR,"xmlfile\shell\open\command","",0x00020000,"%SystemRoot%\system32\notepad.exe %1" ; MSI files HKCR,".msi","",0x00000000,"MSI.Package" Modified: trunk/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivedef.inf [iso-8859-1] Fri May 30 13:12:59 2008 @@ -231,29 +231,29 @@ ; GUI Setup HKCU, "Control Panel\Desktop\WindowMetrics","CaptionFont",0x00000001,f5,ff,ff,ff,00,00,00,\ -00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,44,00,65,00,6a,00,61,00,56,\ -00,75,00,20,00,53,00,61,00,6e,00,73,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,01,00,00,00,00,54,00,61,00,68,00,6f,00,6d,\ +00,61,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKCU, "Control Panel\Desktop\WindowMetrics","IconFont",0x00000001,f5,ff,ff,ff,00,00,00,00,\ -00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,00,00,00,00,00,44,00,65,00,6a,00,61,00,56,00,\ -75,00,20,00,53,00,61,00,6e,00,73,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,01,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,\ +61,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKCU, "Control Panel\Desktop\WindowMetrics","MenuFont",0x00000001,f5,ff,ff,ff,00,00,00,00,\ -00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,00,00,00,00,00,44,00,65,00,6a,00,61,00,56,00,\ -75,00,20,00,53,00,61,00,6e,00,73,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,01,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,\ +61,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKCU, "Control Panel\Desktop\WindowMetrics","MessageFont",0x00000001,f5,ff,ff,ff,00,00,00,\ -00,00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,00,00,00,00,00,44,00,65,00,6a,00,61,00,56,\ -00,75,00,20,00,53,00,61,00,6e,00,73,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,01,00,00,00,00,54,00,61,00,68,00,6f,00,6d,\ +00,61,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKCU, "Control Panel\Desktop\WindowMetrics","SmCaptionFont",0x00000001,f5,ff,ff,ff,00,00,\ -00,00,00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,00,00,00,00,00,44,00,65,00,6a,00,61,00,\ -56,00,75,00,20,00,53,00,61,00,6e,00,73,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,01,00,00,00,00,54,00,61,00,68,00,6f,00,\ +6d,00,61,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKCU, "Control Panel\Desktop\WindowMetrics","IconFont",0x00000001,f5,ff,ff,ff,00,00,00,00,\ -00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,00,00,00,00,00,44,00,65,00,6a,00,61,00,56,00,\ -75,00,20,00,53,00,61,00,6e,00,73,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ -00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKCU, "Control Panel\Desktop\WindowMetrics","StatusFont",0x00000001,f5,ff,ff,ff,00,00,00,\ +00,00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,01,00,00,00,00,54,00,61,00,68,00,6f,00,6d,\ +00,61,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 ; Internet Explorer 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 [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Fri May 30 13:12:59 2008 @@ -434,6 +434,9 @@ media\fonts\LiberationSerif-Italic.ttf 3 media\fonts\LiberationSerif-Regular.ttf 3 +media\fonts\tahoma.ttf 3 +media\fonts\tahomabd.ttf 3 + media\fonts\c0419bt_.ttf 3 media\fonts\c0582bt_.ttf 3 media\fonts\c0583bt_.ttf 3

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