Ros-diffs October 2014

ros-diffs@reactos.org

19 participants
730 discussions

[spetreolle] 64480: [WS2_32_APITEST] Add WSAStartup-dependent tests.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Fri Oct 3 09:00:15 2014 New Revision: 64480 URL: http://svn.reactos.org/svn/reactos?rev=64480&view=rev Log: [WS2_32_APITEST] Add WSAStartup-dependent tests. Added: trunk/rostests/apitests/ws2_32/nostartup.c (with props) Modified: trunk/rostests/apitests/ws2_32/CMakeLists.txt trunk/rostests/apitests/ws2_32/testlist.c Modified: trunk/rostests/apitests/ws2_32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/CMakeList… ============================================================================== --- trunk/rostests/apitests/ws2_32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ws2_32/CMakeLists.txt [iso-8859-1] Fri Oct 3 09:00:15 2014 @@ -3,6 +3,7 @@ getaddrinfo.c helpers.c ioctlsocket.c + nostartup.c recv.c WSAStartup.c testlist.c) Added: trunk/rostests/apitests/ws2_32/nostartup.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/nostartup… ============================================================================== --- trunk/rostests/apitests/ws2_32/nostartup.c (added) +++ trunk/rostests/apitests/ws2_32/nostartup.c [iso-8859-1] Fri Oct 3 09:00:15 2014 @@ -0,0 +1,40 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for WSAStartup + * PROGRAMMER: Sylvain Petreolle <sylvain.petreolle(a)reactos.org> + */ + +#include <apitest.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include <windef.h> +#include <winsock2.h> +#include <ndk/rtlfuncs.h> +#include <ndk/mmfuncs.h> + +// This test depends on WSAStartup not having been called +START_TEST(nostartup) +{ + int Error=0; + ok(WSASocketA(0, 0, 0, NULL, 0, 0) == INVALID_SOCKET, "WSASocketA should have failed\n"); + + WSASetLastError(0xdeadbeef); + getservbyname(NULL,NULL); + Error = WSAGetLastError(); + ok_dec(Error, WSANOTINITIALISED); + + WSASetLastError(0xdeadbeef); + getservbyport(0,NULL); + Error = WSAGetLastError(); + ok_dec(Error, WSANOTINITIALISED); + + WSASetLastError(0xdeadbeef); + gethostbyname(NULL); + Error = WSAGetLastError(); + ok_dec(Error, WSANOTINITIALISED); + + ok_dec(inet_addr("127.0.0.1"), 0x100007f); +} Propchange: trunk/rostests/apitests/ws2_32/nostartup.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/ws2_32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/testlist.… ============================================================================== --- trunk/rostests/apitests/ws2_32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ws2_32/testlist.c [iso-8859-1] Fri Oct 3 09:00:15 2014 @@ -7,14 +7,15 @@ extern void func_ioctlsocket(void); extern void func_recv(void); extern void func_WSAStartup(void); +extern void func_nostartup(void); const struct test winetest_testlist[] = { { "getaddrinfo", func_getaddrinfo }, { "ioctlsocket", func_ioctlsocket }, + { "nostartup", func_nostartup }, { "recv", func_recv }, { "WSAStartup", func_WSAStartup }, - { 0, 0 } };

10 years, 1 month

[akhaldi] 64479: [MSVFW32_WINETEST] * Sync with Wine 1.7.27. CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Oct 3 00:54:45 2014 New Revision: 64479 URL: http://svn.reactos.org/svn/reactos?rev=64479&view=rev Log: [MSVFW32_WINETEST] * Sync with Wine 1.7.27. CORE-8540 Added: trunk/rostests/winetests/msvfw32/drawdib.c (with props) Modified: trunk/rostests/winetests/msvfw32/CMakeLists.txt trunk/rostests/winetests/msvfw32/testlist.c Modified: trunk/rostests/winetests/msvfw32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvfw32/CMakeLi… ============================================================================== --- trunk/rostests/winetests/msvfw32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/msvfw32/CMakeLists.txt [iso-8859-1] Fri Oct 3 00:54:45 2014 @@ -1,6 +1,6 @@ add_definitions(-DUSE_WINE_TODOS) -add_executable(msvfw32_winetest msvfw.c testlist.c) +add_executable(msvfw32_winetest drawdib.c msvfw.c testlist.c) set_module_type(msvfw32_winetest win32cui) -add_importlibs(msvfw32_winetest msvfw32 msvcrt kernel32) +add_importlibs(msvfw32_winetest gdi32 advapi32 msvfw32 msvcrt kernel32) add_cd_file(TARGET msvfw32_winetest DESTINATION reactos/bin FOR all) Added: trunk/rostests/winetests/msvfw32/drawdib.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvfw32/drawdib… ============================================================================== --- trunk/rostests/winetests/msvfw32/drawdib.c (added) +++ trunk/rostests/winetests/msvfw32/drawdib.c [iso-8859-1] Fri Oct 3 00:54:45 2014 @@ -0,0 +1,179 @@ +/* + * Copyright 2014 Akihiro Sagawa + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WIN32_LEAN_AND_MEAN + +#include <windows.h> +#include <vfw.h> +#include <wincrypt.h> +#include <stdlib.h> +#include <string.h> + +#include "wine/test.h" + +#define WIDTH 16 +#define HEIGHT 12 + +static HCRYPTPROV crypt_prov; + +static inline DWORD get_stride(const BITMAPINFO *bmi) +{ + return ((bmi->bmiHeader.biBitCount * bmi->bmiHeader.biWidth + 31) >> 3) & ~3; +} + +static inline DWORD get_dib_size(const BITMAPINFO *bmi) +{ + return get_stride(bmi) * abs(bmi->bmiHeader.biHeight); +} + +static char *hash_dib(const BITMAPINFO *bmi, const void *bits) +{ + DWORD dib_size = get_dib_size(bmi); + HCRYPTHASH hash; + char *buf; + BYTE hash_buf[20]; + DWORD hash_size = sizeof(hash_buf); + int i; + static const char *hex = "0123456789abcdef"; + + if(!crypt_prov) return NULL; + + if(!CryptCreateHash(crypt_prov, CALG_SHA1, 0, 0, &hash)) return NULL; + + CryptHashData(hash, bits, dib_size, 0); + + CryptGetHashParam(hash, HP_HASHVAL, NULL, &hash_size, 0); + if(hash_size != sizeof(hash_buf)) return NULL; + + CryptGetHashParam(hash, HP_HASHVAL, hash_buf, &hash_size, 0); + CryptDestroyHash(hash); + + buf = HeapAlloc(GetProcessHeap(), 0, hash_size * 2 + 1); + + for(i = 0; i < hash_size; i++) + { + buf[i * 2] = hex[hash_buf[i] >> 4]; + buf[i * 2 + 1] = hex[hash_buf[i] & 0xf]; + } + buf[i * 2] = '\0'; + + return buf; +} + +static void init_bmi(BITMAPINFO *bmi, LONG width, LONG height, DWORD size) +{ + memset(bmi, 0, sizeof(*bmi)); + bmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bmi->bmiHeader.biWidth = width; + bmi->bmiHeader.biHeight = height; + bmi->bmiHeader.biPlanes = 1; + bmi->bmiHeader.biBitCount = 32; + bmi->bmiHeader.biCompression = BI_RGB; + bmi->bmiHeader.biSizeImage = size; +} + +static void test_DrawDib_sizeimage(void) +{ + const struct { + LONG width, height; + DWORD size; + char hash[41]; + } test_data[] = { + /* [0] correct size */ + { WIDTH, HEIGHT, WIDTH * HEIGHT * sizeof(RGBQUAD), "bc943d5ab024b8b0118d0a80aa283055d39942b8" }, + /* [1] zero size */ + { WIDTH, HEIGHT, 0, "bc943d5ab024b8b0118d0a80aa283055d39942b8" }, + /* error patterns */ + { WIDTH, -HEIGHT, 0, "" }, + { -WIDTH, HEIGHT, 0, "" }, + { -WIDTH, -HEIGHT, 0, "" }, + { 0, 0, 0, "" }, + { 0, HEIGHT, 0, "" }, + { WIDTH, 0, 0, "" }, + /* [8] zero size (to compare [9], [10] ) */ + { WIDTH, HEIGHT/2, 0, "8b75bf6d54a8645380114fe77505ee0699ffffaa" }, + /* [9] insufficient size */ + { WIDTH, HEIGHT/2, sizeof(RGBQUAD), "8b75bf6d54a8645380114fe77505ee0699ffffaa" }, + /* [10] too much size */ + { WIDTH, HEIGHT/2, WIDTH * HEIGHT * sizeof(RGBQUAD), "8b75bf6d54a8645380114fe77505ee0699ffffaa" }, + }; + HDC hdc; + DWORD src_dib_size, dst_dib_size; + BOOL r; + HBITMAP dib; + BITMAPINFO src_info, dst_info; + RGBQUAD *src_bits = NULL, *dst_bits; + HDRAWDIB hdd; + unsigned int i; + + hdc = CreateCompatibleDC(NULL); + + init_bmi(&dst_info, WIDTH, HEIGHT, 0); + dib = CreateDIBSection(NULL, &dst_info, DIB_RGB_COLORS, (void **)&dst_bits, NULL, 0); + dst_dib_size = get_dib_size(&dst_info); + ok(dib != NULL, "CreateDIBSection failed\n"); + SelectObject(hdc, dib); + + init_bmi(&src_info, WIDTH, HEIGHT, 0); + src_dib_size = get_dib_size(&src_info); + src_bits = HeapAlloc(GetProcessHeap(), 0, src_dib_size); + ok(src_bits != NULL, "Can't allocate memory\n"); + memset(src_bits, 0x88, src_dib_size); + + hdd = DrawDibOpen(); + ok(hdd != NULL, "DrawDibOpen failed\n"); + + for (i = 0; i < sizeof(test_data)/sizeof(test_data[0]); i++) { + char *hash; + memset(dst_bits, 0xff, dst_dib_size); + init_bmi(&src_info, test_data[i].width, test_data[i].height, test_data[i].size); + r = DrawDibDraw(hdd, hdc, + 0, 0, -1, -1, &src_info.bmiHeader, src_bits, + 0, 0, test_data[i].width, test_data[i].height, 0); + if (test_data[i].hash[0]) + ok(r, "[%u] DrawDibDraw failed, expected success\n", i); + else + ok(!r, "[%u] DrawDibDraw succeeded, expected failed\n", i); + if (!r || !test_data[i].hash[0]) + continue; + + hash = hash_dib(&dst_info, dst_bits); + if (!hash) { + win_skip("This platform doesn't support SHA-1 hash\n"); + continue; + } + ok(strcmp(hash, test_data[i].hash) == 0, + "[%u] got %s, expected %s\n", + i, hash, test_data[i].hash); + HeapFree(GetProcessHeap(), 0, hash); + } + + r = DrawDibClose(hdd); + ok(r, "DrawDibClose failed\n"); + + HeapFree(GetProcessHeap(), 0, src_bits); + + DeleteDC(hdc); +} + +START_TEST(drawdib) +{ + CryptAcquireContextW(&crypt_prov, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); + test_DrawDib_sizeimage(); + CryptReleaseContext(crypt_prov, 0); +} Propchange: trunk/rostests/winetests/msvfw32/drawdib.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/winetests/msvfw32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvfw32/testlis… ============================================================================== --- trunk/rostests/winetests/msvfw32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvfw32/testlist.c [iso-8859-1] Fri Oct 3 00:54:45 2014 @@ -1,12 +1,14 @@ -/* Automatically generated file; DO NOT EDIT!! */ +/* Automatically generated by make depend; DO NOT EDIT!! */ #define STANDALONE #include <wine/test.h> +extern void func_drawdib(void); extern void func_msvfw(void); const struct test winetest_testlist[] = { + { "drawdib", func_drawdib }, { "msvfw", func_msvfw }, { 0, 0 } };

10 years, 1 month

[akhaldi] 64478: [MSVFW32] * Sync with Wine 1.7.27. CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Oct 3 00:54:13 2014 New Revision: 64478 URL: http://svn.reactos.org/svn/reactos?rev=64478&view=rev Log: [MSVFW32] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/win32/msvfw32/drawdib.c trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Da.rc trunk/reactos/dll/win32/msvfw32/lang/msvfw32_De.rc trunk/reactos/dll/win32/msvfw32/lang/msvfw32_En.rc trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Es.rc trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Fr.rc trunk/reactos/dll/win32/msvfw32/lang/msvfw32_He.rc trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Hu.rc trunk/reactos/dll/win32/msvfw32/lang/msvfw32_It.rc trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Ko.rc trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Lt.rc trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Nl.rc trunk/reactos/dll/win32/msvfw32/lang/msvfw32_No.rc trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Pl.rc trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Pt.rc trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Ro.rc trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Ru.rc trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Si.rc trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Sq.rc trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Sv.rc trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Tr.rc trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Uk.rc trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Zh.rc trunk/reactos/dll/win32/msvfw32/msvideo_main.c trunk/reactos/dll/win32/msvfw32/msvideo_private.h trunk/reactos/dll/win32/msvfw32/resource.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msvfw32/drawdib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/drawdib.… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/drawdib.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/drawdib.c [iso-8859-1] Fri Oct 3 00:54:13 2014 @@ -236,9 +236,18 @@ DWORD dwSize; /* No compression */ TRACE("Not compressed!\n"); - dwSize = lpbi->biSize + num_colours(lpbi)*sizeof(RGBQUAD); - whdd->lpbiOut = HeapAlloc(GetProcessHeap(), 0, dwSize); - memcpy(whdd->lpbiOut, lpbi, dwSize); + if (lpbi->biHeight <= 0) + { + /* we don't draw inverted DIBs */ + TRACE("detected inverted DIB\n"); + ret = FALSE; + } + else + { + dwSize = lpbi->biSize + num_colours(lpbi)*sizeof(RGBQUAD); + whdd->lpbiOut = HeapAlloc(GetProcessHeap(), 0, dwSize); + memcpy(whdd->lpbiOut, lpbi, dwSize); + } } if (ret) @@ -322,6 +331,8 @@ { TRACE("Something changed!\n"); ret = DrawDibBegin(hdd, hdc, dxDst, dyDst, lpbi, dxSrc, dySrc, 0); + if (!ret) + return ret; } #undef CHANGED @@ -334,12 +345,6 @@ if (!(wFlags & DDF_UPDATE)) { - DWORD biSizeImage = lpbi->biSizeImage; - - /* biSizeImage may be set to 0 for BI_RGB (uncompressed) bitmaps */ - if ((lpbi->biCompression == BI_RGB) && (biSizeImage == 0)) - biSizeImage = ((lpbi->biWidth * lpbi->biBitCount + 31) / 32) * 4 * lpbi->biHeight; - if (lpbi->biCompression) { DWORD flags = 0; @@ -353,6 +358,8 @@ } else { + /* BI_RGB: lpbi->biSizeImage isn't reliable */ + DWORD biSizeImage = ((lpbi->biWidth * lpbi->biBitCount + 31) / 32) * 4 * lpbi->biHeight; memcpy(whdd->lpvbits, lpBits, biSizeImage); } } Modified: trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/lang/msv… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Da.rc [iso-8859-1] Fri Oct 3 00:54:13 2014 @@ -20,34 +20,34 @@ LANGUAGE LANG_DANISH, SUBLANG_DEFAULT -ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 187, 95 +STRINGTABLE +{ + IDS_FULLFRAMES "Fulde billeder (ukomprimeret)" +} + +ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 210, 95 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Video komprimering" FONT 8, "MS Shell Dlg" { - DEFPUSHBUTTON "OK",IDOK,129,2,49,14 - PUSHBUTTON "Annuller",IDCANCEL,129,18,49,14 + DEFPUSHBUTTON "OK",IDOK,154,2,52,14 + PUSHBUTTON "Annuller",IDCANCEL,154,18,52,14 - LTEXT "&Komprimerer:",-1,9,6,105,8 - COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + LTEXT "&Komprimerer:",-1,9,6,135,8 + COMBOBOX IDC_COMP_LIST,9,16,135,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP - PUSHBUTTON "&Opsætning...",882,129,36,49,14 - PUSHBUTTON "O&m...",883,129,52,49,14 + PUSHBUTTON "&Opsætning...",IDC_CONFIGURE,154,36,52,14 + PUSHBUTTON "O&m...",IDC_ABOUT,154,52,52,14 - SCROLLBAR 884,9,44,111,9,WS_TABSTOP + SCROLLBAR IDC_QUALITY_SCROLL,9,44,135,10,WS_TABSTOP - LTEXT "Komprimeringskvalite&t:",886,9,34,80,8 + LTEXT "Komprimeringskvalite&t:",IDC_QUALITY_TXT,9,34,135,8 - CONTROL "Keyframe for hvert",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 - EDITTEXT 888,78,60,22,12 - LTEXT "billede",889,103,62,26,10 + CONTROL "Keyframe for hvert",IDC_KEYFRAME_CHECKBOX,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,86,12 + EDITTEXT IDC_KEYFRAME,98,60,22,12 + LTEXT "billede",IDC_KEYFRAME_FRAMES,123,62,26,10 - CONTROL "&Datahastighed",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 - EDITTEXT 895,78,76,22,12 - LTEXT "KB/s",896,102,78,26,10 + CONTROL "&Datahastighed",IDC_DATARATE_CHECKBOX,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,86,12 + EDITTEXT IDC_DATARATE,98,76,22,12 + LTEXT "KB/s",IDC_DATARATE_KB,123,78,26,10 } - -STRINGTABLE -{ - IDS_FULLFRAMES "Fulde billeder (ukomprimeret)" -} Modified: trunk/reactos/dll/win32/msvfw32/lang/msvfw32_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/lang/msv… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/lang/msvfw32_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/lang/msvfw32_De.rc [iso-8859-1] Fri Oct 3 00:54:13 2014 @@ -21,34 +21,34 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL -ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 187, 95 +STRINGTABLE +{ + IDS_FULLFRAMES "VollstÃ¤ndige Frames (Unkomprimiert)" +} + +ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 210, 95 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Videokompression" FONT 8, "MS Shell Dlg" { - DEFPUSHBUTTON "OK",IDOK,129,2,49,14 - PUSHBUTTON "Abbrechen",IDCANCEL,129,18,49,14 + DEFPUSHBUTTON "OK",IDOK,154,2,52,14 + PUSHBUTTON "Abbrechen",IDCANCEL,154,18,52,14 - LTEXT "&Komprimierer:",-1,9,6,105,8 - COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + LTEXT "&Komprimierer:",-1,9,6,135,8 + COMBOBOX IDC_COMP_LIST,9,16,135,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP - PUSHBUTTON "Kon&figurieren",882,129,36,49,14 - PUSHBUTTON "&Ãber...",883,129,52,49,14 + PUSHBUTTON "Kon&figurieren",IDC_CONFIGURE,154,36,52,14 + PUSHBUTTON "&Ãber...",IDC_ABOUT,154,52,52,14 - SCROLLBAR 884,9,44,111,9,WS_TABSTOP + SCROLLBAR IDC_QUALITY_SCROLL,9,44,135,10,WS_TABSTOP - LTEXT "KomprimierungsqualitÃ¤t:",886,9,34,80,8 + LTEXT "KomprimierungsqualitÃ¤t:",IDC_QUALITY_TXT,9,34,135,8 - CONTROL "Ein &Key-Frame alle",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 - EDITTEXT 888,78,60,22,12 - LTEXT "Frames",889,103,62,26,10 + CONTROL "Ein &Key-Frame alle",IDC_KEYFRAME_CHECKBOX,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,86,12 + EDITTEXT IDC_KEYFRAME,98,60,22,12 + LTEXT "Frames",IDC_KEYFRAME_FRAMES,123,62,26,10 - CONTROL "&Datenrate",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 - EDITTEXT 895,78,76,22,12 - LTEXT "kB/Sek",896,102,78,26,10 + CONTROL "&Datenrate",IDC_DATARATE_CHECKBOX,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,86,12 + EDITTEXT IDC_DATARATE,98,76,22,12 + LTEXT "kB/Sek",IDC_DATARATE_KB,123,78,26,10 } - -STRINGTABLE -{ - IDS_FULLFRAMES "VollstÃ¤ndige Frames (Unkomprimiert)" -} Modified: trunk/reactos/dll/win32/msvfw32/lang/msvfw32_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/lang/msv… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/lang/msvfw32_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/lang/msvfw32_En.rc [iso-8859-1] Fri Oct 3 00:54:13 2014 @@ -18,34 +18,34 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT -ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 187, 95 +STRINGTABLE +{ + IDS_FULLFRAMES "Full Frames (Uncompressed)" +} + +ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 210, 95 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Video Compression" FONT 8, "MS Shell Dlg" { - DEFPUSHBUTTON "OK",IDOK,129,2,49,14 - PUSHBUTTON "Cancel",IDCANCEL,129,18,49,14 + DEFPUSHBUTTON "OK",IDOK,154,2,52,14 + PUSHBUTTON "Cancel",IDCANCEL,154,18,52,14 - LTEXT "&Compressor:",-1,9,6,105,8 - COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + LTEXT "&Compressor:",-1,9,6,135,8 + COMBOBOX IDC_COMP_LIST,9,16,135,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP - PUSHBUTTON "Con&figure...",882,129,36,49,14 - PUSHBUTTON "&About...",883,129,52,49,14 + PUSHBUTTON "Con&figure...",IDC_CONFIGURE,154,36,52,14 + PUSHBUTTON "&About",IDC_ABOUT,154,52,52,14 - SCROLLBAR 884,9,44,111,9,WS_TABSTOP + SCROLLBAR IDC_QUALITY_SCROLL,9,44,135,10,WS_TABSTOP - LTEXT "Compression &Quality:",886,9,34,80,8 + LTEXT "Compression &Quality:",IDC_QUALITY_TXT,9,34,135,8 - CONTROL "&Key Frame Every",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 - EDITTEXT 888,78,60,22,12 - LTEXT "frames",889,103,62,26,10 + CONTROL "&Key Frame Every",IDC_KEYFRAME_CHECKBOX,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,86,12 + EDITTEXT IDC_KEYFRAME,98,60,22,12 + LTEXT "frames",IDC_KEYFRAME_FRAMES,123,62,26,10 - CONTROL "&Data Rate",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 - EDITTEXT 895,78,76,22,12 - LTEXT "KB/sec",896,102,78,26,10 + CONTROL "&Data Rate",IDC_DATARATE_CHECKBOX,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,86,12 + EDITTEXT IDC_DATARATE,98,76,22,12 + LTEXT "kB/s",IDC_DATARATE_KB,123,78,26,10 } - -STRINGTABLE -{ - IDS_FULLFRAMES "Full Frames (Uncompressed)" -} Modified: trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/lang/msv… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Es.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Es.rc [iso-8859-1] Fri Oct 3 00:54:13 2014 @@ -21,34 +21,34 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL -ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 187, 95 +STRINGTABLE +{ + IDS_FULLFRAMES "Cuadros completos (no comprimidos)" +} + +ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 210, 95 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "CompresiÃ³n de vÃdeo" FONT 8, "MS Shell Dlg" { - DEFPUSHBUTTON "Aceptar",IDOK,129,2,49,14 - PUSHBUTTON "Cancelar",IDCANCEL,129,18,49,14 + DEFPUSHBUTTON "Aceptar",IDOK,154,2,52,14 + PUSHBUTTON "Cancelar",IDCANCEL,154,18,52,14 - LTEXT "&Compresor:",-1,9,6,105,8 - COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + LTEXT "&Compresor:",-1,9,6,135,8 + COMBOBOX IDC_COMP_LIST,9,16,135,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP - PUSHBUTTON "C&onfigurar...",882,129,36,49,14 - PUSHBUTTON "&Acerca de...",883,129,52,49,14 + PUSHBUTTON "C&onfigurar...",IDC_CONFIGURE,154,36,52,14 + PUSHBUTTON "&Acerca de...",IDC_ABOUT,154,52,52,14 - SCROLLBAR 884,9,44,111,9,WS_TABSTOP + SCROLLBAR IDC_QUALITY_SCROLL,9,44,135,10,WS_TABSTOP - LTEXT "C&alidad de compresiÃ³n:",886,9,34,80,8 + LTEXT "C&alidad de compresiÃ³n:",IDC_QUALITY_TXT,9,34,135,8 - CONTROL "C&uadro clave cada",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 - EDITTEXT 888,78,60,22,12 - LTEXT "cuadros",889,103,62,26,10 + CONTROL "C&uadro clave cada",IDC_KEYFRAME_CHECKBOX,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,86,12 + EDITTEXT IDC_KEYFRAME,98,60,22,12 + LTEXT "cuadros",IDC_KEYFRAME_FRAMES,123,62,26,10 - CONTROL "&Tasa de datos",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 - EDITTEXT 895,78,76,22,12 - LTEXT "KB/s",896,102,78,26,10 + CONTROL "&Tasa de datos",IDC_DATARATE_CHECKBOX,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,86,12 + EDITTEXT IDC_DATARATE,98,76,22,12 + LTEXT "KB/s",IDC_DATARATE_KB,123,78,26,10 } - -STRINGTABLE -{ - IDS_FULLFRAMES "Cuadros completos (no comprimidos)" -} Modified: trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/lang/msv… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Fr.rc [iso-8859-1] Fri Oct 3 00:54:13 2014 @@ -21,34 +21,34 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL -ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 208, 95 +STRINGTABLE +{ + IDS_FULLFRAMES "Images complÃ¨tes (non compressÃ©es)" +} + +ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 210, 95 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Compression vidÃ©o" FONT 8, "MS Shell Dlg" { - DEFPUSHBUTTON "OK",IDOK,150,2,49,14 - PUSHBUTTON "Annuler",IDCANCEL,150,18,49,14 + DEFPUSHBUTTON "OK",IDOK,154,2,52,14 + PUSHBUTTON "Annuler",IDCANCEL,154,18,52,14 - LTEXT "&CompresseurÂ :",-1,9,6,131,8 - COMBOBOX 880,9,16,135,15,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + LTEXT "&CompresseurÂ :",-1,9,6,135,8 + COMBOBOX IDC_COMP_LIST,9,16,135,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP - PUSHBUTTON "Con&figurer...",882,150,36,49,14 - PUSHBUTTON "Ã &propos",883,150,52,49,14 + PUSHBUTTON "Con&figurer...",IDC_CONFIGURE,154,36,52,14 + PUSHBUTTON "Ã &propos",IDC_ABOUT,154,52,52,14 - SCROLLBAR 884,9,44,133,9,WS_TABSTOP + SCROLLBAR IDC_QUALITY_SCROLL,9,44,135,10,WS_TABSTOP - LTEXT "&QualitÃ© de compressionÂ :",886,9,34,131,8 + LTEXT "&QualitÃ© de compressionÂ :",IDC_QUALITY_TXT,9,34,135,8 - CONTROL "Image &clÃ© toutes les",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,77,12 - EDITTEXT 888,89,60,22,12 - LTEXT "images",889,115,63,26,10 + CONTROL "Image &clÃ© toutes les",IDC_KEYFRAME_CHECKBOX,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,86,12 + EDITTEXT IDC_KEYFRAME,98,60,22,12 + LTEXT "images",IDC_KEYFRAME_FRAMES,123,62,26,10 - CONTROL "&DÃ©bit de donnÃ©es",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,77,12 - EDITTEXT 895,89,76,22,12 - LTEXT "Kio/sec",896,115,78,26,10 + CONTROL "&DÃ©bit de donnÃ©es",IDC_DATARATE_CHECKBOX,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,86,12 + EDITTEXT IDC_DATARATE,98,76,22,12 + LTEXT "Kio/sec",IDC_DATARATE_KB,123,78,26,10 } - -STRINGTABLE -{ - IDS_FULLFRAMES "Images complÃ¨tes (non compressÃ©es)" -} Modified: trunk/reactos/dll/win32/msvfw32/lang/msvfw32_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/lang/msv… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/lang/msvfw32_He.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/lang/msvfw32_He.rc [iso-8859-1] Fri Oct 3 00:54:13 2014 @@ -20,34 +20,34 @@ LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT -ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 187, 95 +STRINGTABLE +{ + IDS_FULLFRAMES "×©×§××¤×××ª ×××××ª (×× ××××¡)" +} + +ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 210, 95 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "××××¡×ª ×××××" FONT 8, "MS Shell Dlg" { - DEFPUSHBUTTON "×××©××¨",IDOK,129,2,49,14 - PUSHBUTTON "×××××",IDCANCEL,129,18,49,14 + DEFPUSHBUTTON "×××©××¨",IDOK,154,2,52,14 + PUSHBUTTON "×××××",IDCANCEL,154,18,52,14 - LTEXT "××××¡:",-1,9,6,105,8 - COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + LTEXT "××××¡:",-1,9,6,135,8 + COMBOBOX IDC_COMP_LIST,9,16,135,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP - PUSHBUTTON "××××¨×...",882,129,36,49,14 - PUSHBUTTON "×××××ª...",883,129,52,49,14 + PUSHBUTTON "××××¨×...",IDC_CONFIGURE,154,36,52,14 + PUSHBUTTON "×××××ª...",IDC_ABOUT,154,52,52,14 - SCROLLBAR 884,9,44,111,9,WS_TABSTOP + SCROLLBAR IDC_QUALITY_SCROLL,9,44,135,10,WS_TABSTOP - LTEXT "×××××ª ××××¡×:",886,9,34,80,8 + LTEXT "×××××ª ××××¡×:",IDC_QUALITY_TXT,9,34,135,8 - CONTROL "&Key Frame Every",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 - EDITTEXT 888,78,60,22,12 - LTEXT "×©×§××¤×××ª:",889,103,62,26,10 + CONTROL "&Key Frame Every",IDC_KEYFRAME_CHECKBOX,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,86,12 + EDITTEXT IDC_KEYFRAME,98,60,22,12 + LTEXT "×©×§××¤×××ª:",IDC_KEYFRAME_FRAMES,123,62,26,10 - CONTROL "×§×¦× ××××¢",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 - EDITTEXT 895,78,76,22,12 - LTEXT "×§""×/×©× ××",896,102,78,26,10 + CONTROL "×§×¦× ××××¢",IDC_DATARATE_CHECKBOX,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,86,12 + EDITTEXT IDC_DATARATE,98,76,22,12 + LTEXT "×§""×/×©× ××",IDC_DATARATE_KB,123,78,26,10 } - -STRINGTABLE -{ - IDS_FULLFRAMES "×©×§××¤×××ª ×××××ª (×× ××××¡)" -} Modified: trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/lang/msv… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Hu.rc [iso-8859-1] Fri Oct 3 00:54:13 2014 @@ -18,34 +18,34 @@ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT -ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 187, 95 +STRINGTABLE +{ + IDS_FULLFRAMES "Teljes képkockák (tömörítetlen)" +} + +ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 210, 95 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Video tömörítés" FONT 8, "MS Shell Dlg" { - DEFPUSHBUTTON "OK",IDOK,129,2,49,14 - PUSHBUTTON "Mégse",IDCANCEL,129,18,49,14 + DEFPUSHBUTTON "OK",IDOK,154,2,52,14 + PUSHBUTTON "Mégse",IDCANCEL,154,18,52,14 - LTEXT "&Tömörítõ:",-1,9,6,105,8 - COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + LTEXT "&Tömörítõ:",-1,9,6,135,8 + COMBOBOX IDC_COMP_LIST,9,16,135,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP - PUSHBUTTON "Beállí&tás...",882,129,36,49,14 - PUSHBUTTON "&About...",883,129,52,49,14 + PUSHBUTTON "Beállí&tás...",IDC_CONFIGURE,154,36,52,14 + PUSHBUTTON "&About",IDC_ABOUT,154,52,52,14 - SCROLLBAR 884,9,44,111,9,WS_TABSTOP + SCROLLBAR IDC_QUALITY_SCROLL,9,44,135,10,WS_TABSTOP - LTEXT "Tömörítési minõsé&g:",886,9,34,80,8 + LTEXT "Tömörítési minõsé&g:",IDC_QUALITY_TXT,9,34,135,8 - CONTROL "&Kulcs képkocka minden",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 - EDITTEXT 888,78,60,22,12 - LTEXT "képkockánként",889,103,62,26,10 + CONTROL "&Kulcs képkocka minden",IDC_KEYFRAME_CHECKBOX,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,86,12 + EDITTEXT IDC_KEYFRAME,98,60,22,12 + LTEXT "képkockánként",IDC_KEYFRAME_FRAMES,123,62,26,10 - CONTROL "A&dat arány",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 - EDITTEXT 895,78,76,22,12 - LTEXT "KB/sec",896,102,78,26,10 + CONTROL "A&dat arány",IDC_DATARATE_CHECKBOX,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,86,12 + EDITTEXT IDC_DATARATE,98,76,22,12 + LTEXT "KB/sec",IDC_DATARATE_KB,123,78,26,10 } - -STRINGTABLE -{ - IDS_FULLFRAMES "Teljes képkockák (tömörítetlen)" -} Modified: trunk/reactos/dll/win32/msvfw32/lang/msvfw32_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/lang/msv… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/lang/msvfw32_It.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/lang/msvfw32_It.rc [iso-8859-1] Fri Oct 3 00:54:13 2014 @@ -21,34 +21,34 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL -ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 187, 95 +STRINGTABLE +{ + IDS_FULLFRAMES "Frames completi (non compresso)" +} + +ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 210, 95 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Compressione video" FONT 8, "MS Shell Dlg" { - DEFPUSHBUTTON "OK",IDOK,129,2,49,14 - PUSHBUTTON "Annulla",IDCANCEL,129,18,49,14 + DEFPUSHBUTTON "OK",IDOK,154,2,52,14 + PUSHBUTTON "Annulla",IDCANCEL,154,18,52,14 - LTEXT "&Compressore:",-1,9,6,105,8 - COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + LTEXT "&Compressore:",-1,9,6,135,8 + COMBOBOX IDC_COMP_LIST,9,16,135,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP - PUSHBUTTON "Con&figura...",882,129,36,49,14 - PUSHBUTTON "&Informazioni...",883,129,52,49,14 + PUSHBUTTON "Con&figura...",IDC_CONFIGURE,154,36,52,14 + PUSHBUTTON "&Informazioni...",IDC_ABOUT,154,52,52,14 - SCROLLBAR 884,9,44,111,9,WS_TABSTOP + SCROLLBAR IDC_QUALITY_SCROLL,9,44,135,10,WS_TABSTOP - LTEXT "&QualitÃ della compressione:",886,9,34,80,8 + LTEXT "&QualitÃ della compressione:",IDC_QUALITY_TXT,9,34,135,8 - CONTROL "&Key Frame Every",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 - EDITTEXT 888,78,60,22,12 - LTEXT "frames",889,103,62,26,10 + CONTROL "&Key Frame Every",IDC_KEYFRAME_CHECKBOX,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,86,12 + EDITTEXT IDC_KEYFRAME,98,60,22,12 + LTEXT "frames",IDC_KEYFRAME_FRAMES,123,62,26,10 - CONTROL "&Data Rate",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 - EDITTEXT 895,78,76,22,12 - LTEXT "KB/sec",896,102,78,26,10 + CONTROL "&Data Rate",IDC_DATARATE_CHECKBOX,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,86,12 + EDITTEXT IDC_DATARATE,98,76,22,12 + LTEXT "KB/sec",IDC_DATARATE_KB,123,78,26,10 } - -STRINGTABLE -{ - IDS_FULLFRAMES "Frames completi (non compresso)" -} Modified: trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/lang/msv… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Ko.rc [iso-8859-1] Fri Oct 3 00:54:13 2014 @@ -19,34 +19,34 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT -ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 187, 95 +STRINGTABLE +{ + IDS_FULLFRAMES "ÀüÃ¤ ÇÁ·¹ÀÓ(ºñ¾ÐÃà)" +} + +ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 210, 95 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ºñµð¿À ¾ÐÃà" FONT 9, "MS Shell Dlg" { - DEFPUSHBUTTON "È®ÀÎ",IDOK,129,2,49,14 - PUSHBUTTON "Ãë¼Ò",IDCANCEL,129,18,49,14 + DEFPUSHBUTTON "È®ÀÎ",IDOK,154,2,52,14 + PUSHBUTTON "Ãë¼Ò",IDCANCEL,154,18,52,14 - LTEXT "¾ÐÃà(&C):",-1,9,6,105,8 - COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + LTEXT "¾ÐÃà(&C):",-1,9,6,135,8 + COMBOBOX IDC_COMP_LIST,9,16,135,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP - PUSHBUTTON "¼³Á¤(&F)...",882,129,36,49,14 - PUSHBUTTON "Á¤º¸(&A)...",883,129,52,49,14 + PUSHBUTTON "¼³Á¤(&F)...",IDC_CONFIGURE,154,36,52,14 + PUSHBUTTON "Á¤º¸(&A)...",IDC_ABOUT,154,52,52,14 - SCROLLBAR 884,9,44,111,9,WS_TABSTOP + SCROLLBAR IDC_QUALITY_SCROLL,9,44,135,10,WS_TABSTOP - LTEXT "¾ÐÃà Ç°Áú(&Q):",886,9,34,80,8 + LTEXT "¾ÐÃà Ç°Áú(&Q):",IDC_QUALITY_TXT,9,34,135,8 - CONTROL "¸ðµç Å° ÇÁ·¹ÀÓ(&K)",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 - EDITTEXT 888,78,60,22,12 - LTEXT "ÇÁ·¹ÀÓ",889,103,62,26,10 + CONTROL "¸ðµç Å° ÇÁ·¹ÀÓ(&K)",IDC_KEYFRAME_CHECKBOX,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,86,12 + EDITTEXT IDC_KEYFRAME,98,60,22,12 + LTEXT "ÇÁ·¹ÀÓ",IDC_KEYFRAME_FRAMES,123,62,26,10 - CONTROL "µ¥ÀÌÅ¸ Àü¼ÛÀ²(&D)",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 - EDITTEXT 895,78,76,22,12 - LTEXT "KB/sec",896,102,78,26,10 + CONTROL "µ¥ÀÌÅ¸ Àü¼ÛÀ²(&D)",IDC_DATARATE_CHECKBOX,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,86,12 + EDITTEXT IDC_DATARATE,98,76,22,12 + LTEXT "KB/sec",IDC_DATARATE_KB,123,78,26,10 } - -STRINGTABLE -{ - IDS_FULLFRAMES "ÀüÃ¤ ÇÁ·¹ÀÓ(ºñ¾ÐÃà)" -} Modified: trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/lang/msv… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Lt.rc [iso-8859-1] Fri Oct 3 00:54:13 2014 @@ -21,34 +21,34 @@ LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL -ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 192, 95 +STRINGTABLE +{ + IDS_FULLFRAMES "Pilni kadrai (neglaudinti)" +} + +ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 210, 95 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "VaizdÅ³ glaudinimas" FONT 8, "MS Shell Dlg" { - DEFPUSHBUTTON "Gerai",IDOK,129,2,54,14 - PUSHBUTTON "Atsisakyti",IDCANCEL,129,18,54,14 + DEFPUSHBUTTON "Gerai",IDOK,154,2,52,14 + PUSHBUTTON "Atsisakyti",IDCANCEL,154,18,52,14 - LTEXT "&Metodas:",-1,9,6,105,8 - COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + LTEXT "&Metodas:",-1,9,6,135,8 + COMBOBOX IDC_COMP_LIST,9,16,135,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP - PUSHBUTTON "Kon&figÅ«ruoti...",882,129,36,54,14 - PUSHBUTTON "&Apie...",883,129,52,54,14 + PUSHBUTTON "Kon&figÅ«ruoti...",IDC_CONFIGURE,154,36,52,14 + PUSHBUTTON "&Apie...",IDC_ABOUT,154,52,52,14 - SCROLLBAR 884,9,44,111,9,WS_TABSTOP + SCROLLBAR IDC_QUALITY_SCROLL,9,44,135,10,WS_TABSTOP - LTEXT "Glaudinimo &kokybÄ:",886,9,34,80,8 + LTEXT "Glaudinimo &kokybÄ:",IDC_QUALITY_TXT,9,34,135,8 - CONTROL "&Rakt. kadras kas",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 - EDITTEXT 888,78,60,22,12 - LTEXT "kadrÅ³",889,103,62,26,10 + CONTROL "&Rakt. kadras kas",IDC_KEYFRAME_CHECKBOX,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,86,12 + EDITTEXT IDC_KEYFRAME,98,60,22,12 + LTEXT "kadrÅ³",IDC_KEYFRAME_FRAMES,123,62,26,10 - CONTROL "&DuomenÅ³ sparta",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 - EDITTEXT 895,78,76,22,12 - LTEXT "KB/sek",896,102,78,26,10 + CONTROL "&DuomenÅ³ sparta",IDC_DATARATE_CHECKBOX,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,86,12 + EDITTEXT IDC_DATARATE,98,76,22,12 + LTEXT "KB/sek",IDC_DATARATE_KB,123,78,26,10 } - -STRINGTABLE -{ - IDS_FULLFRAMES "Pilni kadrai (neglaudinti)" -} Modified: trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/lang/msv… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Nl.rc [iso-8859-1] Fri Oct 3 00:54:13 2014 @@ -18,34 +18,34 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL -ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 187, 95 +STRINGTABLE +{ + IDS_FULLFRAMES "Volledige Frames (Ongecomprimeerd)" +} + +ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 210, 95 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Video Compressie" FONT 8, "MS Shell Dlg" { - DEFPUSHBUTTON "OK",IDOK,129,2,49,14 - PUSHBUTTON "Annuleren",IDCANCEL,129,18,49,14 + DEFPUSHBUTTON "OK",IDOK,154,2,52,14 + PUSHBUTTON "Annuleren",IDCANCEL,154,18,52,14 - LTEXT "&Compressor:",-1,9,6,105,8 - COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + LTEXT "&Compressor:",-1,9,6,135,8 + COMBOBOX IDC_COMP_LIST,9,16,135,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP - PUSHBUTTON "Con&figureer...",882,129,36,49,14 - PUSHBUTTON "&Over...",883,129,52,49,14 + PUSHBUTTON "Con&figureer...",IDC_CONFIGURE,154,36,52,14 + PUSHBUTTON "&Over...",IDC_ABOUT,154,52,52,14 - SCROLLBAR 884,9,44,111,9,WS_TABSTOP + SCROLLBAR IDC_QUALITY_SCROLL,9,44,135,10,WS_TABSTOP - LTEXT "Compressie &Kwaliteit:",886,9,34,80,8 + LTEXT "Compressie &Kwaliteit:",IDC_QUALITY_TXT,9,34,135,8 - CONTROL "&Key Frame Elke",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 - EDITTEXT 888,78,60,22,12 - LTEXT "frames",889,103,62,26,10 + CONTROL "&Key Frame Elke",IDC_KEYFRAME_CHECKBOX,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,86,12 + EDITTEXT IDC_KEYFRAME,98,60,22,12 + LTEXT "frames",IDC_KEYFRAME_FRAMES,123,62,26,10 - CONTROL "&Data Snelheid",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 - EDITTEXT 895,78,76,22,12 - LTEXT "KB/sec",896,102,78,26,10 + CONTROL "&Data Snelheid",IDC_DATARATE_CHECKBOX,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,86,12 + EDITTEXT IDC_DATARATE,98,76,22,12 + LTEXT "KB/sec",IDC_DATARATE_KB,123,78,26,10 } - -STRINGTABLE -{ - IDS_FULLFRAMES "Volledige Frames (Ongecomprimeerd)" -} Modified: trunk/reactos/dll/win32/msvfw32/lang/msvfw32_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/lang/msv… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/lang/msvfw32_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/lang/msvfw32_No.rc [iso-8859-1] Fri Oct 3 00:54:13 2014 @@ -18,34 +18,34 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL -ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 187, 95 +STRINGTABLE +{ + IDS_FULLFRAMES "Fulle bilder (ukomprimert)" +} + +ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 210, 95 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Videokomprimering" FONT 8, "MS Shell Dlg" { - DEFPUSHBUTTON "OK",IDOK,129,2,49,14 - PUSHBUTTON "Avbryt",IDCANCEL,129,18,49,14 + DEFPUSHBUTTON "OK",IDOK,154,2,52,14 + PUSHBUTTON "Avbryt",IDCANCEL,154,18,52,14 - LTEXT "&Komprimerer:",-1,9,6,105,8 - COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + LTEXT "&Komprimerer:",-1,9,6,135,8 + COMBOBOX IDC_COMP_LIST,9,16,135,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP - PUSHBUTTON "&Oppsett...",882,129,36,49,14 - PUSHBUTTON "O&m...",883,129,52,49,14 + PUSHBUTTON "&Oppsett...",IDC_CONFIGURE,154,36,52,14 + PUSHBUTTON "O&m...",IDC_ABOUT,154,52,52,14 - SCROLLBAR 884,9,44,111,9,WS_TABSTOP + SCROLLBAR IDC_QUALITY_SCROLL,9,44,135,10,WS_TABSTOP - LTEXT "Komprimeringskvalite&t:",886,9,34,80,8 + LTEXT "Komprimeringskvalite&t:",IDC_QUALITY_TXT,9,34,135,8 - CONTROL "Nø&kkelbilde for hvert",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 - EDITTEXT 888,78,60,22,12 - LTEXT "bilde",889,103,62,26,10 + CONTROL "Nø&kkelbilde for hvert",IDC_KEYFRAME_CHECKBOX,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,86,12 + EDITTEXT IDC_KEYFRAME,98,60,22,12 + LTEXT "bilde",IDC_KEYFRAME_FRAMES,123,62,26,10 - CONTROL "&Datahastighet",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 - EDITTEXT 895,78,76,22,12 - LTEXT "KB/s",896,102,78,26,10 + CONTROL "&Datahastighet",IDC_DATARATE_CHECKBOX,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,86,12 + EDITTEXT IDC_DATARATE,98,76,22,12 + LTEXT "KB/s",IDC_DATARATE_KB,123,78,26,10 } - -STRINGTABLE -{ - IDS_FULLFRAMES "Fulle bilder (ukomprimert)" -} Modified: trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/lang/msv… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Pl.rc [iso-8859-1] Fri Oct 3 00:54:13 2014 @@ -19,34 +19,34 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT -ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 207, 95 +STRINGTABLE +{ + IDS_FULLFRAMES "Pe³ne ramki (bez kompresji)" +} + +ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 210, 95 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Kompresja wideo" FONT 8, "MS Shell Dlg" { - DEFPUSHBUTTON "&OK",IDOK,146,2,52,14 - PUSHBUTTON "&Anuluj",IDCANCEL,146,18,52,14 + DEFPUSHBUTTON "OK",IDOK,154,2,52,14 + PUSHBUTTON "&Anuluj",IDCANCEL,154,18,52,14 - LTEXT "Typ &kompresji:",-1,9,6,128,8 - COMBOBOX 880,9,16,128,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + LTEXT "Typ &kompresji:",-1,9,6,135,8 + COMBOBOX IDC_COMP_LIST,9,16,135,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP - PUSHBUTTON "Kon&figuruj...",882,146,36,52,14 - PUSHBUTTON "&Informacje...",883,146,52,52,14 + PUSHBUTTON "Kon&figuruj...",IDC_CONFIGURE,154,36,52,14 + PUSHBUTTON "&Informacje...",IDC_ABOUT,154,52,52,14 - SCROLLBAR 884,9,44,128,9,WS_TABSTOP + SCROLLBAR IDC_QUALITY_SCROLL,9,44,135,10,WS_TABSTOP - LTEXT "&Jakoæ kompresji:",886,9,34,97,8 + LTEXT "&Jakoæ kompresji:",IDC_QUALITY_TXT,9,34,135,8 - CONTROL "&Ramka kluczowa co",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,81,12 - EDITTEXT 888,88,60,22,12 - LTEXT "ramek",889,114,62,31,10 + CONTROL "&Ramka kluczowa co",IDC_KEYFRAME_CHECKBOX,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,86,12 + EDITTEXT IDC_KEYFRAME,98,60,22,12 + LTEXT "ramek",IDC_KEYFRAME_FRAMES,123,62,26,10 - CONTROL "&Strumieñ",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,81,12 - EDITTEXT 895,88,76,22,12 - LTEXT "KB/s",896,114,78,31,10 + CONTROL "&Strumieñ",IDC_DATARATE_CHECKBOX,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,86,12 + EDITTEXT IDC_DATARATE,98,76,22,12 + LTEXT "KB/s",IDC_DATARATE_KB,123,78,26,10 } - -STRINGTABLE -{ - IDS_FULLFRAMES "Pe³ne ramki (bez kompresji)" -} Modified: trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/lang/msv… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Pt.rc [iso-8859-1] Fri Oct 3 00:54:13 2014 @@ -18,34 +18,34 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL -ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 187, 95 +STRINGTABLE +{ + IDS_FULLFRAMES "Imagens Completas (Descomprimidas)" +} + +ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 210, 95 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Compressão de vídeo" FONT 8, "MS Shell Dlg" { - DEFPUSHBUTTON "OK",IDOK,129,2,49,14 - PUSHBUTTON "Cancelar",IDCANCEL,129,18,49,14 + DEFPUSHBUTTON "OK",IDOK,154,2,52,14 + PUSHBUTTON "Cancelar",IDCANCEL,154,18,52,14 - LTEXT "&Compressor:",-1,9,6,105,8 - COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + LTEXT "&Compressor:",-1,9,6,135,8 + COMBOBOX IDC_COMP_LIST,9,16,135,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP - PUSHBUTTON "Con&figurar...",882,129,36,49,14 - PUSHBUTTON "&Sobre...",883,129,52,49,14 + PUSHBUTTON "Con&figurar...",IDC_CONFIGURE,154,36,52,14 + PUSHBUTTON "&Sobre...",IDC_ABOUT,154,52,52,14 - SCROLLBAR 884,9,44,111,9,WS_TABSTOP + SCROLLBAR IDC_QUALITY_SCROLL,9,44,135,10,WS_TABSTOP - LTEXT "&Qualidade de compressão:",886,9,34,80,8 + LTEXT "&Qualidade de compressão:",IDC_QUALITY_TXT,9,34,135,8 - CONTROL "&Imagem chave todos os",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 - EDITTEXT 888,78,60,22,12 - LTEXT "frames",889,103,62,26,10 + CONTROL "&Imagem chave todos os",IDC_KEYFRAME_CHECKBOX,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,86,12 + EDITTEXT IDC_KEYFRAME,98,60,22,12 + LTEXT "frames",IDC_KEYFRAME_FRAMES,123,62,26,10 - CONTROL "&Cadência de dados",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 - EDITTEXT 895,78,76,22,12 - LTEXT "KB/sec",896,102,78,26,10 + CONTROL "&Cadência de dados",IDC_DATARATE_CHECKBOX,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,86,12 + EDITTEXT IDC_DATARATE,98,76,22,12 + LTEXT "KB/sec",IDC_DATARATE_KB,123,78,26,10 } - -STRINGTABLE -{ - IDS_FULLFRAMES "Imagens Completas (Descomprimidas)" -} Modified: trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/lang/msv… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Ro.rc [iso-8859-1] Fri Oct 3 00:54:13 2014 @@ -19,38 +19,38 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL - #pragma code_page(65001) -ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 200, 95 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Compresie video" -FONT 8, "MS Shell Dlg" -{ - DEFPUSHBUTTON "Con&firmÄ", IDOK,140,2,51,14 - PUSHBUTTON "A&nuleazÄ", IDCANCEL,140,18,51,14 - - LTEXT "Co&mpresor:", -1,9,6,105,8 - COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP - - PUSHBUTTON "&Configurareâ¦", 882,140,36,51,14 - PUSHBUTTON "&Despreâ¦", 883,140,52,51,14 - - SCROLLBAR 884,9,44,111,9,WS_TABSTOP - - LTEXT "C&alitatea compresiei:", 886,9,34,80,8 - - CONTROL "Cadru c&heie la fiecare", 887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,82,12 - EDITTEXT 888,93,60,22,12 - LTEXT "cadre", 889,118,62,22,10 - - CONTROL "&Rata de date", 894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,70,12 - EDITTEXT 895,93,76,22,12 - LTEXT "ko/s", 896,118,78,22,10 -} +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL STRINGTABLE { IDS_FULLFRAMES "Cadre Ã®ntregi (necomprimate)" } + +ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 210, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Compresie video" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "Con&firmÄ",IDOK,154,2,52,14 + PUSHBUTTON "A&nuleazÄ",IDCANCEL,154,18,52,14 + + LTEXT "Co&mpresor:",-1,9,6,135,8 + COMBOBOX IDC_COMP_LIST,9,16,135,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + + PUSHBUTTON "&Configurareâ¦",IDC_CONFIGURE,154,36,52,14 + PUSHBUTTON "&Despreâ¦",IDC_ABOUT,154,52,52,14 + + SCROLLBAR IDC_QUALITY_SCROLL,9,44,135,10,WS_TABSTOP + + LTEXT "C&alitatea compresiei:",IDC_QUALITY_TXT,9,34,135,8 + + CONTROL "Cadru c&heie la fiecare",IDC_KEYFRAME_CHECKBOX,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,86,12 + EDITTEXT IDC_KEYFRAME,98,60,22,12 + LTEXT "cadre",IDC_KEYFRAME_FRAMES,123,62,26,10 + + CONTROL "&Rata de date",IDC_DATARATE_CHECKBOX,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,86,12 + EDITTEXT IDC_DATARATE,98,76,22,12 + LTEXT "ko/s",IDC_DATARATE_KB,123,78,26,10 +} Modified: trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/lang/msv… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Ru.rc [iso-8859-1] Fri Oct 3 00:54:13 2014 @@ -21,34 +21,34 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT -ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 187, 95 +STRINGTABLE +{ + IDS_FULLFRAMES "ÐÐ°Ð´ÑÑ ÑÐµÐ»Ð¸ÐºÐ¾Ð¼ (ÐÐµÐ· ÐºÐ¾Ð¼Ð¿ÑÐµÑÑÐ¸Ð¸)" +} + +ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 210, 95 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Ð¡Ð¶Ð°ÑÐ¸Ðµ Ð²Ð¸Ð´ÐµÐ¾" FONT 8, "MS Shell Dlg" { - DEFPUSHBUTTON "OK",IDOK,129,2,49,14 - PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°",IDCANCEL,129,18,49,14 + DEFPUSHBUTTON "OK",IDOK,154,2,52,14 + PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°",IDCANCEL,154,18,52,14 - LTEXT "&ÐÐ»Ð³Ð¾ÑÐ¸ÑÐ¼ ÑÐ¶Ð°ÑÐ¸Ñ:",-1,9,6,105,8 - COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + LTEXT "&ÐÐ»Ð³Ð¾ÑÐ¸ÑÐ¼ ÑÐ¶Ð°ÑÐ¸Ñ:",-1,9,6,135,8 + COMBOBOX IDC_COMP_LIST,9,16,135,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP - PUSHBUTTON "&ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸...",882,129,36,49,14 - PUSHBUTTON "&ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ...",883,129,52,49,14 + PUSHBUTTON "&ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸...",IDC_CONFIGURE,154,36,52,14 + PUSHBUTTON "&ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ...",IDC_ABOUT,154,52,52,14 - SCROLLBAR 884,9,44,111,9,WS_TABSTOP + SCROLLBAR IDC_QUALITY_SCROLL,9,44,135,10,WS_TABSTOP - LTEXT "&ÐÐ°ÑÐµÑÑÐ²Ð¾ ÑÐ¶Ð°ÑÐ¸Ñ:",886,9,34,80,8 + LTEXT "&ÐÐ°ÑÐµÑÑÐ²Ð¾ ÑÐ¶Ð°ÑÐ¸Ñ:",IDC_QUALITY_TXT,9,34,135,8 - CONTROL "ÐÐ»&ÑÑÐµÐ²Ð¾Ð¹ ÐºÐ°Ð´Ñ ÐºÐ°Ð¶Ð´ÑÐµ",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 - EDITTEXT 888,78,60,22,12 - LTEXT "ÐºÐ°Ð´Ñ(Ð¾Ð²)",889,103,62,26,10 + CONTROL "ÐÐ»&ÑÑÐµÐ²Ð¾Ð¹ ÐºÐ°Ð´Ñ ÐºÐ°Ð¶Ð´ÑÐµ",IDC_KEYFRAME_CHECKBOX,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,86,12 + EDITTEXT IDC_KEYFRAME,98,60,22,12 + LTEXT "ÐºÐ°Ð´Ñ(Ð¾Ð²)",IDC_KEYFRAME_FRAMES,123,62,26,10 - CONTROL "&ÐÐ¾ÑÐ¾Ðº Ð´Ð°Ð½Ð½ÑÑ",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 - EDITTEXT 895,78,76,22,12 - LTEXT "ÐÐ/ÑÐµÐº",896,102,78,26,10 + CONTROL "&ÐÐ¾ÑÐ¾Ðº Ð´Ð°Ð½Ð½ÑÑ",IDC_DATARATE_CHECKBOX,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,86,12 + EDITTEXT IDC_DATARATE,98,76,22,12 + LTEXT "ÐÐ/ÑÐµÐº",IDC_DATARATE_KB,123,78,26,10 } - -STRINGTABLE -{ - IDS_FULLFRAMES "ÐÐ°Ð´ÑÑ ÑÐµÐ»Ð¸ÐºÐ¾Ð¼ (ÐÐµÐ· ÐºÐ¾Ð¼Ð¿ÑÐµÑÑÐ¸Ð¸)" -} Modified: trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/lang/msv… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Si.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Si.rc [iso-8859-1] Fri Oct 3 00:54:13 2014 @@ -20,34 +20,34 @@ LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT -ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 187, 95 +STRINGTABLE +{ + IDS_FULLFRAMES "Polne slike (nestisnjeno)" +} + +ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 210, 95 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Stiskanje videa" FONT 8, "MS Shell Dlg" { - DEFPUSHBUTTON "V redu",IDOK,129,2,49,14 - PUSHBUTTON "PrekliÄi",IDCANCEL,129,18,49,14 + DEFPUSHBUTTON "V redu",IDOK,154,2,52,14 + PUSHBUTTON "PrekliÄi",IDCANCEL,154,18,52,14 - LTEXT "&Kodek za stiskanje:",-1,9,6,105,8 - COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + LTEXT "&Kodek za stiskanje:",-1,9,6,135,8 + COMBOBOX IDC_COMP_LIST,9,16,135,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP - PUSHBUTTON "&Nastavitve ...",882,129,36,49,14 - PUSHBUTTON "&O ...",883,129,52,49,14 + PUSHBUTTON "&Nastavitve ...",IDC_CONFIGURE,154,36,52,14 + PUSHBUTTON "&O ...",IDC_ABOUT,154,52,52,14 - SCROLLBAR 884,9,44,111,9,WS_TABSTOP + SCROLLBAR IDC_QUALITY_SCROLL,9,44,135,10,WS_TABSTOP - LTEXT "Kakovost &stiskanja:",886,9,34,80,8 + LTEXT "Kakovost &stiskanja:",IDC_QUALITY_TXT,9,34,135,8 - CONTROL "&KljuÄna slika na vsakih",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 - EDITTEXT 888,78,60,22,12 - LTEXT "slik",889,103,62,26,10 + CONTROL "&KljuÄna slika na vsakih",IDC_KEYFRAME_CHECKBOX,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,86,12 + EDITTEXT IDC_KEYFRAME,98,60,22,12 + LTEXT "slik",IDC_KEYFRAME_FRAMES,123,62,26,10 - CONTROL "&Pretok podatkov",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 - EDITTEXT 895,78,76,22,12 - LTEXT "kb/s",896,102,78,26,10 + CONTROL "&Pretok podatkov",IDC_DATARATE_CHECKBOX,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,86,12 + EDITTEXT IDC_DATARATE,98,76,22,12 + LTEXT "kb/s",IDC_DATARATE_KB,123,78,26,10 } - -STRINGTABLE -{ - IDS_FULLFRAMES "Polne slike (nestisnjeno)" -} Modified: trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Sq.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/lang/msv… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Sq.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Sq.rc [iso-8859-1] Fri Oct 3 00:54:13 2014 @@ -21,34 +21,34 @@ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL -ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 187, 95 +STRINGTABLE +{ + IDS_FULLFRAMES "Frames te plote (pa-gnjeshur)" +} + +ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 210, 95 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Video Ngjeshje" FONT 8, "MS Shell Dlg" { - DEFPUSHBUTTON "OK",IDOK,129,2,49,14 - PUSHBUTTON "Anulo",IDCANCEL,129,18,49,14 + DEFPUSHBUTTON "OK",IDOK,154,2,52,14 + PUSHBUTTON "Anulo",IDCANCEL,154,18,52,14 - LTEXT "Ngjeshje:",-1,9,6,105,8 - COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + LTEXT "Ngjeshje:",-1,9,6,135,8 + COMBOBOX IDC_COMP_LIST,9,16,135,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP - PUSHBUTTON "Kon&figuro...",882,129,36,49,14 - PUSHBUTTON "Rreth...",883,129,52,49,14 + PUSHBUTTON "Kon&figuro...",IDC_CONFIGURE,154,36,52,14 + PUSHBUTTON "Rreth...",IDC_ABOUT,154,52,52,14 - SCROLLBAR 884,9,44,111,9,WS_TABSTOP + SCROLLBAR IDC_QUALITY_SCROLL,9,44,135,10,WS_TABSTOP - LTEXT "Kualitet Ngjeshje:",886,9,34,80,8 + LTEXT "Kualitet Ngjeshje:",IDC_QUALITY_TXT,9,34,135,8 - CONTROL "Frame Ã§do Ã§eles",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 - EDITTEXT 888,78,60,22,12 - LTEXT "frames",889,103,62,26,10 + CONTROL "Frame Ã§do Ã§eles",IDC_KEYFRAME_CHECKBOX,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,86,12 + EDITTEXT IDC_KEYFRAME,98,60,22,12 + LTEXT "frames",IDC_KEYFRAME_FRAMES,123,62,26,10 - CONTROL "&Data Rate",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 - EDITTEXT 895,78,76,22,12 - LTEXT "KB/sec",896,102,78,26,10 + CONTROL "&Data Rate",IDC_DATARATE_CHECKBOX,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,86,12 + EDITTEXT IDC_DATARATE,98,76,22,12 + LTEXT "KB/sec",IDC_DATARATE_KB,123,78,26,10 } - -STRINGTABLE -{ - IDS_FULLFRAMES "Frames te plote (pa-gnjeshur)" -} Modified: trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/lang/msv… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Sv.rc [iso-8859-1] Fri Oct 3 00:54:13 2014 @@ -18,34 +18,34 @@ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL -ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 187, 95 +STRINGTABLE +{ + IDS_FULLFRAMES "Hela bildrutor (okomprimerat)" +} + +ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 210, 95 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Videokomprimering" FONT 8, "MS Shell Dlg" { - DEFPUSHBUTTON "OK",IDOK,129,2,49,14 - PUSHBUTTON "Avbryt",IDCANCEL,129,18,49,14 + DEFPUSHBUTTON "OK",IDOK,154,2,52,14 + PUSHBUTTON "Avbryt",IDCANCEL,154,18,52,14 - LTEXT "&Komprimering:",-1,9,6,105,8 - COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + LTEXT "&Komprimering:",-1,9,6,135,8 + COMBOBOX IDC_COMP_LIST,9,16,135,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP - PUSHBUTTON "Kon&figurera...",882,129,36,49,14 - PUSHBUTTON "&Om...",883,129,52,49,14 + PUSHBUTTON "Kon&figurera...",IDC_CONFIGURE,154,36,52,14 + PUSHBUTTON "&Om...",IDC_ABOUT,154,52,52,14 - SCROLLBAR 884,9,44,111,9,WS_TABSTOP + SCROLLBAR IDC_QUALITY_SCROLL,9,44,135,10,WS_TABSTOP - LTEXT "Komprimeringsk&valitet:",886,9,34,80,8 + LTEXT "Komprimeringsk&valitet:",IDC_QUALITY_TXT,9,34,135,8 - CONTROL "&Nyckelbildrutor varje",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 - EDITTEXT 888,78,60,22,12 - LTEXT "frames",889,103,62,26,10 + CONTROL "&Nyckelbildrutor varje",IDC_KEYFRAME_CHECKBOX,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,86,12 + EDITTEXT IDC_KEYFRAME,98,60,22,12 + LTEXT "frames",IDC_KEYFRAME_FRAMES,123,62,26,10 - CONTROL "&Datafrekvens",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 - EDITTEXT 895,78,76,22,12 - LTEXT "KB/s",896,102,78,26,10 + CONTROL "&Datafrekvens",IDC_DATARATE_CHECKBOX,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,86,12 + EDITTEXT IDC_DATARATE,98,76,22,12 + LTEXT "KB/s",IDC_DATARATE_KB,123,78,26,10 } - -STRINGTABLE -{ - IDS_FULLFRAMES "Hela bildrutor (okomprimerat)" -} Modified: trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/lang/msv… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Tr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Tr.rc [iso-8859-1] Fri Oct 3 00:54:13 2014 @@ -20,34 +20,34 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT -ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 187, 95 +STRINGTABLE +{ + IDS_FULLFRAMES "TÃ¼m Kareler (SÄ±kÄ±ÅtÄ±rÄ±lmamÄ±Å)" +} + +ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 210, 95 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Vidyo SÄ±kÄ±ÅtÄ±rma" FONT 8, "MS Shell Dlg" { - DEFPUSHBUTTON "Tamam",IDOK,129,2,49,14 - PUSHBUTTON "Ä°ptal",IDCANCEL,129,18,49,14 + DEFPUSHBUTTON "Tamam",IDOK,154,2,52,14 + PUSHBUTTON "Ä°ptal",IDCANCEL,154,18,52,14 - LTEXT "&SÄ±kÄ±ÅtÄ±rÄ±cÄ±:",-1,9,6,105,8 - COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + LTEXT "&SÄ±kÄ±ÅtÄ±rÄ±cÄ±:",-1,9,6,135,8 + COMBOBOX IDC_COMP_LIST,9,16,135,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP - PUSHBUTTON "&YapÄ±landÄ±r...",882,129,36,49,14 - PUSHBUTTON "&Ãzerine...",883,129,52,49,14 + PUSHBUTTON "&YapÄ±landÄ±r...",IDC_CONFIGURE,154,36,52,14 + PUSHBUTTON "&Ãzerine...",IDC_ABOUT,154,52,52,14 - SCROLLBAR 884,9,44,111,9,WS_TABSTOP + SCROLLBAR IDC_QUALITY_SCROLL,9,44,135,10,WS_TABSTOP - LTEXT "S&Ä±kÄ±ÅtÄ±rma NiteliÄi:",886,9,34,80,8 + LTEXT "S&Ä±kÄ±ÅtÄ±rma NiteliÄi:",IDC_QUALITY_TXT,9,34,135,8 - CONTROL "&Her Anahtar Kare",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 - EDITTEXT 888,78,60,22,12 - LTEXT "kare",889,103,62,26,10 + CONTROL "&Her Anahtar Kare",IDC_KEYFRAME_CHECKBOX,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,86,12 + EDITTEXT IDC_KEYFRAME,98,60,22,12 + LTEXT "kare",IDC_KEYFRAME_FRAMES,123,62,26,10 - CONTROL "&Veri OranÄ±",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 - EDITTEXT 895,78,76,22,12 - LTEXT "KB/sn",896,102,78,26,10 + CONTROL "&Veri OranÄ±",IDC_DATARATE_CHECKBOX,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,86,12 + EDITTEXT IDC_DATARATE,98,76,22,12 + LTEXT "KB/sn",IDC_DATARATE_KB,123,78,26,10 } - -STRINGTABLE -{ - IDS_FULLFRAMES "TÃ¼m Kareler (SÄ±kÄ±ÅtÄ±rÄ±lmamÄ±Å)" -} Modified: trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/lang/msv… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Uk.rc [iso-8859-1] Fri Oct 3 00:54:13 2014 @@ -22,34 +22,34 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT -ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 187, 95 +STRINGTABLE +{ + IDS_FULLFRAMES "ÐÐ°Ð´ÑÐ¸ Ð¿Ð¾Ð²Ð½ÑÑÑÑ (ÐÐµÐ· ÑÑÐ¸ÑÐ½ÐµÐ½Ð½Ñ)" +} + +ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 210, 95 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Ð¡ÑÐ¸ÑÐ½ÐµÐ½Ð½Ñ ÐÑÐ´ÐµÐ¾" FONT 8, "MS Shell Dlg" { - DEFPUSHBUTTON "OK",IDOK,129,2,49,14 - PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸",IDCANCEL,129,18,49,14 + DEFPUSHBUTTON "OK",IDOK,154,2,52,14 + PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸",IDCANCEL,154,18,52,14 - LTEXT "&ÐÐ»Ð³Ð¾ÑÐ¸ÑÐ¼ ÑÑÐ¸ÑÐ½ÐµÐ½Ð½Ñ:",-1,9,6,105,8 - COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + LTEXT "&ÐÐ»Ð³Ð¾ÑÐ¸ÑÐ¼ ÑÑÐ¸ÑÐ½ÐµÐ½Ð½Ñ:",-1,9,6,135,8 + COMBOBOX IDC_COMP_LIST,9,16,135,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP - PUSHBUTTON "ÐÐ°Ð»Ð°ÑÑÑÐ²Ð°&ÑÐ¸...",882,129,36,49,14 - PUSHBUTTON "&ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÑÑ...",883,129,52,49,14 + PUSHBUTTON "ÐÐ°Ð»Ð°ÑÑÑÐ²Ð°&ÑÐ¸...",IDC_CONFIGURE,154,36,52,14 + PUSHBUTTON "&ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÑÑ...",IDC_ABOUT,154,52,52,14 - SCROLLBAR 884,9,44,111,9,WS_TABSTOP + SCROLLBAR IDC_QUALITY_SCROLL,9,44,135,10,WS_TABSTOP - LTEXT "&Ð¯ÐºÑÑÑÑ Ð¡ÑÐ¸ÑÐ½ÐµÐ½Ð½Ñ:",886,9,34,80,8 + LTEXT "&Ð¯ÐºÑÑÑÑ Ð¡ÑÐ¸ÑÐ½ÐµÐ½Ð½Ñ:",IDC_QUALITY_TXT,9,34,135,8 - CONTROL "&ÐÐ»ÑÑÐ¾Ð²Ð¸Ð¹ ÐºÐ°Ð´Ñ ÐºÐ¾Ð¶Ð½Ñ",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 - EDITTEXT 888,78,60,22,12 - LTEXT "ÐºÐ°Ð´ÑÑÐ²",889,103,62,26,10 + CONTROL "&ÐÐ»ÑÑÐ¾Ð²Ð¸Ð¹ ÐºÐ°Ð´Ñ ÐºÐ¾Ð¶Ð½Ñ",IDC_KEYFRAME_CHECKBOX,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,86,12 + EDITTEXT IDC_KEYFRAME,98,60,22,12 + LTEXT "ÐºÐ°Ð´ÑÑÐ²",IDC_KEYFRAME_FRAMES,123,62,26,10 - CONTROL "&ÐÐ¾ÑÑÐº Ð´Ð°Ð½Ð¸Ñ",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 - EDITTEXT 895,78,76,22,12 - LTEXT "KB/sec",896,102,78,26,10 + CONTROL "&ÐÐ¾ÑÑÐº Ð´Ð°Ð½Ð¸Ñ",IDC_DATARATE_CHECKBOX,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,86,12 + EDITTEXT IDC_DATARATE,98,76,22,12 + LTEXT "KB/sec",IDC_DATARATE_KB,123,78,26,10 } - -STRINGTABLE -{ - IDS_FULLFRAMES "ÐÐ°Ð´ÑÐ¸ Ð¿Ð¾Ð²Ð½ÑÑÑÑ (ÐÐµÐ· ÑÑÐ¸ÑÐ½ÐµÐ½Ð½Ñ)" -} Modified: trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/lang/msv… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Zh.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Zh.rc [iso-8859-1] Fri Oct 3 00:54:13 2014 @@ -23,68 +23,68 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED -ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 187, 95 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "è§é¢åç¼©" -FONT 9, "MS Shell Dlg" -{ - DEFPUSHBUTTON "ç¡®å®",IDOK,129,2,49,14 - PUSHBUTTON "åæ¶",IDCANCEL,129,18,49,14 - - LTEXT "åç¼©å¨(&C):",-1,9,6,105,8 - COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP - - PUSHBUTTON "éç½®(&F)...",882,129,36,49,14 - PUSHBUTTON "å³äº(&A)...",883,129,52,49,14 - - SCROLLBAR 884,9,44,111,9,WS_TABSTOP - - LTEXT "åç¼©è´¨é(&Q):",886,9,34,80,8 - - CONTROL "å³é®å¸§/æ¯(&K)",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 - EDITTEXT 888,78,60,22,12 - LTEXT "å¸§",889,103,62,26,10 - - CONTROL "æ°æ®éåº¦(&D)",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 - EDITTEXT 895,78,76,22,12 - LTEXT "KB/sec",896,102,78,26,10 -} - STRINGTABLE { IDS_FULLFRAMES "å¨å¸§(æªåç¼©)" } -LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL - -ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 187, 95 +ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 210, 95 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "è¦é »å£ç¸®" +CAPTION "è§é¢åç¼©" FONT 9, "MS Shell Dlg" { - DEFPUSHBUTTON "ç¢ºå®",IDOK,129,2,49,14 - PUSHBUTTON "åæ¶",IDCANCEL,129,18,49,14 + DEFPUSHBUTTON "ç¡®å®",IDOK,154,2,52,14 + PUSHBUTTON "åæ¶",IDCANCEL,154,18,52,14 - LTEXT "å£ç¸®å¨(&C):",-1,9,6,105,8 - COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + LTEXT "åç¼©å¨(&C):",-1,9,6,135,8 + COMBOBOX IDC_COMP_LIST,9,16,135,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP - PUSHBUTTON "éç½®(&F)...",882,129,36,49,14 - PUSHBUTTON "éæ¼(&A)...",883,129,52,49,14 + PUSHBUTTON "éç½®(&F)...",IDC_CONFIGURE,154,36,52,14 + PUSHBUTTON "å³äº(&A)...",IDC_ABOUT,154,52,52,14 - SCROLLBAR 884,9,44,111,9,WS_TABSTOP + SCROLLBAR IDC_QUALITY_SCROLL,9,44,135,10,WS_TABSTOP - LTEXT "å£ç¸®è³ªé(&Q):",886,9,34,80,8 + LTEXT "åç¼©è´¨é(&Q):",IDC_QUALITY_TXT,9,34,135,8 - CONTROL "ééµå¹/æ¯(&K)",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 - EDITTEXT 888,78,60,22,12 - LTEXT "å¹",889,103,62,26,10 + CONTROL "å³é®å¸§/æ¯(&K)",IDC_KEYFRAME_CHECKBOX,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,86,12 + EDITTEXT IDC_KEYFRAME,98,60,22,12 + LTEXT "å¸§",IDC_KEYFRAME_FRAMES,123,62,26,10 - CONTROL "æ¸æéåº¦(&D)",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 - EDITTEXT 895,78,76,22,12 - LTEXT "KB/sec",896,102,78,26,10 + CONTROL "æ°æ®éåº¦(&D)",IDC_DATARATE_CHECKBOX,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,86,12 + EDITTEXT IDC_DATARATE,98,76,22,12 + LTEXT "KB/sec",IDC_DATARATE_KB,123,78,26,10 } + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL STRINGTABLE { IDS_FULLFRAMES "å¨å¹(æªå£ç¸®)" } + +ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 210, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "è¦é »å£ç¸®" +FONT 9, "MS Shell Dlg" +{ + DEFPUSHBUTTON "ç¢ºå®",IDOK,154,2,52,14 + PUSHBUTTON "åæ¶",IDCANCEL,154,18,52,14 + + LTEXT "å£ç¸®å¨(&C):",-1,9,6,135,8 + COMBOBOX IDC_COMP_LIST,9,16,135,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + + PUSHBUTTON "éç½®(&F)...",IDC_CONFIGURE,154,36,52,14 + PUSHBUTTON "éæ¼(&A)...",IDC_ABOUT,154,52,52,14 + + SCROLLBAR IDC_QUALITY_SCROLL,9,44,135,10,WS_TABSTOP + + LTEXT "å£ç¸®è³ªé(&Q):",IDC_QUALITY_TXT,9,34,135,8 + + CONTROL "ééµå¹/æ¯(&K)",IDC_KEYFRAME_CHECKBOX,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,86,12 + EDITTEXT IDC_KEYFRAME,98,60,22,12 + LTEXT "å¹",IDC_KEYFRAME_FRAMES,123,62,26,10 + + CONTROL "æ¸æéåº¦(&D)",IDC_DATARATE_CHECKBOX,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,86,12 + EDITTEXT IDC_DATARATE,98,76,22,12 + LTEXT "KB/sec",IDC_DATARATE_KB,123,78,26,10 +} Modified: trunk/reactos/dll/win32/msvfw32/msvideo_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvideo_… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/msvideo_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/msvideo_main.c [iso-8859-1] Fri Oct 3 00:54:13 2014 @@ -59,7 +59,7 @@ static reg_driver* reg_driver_list = NULL; -/* This one is a macro such that it works for both ASCII and Unicode */ +/* This one is a macro in order to work for both ASCII and Unicode */ #define fourcc_to_string(str, fcc) do { \ (str)[0] = LOBYTE(LOWORD(fcc)); \ (str)[1] = HIBYTE(LOWORD(fcc)); \ Modified: trunk/reactos/dll/win32/msvfw32/msvideo_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvideo_… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/msvideo_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/msvideo_private.h [iso-8859-1] Fri Oct 3 00:54:13 2014 @@ -34,7 +34,6 @@ #include <wine/debug.h> #define ICM_CHOOSE_COMPRESSOR 1 -#define IDC_COMP_LIST 880 /* HIC struct (same layout as Win95 one) */ typedef struct tagWINE_HIC { Modified: trunk/reactos/dll/win32/msvfw32/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/resource… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/resource.h [iso-8859-1] Fri Oct 3 00:54:13 2014 @@ -18,6 +18,7 @@ #pragma once +#define IDC_COMP_LIST 880 #define IDS_FULLFRAMES 901 #define IDC_CONFIGURE 882 Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Fri Oct 3 00:54:13 2014 @@ -136,7 +136,7 @@ reactos/dll/win32/mstask # Synced to Wine-1.7.17 reactos/dll/win32/msvcrt20 # Out of sync reactos/dll/win32/msvcrt40 # Out of sync -reactos/dll/win32/msvfw32 # Synced to Wine-1.7.17 +reactos/dll/win32/msvfw32 # Synced to Wine-1.7.27 reactos/dll/win32/msvidc32 # Synced to Wine-1.7.17 reactos/dll/win32/msxml # Synced to Wine-1.7.17 reactos/dll/win32/msxml2 # Synced to Wine-1.7.17

10 years, 1 month

[hbelusca] 64477: Fix dprint.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Oct 3 00:33:21 2014 New Revision: 64477 URL: http://svn.reactos.org/svn/reactos?rev=64477&view=rev Log: Fix dprint. Modified: trunk/reactos/subsystems/ntvdm/bios/vidbios.c Modified: trunk/reactos/subsystems/ntvdm/bios/vidbios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/vidb… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/vidbios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/vidbios.c [iso-8859-1] Fri Oct 3 00:33:21 2014 @@ -2126,7 +2126,7 @@ if (Bda->VideoMode < 4 || Bda->VideoMode > 6) { DPRINT1("BIOS Function INT 10h, AH = 0Bh, BH = 0x%02X is unsupported for non-CGA modes\n", - getAH(), getBH()); + getBH()); break; }

10 years, 1 month

[aandrejevic] 64476: [NTVDM] Implement VGA bitmap fonts.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Thu Oct 2 23:50:35 2014 New Revision: 64476 URL: http://svn.reactos.org/svn/reactos?rev=64476&view=rev Log: [NTVDM] Implement VGA bitmap fonts. Modified: trunk/reactos/subsystems/ntvdm/bios/vidbios.c trunk/reactos/subsystems/ntvdm/bios/vidbios.h trunk/reactos/subsystems/ntvdm/hardware/vga.c trunk/reactos/subsystems/ntvdm/hardware/vga.h Modified: trunk/reactos/subsystems/ntvdm/bios/vidbios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/vidb… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/vidbios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/vidbios.c [iso-8859-1] Thu Oct 2 23:50:35 2014 @@ -651,6 +651,782 @@ #endif +static CONST UCHAR Font8x8[VGA_FONT_CHARACTERS * 8] = +{ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x7E, 0x81, 0xA5, 0x81, 0xBD, 0x99, 0x81, 0x7E, + 0x7E, 0xFF, 0xDB, 0xFF, 0xC3, 0xE7, 0xFF, 0x7E, + 0x6C, 0xFE, 0xFE, 0xFE, 0x7C, 0x38, 0x10, 0x00, + 0x10, 0x38, 0x7C, 0xFE, 0x7C, 0x38, 0x10, 0x00, + 0x38, 0x7C, 0x38, 0xFE, 0xFE, 0x92, 0x10, 0x7C, + 0x00, 0x10, 0x38, 0x7C, 0xFE, 0x7C, 0x38, 0x7C, + 0x00, 0x00, 0x18, 0x3C, 0x3C, 0x18, 0x00, 0x00, + 0xFF, 0xFF, 0xE7, 0xC3, 0xC3, 0xE7, 0xFF, 0xFF, + 0x00, 0x3C, 0x66, 0x42, 0x42, 0x66, 0x3C, 0x00, + 0xFF, 0xC3, 0x99, 0xBD, 0xBD, 0x99, 0xC3, 0xFF, + 0x0F, 0x07, 0x0F, 0x7D, 0xCC, 0xCC, 0xCC, 0x78, + 0x3C, 0x66, 0x66, 0x66, 0x3C, 0x18, 0x7E, 0x18, + 0x3F, 0x33, 0x3F, 0x30, 0x30, 0x70, 0xF0, 0xE0, + 0x7F, 0x63, 0x7F, 0x63, 0x63, 0x67, 0xE6, 0xC0, + 0x99, 0x5A, 0x3C, 0xE7, 0xE7, 0x3C, 0x5A, 0x99, + 0x80, 0xE0, 0xF8, 0xFE, 0xF8, 0xE0, 0x80, 0x00, + 0x02, 0x0E, 0x3E, 0xFE, 0x3E, 0x0E, 0x02, 0x00, + 0x18, 0x3C, 0x7E, 0x18, 0x18, 0x7E, 0x3C, 0x18, + 0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x66, 0x00, + 0x7F, 0xDB, 0xDB, 0x7B, 0x1B, 0x1B, 0x1B, 0x00, + 0x3E, 0x63, 0x38, 0x6C, 0x6C, 0x38, 0x86, 0xFC, + 0x00, 0x00, 0x00, 0x00, 0x7E, 0x7E, 0x7E, 0x00, + 0x18, 0x3C, 0x7E, 0x18, 0x7E, 0x3C, 0x18, 0xFF, + 0x18, 0x3C, 0x7E, 0x18, 0x18, 0x18, 0x18, 0x00, + 0x18, 0x18, 0x18, 0x18, 0x7E, 0x3C, 0x18, 0x00, + 0x00, 0x18, 0x0C, 0xFE, 0x0C, 0x18, 0x00, 0x00, + 0x00, 0x30, 0x60, 0xFE, 0x60, 0x30, 0x00, 0x00, + 0x00, 0x00, 0xC0, 0xC0, 0xC0, 0xFE, 0x00, 0x00, + 0x00, 0x24, 0x66, 0xFF, 0x66, 0x24, 0x00, 0x00, + 0x00, 0x18, 0x3C, 0x7E, 0xFF, 0xFF, 0x00, 0x00, + 0x00, 0xFF, 0xFF, 0x7E, 0x3C, 0x18, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x18, 0x3C, 0x3C, 0x18, 0x18, 0x00, 0x18, 0x00, + 0x6C, 0x6C, 0x6C, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x6C, 0x6C, 0xFE, 0x6C, 0xFE, 0x6C, 0x6C, 0x00, + 0x18, 0x7E, 0xC0, 0x7C, 0x06, 0xFC, 0x18, 0x00, + 0x00, 0xC6, 0xCC, 0x18, 0x30, 0x66, 0xC6, 0x00, + 0x38, 0x6C, 0x38, 0x76, 0xDC, 0xCC, 0x76, 0x00, + 0x30, 0x30, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x18, 0x30, 0x60, 0x60, 0x60, 0x30, 0x18, 0x00, + 0x60, 0x30, 0x18, 0x18, 0x18, 0x30, 0x60, 0x00, + 0x00, 0x66, 0x3C, 0xFF, 0x3C, 0x66, 0x00, 0x00, + 0x00, 0x18, 0x18, 0x7E, 0x18, 0x18, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x30, + 0x00, 0x00, 0x00, 0x7E, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, + 0x06, 0x0C, 0x18, 0x30, 0x60, 0xC0, 0x80, 0x00, + 0x7C, 0xCE, 0xDE, 0xF6, 0xE6, 0xC6, 0x7C, 0x00, + 0x30, 0x70, 0x30, 0x30, 0x30, 0x30, 0xFC, 0x00, + 0x78, 0xCC, 0x0C, 0x38, 0x60, 0xCC, 0xFC, 0x00, + 0x78, 0xCC, 0x0C, 0x38, 0x0C, 0xCC, 0x78, 0x00, + 0x1C, 0x3C, 0x6C, 0xCC, 0xFE, 0x0C, 0x1E, 0x00, + 0xFC, 0xC0, 0xF8, 0x0C, 0x0C, 0xCC, 0x78, 0x00, + 0x38, 0x60, 0xC0, 0xF8, 0xCC, 0xCC, 0x78, 0x00, + 0xFC, 0xCC, 0x0C, 0x18, 0x30, 0x30, 0x30, 0x00, + 0x78, 0xCC, 0xCC, 0x78, 0xCC, 0xCC, 0x78, 0x00, + 0x78, 0xCC, 0xCC, 0x7C, 0x0C, 0x18, 0x70, 0x00, + 0x00, 0x18, 0x18, 0x00, 0x00, 0x18, 0x18, 0x00, + 0x00, 0x18, 0x18, 0x00, 0x00, 0x18, 0x18, 0x30, + 0x18, 0x30, 0x60, 0xC0, 0x60, 0x30, 0x18, 0x00, + 0x00, 0x00, 0x7E, 0x00, 0x7E, 0x00, 0x00, 0x00, + 0x60, 0x30, 0x18, 0x0C, 0x18, 0x30, 0x60, 0x00, + 0x3C, 0x66, 0x0C, 0x18, 0x18, 0x00, 0x18, 0x00, + 0x7C, 0xC6, 0xDE, 0xDE, 0xDC, 0xC0, 0x7C, 0x00, + 0x30, 0x78, 0xCC, 0xCC, 0xFC, 0xCC, 0xCC, 0x00, + 0xFC, 0x66, 0x66, 0x7C, 0x66, 0x66, 0xFC, 0x00, + 0x3C, 0x66, 0xC0, 0xC0, 0xC0, 0x66, 0x3C, 0x00, + 0xF8, 0x6C, 0x66, 0x66, 0x66, 0x6C, 0xF8, 0x00, + 0xFE, 0x62, 0x68, 0x78, 0x68, 0x62, 0xFE, 0x00, + 0xFE, 0x62, 0x68, 0x78, 0x68, 0x60, 0xF0, 0x00, + 0x3C, 0x66, 0xC0, 0xC0, 0xCE, 0x66, 0x3A, 0x00, + 0xCC, 0xCC, 0xCC, 0xFC, 0xCC, 0xCC, 0xCC, 0x00, + 0x78, 0x30, 0x30, 0x30, 0x30, 0x30, 0x78, 0x00, + 0x1E, 0x0C, 0x0C, 0x0C, 0xCC, 0xCC, 0x78, 0x00, + 0xE6, 0x66, 0x6C, 0x78, 0x6C, 0x66, 0xE6, 0x00, + 0xF0, 0x60, 0x60, 0x60, 0x62, 0x66, 0xFE, 0x00, + 0xC6, 0xEE, 0xFE, 0xFE, 0xD6, 0xC6, 0xC6, 0x00, + 0xC6, 0xE6, 0xF6, 0xDE, 0xCE, 0xC6, 0xC6, 0x00, + 0x38, 0x6C, 0xC6, 0xC6, 0xC6, 0x6C, 0x38, 0x00, + 0xFC, 0x66, 0x66, 0x7C, 0x60, 0x60, 0xF0, 0x00, + 0x7C, 0xC6, 0xC6, 0xC6, 0xD6, 0x7C, 0x0E, 0x00, + 0xFC, 0x66, 0x66, 0x7C, 0x6C, 0x66, 0xE6, 0x00, + 0x7C, 0xC6, 0xE0, 0x78, 0x0E, 0xC6, 0x7C, 0x00, + 0xFC, 0xB4, 0x30, 0x30, 0x30, 0x30, 0x78, 0x00, + 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xFC, 0x00, + 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0x78, 0x30, 0x00, + 0xC6, 0xC6, 0xC6, 0xC6, 0xD6, 0xFE, 0x6C, 0x00, + 0xC6, 0xC6, 0x6C, 0x38, 0x6C, 0xC6, 0xC6, 0x00, + 0xCC, 0xCC, 0xCC, 0x78, 0x30, 0x30, 0x78, 0x00, + 0xFE, 0xC6, 0x8C, 0x18, 0x32, 0x66, 0xFE, 0x00, + 0x78, 0x60, 0x60, 0x60, 0x60, 0x60, 0x78, 0x00, + 0xC0, 0x60, 0x30, 0x18, 0x0C, 0x06, 0x02, 0x00, + 0x78, 0x18, 0x18, 0x18, 0x18, 0x18, 0x78, 0x00, + 0x10, 0x38, 0x6C, 0xC6, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, + 0x30, 0x30, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x78, 0x0C, 0x7C, 0xCC, 0x76, 0x00, + 0xE0, 0x60, 0x60, 0x7C, 0x66, 0x66, 0xDC, 0x00, + 0x00, 0x00, 0x78, 0xCC, 0xC0, 0xCC, 0x78, 0x00, + 0x1C, 0x0C, 0x0C, 0x7C, 0xCC, 0xCC, 0x76, 0x00, + 0x00, 0x00, 0x78, 0xCC, 0xFC, 0xC0, 0x78, 0x00, + 0x38, 0x6C, 0x64, 0xF0, 0x60, 0x60, 0xF0, 0x00, + 0x00, 0x00, 0x76, 0xCC, 0xCC, 0x7C, 0x0C, 0xF8, + 0xE0, 0x60, 0x6C, 0x76, 0x66, 0x66, 0xE6, 0x00, + 0x30, 0x00, 0x70, 0x30, 0x30, 0x30, 0x78, 0x00, + 0x0C, 0x00, 0x1C, 0x0C, 0x0C, 0xCC, 0xCC, 0x78, + 0xE0, 0x60, 0x66, 0x6C, 0x78, 0x6C, 0xE6, 0x00, + 0x70, 0x30, 0x30, 0x30, 0x30, 0x30, 0x78, 0x00, + 0x00, 0x00, 0xCC, 0xFE, 0xFE, 0xD6, 0xD6, 0x00, + 0x00, 0x00, 0xB8, 0xCC, 0xCC, 0xCC, 0xCC, 0x00, + 0x00, 0x00, 0x78, 0xCC, 0xCC, 0xCC, 0x78, 0x00, + 0x00, 0x00, 0xDC, 0x66, 0x66, 0x7C, 0x60, 0xF0, + 0x00, 0x00, 0x76, 0xCC, 0xCC, 0x7C, 0x0C, 0x1E, + 0x00, 0x00, 0xDC, 0x76, 0x62, 0x60, 0xF0, 0x00, + 0x00, 0x00, 0x7C, 0xC0, 0x70, 0x1C, 0xF8, 0x00, + 0x10, 0x30, 0xFC, 0x30, 0x30, 0x34, 0x18, 0x00, + 0x00, 0x00, 0xCC, 0xCC, 0xCC, 0xCC, 0x76, 0x00, + 0x00, 0x00, 0xCC, 0xCC, 0xCC, 0x78, 0x30, 0x00, + 0x00, 0x00, 0xC6, 0xC6, 0xD6, 0xFE, 0x6C, 0x00, + 0x00, 0x00, 0xC6, 0x6C, 0x38, 0x6C, 0xC6, 0x00, + 0x00, 0x00, 0xCC, 0xCC, 0xCC, 0x7C, 0x0C, 0xF8, + 0x00, 0x00, 0xFC, 0x98, 0x30, 0x64, 0xFC, 0x00, + 0x1C, 0x30, 0x30, 0xE0, 0x30, 0x30, 0x1C, 0x00, + 0x18, 0x18, 0x18, 0x00, 0x18, 0x18, 0x18, 0x00, + 0xE0, 0x30, 0x30, 0x1C, 0x30, 0x30, 0xE0, 0x00, + 0x76, 0xDC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x10, 0x38, 0x6C, 0xC6, 0xC6, 0xFE, 0x00, + 0x7C, 0xC6, 0xC0, 0xC6, 0x7C, 0x0C, 0x06, 0x7C, + 0x00, 0xCC, 0x00, 0xCC, 0xCC, 0xCC, 0x76, 0x00, + 0x1C, 0x00, 0x78, 0xCC, 0xFC, 0xC0, 0x78, 0x00, + 0x7E, 0x81, 0x3C, 0x06, 0x3E, 0x66, 0x3B, 0x00, + 0xCC, 0x00, 0x78, 0x0C, 0x7C, 0xCC, 0x76, 0x00, + 0xE0, 0x00, 0x78, 0x0C, 0x7C, 0xCC, 0x76, 0x00, + 0x30, 0x30, 0x78, 0x0C, 0x7C, 0xCC, 0x76, 0x00, + 0x00, 0x00, 0x7C, 0xC6, 0xC0, 0x78, 0x0C, 0x38, + 0x7E, 0x81, 0x3C, 0x66, 0x7E, 0x60, 0x3C, 0x00, + 0xCC, 0x00, 0x78, 0xCC, 0xFC, 0xC0, 0x78, 0x00, + 0xE0, 0x00, 0x78, 0xCC, 0xFC, 0xC0, 0x78, 0x00, + 0xCC, 0x00, 0x70, 0x30, 0x30, 0x30, 0x78, 0x00, + 0x7C, 0x82, 0x38, 0x18, 0x18, 0x18, 0x3C, 0x00, + 0xE0, 0x00, 0x70, 0x30, 0x30, 0x30, 0x78, 0x00, + 0xC6, 0x10, 0x7C, 0xC6, 0xFE, 0xC6, 0xC6, 0x00, + 0x30, 0x30, 0x00, 0x78, 0xCC, 0xFC, 0xCC, 0x00, + 0x1C, 0x00, 0xFC, 0x60, 0x78, 0x60, 0xFC, 0x00, + 0x00, 0x00, 0x7F, 0x0C, 0x7F, 0xCC, 0x7F, 0x00, + 0x3E, 0x6C, 0xCC, 0xFE, 0xCC, 0xCC, 0xCE, 0x00, + 0x78, 0x84, 0x00, 0x78, 0xCC, 0xCC, 0x78, 0x00, + 0x00, 0xCC, 0x00, 0x78, 0xCC, 0xCC, 0x78, 0x00, + 0x00, 0xE0, 0x00, 0x78, 0xCC, 0xCC, 0x78, 0x00, + 0x78, 0x84, 0x00, 0xCC, 0xCC, 0xCC, 0x76, 0x00, + 0x00, 0xE0, 0x00, 0xCC, 0xCC, 0xCC, 0x76, 0x00, + 0x00, 0xCC, 0x00, 0xCC, 0xCC, 0x7C, 0x0C, 0xF8, + 0xC3, 0x18, 0x3C, 0x66, 0x66, 0x3C, 0x18, 0x00, + 0xCC, 0x00, 0xCC, 0xCC, 0xCC, 0xCC, 0x78, 0x00, + 0x18, 0x18, 0x7E, 0xC0, 0xC0, 0x7E, 0x18, 0x18, + 0x38, 0x6C, 0x64, 0xF0, 0x60, 0xE6, 0xFC, 0x00, + 0xCC, 0xCC, 0x78, 0x30, 0xFC, 0x30, 0xFC, 0x30, + 0xF8, 0xCC, 0xCC, 0xFA, 0xC6, 0xCF, 0xC6, 0xC3, + 0x0E, 0x1B, 0x18, 0x3C, 0x18, 0x18, 0xD8, 0x70, + 0x1C, 0x00, 0x78, 0x0C, 0x7C, 0xCC, 0x76, 0x00, + 0x38, 0x00, 0x70, 0x30, 0x30, 0x30, 0x78, 0x00, + 0x00, 0x1C, 0x00, 0x78, 0xCC, 0xCC, 0x78, 0x00, + 0x00, 0x1C, 0x00, 0xCC, 0xCC, 0xCC, 0x76, 0x00, + 0x00, 0xF8, 0x00, 0xB8, 0xCC, 0xCC, 0xCC, 0x00, + 0xFC, 0x00, 0xCC, 0xEC, 0xFC, 0xDC, 0xCC, 0x00, + 0x3C, 0x6C, 0x6C, 0x3E, 0x00, 0x7E, 0x00, 0x00, + 0x38, 0x6C, 0x6C, 0x38, 0x00, 0x7C, 0x00, 0x00, + 0x18, 0x00, 0x18, 0x18, 0x30, 0x66, 0x3C, 0x00, + 0x00, 0x00, 0x00, 0xFC, 0xC0, 0xC0, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xFC, 0x0C, 0x0C, 0x00, 0x00, + 0xC6, 0xCC, 0xD8, 0x36, 0x6B, 0xC2, 0x84, 0x0F, + 0xC3, 0xC6, 0xCC, 0xDB, 0x37, 0x6D, 0xCF, 0x03, + 0x18, 0x00, 0x18, 0x18, 0x3C, 0x3C, 0x18, 0x00, + 0x00, 0x33, 0x66, 0xCC, 0x66, 0x33, 0x00, 0x00, + 0x00, 0xCC, 0x66, 0x33, 0x66, 0xCC, 0x00, 0x00, + 0x22, 0x88, 0x22, 0x88, 0x22, 0x88, 0x22, 0x88, + 0x55, 0xAA, 0x55, 0xAA, 0x55, 0xAA, 0x55, 0xAA, + 0xDB, 0xF6, 0xDB, 0x6F, 0xDB, 0x7E, 0xD7, 0xED, + 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, + 0x18, 0x18, 0x18, 0x18, 0xF8, 0x18, 0x18, 0x18, + 0x18, 0x18, 0xF8, 0x18, 0xF8, 0x18, 0x18, 0x18, + 0x36, 0x36, 0x36, 0x36, 0xF6, 0x36, 0x36, 0x36, + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x36, 0x36, 0x36, + 0x00, 0x00, 0xF8, 0x18, 0xF8, 0x18, 0x18, 0x18, + 0x36, 0x36, 0xF6, 0x06, 0xF6, 0x36, 0x36, 0x36, + 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, + 0x00, 0x00, 0xFE, 0x06, 0xF6, 0x36, 0x36, 0x36, + 0x36, 0x36, 0xF6, 0x06, 0xFE, 0x00, 0x00, 0x00, + 0x36, 0x36, 0x36, 0x36, 0xFE, 0x00, 0x00, 0x00, + 0x18, 0x18, 0xF8, 0x18, 0xF8, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xF8, 0x18, 0x18, 0x18, + 0x18, 0x18, 0x18, 0x18, 0x1F, 0x00, 0x00, 0x00, + 0x18, 0x18, 0x18, 0x18, 0xFF, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xFF, 0x18, 0x18, 0x18, + 0x18, 0x18, 0x18, 0x18, 0x1F, 0x18, 0x18, 0x18, + 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, + 0x18, 0x18, 0x18, 0x18, 0xFF, 0x18, 0x18, 0x18, + 0x18, 0x18, 0x1F, 0x18, 0x1F, 0x18, 0x18, 0x18, + 0x36, 0x36, 0x36, 0x36, 0x37, 0x36, 0x36, 0x36, + 0x36, 0x36, 0x37, 0x30, 0x3F, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x3F, 0x30, 0x37, 0x36, 0x36, 0x36, + 0x36, 0x36, 0xF7, 0x00, 0xFF, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xFF, 0x00, 0xF7, 0x36, 0x36, 0x36, + 0x36, 0x36, 0x37, 0x30, 0x37, 0x36, 0x36, 0x36, + 0x00, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0x00, 0x00, + 0x36, 0x36, 0xF7, 0x00, 0xF7, 0x36, 0x36, 0x36, + 0x18, 0x18, 0xFF, 0x00, 0xFF, 0x00, 0x00, 0x00, + 0x36, 0x36, 0x36, 0x36, 0xFF, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xFF, 0x00, 0xFF, 0x18, 0x18, 0x18, + 0x00, 0x00, 0x00, 0x00, 0xFF, 0x36, 0x36, 0x36, + 0x36, 0x36, 0x36, 0x36, 0x3F, 0x00, 0x00, 0x00, + 0x18, 0x18, 0x1F, 0x18, 0x1F, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x1F, 0x18, 0x1F, 0x18, 0x18, 0x18, + 0x00, 0x00, 0x00, 0x00, 0x3F, 0x36, 0x36, 0x36, + 0x36, 0x36, 0x36, 0x36, 0xFF, 0x36, 0x36, 0x36, + 0x18, 0x18, 0xFF, 0x18, 0xFF, 0x18, 0x18, 0x18, + 0x18, 0x18, 0x18, 0x18, 0xF8, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x1F, 0x18, 0x18, 0x18, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, + 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, + 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, + 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x76, 0xDC, 0xC8, 0xDC, 0x76, 0x00, + 0x00, 0x78, 0xCC, 0xF8, 0xCC, 0xF8, 0xC0, 0xC0, + 0x00, 0xFC, 0xCC, 0xC0, 0xC0, 0xC0, 0xC0, 0x00, + 0x00, 0x00, 0xFE, 0x6C, 0x6C, 0x6C, 0x6C, 0x00, + 0xFC, 0xCC, 0x60, 0x30, 0x60, 0xCC, 0xFC, 0x00, + 0x00, 0x00, 0x7E, 0xD8, 0xD8, 0xD8, 0x70, 0x00, + 0x00, 0x66, 0x66, 0x66, 0x66, 0x7C, 0x60, 0xC0, + 0x00, 0x76, 0xDC, 0x18, 0x18, 0x18, 0x18, 0x00, + 0xFC, 0x30, 0x78, 0xCC, 0xCC, 0x78, 0x30, 0xFC, + 0x38, 0x6C, 0xC6, 0xFE, 0xC6, 0x6C, 0x38, 0x00, + 0x38, 0x6C, 0xC6, 0xC6, 0x6C, 0x6C, 0xEE, 0x00, + 0x1C, 0x30, 0x18, 0x7C, 0xCC, 0xCC, 0x78, 0x00, + 0x00, 0x00, 0x7E, 0xDB, 0xDB, 0x7E, 0x00, 0x00, + 0x06, 0x0C, 0x7E, 0xDB, 0xDB, 0x7E, 0x60, 0xC0, + 0x38, 0x60, 0xC0, 0xF8, 0xC0, 0x60, 0x38, 0x00, + 0x78, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0x00, + 0x00, 0x7E, 0x00, 0x7E, 0x00, 0x7E, 0x00, 0x00, + 0x18, 0x18, 0x7E, 0x18, 0x18, 0x00, 0x7E, 0x00, + 0x60, 0x30, 0x18, 0x30, 0x60, 0x00, 0xFC, 0x00, + 0x18, 0x30, 0x60, 0x30, 0x18, 0x00, 0xFC, 0x00, + 0x0E, 0x1B, 0x1B, 0x18, 0x18, 0x18, 0x18, 0x18, + 0x18, 0x18, 0x18, 0x18, 0x18, 0xD8, 0xD8, 0x70, + 0x18, 0x18, 0x00, 0x7E, 0x00, 0x18, 0x18, 0x00, + 0x00, 0x76, 0xDC, 0x00, 0x76, 0xDC, 0x00, 0x00, + 0x38, 0x6C, 0x6C, 0x38, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, + 0x0F, 0x0C, 0x0C, 0x0C, 0xEC, 0x6C, 0x3C, 0x1C, + 0x58, 0x6C, 0x6C, 0x6C, 0x6C, 0x00, 0x00, 0x00, + 0x70, 0x98, 0x30, 0x60, 0xF8, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x3C, 0x3C, 0x3C, 0x3C, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +}; + +static CONST UCHAR Font8x16[VGA_FONT_CHARACTERS * 16] = +{ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x7E, 0x81, 0xA5, 0x81, 0x81, 0xBD, + 0x99, 0x81, 0x81, 0x7E, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x7C, 0xFE, 0xFE, 0xD6, 0xFE, 0xFE, + 0xBA, 0xC6, 0xFE, 0x7C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x6C, 0xEE, 0xFE, 0xFE, 0xFE, + 0xFE, 0x7C, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x10, 0x38, 0x7C, 0xFE, 0x7C, + 0x38, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x10, 0x38, 0x38, 0x10, 0x6C, + 0xEE, 0x6C, 0x10, 0x38, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x10, 0x38, 0x7C, 0x7C, 0xFE, 0xFE, + 0xFE, 0x6C, 0x10, 0x38, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x3C, 0x3C, + 0x3C, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xE7, 0xC3, 0xC3, + 0xC3, 0xE7, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0x00, 0x00, 0x00, 0x00, 0x18, 0x3C, 0x66, 0x66, + 0x66, 0x3C, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xFF, 0xFF, 0xFF, 0xFF, 0xE7, 0xC3, 0x99, 0x99, + 0x99, 0xC3, 0xE7, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0x00, 0x00, 0x1E, 0x0E, 0x1E, 0x36, 0x78, 0xCC, + 0xCC, 0xCC, 0xCC, 0x78, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x3C, 0x66, 0x66, 0x66, 0x3C, 0x18, + 0x7E, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x1E, 0x1A, 0x1E, 0x18, 0x18, 0x18, + 0x18, 0x78, 0xF8, 0x70, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x3E, 0x36, 0x3E, 0x36, 0x36, 0x76, + 0xF6, 0x66, 0x0E, 0x1E, 0x0C, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x18, 0xDB, 0x7E, 0x3C, 0x66, 0x66, + 0x3C, 0x7E, 0xDB, 0x18, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x80, 0xE0, 0xF0, 0xFC, 0xFE, + 0xFC, 0xF0, 0xE0, 0x80, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x02, 0x0E, 0x3E, 0x7E, 0xFE, + 0x7E, 0x3E, 0x0E, 0x02, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x18, 0x3C, 0x7E, 0x18, 0x18, 0x18, + 0x18, 0x7E, 0x3C, 0x18, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, + 0x66, 0x00, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x7F, 0xDB, 0xDB, 0xDB, 0xDB, 0x7B, + 0x1B, 0x1B, 0x1B, 0x1B, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x7C, 0xC6, 0xC6, 0x60, 0x7C, 0xF6, + 0xDE, 0x7C, 0x0C, 0xC6, 0xC6, 0x7C, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xFE, 0xFE, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x18, 0x3C, 0x7E, 0x18, 0x18, 0x18, + 0x7E, 0x3C, 0x18, 0x7E, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x18, 0x3C, 0x7E, 0x18, 0x18, 0x18, + 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, + 0x18, 0x7E, 0x3C, 0x18, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x0E, 0xFF, + 0x0E, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x70, 0xFE, + 0x70, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0xC0, + 0xC0, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x66, 0xFF, + 0x66, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x10, 0x38, 0x38, 0x38, 0x7C, + 0x7C, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xFE, 0xFE, 0x7C, 0x7C, 0x7C, + 0x38, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x18, 0x3C, 0x3C, 0x3C, 0x3C, 0x18, + 0x18, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x36, 0x36, 0x36, 0x36, 0x14, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x6C, 0x6C, 0x6C, 0xFE, 0x6C, 0x6C, + 0xFE, 0x6C, 0x6C, 0x6C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x18, 0x18, 0x7C, 0xC6, 0xC0, 0x78, + 0x3C, 0x06, 0xC6, 0x7C, 0x18, 0x18, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x62, 0x66, 0x0C, + 0x18, 0x30, 0x66, 0xC6, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x38, 0x6C, 0x38, 0x30, 0x76, 0x7E, + 0xCC, 0xCC, 0xCC, 0x76, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x0C, 0x0C, 0x0C, 0x18, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x0C, 0x18, 0x30, 0x30, 0x30, 0x30, + 0x30, 0x30, 0x18, 0x0C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x30, 0x18, 0x0C, 0x0C, 0x0C, 0x0C, + 0x0C, 0x0C, 0x18, 0x30, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x6C, 0x38, 0xFE, + 0x38, 0x6C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x7E, + 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x0C, 0x0C, 0x0C, 0x18, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFE, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x02, 0x06, 0x0C, 0x18, + 0x30, 0x60, 0xC0, 0x80, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x7C, 0xC6, 0xC6, 0xCE, 0xDE, 0xF6, + 0xE6, 0xC6, 0xC6, 0x7C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x18, 0x78, 0x18, 0x18, 0x18, 0x18, + 0x18, 0x18, 0x18, 0x7E, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x7C, 0xC6, 0xC6, 0x06, 0x0C, 0x18, + 0x30, 0x60, 0xC6, 0xFE, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x7C, 0xC6, 0x06, 0x06, 0x3C, 0x06, + 0x06, 0x06, 0xC6, 0x7C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x0C, 0x1C, 0x3C, 0x6C, 0xCC, 0xCC, + 0xFE, 0x0C, 0x0C, 0x1E, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xFE, 0xC0, 0xC0, 0xC0, 0xFC, 0x06, + 0x06, 0x06, 0xC6, 0x7C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x7C, 0xC6, 0xC0, 0xC0, 0xFC, 0xC6, + 0xC6, 0xC6, 0xC6, 0x7C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xFE, 0xC6, 0x06, 0x0C, 0x18, 0x30, + 0x30, 0x30, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x7C, 0xC6, 0xC6, 0xC6, 0x7C, 0xC6, + 0xC6, 0xC6, 0xC6, 0x7C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x7C, 0xC6, 0xC6, 0xC6, 0xC6, 0x7E, + 0x06, 0x06, 0xC6, 0x7C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x0C, 0x00, + 0x00, 0x0C, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x0C, 0x00, + 0x00, 0x0C, 0x0C, 0x0C, 0x18, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x0C, 0x18, 0x30, 0x60, 0xC0, + 0x60, 0x30, 0x18, 0x0C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFE, 0x00, + 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x60, 0x30, 0x18, 0x0C, 0x06, + 0x0C, 0x18, 0x30, 0x60, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x7C, 0xC6, 0xC6, 0x0C, 0x18, 0x18, + 0x18, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x7C, 0xC6, 0xC6, 0xC6, 0xDE, 0xDE, + 0xDE, 0xDC, 0xC0, 0x7E, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x38, 0x6C, 0xC6, 0xC6, 0xC6, 0xFE, + 0xC6, 0xC6, 0xC6, 0xC6, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xFC, 0x66, 0x66, 0x66, 0x7C, 0x66, + 0x66, 0x66, 0x66, 0xFC, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x3C, 0x66, 0xC2, 0xC0, 0xC0, 0xC0, + 0xC0, 0xC2, 0x66, 0x3C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xF8, 0x6C, 0x66, 0x66, 0x66, 0x66, + 0x66, 0x66, 0x6C, 0xF8, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xFE, 0x66, 0x60, 0x64, 0x7C, 0x64, + 0x60, 0x60, 0x66, 0xFE, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xFE, 0x66, 0x60, 0x64, 0x7C, 0x64, + 0x60, 0x60, 0x60, 0xF0, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x7C, 0xC6, 0xC6, 0xC0, 0xC0, 0xC0, + 0xCE, 0xC6, 0xC6, 0x7C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xC6, 0xC6, 0xC6, 0xC6, 0xFE, 0xC6, + 0xC6, 0xC6, 0xC6, 0xC6, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x3C, 0x18, 0x18, 0x18, 0x18, 0x18, + 0x18, 0x18, 0x18, 0x3C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x3C, 0x18, 0x18, 0x18, 0x18, 0x18, + 0x18, 0xD8, 0xD8, 0x70, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xC6, 0xC6, 0xCC, 0xD8, 0xF0, 0xF0, + 0xD8, 0xCC, 0xC6, 0xC6, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xF0, 0x60, 0x60, 0x60, 0x60, 0x60, + 0x60, 0x62, 0x66, 0xFE, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xC6, 0xC6, 0xEE, 0xEE, 0xFE, 0xD6, + 0xD6, 0xD6, 0xC6, 0xC6, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xC6, 0xC6, 0xE6, 0xE6, 0xF6, 0xDE, + 0xCE, 0xCE, 0xC6, 0xC6, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x7C, 0xC6, 0xC6, 0xC6, 0xC6, 0xC6, + 0xC6, 0xC6, 0xC6, 0x7C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xFC, 0x66, 0x66, 0x66, 0x66, 0x7C, + 0x60, 0x60, 0x60, 0xF0, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x7C, 0xC6, 0xC6, 0xC6, 0xC6, 0xC6, + 0xC6, 0xD6, 0xD6, 0x7C, 0x06, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xFC, 0x66, 0x66, 0x66, 0x7C, 0x78, + 0x6C, 0x66, 0x66, 0xE6, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x7C, 0xC6, 0xC0, 0xC0, 0x70, 0x1C, + 0x06, 0x06, 0xC6, 0x7C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x7E, 0x5A, 0x18, 0x18, 0x18, 0x18, + 0x18, 0x18, 0x18, 0x3C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xC6, 0xC6, 0xC6, 0xC6, 0xC6, 0xC6, + 0xC6, 0xC6, 0xC6, 0x7C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xC6, 0xC6, 0xC6, 0xC6, 0xC6, 0xC6, + 0xC6, 0x6C, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xC6, 0xC6, 0xC6, 0xD6, 0xD6, 0xD6, + 0xFE, 0xEE, 0xC6, 0xC6, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xC6, 0xC6, 0xC6, 0x6C, 0x38, 0x38, + 0x6C, 0xC6, 0xC6, 0xC6, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3C, + 0x18, 0x18, 0x18, 0x3C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xFE, 0xC6, 0x86, 0x0C, 0x18, 0x30, + 0x60, 0xC2, 0xC6, 0xFE, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x7C, 0x60, 0x60, 0x60, 0x60, 0x60, + 0x60, 0x60, 0x60, 0x7C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x80, 0xC0, 0x60, 0x30, + 0x18, 0x0C, 0x06, 0x02, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x7C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, + 0x0C, 0x0C, 0x0C, 0x7C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x10, 0x38, 0x6C, 0xC6, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, + 0x00, 0x18, 0x18, 0x18, 0x0C, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x0C, 0x7C, + 0xCC, 0xCC, 0xDC, 0x76, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xE0, 0x60, 0x60, 0x7C, 0x66, 0x66, + 0x66, 0x66, 0x66, 0xFC, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x7C, 0xC6, 0xC0, + 0xC0, 0xC0, 0xC6, 0x7C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x1C, 0x0C, 0x0C, 0x7C, 0xCC, 0xCC, + 0xCC, 0xCC, 0xCC, 0x7E, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x7C, 0xC6, 0xC6, + 0xFE, 0xC0, 0xC6, 0x7C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x1C, 0x36, 0x30, 0x30, 0xFC, 0x30, + 0x30, 0x30, 0x30, 0x78, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xCE, 0xC6, + 0xC6, 0xCE, 0x76, 0x06, 0xC6, 0x7C, 0x00, 0x00, + 0x00, 0x00, 0xE0, 0x60, 0x60, 0x7C, 0x66, 0x66, + 0x66, 0x66, 0x66, 0xE6, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x18, 0x18, 0x00, 0x38, 0x18, 0x18, + 0x18, 0x18, 0x18, 0x3C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x0C, 0x0C, 0x00, 0x1C, 0x0C, 0x0C, + 0x0C, 0x0C, 0x0C, 0xCC, 0xCC, 0x78, 0x00, 0x00, + 0x00, 0x00, 0xE0, 0x60, 0x60, 0x66, 0x66, 0x6C, + 0x78, 0x6C, 0x66, 0xE6, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, + 0x18, 0x18, 0x18, 0x1C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xFE, 0xD6, + 0xD6, 0xC6, 0xC6, 0xC6, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0xDC, 0x66, 0x66, + 0x66, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x7C, 0xC6, 0xC6, + 0xC6, 0xC6, 0xC6, 0x7C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0xDC, 0x66, 0x66, + 0x66, 0x66, 0x7C, 0x60, 0x60, 0xF0, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xCC, 0xCC, + 0xCC, 0xCC, 0x7C, 0x0C, 0x0C, 0x1E, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0xDC, 0x66, 0x60, + 0x60, 0x60, 0x60, 0xF0, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x7C, 0xC6, 0xC0, + 0x7C, 0x06, 0xC6, 0x7C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x30, 0x30, 0x30, 0xFC, 0x30, 0x30, + 0x30, 0x30, 0x36, 0x1C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0xCC, 0xCC, 0xCC, + 0xCC, 0xCC, 0xCC, 0x76, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0xC6, 0xC6, 0xC6, + 0xC6, 0x6C, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0xC6, 0xC6, 0xD6, + 0xD6, 0xD6, 0xFE, 0x6C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0xC6, 0xC6, 0x6C, + 0x38, 0x6C, 0xC6, 0xC6, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0xC6, 0xC6, 0xC6, + 0xC6, 0xCE, 0x76, 0x06, 0xC6, 0x7C, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0xFE, 0x86, 0x0C, + 0x18, 0x30, 0x62, 0xFE, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x0E, 0x18, 0x18, 0x18, 0x70, 0x18, + 0x18, 0x18, 0x18, 0x0E, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x00, 0x18, + 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x70, 0x18, 0x18, 0x18, 0x0E, 0x18, + 0x18, 0x18, 0x18, 0x70, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x76, 0xDC, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x38, + 0x6C, 0x6C, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x3C, 0x66, 0xC0, 0xC0, 0xC0, 0xC6, + 0x66, 0x3C, 0x18, 0x0C, 0xCC, 0x38, 0x00, 0x00, + 0x00, 0x00, 0xC6, 0x00, 0x00, 0xC6, 0xC6, 0xC6, + 0xC6, 0xC6, 0xCE, 0x76, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x0C, 0x18, 0x30, 0x00, 0x7C, 0xC6, 0xC6, + 0xFE, 0xC0, 0xC6, 0x7C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x30, 0x78, 0xCC, 0x00, 0x78, 0x0C, 0x7C, + 0xCC, 0xCC, 0xDC, 0x76, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xCC, 0x00, 0x00, 0x78, 0x0C, 0x7C, + 0xCC, 0xCC, 0xDC, 0x76, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x60, 0x30, 0x18, 0x00, 0x78, 0x0C, 0x7C, + 0xCC, 0xCC, 0xDC, 0x76, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x38, 0x6C, 0x38, 0x00, 0x78, 0x0C, 0x7C, + 0xCC, 0xCC, 0xDC, 0x76, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x7C, 0xC6, 0xC0, 0xC0, + 0xC6, 0x7C, 0x18, 0x0C, 0x6C, 0x38, 0x00, 0x00, + 0x00, 0x30, 0x78, 0xCC, 0x00, 0x7C, 0xC6, 0xC6, + 0xFE, 0xC0, 0xC6, 0x7C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xCC, 0x00, 0x00, 0x7C, 0xC6, 0xC6, + 0xFE, 0xC0, 0xC6, 0x7C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x30, 0x18, 0x0C, 0x00, 0x7C, 0xC6, 0xC6, + 0xFE, 0xC0, 0xC6, 0x7C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x66, 0x00, 0x00, 0x38, 0x18, 0x18, + 0x18, 0x18, 0x18, 0x3C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x18, 0x3C, 0x66, 0x00, 0x38, 0x18, 0x18, + 0x18, 0x18, 0x18, 0x3C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x18, 0x18, + 0x18, 0x18, 0x18, 0x3C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0xC6, 0x00, 0x38, 0x6C, 0xC6, 0xC6, 0xC6, + 0xFE, 0xC6, 0xC6, 0xC6, 0x00, 0x00, 0x00, 0x00, + 0x38, 0x6C, 0x38, 0x00, 0x38, 0x6C, 0xC6, 0xC6, + 0xFE, 0xC6, 0xC6, 0xC6, 0x00, 0x00, 0x00, 0x00, + 0x0C, 0x18, 0x30, 0x00, 0xFE, 0x60, 0x60, 0x7C, + 0x60, 0x60, 0x60, 0xFE, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x66, 0xDB, 0x1B, 0x7F, + 0xD8, 0xD8, 0xDF, 0x76, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x7E, 0xD8, 0xD8, 0xD8, 0xD8, 0xFE, + 0xD8, 0xD8, 0xD8, 0xDE, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x30, 0x78, 0xCC, 0x00, 0x7C, 0xC6, 0xC6, + 0xC6, 0xC6, 0xC6, 0x7C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xC6, 0x00, 0x00, 0x7C, 0xC6, 0xC6, + 0xC6, 0xC6, 0xC6, 0x7C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x30, 0x18, 0x0C, 0x00, 0x7C, 0xC6, 0xC6, + 0xC6, 0xC6, 0xC6, 0x7C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x30, 0x78, 0xCC, 0x00, 0xC6, 0xC6, 0xC6, + 0xC6, 0xC6, 0xCE, 0x76, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x60, 0x30, 0x18, 0x00, 0xC6, 0xC6, 0xC6, + 0xC6, 0xC6, 0xCE, 0x76, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x18, 0x00, 0x3C, 0x18, 0x18, 0x18, 0x18, + 0x18, 0x18, 0x18, 0x3C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0xC6, 0x00, 0x7C, 0xC6, 0xC6, 0xC6, 0xC6, + 0xC6, 0xC6, 0xC6, 0x7C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0xC6, 0x00, 0xC6, 0xC6, 0xC6, 0xC6, 0xC6, + 0xC6, 0xC6, 0xC6, 0x7C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x18, 0x18, 0x7C, 0xC6, 0xC0, 0xC0, + 0xC6, 0x7C, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x38, 0x6C, 0x60, 0x60, 0xF0, 0x60, 0x60, + 0x60, 0x66, 0xF6, 0x6C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x66, 0x66, 0x66, 0x66, 0x3C, 0x18, 0x7E, + 0x18, 0x3C, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x3E, 0x63, 0x63, 0x30, 0x1C, 0x06, + 0x63, 0x63, 0x3E, 0x00, 0x1C, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x63, 0x38, + 0x0E, 0x63, 0x3E, 0x00, 0x1C, 0x00, 0x00, 0x00, + 0x00, 0x0C, 0x18, 0x30, 0x00, 0x78, 0x0C, 0x7C, + 0xCC, 0xCC, 0xDC, 0x76, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x0C, 0x18, 0x30, 0x00, 0x38, 0x18, 0x18, + 0x18, 0x18, 0x18, 0x3C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x0C, 0x18, 0x30, 0x00, 0x7C, 0xC6, 0xC6, + 0xC6, 0xC6, 0xC6, 0x7C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x18, 0x30, 0x60, 0x00, 0xCC, 0xCC, 0xCC, + 0xCC, 0xCC, 0xDC, 0x76, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x76, 0xDC, 0x00, 0xBC, 0x66, 0x66, + 0x66, 0x66, 0x66, 0xE6, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x76, 0xDC, 0x00, 0xC6, 0xC6, 0xE6, 0xF6, + 0xDE, 0xCE, 0xC6, 0xC6, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x21, 0x1E, 0x00, 0x1E, 0x33, 0x60, 0x60, + 0x67, 0x63, 0x33, 0x1D, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x42, 0x3C, 0x00, 0x3B, 0x66, 0x66, 0x66, + 0x3E, 0x06, 0x66, 0x3C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x30, 0x30, 0x00, 0x30, 0x30, 0x30, + 0x60, 0xC6, 0xC6, 0x7C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7E, + 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7E, + 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x60, 0x60, 0x62, 0x66, 0x6C, 0x18, 0x30, + 0x60, 0xDC, 0x36, 0x0C, 0x18, 0x3E, 0x00, 0x00, + 0x00, 0x60, 0x60, 0x62, 0x66, 0x6C, 0x18, 0x36, + 0x6E, 0xDE, 0x36, 0x7E, 0x06, 0x06, 0x00, 0x00, + 0x00, 0x00, 0x18, 0x18, 0x00, 0x18, 0x18, 0x3C, + 0x3C, 0x3C, 0x3C, 0x18, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x6C, 0xD8, + 0x6C, 0x36, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0xD8, 0x6C, 0x36, + 0x6C, 0xD8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x11, 0x44, 0x11, 0x44, 0x11, 0x44, 0x11, 0x44, + 0x11, 0x44, 0x11, 0x44, 0x11, 0x44, 0x11, 0x44, + 0xAA, 0x55, 0xAA, 0x55, 0xAA, 0x55, 0xAA, 0x55, + 0xAA, 0x55, 0xAA, 0x55, 0xAA, 0x55, 0xAA, 0x55, + 0xDD, 0x77, 0xDD, 0x77, 0xDD, 0x77, 0xDD, 0x77, + 0xDD, 0x77, 0xDD, 0x77, 0xDD, 0x77, 0xDD, 0x77, + 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, + 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, + 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xF8, + 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, + 0x18, 0x18, 0x18, 0x18, 0x18, 0xF8, 0x18, 0xF8, + 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, + 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0xF6, + 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFE, + 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, + 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8, 0x18, 0xF8, + 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, + 0x36, 0x36, 0x36, 0x36, 0x36, 0xF6, 0x06, 0xF6, + 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, + 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, + 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, + 0x00, 0x00, 0x00, 0x00, 0x00, 0xFE, 0x06, 0xF6, + 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, + 0x36, 0x36, 0x36, 0x36, 0x36, 0xF6, 0x06, 0xFE, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0xFE, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x18, 0x18, 0x18, 0x18, 0x18, 0xF8, 0x18, 0xF8, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8, + 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, + 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1F, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xFF, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, + 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, + 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1F, + 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xFF, + 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, + 0x18, 0x18, 0x18, 0x18, 0x18, 0x1F, 0x18, 0x1F, + 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, + 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x37, + 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, + 0x36, 0x36, 0x36, 0x36, 0x36, 0x37, 0x30, 0x3F, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x30, 0x37, + 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, + 0x36, 0x36, 0x36, 0x36, 0x36, 0xF7, 0x00, 0xFF, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0xF7, + 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, + 0x36, 0x36, 0x36, 0x36, 0x36, 0x37, 0x30, 0x37, + 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, + 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x36, 0x36, 0x36, 0x36, 0x36, 0xF7, 0x00, 0xF7, + 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, + 0x18, 0x18, 0x18, 0x18, 0x18, 0xFF, 0x00, 0xFF, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0xFF, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, + 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, + 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, + 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x3F, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x18, 0x18, 0x18, 0x18, 0x18, 0x1F, 0x18, 0x1F, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x18, 0x1F, + 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, + 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, + 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0xFF, + 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, + 0x18, 0x18, 0x18, 0x18, 0x18, 0xFF, 0x18, 0xFF, + 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, + 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xF8, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1F, + 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, + 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, + 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, + 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x76, 0xDC, 0xD8, 0xD8, + 0xD8, 0xD8, 0xDC, 0x76, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x78, 0xCC, 0xCC, 0xD8, 0xFC, 0xC6, + 0xC6, 0xC6, 0xC6, 0xCC, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xFE, 0x66, 0x62, 0x60, 0x60, 0x60, + 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0xFE, 0x6C, 0x6C, + 0x6C, 0x6C, 0x6C, 0x6C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xFE, 0xC6, 0x62, 0x30, 0x18, 0x18, + 0x30, 0x62, 0xC6, 0xFE, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x7E, 0xD8, 0xCC, + 0xCC, 0xCC, 0xD8, 0x70, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0x66, 0x66, + 0x66, 0x7C, 0x60, 0xC0, 0x80, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xDC, 0x18, + 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xFE, 0x38, 0x38, 0x6C, 0xC6, 0xC6, + 0x6C, 0x38, 0x38, 0xFE, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x38, 0x6C, 0xC6, 0xC6, 0xFE, + 0xC6, 0xC6, 0x6C, 0x38, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x38, 0x6C, 0xC6, 0xC6, 0xC6, 0xC6, + 0x6C, 0x6C, 0x6C, 0xEE, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x3E, 0x60, 0x60, 0x3C, 0x66, 0xC6, + 0xC6, 0xC6, 0xCC, 0x78, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x7E, 0xDB, 0xDB, + 0xDB, 0x7E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x02, 0x06, 0x7C, 0xCE, 0xDE, 0xF6, + 0xF6, 0x7C, 0x60, 0xC0, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x1C, 0x30, 0x60, 0x60, 0x7C, + 0x60, 0x60, 0x30, 0x1C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x7C, 0xC6, 0xC6, 0xC6, 0xC6, 0xC6, + 0xC6, 0xC6, 0xC6, 0xC6, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x00, 0x00, 0xFE, + 0x00, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x7E, 0x18, + 0x18, 0x00, 0x00, 0x7E, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x30, 0x18, 0x0C, 0x06, 0x0C, 0x18, + 0x30, 0x00, 0x00, 0x7E, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x0C, 0x18, 0x30, 0x60, 0x30, 0x18, + 0x0C, 0x00, 0x00, 0x7E, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x0C, 0x1E, 0x1A, 0x18, + 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, + 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, + 0x18, 0x18, 0x58, 0x78, 0x30, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x7E, + 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xDC, + 0x00, 0x76, 0xDC, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x78, 0xCC, 0xCC, 0x78, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, + 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x1F, 0x18, 0x18, 0x18, 0x18, 0x18, + 0xD8, 0xD8, 0x78, 0x38, 0x18, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xD8, 0x6C, 0x6C, 0x6C, 0x6C, 0x6C, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x70, 0xD8, 0x18, 0x30, 0x60, 0xF8, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x7E, 0x7E, + 0x7E, 0x7E, 0x7E, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +}; + /* PRIVATE FUNCTIONS **********************************************************/ static VOID VidBiosReadWindow(LPWORD Buffer, SMALL_RECT Rectangle, BYTE Page) @@ -1631,6 +2407,42 @@ break; } + /* Font Control */ + case 0x11: + { + switch (getAL()) + { + case 0x30: + { + USHORT Offsets[] = + { + FONT_8x8_HIGH_OFFSET, /* 00h - INT 0x1F pointer */ + 0, /* 01h - NOT IMPLEMENTED - INT 0x43 pointer */ + 0, /* 02h - NOT IMPLEMENTED - 8x14 font */ + FONT_8x8_OFFSET, /* 03h - 8x8 font */ + FONT_8x8_HIGH_OFFSET, /* 04h - 8x8 font, upper half */ + 0, /* 05h - NOT IMPLEMENTED - 9x14 font */ + FONT_8x16_OFFSET, /* 06h - 8x16 font */ + 0, /* 07h - NOT IMPLEMENTED - 9x16 font */ + }; + + /* Return the data */ + setES(VIDEO_BIOS_DATA_SEG); + setBP(Offsets[getBH() & 7]); + + break; + } + + default: + { + DPRINT1("BIOS Font Control Sub-command AL = 0x%02X NOT IMPLEMENTED\n", + getAL()); + } + } + + break; + } + /* Alternate Function Select */ case 0x12: { @@ -1702,15 +2514,25 @@ Attached = FALSE; } - BOOLEAN VidBiosInitialize(VOID) { /* Some interrupts are in fact addresses to tables */ ((PULONG)BaseAddress)[0x1D] = (ULONG)NULL; - ((PULONG)BaseAddress)[0x1F] = (ULONG)NULL; + ((PULONG)BaseAddress)[0x1F] = MAKELONG(FONT_8x8_HIGH_OFFSET, VIDEO_BIOS_DATA_SEG); // ((PULONG)BaseAddress)[0x42] = (ULONG)NULL; ((PULONG)BaseAddress)[0x43] = (ULONG)NULL; ((PULONG)BaseAddress)[0x44] = (ULONG)NULL; + + /* Fill the tables */ + RtlMoveMemory(SEG_OFF_TO_PTR(VIDEO_BIOS_DATA_SEG, FONT_8x8_OFFSET), + Font8x8, + sizeof(Font8x8)); + RtlMoveMemory(SEG_OFF_TO_PTR(VIDEO_BIOS_DATA_SEG, FONT_8x16_OFFSET), + Font8x16, + sizeof(Font8x16)); + + /* Write the default font to the VGA font plane */ + VgaWriteFont(0, Font8x16, 16); /* Initialize the VGA BDA data */ Bda->VGAOptions = 0x30; /* 256 KB Video RAM */ Modified: trunk/reactos/subsystems/ntvdm/bios/vidbios.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/vidb… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/vidbios.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/vidbios.h [iso-8859-1] Thu Oct 2 23:50:35 2014 @@ -26,6 +26,11 @@ #define GRAPHICS_VIDEO_SEG 0xA000 #define TEXT_VIDEO_SEG 0xB800 +#define VIDEO_BIOS_DATA_SEG 0xC000 + +#define FONT_8x8_OFFSET 0x0000 +#define FONT_8x8_HIGH_OFFSET 0x0400 +#define FONT_8x16_OFFSET 0x0800 enum { Modified: trunk/reactos/subsystems/ntvdm/hardware/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/vga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/vga.c [iso-8859-1] Thu Oct 2 23:50:35 2014 @@ -1914,8 +1914,28 @@ PaletteChanged = TRUE; } - - +VOID VgaWriteFont(UINT FontNumber, CONST UCHAR *FontData, UINT Height) +{ + UINT i, j; + PUCHAR FontMemory = (PUCHAR)&VgaMemory[VGA_BANK_SIZE * VGA_FONT_BANK + (FontNumber * VGA_FONT_SIZE)]; + + ASSERT(Height <= VGA_MAX_FONT_HEIGHT); + + for (i = 0 ; i < VGA_FONT_CHARACTERS; i++) + { + /* Write the character */ + for (j = 0; j < Height; j++) + { + FontMemory[i * VGA_MAX_FONT_HEIGHT + j] = FontData[i * Height + j]; + } + + /* Clear the unused part */ + for (j = Height; j < VGA_MAX_FONT_HEIGHT; j++) + { + FontMemory[i * VGA_MAX_FONT_HEIGHT + j] = 0; + } + } +} VOID ScreenEventHandler(PWINDOW_BUFFER_SIZE_RECORD ScreenEvent) { Modified: trunk/reactos/subsystems/ntvdm/hardware/vga.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/vga.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/vga.h [iso-8859-1] Thu Oct 2 23:50:35 2014 @@ -25,6 +25,10 @@ #define VGA_DAC_TO_COLOR(x) (((x) << 2) | ((x) >> 4)) #define VGA_COLOR_TO_DAC(x) ((x) >> 2) #define VGA_INTERLACE_HIGH_BIT (1 << 13) +#define VGA_FONT_BANK 2 +#define VGA_FONT_CHARACTERS 256 +#define VGA_MAX_FONT_HEIGHT 32 +#define VGA_FONT_SIZE (VGA_FONT_CHARACTERS * VGA_MAX_FONT_HEIGHT) /* Register I/O ports */ @@ -259,6 +263,7 @@ COORD VgaGetDisplayResolution(VOID); VOID VgaRefreshDisplay(VOID); VOID VgaHorizontalRetrace(VOID); +VOID VgaWriteFont(UINT FontNumber, CONST UCHAR *FontData, UINT Height); VOID VgaReadMemory(DWORD Address, LPBYTE Buffer, DWORD Size); VOID VgaWriteMemory(DWORD Address, LPBYTE Buffer, DWORD Size); VOID VgaClearMemory(VOID);

10 years, 1 month

[jgardou] 64475: [ADVAPI32] - Reimplement RegEnumValueA on top of RegEnumValueW CORE-8582

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Oct 2 22:03:58 2014 New Revision: 64475 URL: http://svn.reactos.org/svn/reactos?rev=64475&view=rev Log: [ADVAPI32] - Reimplement RegEnumValueA on top of RegEnumValueW CORE-8582 Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Thu Oct 2 22:03:58 2014 @@ -2697,120 +2697,139 @@ * @implemented */ LONG WINAPI -RegEnumValueA(HKEY hKey, - DWORD index, - LPSTR value, - LPDWORD val_count, - LPDWORD reserved, - LPDWORD type, - LPBYTE data, - LPDWORD count) -{ - HANDLE KeyHandle; - NTSTATUS status; - ULONG total_size; - char buffer[256], *buf_ptr = buffer; - KEY_VALUE_FULL_INFORMATION *info = (KEY_VALUE_FULL_INFORMATION *)buffer; - static const int info_size = FIELD_OFFSET( KEY_VALUE_FULL_INFORMATION, Name ); - - //TRACE("(%p,%ld,%p,%p,%p,%p,%p,%p)\n", - // hkey, index, value, val_count, reserved, type, data, count ); - - /* NT only checks count, not val_count */ - if ((data && !count) || reserved) +RegEnumValueA( + _In_ HKEY hKey, + _In_ DWORD dwIndex, + _Out_ LPSTR lpName, + _Inout_ LPDWORD lpcbName, + _Reserved_ LPDWORD lpdwReserved, + _Out_opt_ LPDWORD lpdwType, + _Out_opt_ LPBYTE lpData, + _Out_opt_ LPDWORD lpcbData) +{ + WCHAR* NameBuffer; + DWORD NameBufferSize, NameLength; + LONG ErrorCode; + DWORD LocalType = REG_NONE; + BOOL NameOverflow = FALSE; + + /* Do parameter checks now, once and for all. */ + if ((lpData && !lpcbData) || lpdwReserved) return ERROR_INVALID_PARAMETER; - status = MapDefaultKey(&KeyHandle, hKey); - if (!NT_SUCCESS(status)) - { - return RtlNtStatusToDosError(status); - } - - total_size = info_size + (MAX_PATH + 1) * sizeof(WCHAR); - if (data) total_size += *count; - total_size = min( sizeof(buffer), total_size ); - - status = NtEnumerateValueKey( KeyHandle, index, KeyValueFullInformation, - buffer, total_size, &total_size ); - if (status && (status != STATUS_BUFFER_OVERFLOW) && (status != STATUS_BUFFER_TOO_SMALL)) goto done; - - /* we need to fetch the contents for a string type even if not requested, - * because we need to compute the length of the ASCII string. */ - if (value || data || is_string(info->Type)) - { - /* retry with a dynamically allocated buffer */ - while ((status == STATUS_BUFFER_OVERFLOW) || (status == STATUS_BUFFER_TOO_SMALL)) - { - if (buf_ptr != buffer) HeapFree( GetProcessHeap(), 0, buf_ptr ); - if (!(buf_ptr = HeapAlloc( GetProcessHeap(), 0, total_size ))) - { - status = STATUS_INSUFFICIENT_RESOURCES; - goto done; - } - info = (KEY_VALUE_FULL_INFORMATION *)buf_ptr; - status = NtEnumerateValueKey( KeyHandle, index, KeyValueFullInformation, - buf_ptr, total_size, &total_size ); - } - - if (status) goto done; - - if (is_string(info->Type)) - { - ULONG len; - RtlUnicodeToMultiByteSize( &len, (WCHAR *)(buf_ptr + info->DataOffset), - info->DataLength ); - if (data && len) - { - if (len > *count) status = STATUS_BUFFER_OVERFLOW; - else - { - RtlUnicodeToMultiByteN( (PCHAR)data, len, NULL, (WCHAR *)(buf_ptr + info->DataOffset), - info->DataLength ); - /* if the type is REG_SZ and data is not 0-terminated - * and there is enough space in the buffer NT appends a \0 */ - if (len < *count && data[len-1]) data[len] = 0; - } - } - info->DataLength = len; - } - else if (data) - { - if (info->DataLength > *count) status = STATUS_BUFFER_OVERFLOW; - else memcpy( data, buf_ptr + info->DataOffset, info->DataLength ); - } - - if (value && !status) - { - ULONG len; - - RtlUnicodeToMultiByteSize( &len, info->Name, info->NameLength ); - if (len >= *val_count) - { - status = STATUS_BUFFER_OVERFLOW; - if (*val_count) - { - len = *val_count - 1; - RtlUnicodeToMultiByteN( value, len, NULL, info->Name, info->NameLength ); - value[len] = 0; - } - } - else - { - RtlUnicodeToMultiByteN( value, len, NULL, info->Name, info->NameLength ); - value[len] = 0; - *val_count = len; - } - } - } - else status = STATUS_SUCCESS; - - if (type) *type = info->Type; - if (count) *count = info->DataLength; - - done: - if (buf_ptr != buffer) HeapFree( GetProcessHeap(), 0, buf_ptr ); - ClosePredefKey(KeyHandle); - return RtlNtStatusToDosError(status); + /* Get the size of the buffer we must use for the first call ro RegEnumValueW */ + ErrorCode = RegQueryInfoKeyW( + hKey, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &NameBufferSize, NULL, NULL, NULL); + if (ErrorCode != ERROR_SUCCESS) + return ErrorCode; + + /* Allocate the buffer for the unicode name */ + NameBuffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, NameBufferSize * sizeof(WCHAR)); + if (NameBuffer == NULL) + { + return ERROR_NOT_ENOUGH_MEMORY; + } + + /* + * This code calls RegEnumValueW twice, because we need to know the type of the enumerated value. + * So for the first call, we check if we overflow on the name, as we have no way of knowing if this + * is an overflow on the data or on the name during the the second call. So the first time, we make the + * call with the supplied value. This is merdique, but this is how it is. + */ + NameLength = *lpcbName; + ErrorCode = RegEnumValueW( + hKey, + dwIndex, + NameBuffer, + &NameLength, + NULL, + &LocalType, + NULL, + NULL); + if (ErrorCode != ERROR_SUCCESS) + { + if (ErrorCode == ERROR_MORE_DATA) + NameOverflow = TRUE; + else + goto Exit; + } + + if (is_string(LocalType) && lpcbData) + { + /* We must allocate a buffer to get the unicode data */ + DWORD DataBufferSize = *lpcbData * sizeof(WCHAR); + WCHAR* DataBuffer = NULL; + DWORD DataLength = *lpcbData; + LPSTR DataStr = (LPSTR)lpData; + + if (lpData) + DataBuffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, *lpcbData * sizeof(WCHAR)); + + /* Do the real call */ + ErrorCode = RegEnumValueW( + hKey, + dwIndex, + NameBuffer, + &NameBufferSize, + lpdwReserved, + lpdwType, + (LPBYTE)DataBuffer, + &DataBufferSize); + + *lpcbData = DataBufferSize / sizeof(WCHAR); + + if (ErrorCode != ERROR_SUCCESS) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, DataBuffer); + goto Exit; + } + + /* Copy the data whatever the error code is */ + if (lpData) + { + /* Do the data conversion */ + RtlUnicodeToMultiByteN(DataStr, DataLength, 0, DataBuffer, DataBufferSize); + /* NULL-terminate if there is enough room */ + if ((DataLength > *lpcbData) && (DataStr[*lpcbData - 1] != '\0')) + DataStr[*lpcbData] = '\0'; + } + + RtlFreeHeap(RtlGetProcessHeap(), 0, DataBuffer); + } + else + { + /* No data conversion needed. Do the call with provided buffers */ + ErrorCode = RegEnumValueW( + hKey, + dwIndex, + NameBuffer, + &NameBufferSize, + lpdwReserved, + lpdwType, + lpData, + lpcbData); + + if (ErrorCode != ERROR_SUCCESS) + { + goto Exit; + } + } + + if (NameOverflow) + { + ErrorCode = ERROR_MORE_DATA; + goto Exit; + } + + /* Convert the name string */ + RtlUnicodeToMultiByteN(lpName, *lpcbName, lpcbName, NameBuffer, NameBufferSize * sizeof(WCHAR)); + ((PSTR)lpName)[*lpcbName] = '\0'; + +Exit: + if (NameBuffer) + RtlFreeHeap(RtlGetProcessHeap(), 0, NameBuffer); + + return ErrorCode; }

10 years, 1 month

[aandrejevic] 64474: [NTVDM] Not every handle is a device handle.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Thu Oct 2 21:16:12 2014 New Revision: 64474 URL: http://svn.reactos.org/svn/reactos?rev=64474&view=rev Log: [NTVDM] Not every handle is a device handle. Modified: trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c Modified: trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/dos/dos32… ============================================================================== --- trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Thu Oct 2 21:16:12 2014 @@ -1406,15 +1406,18 @@ { /* Console input */ InfoWord |= 1 << 0; + + /* It is a device */ + InfoWord |= 1 << 7; } else if (Handle == DosSystemFileTable[DOS_OUTPUT_HANDLE].Handle) { /* Console output */ InfoWord |= 1 << 1; - } - - /* It is a device */ - InfoWord |= 1 << 7; + + /* It is a device */ + InfoWord |= 1 << 7; + } /* Return the device information word */ setDX(InfoWord);

10 years, 1 month

[tkreuzer] 64473: [PSDK] - Convert a stray extern into what it was supposed to become.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Oct 2 21:13:03 2014 New Revision: 64473 URL: http://svn.reactos.org/svn/reactos?rev=64473&view=rev Log: [PSDK] - Convert a stray extern into what it was supposed to become. Modified: trunk/reactos/include/psdk/winddi.h Modified: trunk/reactos/include/psdk/winddi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winddi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winddi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winddi.h [iso-8859-1] Thu Oct 2 21:13:03 2014 @@ -4345,7 +4345,7 @@ _In_ HANDLE hLogicalSurface, _In_ SIZEL sizl); typedef FN_DrvAssociateSharedSurface *PFN_DrvAssociateSharedSurface; -extern +extern FN_DrvAssociateSharedSurface DrvAssociateSharedSurface; typedef LONG (APIENTRY FN_DrvSynchronizeRedirectionBitmaps)(

10 years, 1 month

[tkreuzer] 64472: [PSDK] Fix build

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Oct 2 20:13:03 2014 New Revision: 64472 URL: http://svn.reactos.org/svn/reactos?rev=64472&view=rev Log: [PSDK] Fix build Modified: trunk/reactos/include/psdk/winddi.h Modified: trunk/reactos/include/psdk/winddi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winddi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winddi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winddi.h [iso-8859-1] Thu Oct 2 20:13:03 2014 @@ -1187,7 +1187,7 @@ #define BMF_UMPDMEM 0x0080 #if (NTDDI_VERSION >= NTDDI_WIN7) #define BMF_TEMP_ALPHA 0x0100 -#endif /* (NTDDI_VERSION >= NTDDI_WIN7) *( +#endif /* (NTDDI_VERSION >= NTDDI_WIN7) */ #if (NTDDI_VERSION >= NTDDI_WIN8) #define BMF_ACC_NOTIFY 0x8000 #define BMF_RMT_ENTER 0x4000

10 years, 1 month

[tkreuzer] 64471: [PSDK] Add missing definitions to winddi.h

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Oct 2 20:11:24 2014 New Revision: 64471 URL: http://svn.reactos.org/svn/reactos?rev=64471&view=rev Log: [PSDK] Add missing definitions to winddi.h Modified: trunk/reactos/include/psdk/winddi.h trunk/reactos/win32ss/gdi/eng/ldevobj.c trunk/reactos/win32ss/reactx/ntddraw/eng.c Modified: trunk/reactos/include/psdk/winddi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winddi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winddi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winddi.h [iso-8859-1] Thu Oct 2 20:11:24 2014 @@ -29,6 +29,7 @@ #error video.h cannot be included with winddi.h #else +//#include <winapifamily.h> #include <ddrawint.h> #include <d3dnthal.h> #include <specstrings.h> @@ -42,10 +43,62 @@ #endif #if defined(_ENGINE_EXPORT_) -#define ENGAPI + #define ENGAPI #else -#define ENGAPI DECLSPEC_IMPORT + #define ENGAPI DECLSPEC_IMPORT #endif + +#ifndef _NO_DDRAWINT_NO_COM + +#if !defined(EXTERN_C) + #ifdef __cplusplus + #define EXTERN_C extern "C" + #define __EXTERN_C extern "C" + #else + #define EXTERN_C extern + #define __EXTERN_C + #endif +#endif /* !defined(EXTERN_C) */ + +#if !defined(DEFINE_GUID) + #ifdef INITGUID + #define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ + __EXTERN_C const GUID name = { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } + #else /* !INITGUID */ + #define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ + EXTERN_C const GUID FAR name + #endif /* !INITGUID */ +#endif /* !defined(DEFINE_GUID) */ + +#if !defined(DEFINE_GUIDEX) + #define DEFINE_GUIDEX(name) EXTERN_C const CDECL GUID name +#endif /* !defined(DEFINE_GUIDEX) */ + +#if !defined(STATICGUIDOF) + #define STATICGUIDOF(guid) STATIC_##guid +#endif /* !defined(STATICGUIDOF) */ + +#if !defined(GUID_DEFINED) + #define GUID_DEFINED + typedef struct _GUID + { + ULONG Data1; + USHORT Data2; + USHORT Data3; + UCHAR Data4[8]; + } GUID; +#endif /* !defined(GUID_DEFINED) */ + +#if !defined(IsEqualGUID) + #define IsEqualGUID(guid1, guid2) \ + (!memcmp((guid1), (guid2), sizeof(GUID))) +#endif /* !defined(IsEqualGUID) */ + +#ifndef IsEqualIID + #define IsEqualIID IsEqualGUID +#endif /* !defined(IsEqualIID) */ + +#endif /* !_NO_DDRAWINT_NO_COM */ #define DDI_DRIVER_VERSION_NT4 0x00020000 #define DDI_DRIVER_VERSION_SP3 0x00020003 @@ -85,6 +138,9 @@ DECLARE_HANDLE(DHSURF); DECLARE_HANDLE(DHPDEV); DECLARE_HANDLE(HDRVOBJ); +DECLARE_HANDLE(HSEMAPHORE); + +typedef _Return_type_success_(return >= 0) long NTSTATUS; #ifndef _NTDDVDEO_ typedef struct _ENG_EVENT *PEVENT; @@ -108,6 +164,14 @@ #define DN_DEVICE_ORIGIN 2 #define DN_SLEEP_MODE 3 #define DN_DRAWING_BEGIN 4 +#if (NTDDI_VERSION >= NTDDI_WIN8) +#define DN_ASSOCIATE_WINDOW 5 +#define DN_COMPOSITION_CHANGED 6 +#define DN_DRAWING_BEGIN_APIBITMAP 7 +#define DN_SURFOBJ_DESTRUCTION 8 +#endif /* (NTDDI_VERSION >= NTDDI_WIN8) */ + +#define SGI_EXTRASPACE 0 #define DCR_SOLID 0 #define DCR_DRIVER 1 @@ -123,6 +187,10 @@ #define FXTOLFLOOR(x) ((x) >> 4) #define FXTOLCEILING(x) ((x + 0x0F) >> 4) #define FXTOLROUND(x) ((((x) >> 3) + 1) >> 1) + +#define SIZEOFDV(cAxes) (offsetof(DESIGNVECTOR, dvValues) + (cAxes) * sizeof(LONG)) +#define SIZEOFAXIW(cAxes) (offsetof(AXESLISTW, axlAxisInfo) + (cAxes) * sizeof(AXISINFOW)) +#define SIZEOFAXIA(cAxes) (offsetof(AXESLISTA, axlAxisInfo) + (cAxes) * sizeof(AXISINFOA)) typedef struct _POINTE { FLOATL x; @@ -306,6 +374,17 @@ #define GCAPS2_ICD_MULTIMON 0x00000100 #define GCAPS2_MOUSETRAILS 0x00000200 #define GCAPS2_RESERVED1 0x00000400 +#if (NTDDI_VERSION >= NTDDI_VISTA) +#define GCAPS2_EXCLUDELAYERED 0x00000800 +#define GCAPS2_INCLUDEAPIBITMAPS 0x00001000 +#define GCAPS2_SHOWHIDDENPOINTER 0x00002000 +#endif /* (NTDDI_VERSION >= NTDDI_VISTA) */ +#if (NTDDI_VERSION >= NTDDI_WIN7) +#define GCAPS2_CLEARTYPE 0x00004000 +#endif /* (NTDDI_VERSION >= NTDDI_WIN7) */ +#if (NTDDI_VERSION >= NTDDI_WIN8) +#define GCAPS2_ACC_DRIVER 0x00008000 +#endif /* (NTDDI_VERSION >= NTDDI_WIN8) */ typedef struct _DEVINFO { FLONG flGraphicsCaps; @@ -465,8 +544,11 @@ DRVFN *pdrvfn; } DRVENABLEDATA, *PDRVENABLEDATA; -DECLARE_HANDLE(HSEMAPHORE); - +/* Font file status values */ +#define FF_SIGNATURE_VERIFIED 0x00000001L +#define FF_IGNORED_SIGNATURE 0x00000002L + + /* Obsolete in Windows 2000 and later */ typedef struct { DWORD nSize; HDC hdc; @@ -569,6 +651,22 @@ FWORD fwdKern; } FD_KERNINGPAIR; + /* Obsolete in Windows 2000 and later */ +typedef struct _LIGATURE { + ULONG culSize; + LPWSTR pwsz; + ULONG chglyph; + HGLYPH ahglyph[1]; +} LIGATURE, *PLIGATURE; + + /* Obsolete in Windows 2000 and later */ +typedef struct _FD_LIGATURE { + ULONG culThis; + ULONG ulType; + ULONG cLigatures; + LIGATURE alig[1]; +} FD_LIGATURE; + #if defined(_X86_) && !defined(USERMODE_DRIVER) typedef struct _FLOATOBJ { @@ -654,6 +752,11 @@ #define FO_NOCLEARTYPE 0x02000000 #define FO_CLEARTYPE_X 0x10000000 #define FO_CLEARTYPE_Y 0x20000000 +#define FO_CLEARTYPENATURAL_X 0x40000000 + +#define FD_NEGATIVE_FONT 1L /* Obsolete in Windows 2000 and later */ +#define FO_DEVICE_FONT 1L +#define FO_OUTLINE_CAPABLE 2L typedef struct _FONTOBJ { ULONG iUniq; @@ -842,6 +945,9 @@ #define PO_ELLIPSE 0x00000002 #define PO_ALL_INTEGERS 0x00000004 #define PO_ENUM_AS_INTEGERS 0x00000008 +#if (NTDDI_VERSION >= NTDDI_WIN7) +#define PO_WIDENED 0x00000010 +#endif /* (NTDDI_VERSION >= NTDDI_WIN7) */ typedef struct _PATHOBJ { FLONG fl; @@ -932,7 +1038,7 @@ #define FM_INFO_IGNORE_TC_RA_ABLE 0x40000000 #define FM_INFO_TECH_TYPE1 0x80000000 -#define MAXCHARSETS 16 +#define MAXCHARSETS 16 /* Obsolete in Windows 2000 and later */ /* IFIMETRICS.ulPanoseCulture constants */ #define FM_PANOSE_CULTURE_LATIN 0x0 @@ -1079,7 +1185,21 @@ #define BMF_NOTSYSMEM 0x0020 #define BMF_WINDOW_BLT 0x0040 #define BMF_UMPDMEM 0x0080 +#if (NTDDI_VERSION >= NTDDI_WIN7) +#define BMF_TEMP_ALPHA 0x0100 +#endif /* (NTDDI_VERSION >= NTDDI_WIN7) *( +#if (NTDDI_VERSION >= NTDDI_WIN8) +#define BMF_ACC_NOTIFY 0x8000 +#define BMF_RMT_ENTER 0x4000 +#endif /* (NTDDI_VERSION >= NTDDI_WIN8) */ + +#if (NTDDI_VERSION >= NTDDI_WIN8) +#define BMF_RESERVED 0x3E00 +#elif (NTDDI_VERSION >= NTDDI_WIN7) +#define BMF_RESERVED 0xFE00 +#else #define BMF_RESERVED 0xFF00 +#endif typedef struct _SURFOBJ { DHSURF dhsurf; @@ -1237,6 +1357,9 @@ #define FL_ZERO_MEMORY 0x00000001 #define FL_NONPAGED_MEMORY 0x00000002 +#if (NTDDI_VERSION >= NTDDI_WIN7) +#define FL_NON_SESSION 0x00000004 +#endif /* (NTDDI_VERSION >= NTDDI_WIN7) */ #ifdef USERMODE_DRIVER @@ -1244,7 +1367,7 @@ #define EngAllocPrivateUserMem(psl, cj, tag) ((PVOID)GlobalAlloc(GMEM_FIXED, cj)) #define EngAllocUserMem(cj, tag) ((PVOID)GlobalAlloc(GMEM_FIXED, cj)) -#else +#else /* !USERMODE_DRIVER */ _Must_inspect_result_ _When_(fl & FL_ZERO_MEMORY, _Ret_opt_bytecount_(cjMemSize)) @@ -1276,7 +1399,7 @@ _In_ SIZE_T cjMemSize, _In_ ULONG ulTag); -#endif /* USERMODE_DRIVER */ +#endif /* !USERMODE_DRIVER */ ENGAPI BOOL @@ -1350,6 +1473,7 @@ EngClearEvent( _In_ PEVENT pEvent); +_Success_(return != 0) ENGAPI FD_GLYPHSET* APIENTRY @@ -1377,8 +1501,8 @@ _In_ SURFOBJ *psoSrc, _In_opt_ CLIPOBJ *pco, _In_opt_ XLATEOBJ *pxlo, - _In_ RECTL *prclDest, - _In_ POINTL *pptlSrc); + _In_ __in_data_source(USER_MODE) RECTL *prclDest, + _In_ __in_data_source(USER_MODE) POINTL *pptlSrc); ENGAPI HBITMAP @@ -1567,9 +1691,9 @@ EngDeviceIoControl( _In_ HANDLE hDevice, _In_ DWORD dwIoControlCode, - _In_opt_bytecount_(cjInBufferSize) LPVOID lpInBuffer, + _In_reads_bytes_opt_(cjInBufferSize) LPVOID lpInBuffer, _In_ DWORD cjInBufferSize, - _Out_opt_bytecap_(cjOutBufferSize) LPVOID lpOutBuffer, + _Out_writes_bytes_opt_(cjOutBufferSize) LPVOID lpOutBuffer, _In_ DWORD cjOutBufferSize, _Out_ LPDWORD lpBytesReturned); @@ -1587,6 +1711,18 @@ _When_(iMode == DM_MONOCHROME, _Out_writes_bytes_(8)) ULONG *pul); +/* Obsolete in Windows 2000 and later */ +ENGAPI +HRESULT +APIENTRY +EngDxIoctl( + _In_ ULONG ulIoctl, + _Inout_ PVOID pBuffer, + _In_ ULONG ulBufferSize); + +#ifdef USERMODE_DRIVER +#define EngEnumForms EnumForms +#else /* !USERMODE_DRIVER */ ENGAPI BOOL APIENTRY @@ -1597,6 +1733,7 @@ _In_ DWORD cbBuf, _Out_ LPDWORD pcbNeeded, _Out_ LPDWORD pcReturned); +#endif /* !USERMODE_DRIVER */ ENGAPI BOOL @@ -1618,12 +1755,16 @@ _In_ MIX mix, _In_ FLONG flOptions); +#ifdef USERMODE_DRIVER +#define EngFindImageProcAddress(h, procname) ((PVOID) GetProcAddress(h, procname)) +#else /* !USERMODE_DRIVER */ ENGAPI PVOID APIENTRY EngFindImageProcAddress( _In_ HANDLE hModule, _In_ LPSTR lpProcName); +#endif /* !USERMODE_DRIVER */ ENGAPI PVOID @@ -1735,6 +1876,12 @@ _In_ HANDLE h, _Out_ WCHAR (*pDest)[MAX_PATH+1]); +#ifdef USERMODE_DRIVER +#define EngGetForm GetForm +#define EngGetLastError GetLastError +#define EngGetPrinter GetPrinter +#define EngGetPrinterData GetPrinterData +#else /* !USERMODE_DRIVER */ ENGAPI BOOL APIENTRY @@ -1746,14 +1893,10 @@ _In_ DWORD cbBuf, _Out_ LPDWORD pcbNeeded); -#ifdef USERMODE_DRIVER -#define EngGetLastError GetLastError -#else ENGAPI ULONG APIENTRY EngGetLastError(VOID); -#endif ENGAPI BOOL @@ -1775,6 +1918,7 @@ _Out_writes_bytes_opt_(cjSize) LPBYTE pData, _In_ DWORD cjSize, _Out_ LPDWORD pcjNeeded); +#endif /* !USERMODE_DRIVER */ ENGAPI LPWSTR @@ -1782,6 +1926,9 @@ EngGetPrinterDataFileName( _In_ HDEV hdev); +#ifdef USERMODE_DRIVER +#define EngGetPrinterDriver GetPrinterDriver +#else /* !USERMODE_DRIVER */ ENGAPI BOOL APIENTRY @@ -1792,6 +1939,7 @@ _Out_writes_bytes_opt_(cjBufSize) BYTE *lpbDrvInfo, _In_ DWORD cjBufSize, _Out_ DWORD *pcjNeeded); +#endif /* !USERMODE_DRIVER */ ENGAPI HANDLE @@ -1867,11 +2015,15 @@ _In_opt_ RECTL *prclBounds, _In_ MIX mix); +#ifdef USERMODE_DRIVER +#define EngLoadImage(pwszDriver) ((HANDLE)LoadLibraryW(pwszDriver)) +#else /* !USERMODE_DRIVER */ ENGAPI HANDLE APIENTRY EngLoadImage( _In_ LPWSTR pwszDriver); +#endif /* !USERMODE_DRIVER */ ENGAPI HANDLE @@ -1929,6 +2081,7 @@ _In_ ULONG cjSize, _Out_ ULONG_PTR *piFile); +__drv_preferredFunction("EngMapFontFileFD", "Obsolete") ENGAPI BOOL APIENTRY @@ -1961,6 +2114,7 @@ /* EngModifySurface.flSurface constants */ #define MS_NOTSYSTEMMEMORY 0x00000001 #define MS_SHAREDACCESS 0x00000002 +#define MS_CDDDEVICEBITMAP 0x00000004 ENGAPI BOOL @@ -2024,7 +2178,7 @@ _In_ CLIPOBJ *pco, _In_ BRUSHOBJ *pbo, _In_ POINTL *pptlBrushOrg, - _In_ MIX mix); + _In_ __in_data_source(USER_MODE) MIX mix); ENGAPI BOOL @@ -2040,18 +2194,14 @@ _In_ POINTFIX *pptfx, _In_ RECTL *prcl, _When_(psoMsk, _In_) POINTL *pptl, - _In_ ULONG iMode); + _In_ __in_data_source(USER_MODE) ULONG iMode); ENGAPI VOID APIENTRY EngProbeForRead( _In_reads_bytes_(Length) PVOID Address, -#if (NTDDI_VERSION <= NTDDI_WINXP) - _In_ ULONG Length, -#else _In_ SIZE_T Length, -#endif _In_ ULONG Alignment); ENGAPI @@ -2059,11 +2209,7 @@ APIENTRY EngProbeForReadAndWrite( _Inout_updates_bytes_(Length) PVOID Address, -#if (NTDDI_VERSION <= NTDDI_WINXP) - _In_ ULONG Length, -#else _In_ SIZE_T Length, -#endif _In_ ULONG Alignment); typedef enum _ENG_DEVICE_ATTRIBUTE { @@ -2082,6 +2228,13 @@ _Out_writes_bytes_(cjOutSize) PVOID pvOut, _In_ ULONG cjOutSize); +/* Obsolete in Windows 2000 and later */ +DECLSPEC_DEPRECATED_DDK +BOOL APIENTRY +EngQueryEMFInfo( + _In_ HDEV hdev, + _Out_ EMFINFO *pEMFInfo); + ENGAPI LARGE_INTEGER APIENTRY @@ -2125,6 +2278,11 @@ #define QSA_MMX 0x00000100 #define QSA_SSE 0x00002000 #define QSA_3DNOW 0x00004000 +#if (NTDDI_VERSION >= NTDDI_VISTA) +#define QSA_SSE1 QSA_SSE +#define QSA_SSE2 0x00010000 +#define QSA_SSE3 0x00080000 +#endif /* (NTDDI_VERSION >= NTDDI_VISTA) */ _Check_return_ _Success_(return) @@ -2146,6 +2304,8 @@ APIENTRY EngReleaseSemaphore( _In_ HSEMAPHORE hsem); + +#if defined(_M_AMD64) && (NTDDI_VERSION >= NTDDI_VISTA) _Check_return_ _Success_(return) @@ -2157,7 +2317,11 @@ APIENTRY EngRestoreFloatingPointState( _In_reads_(_Inexpressible_(statesize)) - PVOID pBuffer); + PVOID pBuffer) +{ + UNREFERENCED_PARAMETER(pBuffer); + return TRUE; +} _Check_return_ _Success_(((pBuffer != NULL && cjBufferSize != 0) && return == 1) || @@ -2171,7 +2335,41 @@ EngSaveFloatingPointState( _At_(*pBuffer, _Kernel_requires_resource_not_held_(EngFloatState)) _Out_writes_bytes_opt_(cjBufferSize) PVOID pBuffer, + _Inout_ ULONG cjBufferSize) +{ + return ((((pBuffer) == NULL) || ((cjBufferSize) == 0)) ? 8 : TRUE); +} + +#else /* !(defined(_M_AMD64) && (NTDDI_VERSION >= NTDDI_VISTA)) */ + +_Check_return_ +_Success_(return) +_Kernel_float_restored_ +_At_(*pBuffer, _Kernel_requires_resource_held_(EngFloatState) + _Kernel_releases_resource_(EngFloatState)) +ENGAPI +BOOL +APIENTRY +EngRestoreFloatingPointState( + _In_reads_(_Inexpressible_(statesize)) + PVOID pBuffer); + +_Check_return_ +_Success_(((pBuffer != NULL && cjBufferSize != 0) && return == 1) || + ((pBuffer == NULL || cjBufferSize == 0) && return > 0)) +_When_(pBuffer != NULL && cjBufferSize != 0 && return == 1, _Kernel_float_saved_ + _At_(*pBuffer, _Post_valid_ _Kernel_acquires_resource_(EngFloatState))) +_On_failure_(_Post_satisfies_(return == 0)) +ENGAPI +ULONG +APIENTRY +EngSaveFloatingPointState( + _At_(*pBuffer, _Kernel_requires_resource_not_held_(EngFloatState)) + _Out_writes_bytes_opt_(cjBufferSize) PVOID pBuffer, _Inout_ ULONG cjBufferSize); + + +#endif /* defined(_M_AMD64) && (NTDDI_VERSION >= NTDDI_VISTA) */ ENGAPI HANDLE @@ -2188,13 +2386,13 @@ #ifdef USERMODE_DRIVER #define EngSetLastError SetLastError -#else +#else /* !USERMODE_DRIVER */ ENGAPI VOID APIENTRY EngSetLastError( _In_ ULONG iError); -#endif +#endif /* !USERMODE_DRIVER */ ENGAPI ULONG @@ -2211,6 +2409,7 @@ _In_ RECTL *prcl, _In_ FLONG fl); +__drv_preferredFunction("(see documentation)", "Obsolete, always returns false. ") ENGAPI BOOL APIENTRY @@ -2221,6 +2420,9 @@ _Reserved_ XLATEOBJ *pxlo, _In_ FLONG fl); +#ifdef USERMODE_DRIVER +#define EngSetPrinterData SetPrinterData +#else /* !USERMODE_DRIVER */ ENGAPI DWORD APIENTRY @@ -2230,6 +2432,7 @@ _In_ DWORD dwType, _In_reads_bytes_(cjPrinterData) LPBYTE lpbPrinterData, _In_ DWORD cjPrinterData); +#endif /* !USERMODE_DRIVER */ typedef int (CDECL *SORTCOMP)(const void *pv1, const void *pv2); @@ -2288,8 +2491,8 @@ _In_ LINEATTRS *plineattrs, _In_ BRUSHOBJ *pboFill, _In_ POINTL *pptlBrushOrg, - _In_ MIX mixFill, - _In_ FLONG flOptions); + _In_ __in_data_source(USER_MODE) MIX mixFill, + _In_ __in_data_source(USER_MODE) FLONG flOptions); ENGAPI BOOL @@ -2342,11 +2545,15 @@ _In_reads_bytes_(cjUnicodeString) PWSTR pwszUnicodeString, _In_ ULONG cjUnicodeString); +#ifdef USERMODE_DRIVER +#define EngUnloadImage(h) FreeLibrary((HMODULE) (h)) +#else /* !USERMODE_DRIVER */ ENGAPI VOID APIENTRY EngUnloadImage( _In_ HANDLE hModule); +#endif /* !USERMODE_DRIVER */ ENGAPI BOOL @@ -2378,6 +2585,7 @@ EngUnmapFile( _In_ ULONG_PTR iFile); +__drv_preferredFunction("EngUnmapFontFileFD", "Obsolete") ENGAPI VOID APIENTRY @@ -2413,6 +2621,9 @@ _Out_z_bytecap_(cjMultiByteString) LPSTR pszMultiByteString, _In_ INT cjMultiByteString); +#ifdef USERMODE_DRIVER +#define EngWritePrinter WritePrinter +#else /* !USERMODE_DRIVER */ ENGAPI BOOL APIENTRY @@ -2421,6 +2632,7 @@ _In_reads_bytes_(cjBuf) LPVOID pvBuf, _In_ DWORD cjBuf, _Out_ LPDWORD pcWritten); +#endif /* !USERMODE_DRIVER */ #if defined(_X86_) && !defined(USERMODE_DRIVER) ENGAPI @@ -2684,6 +2896,7 @@ _Out_bytecap_(cjSize) FONTINFO *pfi); #if (NTDDI_VERSION <= NTDDI_WINXP) + /* Obsolete in Windows 2000 and later */ GAMMA_TABLES* APIENTRY FONTOBJ_pGetGammaTables( @@ -2892,6 +3105,14 @@ _In_reads_bytes_(cPoints * sizeof(POINTL)) PVOID pvIn, _Out_writes_bytes_(cPoints * sizeof(POINTL)) PVOID pvOut); +/* Obsolete in Windows 2000 and later */ +DECLSPEC_DEPRECATED_DDK +ENGAPI +HANDLE +APIENTRY +XFORMOBJ_cmGetTransform( + XFORMOBJ *pxo); + #if !defined(USERMODE_DRIVER) ENGAPI ULONG @@ -2945,6 +3166,223 @@ XLATEOBJ_piVector( _In_ XLATEOBJ *pxlo); +#if (NTDDI_VERSION >= NTDDI_WINXPSP2) + +ENGAPI +VOID +APIENTRY +EngBugCheckEx( + _In_ ULONG BugCheckCode, + _In_ ULONG_PTR P1, + _In_ ULONG_PTR P2, + _In_ ULONG_PTR P3, + _In_ ULONG_PTR P4); + +#endif /* (NTDDI_VERSION >= NTDDI_WINXPSP2) */ + +#if (NTDDI_VERSION >= NTDDI_VISTA) + +ENGAPI +HANDLE +APIENTRY +EngCreateRectRgn( + _In_ INT left, + _In_ INT top, + _In_ INT right, + _In_ INT bottom); + +ENGAPI +VOID +APIENTRY +EngDeleteRgn( + _In_ HANDLE hrgn); + +ENGAPI +INT +APIENTRY +EngCombineRgn( + _In_ HANDLE hrgnTrg, + _In_ HANDLE hrgnSrc1, + _In_ HANDLE hrgnSrc2, + _In_ INT iMode); + +ENGAPI +INT +APIENTRY +EngCopyRgn( + _In_ HANDLE hrgnDst, + _In_ HANDLE hrgnSrc); + +ENGAPI +INT +APIENTRY +EngIntersectRgn( + _In_ HANDLE hrgnResult, + _In_ HANDLE hRgnA, + _In_ HANDLE hRgnB); + +ENGAPI +INT +APIENTRY +EngSubtractRgn( + _In_ HANDLE hrgnResult, + _In_ HANDLE hRgnA, + _In_ HANDLE hRgnB); + +ENGAPI +INT +APIENTRY +EngUnionRgn( + _In_ HANDLE hrgnResult, + _In_ HANDLE hRgnA, + _In_ HANDLE hRgnB); + +ENGAPI +INT +APIENTRY +EngXorRgn( + _In_ HANDLE hrgnResult, + _In_ HANDLE hRgnA, + _In_ HANDLE hRgnB); + +ENGAPI +BOOL +APIENTRY +EngRectInRgn( + _In_ HANDLE hrgn, + _In_ LPRECT prcl); + +ENGAPI +BOOL +APIENTRY +EngEqualRgn( + _In_ HANDLE hrgn1, + _In_ HANDLE hrgn2); + +ENGAPI +DWORD +APIENTRY +EngGetRgnData( + _In_ HANDLE hrgn, + _In_ DWORD nCount, + _Out_cap_(nCount) LPRGNDATA lpRgnData); + +ENGAPI +BOOL +APIENTRY +EngSetRectRgn( + _In_ HANDLE hrgn, + _In_ INT left, + _In_ INT top, + _In_ INT right, + _In_ INT bottom); + +ENGAPI +INT +APIENTRY +EngGetRgnBox( + _In_ HANDLE hrgn, + _Out_ LPRECT prcl); + +ENGAPI +INT +APIENTRY +EngOffsetRgn( + _In_ HANDLE hrgn, + _In_ INT x, + _In_ INT y); + +ENGAPI +VOID +APIENTRY +EngRenderHint( + _In_ DHPDEV dhpdev, + _In_ ULONG NotifyCode, + _In_ SIZE_T Length, + _In_reads_bytes_opt_(Length) PVOID Data); + +ENGAPI +VOID +APIENTRY +EngAcquireSemaphoreShared( + _In_ HSEMAPHORE hsem); + +ENGAPI +BOOL +APIENTRY +EngAcquireSemaphoreNoWait( + _In_ HSEMAPHORE hsem); + +ENGAPI +BOOL +APIENTRY +EngAcquireSemaphoreSharedNoWait( + _In_ HSEMAPHORE hsem); + +ENGAPI +BOOL +APIENTRY +EngIsSemaphoreSharedByCurrentThread( + _In_ HSEMAPHORE hsem); + +DECLARE_HANDLE(HFASTMUTEX); + +ENGAPI +HFASTMUTEX +APIENTRY +EngCreateFastMutex( + VOID); + +ENGAPI +VOID +APIENTRY +EngDeleteFastMutex( + _In_ HFASTMUTEX hfm); + +ENGAPI +VOID +APIENTRY +EngAcquireFastMutex( + _In_ HFASTMUTEX hfm); + +ENGAPI +VOID +APIENTRY +EngReleaseFastMutex( + _In_ HFASTMUTEX hfm); + +ENGAPI +BOOL +APIENTRY +EngUpdateDeviceSurface( + _In_ SURFOBJ *pso, + _Inout_ CLIPOBJ **ppco); + +#endif /* (NTDDI_VERSION >= NTDDI_VISTA) */ + +#if (NTDDI_VERSION >= NTDDI_WIN7) + +ENGAPI +HBITMAP +APIENTRY +EngCreateRedirectionDeviceBitmap( + __in_data_source(USER_MODE) DHSURF dhsurf, + __in_data_source(USER_MODE) SIZEL sizl, + _In_ ULONG iFormatCompat); + +VOID +APIENTRY +EngCTGetGammaTable( + _In_ ULONG ulGamma, + _Out_ CONST BYTE** pGammaTable, + _Out_ CONST BYTE** pInverseGammaTable); + +ULONG +APIENTRY +EngCTGetCurrentGamma( + _In_ HDEV hdev); + +#endif /* (NTDDI_VERSION >= NTDDI_WIN7) */ /* Graphics Driver Functions */ @@ -3382,7 +3820,6 @@ #define QC_OUTLINES 0x00000001 #define QC_1BIT 0x00000002 #define QC_4BIT 0x00000004 - #define QC_FONTDRIVERCAPS (QC_OUTLINES | QC_1BIT | QC_4BIT) typedef LONG @@ -3578,6 +4015,9 @@ #define SPS_ANIMATESTART 0x00000004L #define SPS_ANIMATEUPDATE 0x00000008L #define SPS_ALPHA 0x00000010L +#define SPS_RESERVED 0x00000020L /* Force s/w cursor rendering */ +#define SPS_RESERVED1 0x00000040L /* Force show/hide system cursor */ +#define SPS_FLAGSMASK 0x000000FFL #define SPS_LENGTHMASK 0x00000F00L #define SPS_FREQMASK 0x000FF000L @@ -3776,6 +4216,192 @@ typedef FN_DrvQuerySpoolType *PFN_DrvQuerySpoolType; extern FN_DrvQuerySpoolType DrvQuerySpoolType; +typedef LONG +(APIENTRY FN_DrvQueryTrueTypeSection)( + ULONG, + ULONG, + ULONG, + HANDLE *, + PTRDIFF *); +typedef FN_DrvQueryTrueTypeSection *PFN_DrvQueryTrueTypeSection; +extern FN_DrvQueryTrueTypeSection DrvQueryTrueTypeSection; + +DECLSPEC_DEPRECATED_DDK +typedef VOID +(APIENTRY FN_DrvMovePanning)( + _In_ LONG x, + _In_ LONG y, + _In_ FLONG fl); +typedef FN_DrvMovePanning *PFN_DrvMovePanning; +extern FN_DrvMovePanning DrvMovePanning; + +#if (NTDDI_VERSION >= NTDDI_VISTA) + +typedef LONG +(APIENTRY FN_DrvRenderHint)( + _In_ DHPDEV dhpdev, + _In_ ULONG NotifyCode, + _In_ SIZE_T Length, + _In_reads_bytes_opt_(Length) PVOID Data); +typedef FN_DrvRenderHint *PFN_DrvRenderHint; +extern FN_DrvRenderHint DrvRenderHint; + +typedef struct _DRH_APIBITMAPDATA +{ + SURFOBJ *pso; + BOOL b; +} DRH_APIBITMAPDATA, *PDRH_APIBITMAPDATA; + +#define DRH_APIBITMAP 0x00000001 + +typedef HANDLE +(APIENTRY FN_EngCreateRectRgn)( + _In_ INT left, + _In_ INT top, + _In_ INT right, + _In_ INT bottom); +typedef FN_EngCreateRectRgn *PFN_EngCreateRectRgn; + +typedef VOID +(APIENTRY FN_EngDeleteRgn)( + HANDLE hrgn); +typedef FN_EngDeleteRgn *PFN_EngDeleteRgn; + +typedef INT +(APIENTRY FN_EngCombineRgn)( + _In_ HANDLE hrgnTrg, + _In_ HANDLE hrgnSrc1, + _In_ HANDLE hrgnSrc2, + _In_ INT iMode); +typedef FN_EngCombineRgn *PFN_EngCombineRgn; + +typedef INT +(APIENTRY FN_EngCopyRgn)( + _In_ HANDLE hrgnDst, + _In_ HANDLE hrgnSrc); +typedef FN_EngCopyRgn *PFN_EngCopyRgn; + +typedef INT +(APIENTRY FN_EngIntersectRgn)( + _In_ HANDLE hrgnResult, + _In_ HANDLE hRgnA, + _In_ HANDLE hRgnB); +typedef FN_EngIntersectRgn *PFN_EngIntersectRgn; + +typedef INT +(APIENTRY FN_EngSubtractRgn)( + _In_ HANDLE hrgnResult, + _In_ HANDLE hRgnA, + _In_ HANDLE hRgnB); +typedef FN_EngSubtractRgn *PFN_EngSubtractRgn; + +typedef INT +(APIENTRY FN_EngUnionRgn)( + _In_ HANDLE hrgnResult, + _In_ HANDLE hRgnA, + _In_ HANDLE hRgnB); +typedef FN_EngUnionRgn *PFN_EngUnionRgn; + +typedef INT +(APIENTRY FN_EngXorRgn)( + _In_ HANDLE hrgnResult, + _In_ HANDLE hRgnA, + _In_ HANDLE hRgnB); +typedef FN_EngXorRgn *PFN_EngXorRgn; + +#endif /* (NTDDI_VERSION >= NTDDI_VISTA) */ + +#if (NTDDI_VERSION >= NTDDI_WIN7) + +/* DrvCreateDeviceBitmapEx() flags */ +#define CDBEX_REDIRECTION 0x00000001 +#define CDBEX_DXINTEROP 0x00000002 + +typedef HBITMAP +(APIENTRY FN_DrvCreateDeviceBitmapEx)( + _In_ DHPDEV dhpdev, + _In_ SIZEL sizl, + _In_ ULONG iFormat, + _In_ DWORD Flags, + _In_ DHSURF dhsurfGroup, + _In_ DWORD DxFormat, +#if (NTDDI_VERSION >= NTDDI_WIN8) + _In_ DWORD SubresourceIndex, +#endif /* (NTDDI_VERSION >= NTDDI_WIN8) */ + _Out_ HANDLE* phSharedSurface); +typedef FN_DrvCreateDeviceBitmapEx *PFN_DrvCreateDeviceBitmapEx; +extern DrvCreateDeviceBitmapEx DrvCreateDeviceBitmapEx + +typedef VOID +(APIENTRY FN_DrvDeleteDeviceBitmapEx)( + _Inout_ DHSURF); +typedef FN_DrvDeleteDeviceBitmapEx *PFN_DrvDeleteDeviceBitmapEx; +extern FN_DrvDeleteDeviceBitmapEx DrvDeleteDeviceBitmapEx; + +typedef BOOL +(APIENTRY FN_DrvAssociateSharedSurface)( + _In_ SURFOBJ* psoSurf, + _In_ HANDLE hPhysicalSurface, + _In_ HANDLE hLogicalSurface, + _In_ SIZEL sizl); +typedef FN_DrvAssociateSharedSurface *PFN_DrvAssociateSharedSurface; +extern + +typedef LONG +(APIENTRY FN_DrvSynchronizeRedirectionBitmaps)( + _In_ DHPDEV dhpdev, + _Out_ UINT64* puiFenceID); +typedef FN_DrvSynchronizeRedirectionBitmaps *PFN_DrvSynchronizeRedirectionBitmaps; +extern FN_DrvSynchronizeRedirectionBitmaps DrvSynchronizeRedirectionBitmaps; + +#define WINDDI_MAX_BROADCAST_CONTEXT 64 +typedef struct tagCDDDXGK_REDIRBITMAPPRESENTINFO +{ + UINT NumDirtyRects; + PRECT DirtyRect; + UINT NumContexts; + HANDLE hContext[WINDDI_MAX_BROADCAST_CONTEXT+1]; +} CDDDXGK_REDIRBITMAPPRESENTINFO; + +typedef BOOL +(APIENTRY FN_DrvAccumulateD3DDirtyRect)( + _In_ SURFOBJ* psoSurf, + _In_ CDDDXGK_REDIRBITMAPPRESENTINFO* pDirty); +typedef FN_DrvAccumulateD3DDirtyRect *PFN_DrvAccumulateD3DDirtyRect; +extern FN_DrvAccumulateD3DDirtyRect DrvAccumulateD3DDirtyRect; + +typedef BOOL +(APIENTRY FN_DrvStartDxInterop)( + _In_ SURFOBJ* psoSurf, + _In_ BOOL bDiscard, + _In_ PVOID KernelModeDeviceHandle); +typedef FN_DrvStartDxInterop *PFN_DrvStartDxInterop; +extern FN_DrvStartDxInterop DrvStartDxInterop; + +typedef BOOL +(APIENTRY FN_DrvEndDxInterop)( + _In_ SURFOBJ* psoSurf, + _In_ BOOL bDiscard, + _Out_ BOOL* bDeviceLost, + _In_ PVOID KernelModeDeviceHandle); +typedef FN_DrvEndDxInterop *PFN_DrvEndDxInterop; +extern FN_DrvEndDxInterop DrvEndDxInterop; + +typedef VOID +(APIENTRY FN_DrvLockDisplayArea)( + _In_ DHPDEV dhpdev, + _In_opt_ RECTL *prcl); +typedef FN_DrvLockDisplayArea *PFN_DrvLockDisplayArea; +extern FN_DrvLockDisplayArea DrvLockDisplayArea; + +typedef VOID +(APIENTRY FN_DrvUnlockDisplayArea)( + _In_ DHPDEV dhpdev, + _In_opt_ RECTL *prcl); +typedef FN_DrvUnlockDisplayArea *PFN_DrvUnlockDisplayArea; +extern FN_DrvUnlockDisplayArea DrvUnlockDisplayArea; + +#endif /* (NTDDI_VERSION >= NTDDI_WIN7) */ #ifdef __cplusplus } Modified: trunk/reactos/win32ss/gdi/eng/ldevobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/ldevobj.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/ldevobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/ldevobj.c [iso-8859-1] Thu Oct 2 20:11:24 2014 @@ -292,6 +292,7 @@ pExportDir = pldev->pGdiDriverInfo->ExportSectionPointer; if (!pExportDir) { + ERR("LDEVOBJ_pvFindImageProcAddress: no export section found\n"); return NULL; } Modified: trunk/reactos/win32ss/reactx/ntddraw/eng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/reactx/ntddraw/eng… ============================================================================== --- trunk/reactos/win32ss/reactx/ntddraw/eng.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/reactx/ntddraw/eng.c [iso-8859-1] Thu Oct 2 20:11:24 2014 @@ -122,7 +122,7 @@ * This function is no longer used in Windows NT 2000/XP/2003 * *--*/ -DWORD +HRESULT APIENTRY EngDxIoctl(ULONG ulIoctl, PVOID pBuffer,

10 years, 1 month

← Newer
1
...
66
67
68
69
70
71
72
73
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2014